Merge pull request #1 from scaleway/client-update

Client update

Author: Sonderfall

.github/workflows/publish.yaml

@@ -21,7 +21,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install dependencies
       run: |

.github/workflows/test.yaml

@@ -13,7 +13,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install dependencies
       run: |
@@ -39,5 +39,5 @@ jobs:
       run: pytest -s --showprogress -vv tests/
       env:
         CIRQ_SCALEWAY_PROJECT_ID: ${{ secrets.STG_CIRQ_SCALEWAY_PROJECT_ID }}
-        CIRQ_SCALEWAY_API_TOKEN: ${{ secrets.STG_CIRQ_SCALEWAY_API_TOKEN }}
+        CIRQ_SCALEWAY_SECRET_KEY: ${{ secrets.STG_CIRQ_SCALEWAY_API_TOKEN }}
         CIRQ_SCALEWAY_API_URL: ${{ secrets.STG_CIRQ_SCALEWAY_API_URL }}

cirq_scaleway/scaleway_client.py

@@ -15,26 +15,20 @@
 
 from typing import Union, Optional
 
+from scaleway_qaas_client import QaaSClient, QaaSPlatform
+
 from .scaleway_session import ScalewaySession
-from .scaleway_client import QaaSClient
 
 
 class ScalewayDevice(cirq.devices.Device):
     def __init__(
         self,
         client: QaaSClient,
-        id: str,
-        name: str,
-        version: str,
-        num_qubits: int,
-        metadata: Optional[str],
+        platform: QaaSPlatform,
     ) -> None:
         self.__id = id
         self.__client = client
-        self.__version = version
-        self.__num_qubits = num_qubits
-        self.__name = name
-        self.__metadata = metadata
+        self.__platform = platform
 
     def __repr__(self) -> str:
         return f"<ScalewayDevice(name={self.__name},num_qubits={self.__num_qubits},platform_id={self.id})>"
@@ -46,7 +40,7 @@ def id(self) -> str:
         Returns:
             str: The UUID of the platform.
         """
-        return self.__id
+        return self.__platform.id
 
     @property
     def availability(self) -> str:
@@ -55,9 +49,9 @@ def availability(self) -> str:
         Returns:
             str: the current availability statys of the session. Can be either: available, shortage or scarce
         """
-        resp = self.__client.get_platform(self.__id)
+        platform = self.__client.get_platform(self.__platform.id)
 
-        return resp.get("availability")
+        return platform.availability
 
     @property
     def name(self) -> str:
@@ -66,7 +60,7 @@ def name(self) -> str:
         Returns:
             str: the name of the platform.
         """
-        return self.__name
+        return self.__platform.name
 
     @property
     def num_qubits(self) -> int:
@@ -76,7 +70,7 @@ def num_qubits(self) -> int:
         Returns:
             int: the estimated amount of maximum number of runnable qubits.
         """
-        return self.__num_qubits
+        return self.__platform.max_qubit_count
 
     @property
     def version(self):
@@ -85,13 +79,13 @@ def version(self):
         Returns:
             str: the platform's version.
         """
-        return self.__version
+        return self.__platform.version
 
     def create_session(
         self,
         name: Optional[str] = "qsim-session-from-cirq",
         deduplication_id: Optional[str] = "qsim-session-from-cirq",
-        max_duration: Union[int, str] = "1h",
+        max_duration: Union[int, str] = "59m",
         max_idle_duration: Union[int, str] = "20m",
     ) -> ScalewaySession:
         """Create a new device session to run job against.