azure-quantum 1.1.1.dev0__tar.gz → 1.1.2.dev0__tar.gz

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azure-quantum
-Version: 1.1.1.dev0
+Version: 1.1.2.dev0
 Summary: Python client for Azure Quantum
 Home-page: https://github.com/microsoft/azure-quantum-python
 Author: Microsoft
@@ -23,10 +23,9 @@ Provides-Extra: all
 
 [![Build Status](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_apis/build/status/microsoft.qdk-python?branchName=main)](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_build/latest?definitionId=32&branchName=main) [![PyPI version](https://badge.fury.io/py/azure-quantum.svg)](https://badge.fury.io/py/azure-quantum)
 
-Azure Quantum is Microsoft's cloud service for running Quantum Computing circuits or solving Optimization problems with our quantum partners and technologies. The `azure-quantum` package for Python provides functionality for interacting with Azure Quantum workspaces,
-including creating jobs, listing jobs, and retrieving job results. For more information, view the [Azure Quantum Documentation](https://docs.microsoft.com/azure/quantum).
+Azure Quantum is Microsoft's cloud service for running Quantum Computing programs and circuits with our quantum partners and technologies. The `azure-quantum` package for Python provides functionality for interacting with Azure Quantum workspaces, including creating jobs, listing jobs, and retrieving job results. For more information, view the [Azure Quantum Documentation](https://learn.microsoft.com/en-us/azure/quantum/).
 
-This package supports submitting quantum circuits or problem definitions written with Python. To submit quantum programs written with Q#, Microsoft's Domain-specific language for Quantum Programming, view [Submit Q# Jobs to Azure Quantum](https://docs.microsoft.com/azure/quantum/how-to-submit-jobs).
+This package supports submitting quantum programs or circuits written with Python. To submit quantum programs written with Q#, Microsoft's Domain-specific language for Quantum Programming, view [Submit Q# Jobs to Azure Quantum](https://learn.microsoft.com/azure/quantum/how-to-submit-jobs).
 
 ## Installation ##
 
@@ -50,13 +49,13 @@ pip install azure-quantum[cirq]
 
 ## Getting started and Quickstart guides ##
 
-To work in Azure Quantum, you need an Azure subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/). Follow the [Create an Azure Quantum workspace](https://docs.microsoft.com/azure/quantum/how-to-create-workspace) how-to guide to set up your Workspace and enable your preferred providers.
+To work in Azure Quantum, you need an Azure subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/). Follow the [Create an Azure Quantum workspace](https://learn.microsoft.com/azure/quantum/how-to-create-workspace) how-to guide to set up your Workspace and enable your preferred providers.
 
 To get started, visit the following Quickstart guides:
 
-- [Quickstart: Submit a circuit with Qiskit](https://docs.microsoft.com/azure/quantum/quickstart-microsoft-qiskit)
-- [Quickstart: Submit a circuit with Cirq](https://docs.microsoft.com/azure/quantum/quickstart-microsoft-qiskit)
-- [Quickstart: Submit a circuit with a provider-specific format](https://docs.microsoft.com/azure/quantum/quickstart-microsoft-provider-format).
+- [Quickstart: Submit a circuit with Qiskit](https://learn.microsoft.com/azure/quantum/quickstart-microsoft-qiskit)
+- [Quickstart: Submit a circuit with Cirq](https://learn.microsoft.com/azure/quantum/quickstart-microsoft-qiskit)
+- [Quickstart: Submit a circuit with a provider-specific format](https://learn.microsoft.com/azure/quantum/quickstart-microsoft-provider-format).
 
 ## General usage ##
 
@@ -80,16 +79,16 @@ To list all targets that are available to your workspace, run
 workspace.get_targets()
 ```
 
-### Submit a quantum circuit or optimization problem ###
+### Submit a quantum program or circuit ###
 
-First, define a quantum circuit or optimization problem, and create a job by submitting it to one of the available targets:
+First, define a quantum program or circuit, and create a job by submitting it to one of the available targets:
 
 ```python
 # Enter target name below
-target = workspace.get_targets("")
+target = workspace.get_targets("mytarget")
 
-# Submit quantum circuit or optimization problem
-job = target.submit(problem)
+# Submit quantum program or circuit
+job = target.submit(my_quantum_program)
 
 # Wait for job to complete and fetch results
 result = job.get_results()

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/README.md

@@ -4,10 +4,9 @@
 
 [![Build Status](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_apis/build/status/microsoft.qdk-python?branchName=main)](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_build/latest?definitionId=32&branchName=main) [![PyPI version](https://badge.fury.io/py/azure-quantum.svg)](https://badge.fury.io/py/azure-quantum)
 
-Azure Quantum is Microsoft's cloud service for running Quantum Computing circuits or solving Optimization problems with our quantum partners and technologies. The `azure-quantum` package for Python provides functionality for interacting with Azure Quantum workspaces,
-including creating jobs, listing jobs, and retrieving job results. For more information, view the [Azure Quantum Documentation](https://docs.microsoft.com/azure/quantum).
+Azure Quantum is Microsoft's cloud service for running Quantum Computing programs and circuits with our quantum partners and technologies. The `azure-quantum` package for Python provides functionality for interacting with Azure Quantum workspaces, including creating jobs, listing jobs, and retrieving job results. For more information, view the [Azure Quantum Documentation](https://learn.microsoft.com/en-us/azure/quantum/).
 
-This package supports submitting quantum circuits or problem definitions written with Python. To submit quantum programs written with Q#, Microsoft's Domain-specific language for Quantum Programming, view [Submit Q# Jobs to Azure Quantum](https://docs.microsoft.com/azure/quantum/how-to-submit-jobs).
+This package supports submitting quantum programs or circuits written with Python. To submit quantum programs written with Q#, Microsoft's Domain-specific language for Quantum Programming, view [Submit Q# Jobs to Azure Quantum](https://learn.microsoft.com/azure/quantum/how-to-submit-jobs).
 
 ## Installation ##
 
@@ -31,13 +30,13 @@ pip install azure-quantum[cirq]
 
 ## Getting started and Quickstart guides ##
 
-To work in Azure Quantum, you need an Azure subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/). Follow the [Create an Azure Quantum workspace](https://docs.microsoft.com/azure/quantum/how-to-create-workspace) how-to guide to set up your Workspace and enable your preferred providers.
+To work in Azure Quantum, you need an Azure subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/). Follow the [Create an Azure Quantum workspace](https://learn.microsoft.com/azure/quantum/how-to-create-workspace) how-to guide to set up your Workspace and enable your preferred providers.
 
 To get started, visit the following Quickstart guides:
 
-- [Quickstart: Submit a circuit with Qiskit](https://docs.microsoft.com/azure/quantum/quickstart-microsoft-qiskit)
-- [Quickstart: Submit a circuit with Cirq](https://docs.microsoft.com/azure/quantum/quickstart-microsoft-qiskit)
-- [Quickstart: Submit a circuit with a provider-specific format](https://docs.microsoft.com/azure/quantum/quickstart-microsoft-provider-format).
+- [Quickstart: Submit a circuit with Qiskit](https://learn.microsoft.com/azure/quantum/quickstart-microsoft-qiskit)
+- [Quickstart: Submit a circuit with Cirq](https://learn.microsoft.com/azure/quantum/quickstart-microsoft-qiskit)
+- [Quickstart: Submit a circuit with a provider-specific format](https://learn.microsoft.com/azure/quantum/quickstart-microsoft-provider-format).
 
 ## General usage ##
 
@@ -61,16 +60,16 @@ To list all targets that are available to your workspace, run
 workspace.get_targets()
 ```
 
-### Submit a quantum circuit or optimization problem ###
+### Submit a quantum program or circuit ###
 
-First, define a quantum circuit or optimization problem, and create a job by submitting it to one of the available targets:
+First, define a quantum program or circuit, and create a job by submitting it to one of the available targets:
 
 ```python
 # Enter target name below
-target = workspace.get_targets("")
+target = workspace.get_targets("mytarget")
 
-# Submit quantum circuit or optimization problem
-job = target.submit(problem)
+# Submit quantum program or circuit
+job = target.submit(my_quantum_program)
 
 # Wait for job to complete and fetch results
 result = job.get_results()

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/_authentication/_default.py

@@ -50,43 +50,43 @@ class _DefaultAzureCredential(_ChainedTokenCredential):
        This is a mitigation for bug https://github.com/Azure/azure-sdk-for-python/issues/18975
        We need the following parameters to enable auto-detection of tenant_id
        - subscription_id
-       - arm_base_url (defaults to the production url "https://management.azure.com/")
+       - arm_endpoint (defaults to the production url "https://management.azure.com/")
     3) Add custom TokenFileCredential as first method to attempt,
        which will look for a local access token.
     """
     def __init__(
         self,
-        arm_base_url: str,
+        arm_endpoint: str,
         subscription_id: str,
         client_id: Optional[str] = None,
         tenant_id: Optional[str] = None,
         authority: Optional[str] = None,
     ):
-        if arm_base_url is None:
-            raise ValueError("arm_base_url is mandatory parameter")
+        if arm_endpoint is None:
+            raise ValueError("arm_endpoint is mandatory parameter")
         if subscription_id is None:
             raise ValueError("subscription_id is mandatory parameter")
 
         self.authority = self._authority_or_default(
             authority=authority,
-            arm_base_url=arm_base_url)
+            arm_endpoint=arm_endpoint)
         self.tenant_id = tenant_id
         self.subscription_id = subscription_id
-        self.arm_base_url = arm_base_url
+        self.arm_endpoint = arm_endpoint
         self.client_id = client_id
         # credentials will be created lazy on the first call to get_token
         super(_DefaultAzureCredential, self).__init__()
 
-    def _authority_or_default(self, authority: str, arm_base_url: str):
+    def _authority_or_default(self, authority: str, arm_endpoint: str):
         if authority:
             return AzureIdentityInternals.normalize_authority(authority)
-        if arm_base_url == ConnectionConstants.DOGFOOD_ARM_BASE_URL:
+        if arm_endpoint == ConnectionConstants.ARM_DOGFOOD_ENDPOINT:
             return ConnectionConstants.DOGFOOD_AUTHORITY
         return ConnectionConstants.AUTHORITY
 
     def _initialize_credentials(self):
         self._discover_tenant_id_(
-            arm_base_url=self.arm_base_url,
+            arm_endpoint=self.arm_endpoint,
             subscription_id=self.subscription_id)
         credentials = []
         credentials.append(_TokenFileCredential())
@@ -120,7 +120,7 @@ class _DefaultAzureCredential(_ChainedTokenCredential):
 
         return super(_DefaultAzureCredential, self).get_token(*scopes, **kwargs)
 
-    def _discover_tenant_id_(self, arm_base_url:str, subscription_id:str):
+    def _discover_tenant_id_(self, arm_endpoint:str, subscription_id:str):
         """
         If the tenant_id was not given, try to obtain it
         by calling the management endpoint for the subscription_id,
@@ -131,7 +131,7 @@ class _DefaultAzureCredential(_ChainedTokenCredential):
 
         try:
             url = (
-                f"{arm_base_url.rstrip('/')}/subscriptions/"
+                f"{arm_endpoint.rstrip('/')}/subscriptions/"
                 + f"{subscription_id}?api-version=2018-01-01"
                 + "&discover-tenant-id"  # used by the test recording infrastructure
             )

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/_client/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.1.1.dev0"
+VERSION = "1.1.2.dev0"

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/_constants.py

@@ -17,7 +17,6 @@ class EnvironmentVariables:
     QUANTUM_SUBSCRIPTION_ID = "AZURE_QUANTUM_SUBSCRIPTION_ID"
     SUBSCRIPTION_ID = "SUBSCRIPTION_ID"
     WORKSPACE_NAME = "AZURE_QUANTUM_WORKSPACE_NAME"
-    QUANTUM_BASE_URL = "AZURE_QUANTUM_BASEURL"
     QUANTUM_ENV = "AZURE_QUANTUM_ENV"
     AZURE_CLIENT_ID = SdkEnvironmentVariables.AZURE_CLIENT_ID
     AZURE_CLIENT_SECRET = SdkEnvironmentVariables.AZURE_CLIENT_SECRET
@@ -33,7 +32,6 @@ class EnvironmentVariables:
         QUANTUM_SUBSCRIPTION_ID,
         SUBSCRIPTION_ID,
         WORKSPACE_NAME,
-        QUANTUM_BASE_URL,
         QUANTUM_ENV,
         AZURE_CLIENT_ID,
         AZURE_CLIENT_SECRET,
@@ -59,15 +57,15 @@ class ConnectionConstants:
     DOGFOOD_AUTHORITY = "login.windows-ppe.net"
 
     # pylint: disable=unnecessary-lambda-assignment
-    QUANTUM_BASE_URL = \
+    GET_QUANTUM_PRODUCTION_ENDPOINT = \
         lambda location: f"https://{location}.quantum.azure.com/"
-    QUANTUM_CANARY_BASE_URL = \
+    GET_QUANTUM_CANARY_ENDPOINT = \
         lambda location: f"https://{location or 'eastus2euap'}.quantum.azure.com/"
-    QUANTUM_DOGFOOD_BASE_URL = \
+    GET_QUANTUM_DOGFOOD_ENDPOINT = \
         lambda location: f"https://{location}.quantum-test.azure.com/"
 
-    ARM_BASE_URL = "https://management.azure.com/"
-    DOGFOOD_ARM_BASE_URL = "https://api-dogfood.resources.windows-int.net/"
+    ARM_PRODUCTION_ENDPOINT = "https://management.azure.com/"
+    ARM_DOGFOOD_ENDPOINT = "https://api-dogfood.resources.windows-int.net/"
 
     VALID_RESOURCE_ID = (
         lambda subscription_id, resource_group, workspace_name:
@@ -87,3 +85,7 @@ class ConnectionConstants:
     )
 
     QUANTUM_API_KEY_HEADER = "x-ms-quantum-api-key"
+
+GUID_REGEX_PATTERN = (
+    r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
+)

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/_workspace_connection_params.py

@@ -19,6 +19,7 @@ from azure.quantum._constants import (
     EnvironmentKind,
     EnvironmentVariables,
     ConnectionConstants,
+    GUID_REGEX_PATTERN,
 )
 
 class WorkspaceConnectionParams:
@@ -28,24 +29,24 @@ class WorkspaceConnectionParams:
     """
 
     RESOURCE_ID_REGEX = re.compile(
-        r"""
+        fr"""
             ^
-            /subscriptions/(?P<subscription_id>[a-fA-F0-9-]*)
-            /resourceGroups/(?P<resource_group>[^\s/]*)
+            /subscriptions/(?P<subscription_id>{GUID_REGEX_PATTERN})
+            /resourceGroups/(?P<resource_group>[^\s/]+)
             /providers/Microsoft\.Quantum
-            /Workspaces/(?P<workspace_name>[^\s/]*)
+            /Workspaces/(?P<workspace_name>[^\s/]+)
             $
         """,
         re.VERBOSE | re.IGNORECASE)
 
     CONNECTION_STRING_REGEX = re.compile(
-        r"""
+        fr"""
             ^
-            SubscriptionId=(?P<subscription_id>[a-fA-F0-9-]*);
-            ResourceGroupName=(?P<resource_group>[^\s/]*);
-            WorkspaceName=(?P<workspace_name>[^\s/]*);
-            ApiKey=(?P<api_key>[^\s/]*);
-            QuantumEndpoint=(?P<base_url>https://(?P<location>[^\s/]*).quantum(?:-test)?.azure.com/);
+            SubscriptionId=(?P<subscription_id>{GUID_REGEX_PATTERN});
+            ResourceGroupName=(?P<resource_group>[^\s;]+);
+            WorkspaceName=(?P<workspace_name>[^\s;]+);
+            ApiKey=(?P<api_key>[^\s;]+);
+            QuantumEndpoint=(?P<quantum_endpoint>https://(?P<location>[^\s\.]+).quantum(?:-test)?.azure.com/);
         """,
         re.VERBOSE | re.IGNORECASE)
 
@@ -55,8 +56,8 @@ class WorkspaceConnectionParams:
         resource_group: Optional[str] = None,
         workspace_name: Optional[str] = None,
         location: Optional[str] = None,
-        base_url: Optional[str] = None,
-        arm_base_url: Optional[str] = None,
+        quantum_endpoint: Optional[str] = None,
+        arm_endpoint: Optional[str] = None,
         environment: Union[str, EnvironmentKind, None] = None,
         credential: Optional[object] = None,
         resource_id: Optional[str] = None,
@@ -72,8 +73,8 @@ class WorkspaceConnectionParams:
         # they have special getters/setters
         self._location = None
         self._environment = None
-        self._base_url = None
-        self._arm_base_url = None
+        self._quantum_endpoint = None
+        self._arm_endpoint = None
         # regular connection properties
         self.subscription_id = None
         self.resource_group = None
@@ -93,8 +94,8 @@ class WorkspaceConnectionParams:
         self.apply_connection_string(connection_string)
         self.merge(
             api_version=api_version,
-            arm_base_url=arm_base_url,
-            base_url=base_url,
+            arm_endpoint=arm_endpoint,
+            quantum_endpoint=quantum_endpoint,
             client_id=client_id,
             credential=credential,
             environment=environment,
@@ -138,60 +139,60 @@ class WorkspaceConnectionParams:
                              else value)
 
     @property
-    def api_key(self):
-        """
-        The api-key stored in a AzureKeyCredential.
-        """
-        return (self.credential.key
-                if isinstance(self.credential, AzureKeyCredential)
-                else None)
-
-    @api_key.setter
-    def api_key(self, value: str):
-        if value:
-            self.credential = AzureKeyCredential(value)
-        self._api_key = value
-
-    @property
-    def base_url(self):
+    def quantum_endpoint(self):
         """
-        The data plane base_url.
-        Defaults to well-known base_url based on the environment.
+        The Azure Quantum data plane endpoint.
+        Defaults to well-known endpoint based on the environment.
         """
-        if self._base_url:
-            return self._base_url
+        if self._quantum_endpoint:
+            return self._quantum_endpoint
         if not self.location:
             raise ValueError("Location not specified")
         if self.environment is EnvironmentKind.PRODUCTION:
-            return ConnectionConstants.QUANTUM_BASE_URL(self.location)
+            return ConnectionConstants.GET_QUANTUM_PRODUCTION_ENDPOINT(self.location)
         if self.environment is EnvironmentKind.CANARY:
-            return ConnectionConstants.QUANTUM_CANARY_BASE_URL(self.location)
+            return ConnectionConstants.GET_QUANTUM_CANARY_ENDPOINT(self.location)
         if self.environment is EnvironmentKind.DOGFOOD:
-            return ConnectionConstants.QUANTUM_DOGFOOD_BASE_URL(self.location)
+            return ConnectionConstants.GET_QUANTUM_DOGFOOD_ENDPOINT(self.location)
         raise ValueError(f"Unknown environment `{self.environment}`.")
 
-    @base_url.setter
-    def base_url(self, value: str):
-        self._base_url = value
+    @quantum_endpoint.setter
+    def quantum_endpoint(self, value: str):
+        self._quantum_endpoint = value
 
     @property
-    def arm_base_url(self):
+    def arm_endpoint(self):
         """
-        The control plane base_url.
-        Defaults to well-known arm_base_url based on the environment.
+        The control plane endpoint.
+        Defaults to well-known arm_endpoint based on the environment.
         """
-        if self._arm_base_url:
-            return self._arm_base_url
+        if self._arm_endpoint:
+            return self._arm_endpoint
         if self.environment is EnvironmentKind.DOGFOOD:
-            return ConnectionConstants.DOGFOOD_ARM_BASE_URL
+            return ConnectionConstants.ARM_DOGFOOD_ENDPOINT
         if self.environment in [EnvironmentKind.PRODUCTION,
                                 EnvironmentKind.CANARY]:
-            return ConnectionConstants.ARM_BASE_URL
+            return ConnectionConstants.ARM_PRODUCTION_ENDPOINT
         raise ValueError(f"Unknown environment `{self.environment}`.")
 
-    @arm_base_url.setter
-    def arm_base_url(self, value: str):
-        self._arm_base_url = value
+    @arm_endpoint.setter
+    def arm_endpoint(self, value: str):
+        self._arm_endpoint = value
+
+    @property
+    def api_key(self):
+        """
+        The api-key stored in a AzureKeyCredential.
+        """
+        return (self.credential.key
+                if isinstance(self.credential, AzureKeyCredential)
+                else None)
+
+    @api_key.setter
+    def api_key(self, value: str):
+        if value:
+            self.credential = AzureKeyCredential(value)
+        self._api_key = value
 
     def __repr__(self):
         """
@@ -241,8 +242,8 @@ class WorkspaceConnectionParams:
         resource_group: Optional[str] = None,
         workspace_name: Optional[str] = None,
         location: Optional[str] = None,
-        base_url: Optional[str] = None,
-        arm_base_url: Optional[str] = None,
+        quantum_endpoint: Optional[str] = None,
+        arm_endpoint: Optional[str] = None,
         environment: Union[str, EnvironmentKind, None] = None,
         credential: Optional[object] = None,
         user_agent: Optional[str] = None,
@@ -259,8 +260,8 @@ class WorkspaceConnectionParams:
         """
         self._merge(
             api_version=api_version,
-            arm_base_url=arm_base_url,
-            base_url=base_url,
+            arm_endpoint=arm_endpoint,
+            quantum_endpoint=quantum_endpoint,
             client_id=client_id,
             credential=credential,
             environment=environment,
@@ -282,8 +283,8 @@ class WorkspaceConnectionParams:
         resource_group: Optional[str] = None,
         workspace_name: Optional[str] = None,
         location: Optional[str] = None,
-        base_url: Optional[str] = None,
-        arm_base_url: Optional[str] = None,
+        quantum_endpoint: Optional[str] = None,
+        arm_endpoint: Optional[str] = None,
         environment: Union[str, EnvironmentKind, None] = None,
         credential: Optional[object] = None,
         user_agent: Optional[str] = None,
@@ -301,8 +302,8 @@ class WorkspaceConnectionParams:
         """
         self._merge(
             api_version=api_version,
-            arm_base_url=arm_base_url,
-            base_url=base_url,
+            arm_endpoint=arm_endpoint,
+            quantum_endpoint=quantum_endpoint,
             client_id=client_id,
             credential=credential,
             environment=environment,
@@ -325,8 +326,8 @@ class WorkspaceConnectionParams:
         resource_group: Optional[str] = None,
         workspace_name: Optional[str] = None,
         location: Optional[str] = None,
-        base_url: Optional[str] = None,
-        arm_base_url: Optional[str] = None,
+        quantum_endpoint: Optional[str] = None,
+        arm_endpoint: Optional[str] = None,
         environment: Union[str, EnvironmentKind, None] = None,
         credential: Optional[object] = None,
         user_agent: Optional[str] = None,
@@ -365,8 +366,8 @@ class WorkspaceConnectionParams:
         self.api_key = _get_value_or_default(self.api_key, api_key)
         # for these properties that have a default value in the getter, we use
         # the private field as the old_value
-        self.base_url = _get_value_or_default(self._base_url, base_url)
-        self.arm_base_url = _get_value_or_default(self._arm_base_url, arm_base_url)
+        self.quantum_endpoint = _get_value_or_default(self._quantum_endpoint, quantum_endpoint)
+        self.arm_endpoint = _get_value_or_default(self._arm_endpoint, arm_endpoint)
         return self
 
     def _merge_connection_params(
@@ -394,8 +395,8 @@ class WorkspaceConnectionParams:
             # for these properties that have a default value in the getter,
             # so we use the private field instead
             # pylint: disable=protected-access
-            arm_base_url=connection_params._arm_base_url,
-            base_url=connection_params._base_url,
+            arm_endpoint=connection_params._arm_endpoint,
+            quantum_endpoint=connection_params._quantum_endpoint,
         )
         return self
 
@@ -407,7 +408,7 @@ class WorkspaceConnectionParams:
         return (self.credential
                 or _DefaultAzureCredential(
                     subscription_id=self.subscription_id,
-                    arm_base_url=self.arm_base_url,
+                    arm_endpoint=self.arm_endpoint,
                     tenant_id=self.tenant_id))
 
     def get_auth_policy(self) -> Any:
@@ -506,8 +507,6 @@ class WorkspaceConnectionParams:
         # because the getter return default values
         self.environment = (self._environment
                             or os.environ.get(EnvironmentVariables.QUANTUM_ENV))
-        self.base_url = (self._base_url
-                         or os.environ.get(EnvironmentVariables.QUANTUM_BASE_URL))
         # only try to use the connection string from env var if
         # we really need it
         if (not self.location
@@ -540,7 +539,6 @@ class WorkspaceConnectionParams:
             resource_group=get_value('resource_group'),
             workspace_name=get_value('workspace_name'),
             location=get_value('location'),
-            base_url=get_value('base_url'),
-            arm_base_url=get_value('arm_base_url'),
+            quantum_endpoint=get_value('quantum_endpoint'),
             api_key=get_value('api_key'),
         )

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/job/base_job.py

@@ -220,7 +220,7 @@ class BaseJob(WorkspaceItem):
         job = cls(workspace, details, **kwargs)
 
         logger.info(
-            f"Submitting problem '{name}'. \
+            f"Submitting job '{name}'. \
                 Using payload from: '{job.details.input_data_uri}'"
         )
 

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/job/job.py

@@ -79,7 +79,7 @@ class Job(BaseJob, FilteredJob):
         :type timeout_secs: int
         :param print_progress: Print "." to stdout to display progress
         :type print_progress: bool
-        :raises TimeoutError: If the total poll time exceeds timeout, raise
+        :raises: :class:`TimeoutError` If the total poll time exceeds timeout, raise.
         """
         self.refresh()
         poll_wait = Job._default_poll_wait
@@ -106,10 +106,12 @@ class Job(BaseJob, FilteredJob):
         """Get job results by downloading the results blob from the
         storage container linked via the workspace.
 
+        Raises :class:`RuntimeError` if job execution fails.
+
         :param timeout_secs: Timeout in seconds, defaults to 300
         :type timeout_secs: float
-        :raises RuntimeError: Raises RuntimeError if job execution failed
         :return: Results dictionary with histogram shots, or raw results if not a json object.
+        :rtype: Any
         """
         if self.results is not None:
             return self.results

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/qiskit/provider.py

@@ -24,8 +24,6 @@ from azure.quantum.qiskit.backends.backend import AzureBackendBase
 from azure.quantum.qiskit.job import AzureQuantumJob
 from azure.quantum.qiskit.backends import *
 
-# Target ID keyword for parameter-free solvers
-PARAMETER_FREE = "parameterfree"
 
 QISKIT_USER_AGENT = "azure-quantum-qiskit"
 

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/target/__init__.py

@@ -6,10 +6,6 @@
 """Defines set of targets for interacting with Azure Quantum"""
 
 from .target import Target
-from .solvers import Solver
-from .toshiba import (
-    SimulatedBifurcationMachine
-)
 from .ionq import IonQ
 from .quantinuum import Quantinuum
 from .rigetti import Rigetti
@@ -22,7 +18,6 @@ DEFAULT_TARGETS = {
     "ionq": IonQ,
     "quantinuum": Quantinuum,
     "rigetti": Rigetti,
-    "toshiba": Solver,
     "pasqal": Pasqal
 }
 

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/target/microsoft/elements/dft/job.py

@@ -27,13 +27,13 @@ class MicrosoftElementsDftJob(Job):
 
         :param timeout_secs: Timeout in seconds, defaults to 300
         :type timeout_secs: float
-        :raises RuntimeError: Raises RuntimeError if job execution failed
+        :raises: :class:`RuntimeError` Raises RuntimeError if job execution failed
         :return: Results dictionary with histogram shots, or raw results if not a json object.
         """
 
         try:
             job_results = super().get_results(timeout_secs)
-            return job_results["results"]
+            return job_results
         except JobFailedWithResultsError as e:
                 failure_results = e.get_failure_results()
                 if MicrosoftElementsDftJob._is_dft_failure_results(failure_results):

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/target/rigetti/target.py

@@ -30,7 +30,6 @@ class RigettiTarget(str, Enum):
     """A simulator target for Quil. See https://github.com/quil-lang/qvm for more info."""
 
     ANKAA_9Q_1 = "rigetti.qpu.ankaa-9q-1"
-    ASPEN_M_3 = "rigetti.qpu.aspen-m-3"
     ANKAA_2 = "rigetti.qpu.ankaa-2"
 
     def simulators() -> List[str]:
@@ -43,7 +42,6 @@ class RigettiTarget(str, Enum):
         """Returns a list of QPU targets"""
         return [
             RigettiTarget.ANKAA_9Q_1.value,
-            RigettiTarget.ASPEN_M_3.value,
             RigettiTarget.ANKAA_2.value,
         ]
 
@@ -54,8 +52,6 @@ class RigettiTarget(str, Enum):
             return 9
         elif target_name == RigettiTarget.QVM.value:
             return 20
-        elif target_name == RigettiTarget.ASPEN_M_3.value:
-            return 80
         elif target_name == RigettiTarget.ANKAA_2.value:
             return 84
         else:

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/target/target_factory.py

@@ -10,9 +10,6 @@ if TYPE_CHECKING:
     from azure.quantum import Workspace
     from azure.quantum._client.models import TargetStatus
 
-# Target ID keyword for parameter-free solvers
-PARAMETER_FREE = "parameterfree"
-
 
 class TargetFactory:
     """Factory class for generating a Target based on a
@@ -136,13 +133,10 @@ https://github.com/microsoft/qdk-python/issues.")
             return self.from_target_status(*target_statuses[0], **kwargs)
 
         else:
-            # Don't return redundant parameter-free targets
+            # Don't return redundant targets
             return [
                 self.from_target_status(_provider_id, status, **kwargs)
                 for _provider_id, status in target_statuses
-                if PARAMETER_FREE not in status.id
-                and (
-                    _provider_id.lower() in self._default_targets
+                if _provider_id.lower() in self._default_targets
                     or status.id in self._all_targets
-                )
             ]

{azure-quantum-1.1.1.dev0 → azure-quantum-1.1.2.dev0}/azure/quantum/version.py

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