feat(client): update client side

Author: vmscw

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.

cirq_scaleway/scaleway_device.py

@@ -14,13 +14,10 @@
 import os
 
 from typing import Optional, List, Dict
-from dotenv import dotenv_values
-
-from .scaleway_device import ScalewayDevice
-from .scaleway_client import QaaSClient
 
+from scaleway_qaas_client import QaaSClient
 
-_ENDPOINT_URL = "https://api.scaleway.com/qaas/v1alpha1"
+from .scaleway_device import ScalewayDevice
 
 
 class ScalewayQuantumService:
@@ -39,27 +36,19 @@ def __init__(
         Returns:
             ScalewayDevice: The device that match the given name. None if no match.
         """
-        env_token = dotenv_values().get("CIRQ_SCALEWAY_API_TOKEN") or os.getenv(
-            "CIRQ_SCALEWAY_API_TOKEN"
-        )
-        env_project_id = dotenv_values().get("CIRQ_SCALEWAY_PROJECT_ID") or os.getenv(
-            "CIRQ_SCALEWAY_PROJECT_ID"
-        )
-        env_api_url = dotenv_values().get("CIRQ_SCALEWAY_API_URL") or os.getenv(
-            "CIRQ_SCALEWAY_API_URL"
-        )
+        secret_key = secret_key or os.getenv("CIRQ_SCALEWAY_SECRET_KEY")
+        project_id = project_id or os.getenv("CIRQ_SCALEWAY_PROJECT_ID")
+        url = url or os.getenv("CIRQ_SCALEWAY_API_URL")
 
-        token = secret_key or env_token
-        if token is None:
+        if secret_key is None:
             raise Exception("secret_key is missing")
 
-        project_id = project_id or env_project_id
         if project_id is None:
             raise Exception("project_id is missing")
 
-        api_url = url or env_api_url or _ENDPOINT_URL
-
-        self.__client = QaaSClient(url=api_url, token=token, project_id=project_id)
+        self.__client = QaaSClient(
+            url=url, secret_key=secret_key, project_id=project_id
+        )
 
     def device(self, name: str) -> ScalewayDevice:
         """Returns a device matching the specified name.
@@ -97,20 +86,16 @@ def devices(self, name: Optional[str] = None, **kwargs) -> List[ScalewayDevice]:
         if kwargs.get("min_num_qubits") is not None:
             filters["min_num_qubits"] = kwargs.pop("min_num_qubits", None)
 
-        json_resp = self.__client.list_platforms(name)
+        platforms = self.__client.list_platforms(name)
 
-        for platform_dict in json_resp["platforms"]:
-            backend_name = platform_dict.get("backend_name")
+        for platform in platforms:
+            backend_name = platform.backend_name
 
             if backend_name == "qsim":
                 scaleway_platforms.append(
                     ScalewayDevice(
                         client=self.__client,
-                        id=platform_dict.get("id"),
-                        name=platform_dict.get("name"),
-                        version=platform_dict.get("version"),
-                        num_qubits=platform_dict.get("max_qubit_count"),
-                        metadata=platform_dict.get("metadata", None),
+                        platform=platform,
                     )
                 )