azure-quantum 2.3.0__py3-none-any.whl → 2.5.0.dev0__py3-none-any.whl

azure/quantum/_client/py.typed

@@ -0,0 +1 @@
+# Marker file for PEP 561.

azure/quantum/target/microsoft/elements/dft/target.py

@@ -195,6 +195,7 @@ class MicrosoftElementsDft(Target):
             "geometry": [],
             "symbols": [],
         }
+        bohr_to_angstrom = 0.52917721092
         for line in lines:
             if line:
                 elements = line.split()
@@ -202,7 +203,7 @@ class MicrosoftElementsDft(Target):
                     raise ValueError("Invalid xyz format.")
                 symbol, x, y, z = elements
                 mol["symbols"].append(symbol)
-                mol["geometry"] += [float(x), float(y), float(z)]
+                mol["geometry"] += [float(x)/bohr_to_angstrom, float(y)/bohr_to_angstrom, float(z)/bohr_to_angstrom]
             else:
                 break
         

azure/quantum/target/rigetti/target.py

@@ -53,7 +53,7 @@ class RigettiTarget(str, Enum):
         if target_name == RigettiTarget.QVM.value:
             return 20
         elif target_name == RigettiTarget.ANKAA_3.value:
-            return 82
+            return 84
         elif target_name == RigettiTarget.ANKAA_9Q_3.value:
             return 9
         else:

azure/quantum/version.py

@@ -5,4 +5,4 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 ##
-__version__ = "2.3.0"
+__version__ = "2.5.0.dev0"

azure/quantum/workspace.py

@@ -10,6 +10,7 @@ an Azure Quantum Workspace.
 from __future__ import annotations
 from datetime import datetime
 import logging
+from urllib.parse import quote
 from typing import (
     Any,
     Dict,
@@ -20,7 +21,9 @@ from typing import (
     Tuple,
     Union,
 )
-from azure.quantum._client import QuantumClient
+from azure.core.paging import ItemPaged
+from azure.quantum._client import ServicesClient
+from azure.quantum._client.models import JobDetails, ItemDetails, SessionDetails
 from azure.quantum._client.operations import (
     JobsOperations,
     StorageOperations,
@@ -49,7 +52,6 @@ from azure.quantum.storage import (
 if TYPE_CHECKING:
     from azure.quantum.target import Target
 
-
 logger = logging.getLogger(__name__)
 
 __all__ = ["Workspace"]
@@ -139,6 +141,9 @@ class Workspace:
 
         self._connection_params = connection_params
         self._storage = storage
+        self._subscription_id = connection_params.subscription_id
+        self._resource_group = connection_params.resource_group
+        self._workspace_name = connection_params.workspace_name
 
         # Create QuantumClient
         self._client = self._create_client()
@@ -213,7 +218,7 @@ class Workspace:
         """
         return self._storage
 
-    def _create_client(self) -> QuantumClient:
+    def _create_client(self) -> ServicesClient:
         """"
         An internal method to (re)create the underlying Azure SDK REST API client.
 
@@ -224,12 +229,12 @@ class Workspace:
         kwargs = {}
         if connection_params.api_version:
             kwargs["api_version"] = connection_params.api_version
-        client = QuantumClient(
+        client = ServicesClient(
+            region=connection_params.location,
             credential=connection_params.get_credential_or_default(),
             subscription_id=connection_params.subscription_id,
             resource_group_name=connection_params.resource_group,
             workspace_name=connection_params.workspace_name,
-            azure_region=connection_params.location,
             user_agent=connection_params.get_full_user_agent(),
             credential_scopes = [ConnectionConstants.DATA_PLANE_CREDENTIAL_SCOPE],
             endpoint=connection_params.quantum_endpoint,
@@ -352,7 +357,11 @@ class Workspace:
         blob_details = BlobDetails(
             container_name=container_name, blob_name=blob_name
         )
-        container_uri = client.sas_uri(blob_details=blob_details)
+        container_uri = client.get_sas_uri(
+            self._subscription_id,
+            self._resource_group,
+            self._workspace_name, 
+            blob_details=blob_details)
 
         logger.debug("Container URI from service: %s", container_uri)
         return container_uri.sas_uri
@@ -368,8 +377,12 @@ class Workspace:
         :rtype: Job
         """
         client = self._get_jobs_client()
-        details = client.create(
-            job.details.id, job.details
+        details = client.create_or_replace(
+            self._subscription_id,
+            self._resource_group,
+            self._workspace_name,
+            job.details.id, 
+            job.details
         )
         return Job(self, details)
 
@@ -385,8 +398,16 @@ class Workspace:
         :rtype: Job
         """
         client = self._get_jobs_client()
-        client.cancel(job.details.id)
-        details = client.get(job.id)
+        client.delete(
+            self._subscription_id,
+            self._resource_group,
+            self._workspace_name,
+            job.details.id)
+        details = client.get(
+            self._subscription_id,
+            self._resource_group,
+            self._workspace_name,
+            job.id)
         return Job(self, details)
 
     def get_job(self, job_id: str) -> Job:
@@ -404,7 +425,11 @@ class Workspace:
         from azure.quantum.target import Target
 
         client = self._get_jobs_client()
-        details = client.get(job_id)
+        details = client.get(
+            self._subscription_id,
+            self._resource_group,
+            self._workspace_name,
+            job_id)
         target_factory = TargetFactory(base_cls=Target, workspace=self)
         # pylint: disable=protected-access
         target_cls = target_factory._target_cls(
@@ -416,8 +441,14 @@ class Workspace:
     def list_jobs(
         self,
         name_match: Optional[str] = None,
-        status: Optional[JobStatus] = None,
-        created_after: Optional[datetime] = None
+        job_type: Optional[list[str]]= None,
+        provider: Optional[list[str]]= None,
+        target: Optional[list[str]]= None,
+        status: Optional[list[JobStatus]] = None,
+        created_after: Optional[datetime] = None,
+        created_before: Optional[datetime] = None,
+        orderby_property: Optional[str] = None,
+        is_asc: Optional[bool] = True
     ) -> List[Job]:
         """
         Returns list of jobs that meet optional (limited) filter criteria.
@@ -434,17 +465,54 @@ class Workspace:
         :return: Jobs that matched the search criteria.
         :rtype: typing.List[Job]
         """
-        client = self._get_jobs_client()
-        jobs = client.list()
+        paginator = self.list_jobs_paginated (
+            name_match=name_match,
+            job_type=job_type,
+            provider=provider,
+            target=target,
+            status=status,
+            created_after=created_after,
+            created_before=created_before,
+            orderby_property=orderby_property,
+            is_asc=is_asc)
 
         result = []
-        for j in jobs:
+        for j in paginator:
             deserialized_job = Job(self, j)
-            if deserialized_job.matches_filter(name_match, status, created_after):
-                result.append(deserialized_job)
+            result.append(deserialized_job)
 
         return result
 
+    def list_jobs_paginated( 
+        self,
+        *,
+        name_match: Optional[str] = None, 
+        job_type: Optional[str]= None, 
+        provider: Optional[list[str]]= None, 
+        target: Optional[list[str]]= None, 
+        status: Optional[list[JobStatus]] = None, 
+        created_after: Optional[datetime] = None,
+        created_before: Optional[datetime] = None, 
+        skip: Optional[int] = 0,
+        top: Optional[int]=100,
+        orderby_property: Optional[str] = None,
+        is_asc: Optional[bool] = True
+    ) -> ItemPaged[JobDetails]:
+        client = self._get_jobs_client()
+
+        job_filter = self._create_filter(
+            job_name=name_match,
+            job_type=job_type,
+            provider_ids=provider,
+            target=target,
+            status=status,
+            created_after=created_after,
+            created_before=created_before
+        )
+        orderby = self._create_orderby(orderby_property, is_asc)
+
+        return client.list(subscription_id=self.subscription_id, resource_group_name=self.resource_group, workspace_name=self._workspace_name, filter=job_filter, orderby=orderby, top = top, skip = skip)
+
     def _get_target_status(
             self,
             name: Optional[str] = None,
@@ -465,7 +533,10 @@ class Workspace:
         """
         return [
             (provider.id, target)
-            for provider in self._client.providers.get_status()
+            for provider in self._client.providers.list(
+                self._subscription_id,
+                self._resource_group,
+                self._workspace_name)
             for target in provider.targets
             if (provider_id is None or provider.id.lower() == provider_id.lower())
                 and (name is None or target.id.lower() == name.lower())
@@ -521,10 +592,24 @@ class Workspace:
         :rtype: typing.List[typing.Dict[str, typing.Any]
         """
         client = self._get_quotas_client()
-        return [q.as_dict() for q in client.list()]
+        return [q.as_dict() for q in client.list(
+            self._subscription_id,
+            self._resource_group,
+            self._workspace_name
+        )]
 
     def list_top_level_items(
-        self
+        self,
+        name_match: Optional[str] = None,
+        item_type: Optional[list[str]]= None,
+        job_type: Optional[list[str]]= None,
+        provider: Optional[list[str]]= None,
+        target: Optional[list[str]]= None,
+        status: Optional[list[JobStatus]] = None,
+        created_after: Optional[datetime] = None,
+        created_before: Optional[datetime] = None,
+        orderby_property: Optional[str] = None,
+        is_asc: Optional[bool] = True
     ) -> List[Union[Job, Session]]:
         """
         Get a list of top level items for the given workspace,
@@ -534,14 +619,64 @@ class Workspace:
         :return: List of Workspace top level Jobs or Sessions.
         :rtype: typing.List[typing.Union[Job, Session]]
         """
-        client = self._get_top_level_items_client()
-        item_details_list = client.list()
+        paginator = self.list_top_level_items_paginated(
+            name_match=name_match,
+            item_type=item_type,
+            job_type=job_type,
+            provider=provider,
+            target=target,
+            status=status,
+            created_after=created_after,
+            created_before=created_before,
+            orderby_property=orderby_property,
+            is_asc=is_asc
+        )
+
         result = [WorkspaceItemFactory.__new__(workspace=self, item_details=item_details)
-                  for item_details in item_details_list]
+                  for item_details in paginator]
         return result
 
+    def list_top_level_items_paginated( 
+        self,
+        *,
+        name_match: Optional[str] = None, 
+        item_type: Optional[str]= None, 
+        job_type: Optional[str]= None, 
+        provider: Optional[list[str]]= None, 
+        target: Optional[list[str]]= None, 
+        status: Optional[list[JobStatus]] = None, 
+        created_after: Optional[datetime] = None,
+        created_before: Optional[datetime] = None, 
+        skip: Optional[int] = 0,
+        top: Optional[int]=100,
+        orderby_property: Optional[str] = None,
+        is_asc: Optional[bool] = True
+    ) -> ItemPaged[ItemDetails]:
+        client = self._get_top_level_items_client()
+
+        top_level_item_filter = self._create_filter(
+            job_name=name_match,
+            item_type=item_type,
+            job_type=job_type,
+            provider_ids=provider,
+            target=target,
+            status=status,
+            created_after=created_after,
+            created_before=created_before
+        )
+        orderby = self._create_orderby(orderby_property, is_asc)
+
+        return client.list(subscription_id=self.subscription_id, resource_group_name=self.resource_group, workspace_name=self._workspace_name, filter=top_level_item_filter, orderby=orderby, top = top, skip = skip)
+
     def list_sessions(
-        self
+        self,
+        provider: Optional[list[str]]= None,
+        target: Optional[list[str]]= None,
+        status: Optional[list[JobStatus]] = None,
+        created_after: Optional[datetime] = None,
+        created_before: Optional[datetime] = None,
+        orderby_property: Optional[str] = None,
+        is_asc: Optional[bool] = True
     ) -> List[Session]:
         """
         Get the list of sessions in the given workspace.
@@ -549,11 +684,50 @@ class Workspace:
         :return: List of Workspace Sessions.
         :rtype: typing.List[Session]
         """
-        client = self._get_sessions_client()
-        session_details_list = client.list()
+        paginator = self.list_sessions_paginated(
+            provider=provider,
+            target=target,
+            status=status,
+            created_after=created_after,
+            created_before=created_before,
+            orderby_property=orderby_property,
+            is_asc=is_asc)
+
         result = [Session(workspace=self,details=session_details)
-                  for session_details in session_details_list]
+                  for session_details in paginator]
         return result
+    
+    def list_sessions_paginated(
+        self,
+        *,
+        provider: Optional[list[str]]= None, 
+        target: Optional[list[str]]= None, 
+        status: Optional[list[JobStatus]] = None, 
+        created_after: Optional[datetime] = None,
+        created_before: Optional[datetime] = None, 
+        skip: Optional[int] = 0, 
+        top: Optional[int]=100, 
+        orderby_property: Optional[str] = None,
+        is_asc: Optional[bool] = True
+    ) -> ItemPaged[SessionDetails]:
+        """
+        Get the list of sessions in the given workspace.
+
+        :return: List of Workspace Sessions.
+        :rtype: typing.List[Session]
+        """
+        client = self._get_sessions_client()
+        session_filter = self._create_filter(
+            provider_ids=provider,
+            target=target,
+            status=status,
+            created_after=created_after,
+            created_before=created_before
+        )
+
+        orderby = self._create_orderby(orderby_property=orderby_property, is_asc=is_asc)
+
+        return client.list(subscription_id=self.subscription_id, resource_group_name=self.resource_group, workspace_name=self._workspace_name, filter = session_filter, orderby=orderby, skip=skip, top=top)
 
     def open_session(
         self,
@@ -569,9 +743,12 @@ class Workspace:
         :rtype: Session
         """
         client = self._get_sessions_client()
-        session.details = client.open(
-            session_id=session.id,
-            session=session.details)
+        session.details = client.create_or_replace(
+            self._subscription_id,
+            self._resource_group,
+            self._workspace_name,
+            session.id,
+            session.details)
 
     def close_session(
         self,
@@ -587,9 +764,17 @@ class Workspace:
         """
         client = self._get_sessions_client()
         if not session.is_in_terminal_state():
-            session.details = client.close(session_id=session.id)
+            session.details = client.close(
+                self._subscription_id,
+                self._resource_group,
+                self._workspace_name,
+                session_id=session.id)
         else:
-            session.details = client.get(session_id=session.id)
+            session.details = client.get(
+                self._subscription_id,
+                self._resource_group,
+                self._workspace_name,
+                session_id=session.id)
 
         if session.target:
             if (session.target.latest_session
@@ -623,13 +808,21 @@ class Workspace:
         :rtype: Session
         """
         client = self._get_sessions_client()
-        session_details = client.get(session_id=session_id)
+        session_details = client.get(
+            self._subscription_id,
+            self._resource_group,
+            self._workspace_name,
+            session_id=session_id)
         result = Session(workspace=self, details=session_details)
         return result
 
     def list_session_jobs(
         self,
-        session_id: str
+        session_id: str,
+        name_match: Optional[str] = None,
+        status: Optional[list[JobStatus]] = None,
+        orderby_property: Optional[str] = None,
+        is_asc: Optional[bool] = True
     ) -> List[Job]:
         """
         Gets all jobs associated with a session.
@@ -640,12 +833,48 @@ class Workspace:
         :return: List of all jobs associated with a session.
         :rtype: typing.List[Job]
         """
-        client = self._get_sessions_client()
-        job_details_list = client.jobs_list(session_id=session_id)
+        paginator = self.list_session_jobs_paginated(
+            session_id=session_id,
+            name_match=name_match,
+            status=status,
+            orderby_property=orderby_property,
+            is_asc=is_asc)
+
         result = [Job(workspace=self, job_details=job_details)
-                  for job_details in job_details_list]
+                  for job_details in paginator]
         return result
 
+    def list_session_jobs_paginated(
+        self,
+        *,
+        session_id: str,
+        name_match: Optional[str] = None,
+        status: Optional[list[JobStatus]] = None,
+        skip: Optional[int] = 0,
+        top: Optional[int]=100,
+        orderby_property: Optional[str] = None,
+        is_asc: Optional[bool] = True
+    ) -> ItemPaged[JobDetails]:
+        """
+        Gets all jobs associated with a session.
+
+        :param session_id:
+            The id of session.
+
+        :return: List of all jobs associated with a session.
+        :rtype: typing.List[Job]
+        """
+        client = self._get_sessions_client()
+
+        session_job_filter = self._create_filter(
+            job_name=name_match,
+            status=status
+        )
+
+        orderby = self._create_orderby(orderby_property=orderby_property, is_asc=is_asc)
+
+        return client.jobs_list(subscription_id=self.subscription_id, resource_group_name=self.resource_group, workspace_name=self._workspace_name, session_id=session_id, filter = session_job_filter, orderby=orderby, skip=skip, top=top)
+
     def get_container_uri(
         self,
         job_id: Optional[str] = None,
@@ -691,3 +920,107 @@ class Workspace:
                 self.storage, container_name
             )
         return container_uri
+
+    def _create_filter(self,
+            job_name: Optional[str] = None,
+            item_type: Optional[List[str]] = None,
+            job_type: Optional[List[str]] = None,
+            provider_ids: Optional[List[str]] = None,
+            target: Optional[List[str]] = None,
+            status: Optional[List[str]] = None,
+            created_after: Optional[datetime] = None,
+            created_before: Optional[datetime] = None,) -> str:
+        has_filter = False
+        filter_string = ""
+
+        if job_name:
+            filter_string += f"startswith(Name, '{job_name}')"
+            has_filter = True
+
+        if (item_type is not None and item_type.count != 0):
+            if has_filter:
+                filter_string += " and "
+
+            filter_string += "("
+
+            item_type_filter = " or ".join([f"ItemType eq '{iid}'" for iid in item_type])
+
+            filter_string += f"{item_type_filter})"
+            has_filter = True
+
+        if (job_type is not None and job_type.count != 0):
+            if has_filter:
+                filter_string += " and "
+
+            filter_string += "("
+
+            job_type_filter = " or ".join([f"JobType eq '{jid}'" for jid in job_type])
+
+            filter_string += f"{job_type_filter})"
+            has_filter = True
+
+        if (provider_ids is not None and provider_ids.count != 0):
+            if has_filter:
+                filter_string += " and "
+
+            filter_string += "("
+
+            provider_filter = " or ".join([f"ProviderId eq '{pid}'" for pid in provider_ids])
+
+            filter_string += f"{provider_filter})"
+            has_filter = True
+
+        if (target is not None and target.count != 0):
+            if has_filter:
+                filter_string += " and "
+
+            filter_string += "("
+
+            target_filter = " or ".join([f"Target eq '{tid}'" for tid in target])
+
+            filter_string += f"{target_filter})"
+            has_filter = True
+
+        if (status is not None and status.count != 0):
+            if has_filter:
+                filter_string += " and "
+
+            filter_string += "("
+
+            status_filter = " or ".join([f"State eq '{sid}'" for sid in status])
+
+            filter_string += f"{status_filter})"
+            has_filter = True
+
+        if created_after is not None:
+            if has_filter:
+                filter_string += " and "
+
+            iso_date_string = created_after.date().isoformat()
+            filter_string += f"CreationTime ge {iso_date_string}"
+
+        if created_before is not None:
+            if has_filter:
+                filter_string += " and "
+
+            iso_date_string = created_before.date().isoformat()
+            filter_string += f"CreationTime le {iso_date_string}"
+
+        if filter_string:
+            return filter_string
+        else:
+            return None
+
+    def _create_orderby(self, orderby_property: str, is_asc: bool) -> str:
+        if orderby_property:
+            var_names = ["Name", "ItemType", "JobType", "ProviderId", "Target", "State", "CreationTime"]
+
+            if orderby_property in var_names:
+                orderby = f"{orderby_property} asc" if is_asc else f"{orderby_property} desc"
+            else:
+                raise ValueError(f"Invalid orderby property: {orderby_property}")
+
+            return orderby
+        else:
+            return None
+    

{azure_quantum-2.3.0.dist-info → azure_quantum-2.5.0.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azure-quantum
-Version: 2.3.0
+Version: 2.5.0.dev0
 Summary: Python client for Azure Quantum
 Home-page: https://github.com/microsoft/azure-quantum-python
 Author: Microsoft