Skip to content

Fix workspace operations when connected by name, improve tests #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xinyi-joffre merged 3 commits into from
Dec 19, 2025
Merged

Fix workspace operations when connected by name, improve tests #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b510a96
Improve error message in arm request
rigidit Dec 19, 2025
40ceb53
Use connection params instead of duplicating in workspace, add live t…
rigidit Dec 19, 2025
2137afd
Helper method name improvement
rigidit Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 37 additions & 40 deletions azure-quantum/azure/quantum/workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@ def __init__(

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

if not self._mgmt_client:
credential = connection_params.get_credential_or_default()
Expand Down Expand Up @@ -404,9 +401,9 @@ def _get_linked_storage_sas_uri(
container_name=container_name, blob_name=blob_name
)
container_uri = client.get_sas_uri(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
blob_details=blob_details)

logger.debug("Container URI from service: %s", container_uri)
Expand All @@ -424,9 +421,9 @@ def submit_job(self, job: Job) -> Job:
"""
client = self._get_jobs_client()
details = client.create_or_replace(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
job.details.id,
job.details
)
Expand All @@ -445,14 +442,14 @@ def cancel_job(self, job: Job) -> Job:
"""
client = self._get_jobs_client()
client.delete(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
job.details.id)
details = client.get(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
job.id)
return Job(self, details)

Expand All @@ -472,9 +469,9 @@ def get_job(self, job_id: str) -> Job:

client = self._get_jobs_client()
details = client.get(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
job_id)
target_factory = TargetFactory(base_cls=Target, workspace=self)
# pylint: disable=protected-access
Expand Down Expand Up @@ -557,7 +554,7 @@ def list_jobs_paginated(
)
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)
return client.list(subscription_id=self.subscription_id, resource_group_name=self.resource_group, workspace_name=self.name, filter=job_filter, orderby=orderby, top = top, skip = skip)

def _get_target_status(
self,
Expand All @@ -580,9 +577,9 @@ def _get_target_status(
return [
(provider.id, target)
for provider in self._client.providers.list(
self._subscription_id,
self._resource_group,
self._workspace_name)
self.subscription_id,
self.resource_group,
self.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())
Expand Down Expand Up @@ -639,9 +636,9 @@ def get_quotas(self) -> List[Dict[str, Any]]:
"""
client = self._get_quotas_client()
return [q.as_dict() for q in client.list(
self._subscription_id,
self._resource_group,
self._workspace_name
self.subscription_id,
self.resource_group,
self.name
)]

def list_top_level_items(
Expand Down Expand Up @@ -712,7 +709,7 @@ def list_top_level_items_paginated(
)
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)
return client.list(subscription_id=self.subscription_id, resource_group_name=self.resource_group, workspace_name=self.name, filter=top_level_item_filter, orderby=orderby, top = top, skip = skip)

def list_sessions(
self,
Expand Down Expand Up @@ -773,7 +770,7 @@ def list_sessions_paginated(

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)
return client.list(subscription_id=self.subscription_id, resource_group_name=self.resource_group, workspace_name=self.name, filter = session_filter, orderby=orderby, skip=skip, top=top)

def open_session(
self,
Expand All @@ -790,9 +787,9 @@ def open_session(
"""
client = self._get_sessions_client()
session.details = client.create_or_replace(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
session.id,
session.details)

Expand All @@ -811,15 +808,15 @@ def close_session(
client = self._get_sessions_client()
if not session.is_in_terminal_state():
session.details = client.close(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
session_id=session.id)
else:
session.details = client.get(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
session_id=session.id)

if session.target:
Expand Down Expand Up @@ -855,9 +852,9 @@ def get_session(
"""
client = self._get_sessions_client()
session_details = client.get(
self._subscription_id,
self._resource_group,
self._workspace_name,
self.subscription_id,
self.resource_group,
self.name,
session_id=session_id)
result = Session(workspace=self, details=session_details)
return result
Expand Down Expand Up @@ -919,7 +916,7 @@ def list_session_jobs_paginated(

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)
return client.jobs_list(subscription_id=self.subscription_id, resource_group_name=self.resource_group, workspace_name=self.name, session_id=session_id, filter = session_job_filter, orderby=orderby, skip=skip, top=top)

def get_container_uri(
self,
Expand Down
Loading
Loading