feat(ys): update to qio

Author: vmscw

.github/workflows/publish.yaml

@@ -17,6 +17,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
     - name: Set up Python
       uses: actions/setup-python@v4
@@ -26,16 +28,18 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build twine wheel scmver setuptools
+        pip install build twine setuptools-scm
 
-    - name: Get version from setup.py
+    - name: Get version
       id: version
       run: |
-        version=$(python3 setup.py --version)
+        version=$(python -m setuptools_scm)
         echo "version=$version" >> $GITHUB_ENV
+        echo "Version : $version"
 
     - name: Build package
-      run: python setup.py sdist bdist_wheel
+      run: |
+        python -m build
 
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@v1.5.0
@@ -48,4 +52,4 @@ jobs:
         git tag v$version
         git push origin v$version
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yaml

@@ -18,19 +18,19 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build twine wheel scmver setuptools
+        pip install build twine wheel scmver setuptools setuptools-scm
 
     - name: Get version from setup.py
       id: version
       run: |
-        version=$(python3 setup.py --version)
+        version=$(python -m setuptools_scm)
         echo "version=$version" >> $GITHUB_ENV
 
     - name: Build package
-      run: python setup.py sdist bdist_wheel
+      run: python -m build
 
     - name: Install package
-      run: pip install dist/pulser_scaleway-${version}-py3-none-any.whl
+      run: pip install dist/yardstiq_scaleway-${version}-py3-none-any.whl
 
     - name: Install test
       run: pip install -r tests/requirements.txt

pyproject.toml

@@ -11,8 +11,11 @@ requires-python = ">=3.12"
 dependencies = [
     "yardstiq>=0.1.0",
     "scaleway-qaas-client>=0.1.23",
-    "qami,"
+    "qami>=0.1.0",
 ]
 
+[project.urls]
+Repository = "https://github.com/scaleway/yardstiq-scaleway"
+
 [project.entry-points."yardstiq.plugins"]
 scaleway = "yardstiq_scaleway.plugin_loader"

yardstiq_scaleway/scaleway_provider.py

@@ -3,7 +3,7 @@
 
 from typing import List, Union
 
-from qami import (
+from qio.core import (
     QuantumProgram,
     QuantumProgramResult,
     QuantumComputationModel,
@@ -54,50 +54,49 @@ def deallocate(self, **kwargs) -> None:
             return
 
         self.__client.terminate_session(self.__session_id)
+        self.__session_id = None
 
     def run(
         self,
         program: Union[QuantumProgram, List[QuantumProgram]],
         shots: int,
-        wait: bool,
         **kwargs,
     ) -> List[QuantumProgramResult]:
         if not isinstance(program, list):
             program = [program]
 
-        computation_model = QuantumComputationModel(
+        computation_model_dict = QuantumComputationModel(
             programs=program,
             backend=None,
             client=None,
         ).to_dict()
 
-        computation_parameters = QuantumComputationParameters(
+        computation_parameters_dict = QuantumComputationParameters(
             shots=shots,
         ).to_dict()
 
-        model = self.__client.create_model(computation_model)
+        model = self.__client.create_model(computation_model_dict)
 
         if not model:
             raise RuntimeError("Failed to push model data")
 
-        job = self.__client.create_job(self.__session_id, model_id=model.id)
+        job = self.__client.create_job(
+            self.__session_id, model_id=model.id, parameters=computation_parameters_dict
+        )
 
-        if wait:
-            while job.status in ["waiting", "running"]:
-                time.sleep(2)
-                job = self.__client.get_job(job.id)
+        while job.status in ["waiting", "running"]:
+            time.sleep(2)
+            job = self.__client.get_job(job.id)
 
         if job.status == "error":
             raise RuntimeError(f"Job failed with error: {job.progress_message}")
 
-        raw_results = self.__client.list_job_results(job.id)
+        job_results = self.__client.list_job_results(job.id)
 
         program_results = list(
             map(
-                lambda r: QuantumProgramResult.from_json(
-                    self._extract_payload_from_response(r)
-                ),
-                raw_results,
+                lambda r: self._extract_payload_from_response(r),
+                job_results,
             )
         )
 
@@ -106,7 +105,9 @@ def run(
 
         return program_results
 
-    def _extract_payload_from_response(self, job_result: QaaSJobResult) -> str:
+    def _extract_payload_from_response(
+        self, job_result: QaaSJobResult
+    ) -> QuantumProgramResult:
         result = job_result.result
 
         if result is None or result == "":
@@ -115,12 +116,11 @@ def _extract_payload_from_response(self, job_result: QaaSJobResult) -> str:
             if url is not None:
                 resp = httpx.get(url)
                 resp.raise_for_status()
-
-                return resp.text
+                result = resp.text
             else:
                 raise RuntimeError("Got result with empty data and url fields")
-        else:
-            return result
+
+        return QuantumProgramResult.from_json(result)
 
     @property
     def max_qubit_count(self) -> int: