feat(client): fix client

Author: vmscw

scaleway_qaas_client/client.py

@@ -14,63 +14,75 @@
 import json
 import randomname
 
+from pytimeparse.timeparse import timeparse
+
 from typing import List, Optional, Dict, Union
 
 from scaleway_qaas_client.quantum_as_a_service_api_client.models import (
     CreateJobBody,
-    CancelJobBody,
     CreateJobBodyCircuit,
     CreateSessionBody,
     TerminateSessionBody,
+    CancelJobBody,
     ScalewayQaasV1Alpha1Platform,
     ScalewayQaasV1Alpha1Job,
     ScalewayQaasV1Alpha1JobResult,
     ScalewayQaasV1Alpha1Session,
 )
 
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.sessions.create_session import (
-    sync as _create_session_sync,
+    sync_detailed as _create_session_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.sessions.get_session import (
-    sync as _get_session_sync,
+    sync_detailed as _get_session_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.sessions.list_sessions import (
-    sync as _list_session_sync,
+    sync_detailed as _list_session_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.sessions.terminate_session import (
-    sync as _terminate_session_sync,
+    sync_detailed as _terminate_session_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.sessions.delete_session import (
     sync_detailed as _delete_session_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.platforms.list_platforms import (
-    sync as _list_platforms_sync,
+    sync_detailed as _list_platforms_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.platforms.get_platform import (
-    sync as _get_platform_sync,
+    sync_detailed as _get_platform_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.jobs.create_job import (
-    sync as _create_job_sync,
+    sync_detailed as _create_job_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.jobs.get_job import (
-    sync as _get_job_sync,
+    sync_detailed as _get_job_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.jobs.cancel_job import (
-    sync as _cancel_job_sync,
+    sync_detailed as _cancel_job_sync,
 )
 from scaleway_qaas_client.quantum_as_a_service_api_client.api.jobs.list_job_results import (
-    sync as _list_job_result_sync,
+    sync_detailed as _list_job_result_sync,
 )
+from scaleway_qaas_client.quantum_as_a_service_api_client.types import Response
 
 from scaleway_qaas_client.quantum_as_a_service_api_client.client import (
-    Client,
     AuthenticatedClient,
 )
 
 
 _DEFAULT_URL = "https://api.scaleway.com"
 
 
+def _raise_on_error(response: Response):
+    if not response:
+        raise Exception("error: None response")
+
+    if response.status_code.is_server_error or response.status_code.is_client_error:
+        raise Exception(
+            f"error {response.status_code}: {response.content.decode("utf-8")}"
+        )
+
+
 class QaaSClient:
     def __init__(self, project_id: str, secret_key: str, url: str = _DEFAULT_URL):
         self.__project_id = project_id
@@ -89,30 +101,38 @@ def __repr__(self) -> str:
         return f"<QaaSClient(url={self.__client._base_url},project_id={self.__project_id})>"
 
     def get_platform(self, platform_id: str) -> ScalewayQaasV1Alpha1Platform:
-        platform = _get_platform_sync(client=self.__client, platform_id=platform_id)
+        response = _get_platform_sync(client=self.__client, platform_id=platform_id)
+
+        _raise_on_error(response)
 
-        return platform
+        return response.parsed
 
     def list_platforms(
         self, name: Optional[str] = None
     ) -> List[ScalewayQaasV1Alpha1Platform]:
         response = _list_platforms_sync(client=self.__client, name=name)
 
-        assert response
+        _raise_on_error(response)
 
-        return response.platforms
+        return response.parsed.platforms
 
     def create_session(
         self,
         platform_id: str,
-        max_duration: str,
-        max_idle_duration: str,
+        max_duration: Union[str, int],
+        max_idle_duration: Union[str, int],
         deduplication_id: Optional[str] = None,
         name: Optional[str] = None,
     ) -> ScalewayQaasV1Alpha1Session:
         name = name if name else f"qs-{randomname.get_name()}"
 
-        session = _create_session_sync(
+        if isinstance(max_duration, str):
+            max_duration = f"{timeparse(max_duration)}s"
+
+        if isinstance(max_idle_duration, str):
+            max_idle_duration = f"{timeparse(max_idle_duration)}s"
+
+        response = _create_session_sync(
             client=self.__client,
             body=CreateSessionBody(
                 project_id=self.__project_id,
@@ -124,35 +144,38 @@ def create_session(
             ),
         )
 
-        return session
+        _raise_on_error(response)
+
+        return response.parsed
 
     def get_session(self, session_id: str) -> ScalewayQaasV1Alpha1Session:
-        session = _get_session_sync(client=self.__client, session_id=session_id)
+        response = _get_session_sync(client=self.__client, session_id=session_id)
 
-        return session
+        _raise_on_error(response)
+
+        return response.parsed
 
     def list_session(
         self, platform_id: Optional[str] = None
     ) -> List[ScalewayQaasV1Alpha1Session]:
         response = _list_session_sync(
-            client=self.__client,
-            project_id=self.__project_id,
-            platform_id=platform_id
+            client=self.__client, project_id=self.__project_id, platform_id=platform_id
         )
 
-        assert response
+        _raise_on_error(response)
 
-        return response.sessions
+        return response.parsed.sessions
 
     def terminate_session(self, session_id: str) -> ScalewayQaasV1Alpha1Session:
-        session = _terminate_session_sync(
+        response = _terminate_session_sync(
             client=self.__client,
-            body=TerminateSessionBody(
-                session_id=session_id,
-            ),
+            session_id=session_id,
+            body=TerminateSessionBody(),
         )
 
-        return session
+        _raise_on_error(response)
+
+        return response.parsed
 
     def delete_session(self, session_id: str):
         _delete_session_sync(client=self.__client, session_id=session_id)
@@ -166,7 +189,7 @@ def create_job(
         payload = payload if isinstance(payload, str) else json.dumps(payload)
         name = name if name else f"qj-{randomname.get_name()}"
 
-        job = _create_job_sync(
+        response = _create_job_sync(
             client=self.__client,
             body=CreateJobBody(
                 name=name,
@@ -175,19 +198,31 @@ def create_job(
             ),
         )
 
-        return job
+        _raise_on_error(response)
+
+        return response.parsed
 
     def get_job(self, job_id: str) -> ScalewayQaasV1Alpha1Job:
-        job = _get_job_sync(client=self.__client, job_id=job_id)
+        response = _get_job_sync(client=self.__client, job_id=job_id)
 
-        return job
+        _raise_on_error(response)
+
+        return response.parsed
 
     def list_job_results(self, job_id: str) -> List[ScalewayQaasV1Alpha1JobResult]:
         response = _list_job_result_sync(client=self.__client, job_id=job_id)
 
-        return response.job_results
+        _raise_on_error(response)
+
+        return response.parsed.job_results
 
     def cancel_job(self, job_id: str) -> ScalewayQaasV1Alpha1Job:
-        job = _cancel_job_sync(client=self.__client, body=CancelJobBody(job_id=job_id))
+        response = _cancel_job_sync(
+            client=self.__client,
+            job_id=job_id,
+            body=CancelJobBody(),
+        )
+
+        _raise_on_error(response)
 
-        return job
+        return response.parsed

setup.py

@@ -22,7 +22,7 @@
 
 setup(
     name="scaleway_qaas_client",
-    version="0.1.4",
+    version="0.1.5",
     project_urls={
         "Documentation": "https://www.scaleway.com/en/quantum-as-a-service/",
         "Source": "https://github.com/scaleway/scaleway-qaas-client-pythom",

tests/test_api.py

@@ -51,7 +51,7 @@ def test_create_delete_session():
     assert target_platform.id is not None
 
     session = client.create_session(
-        platform_id=target_platform.id, max_duration="2min", max_idle_duration="2min"
+        platform_id=target_platform.id, max_duration="2m", max_idle_duration="2m"
     )
 
     assert session is not None