openquantum-sdk 0.4.1__tar.gz → 0.4.2__tar.gz

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openquantum-sdk
-Version: 0.4.1
+Version: 0.4.2
 Summary: Python SDK for Open Quantum
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
@@ -227,9 +227,8 @@ try:
     cheapest_plan = min(result.quote, key=lambda p: p.price)
     cheapest_prio = min(cheapest_plan.queue_priorities, key=lambda q: q.price_increase)
 
-    # 7. Create job
+    # 7. Create job (organization comes from the preparation)
     job = JobCreate(
-        organization_id=org.id,
         job_preparation_id=prep_resp.id,
         execution_plan_id=cheapest_plan.execution_plan_id,
         queue_priority_id=cheapest_prio.queue_priority_id,
@@ -327,7 +326,7 @@ finally:
 | `BackendClassRead` | `id`, `name`, `description`, `type`, `provider_id`, `short_code`, `queue_depth`, `accepting_jobs`, `status` |
 | `ErrorResponse` | `status_code`, `message: List[str]`, `type`, `error_code` (request id) |
 | `JobCategoryRead` | `id`, `name`, `short_code` |
-| `JobCreate` | `organization_id`, `job_preparation_id`, `execution_plan_id`, `queue_priority_id` |
+| `JobCreate` | `job_preparation_id`, `execution_plan_id`, `queue_priority_id`, optional `organization_id` |
 | `JobList` | `id`, `backend_class_id`, `name`, `status`, `backend_name`, `output_data_url`, `calibration_data_url`, `credits_used`, `submitted_at` |
 | `JobPreparationCreate` | `organization_id`, `backend_class_id`, `name`, `upload_endpoint_id`, `job_subcategory_id`, `shots`, `configuration_data`, `input_format`, `submitted_with` |
 | `JobPreparationResponse` | `id` |

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/README.md

@@ -205,9 +205,8 @@ try:
     cheapest_plan = min(result.quote, key=lambda p: p.price)
     cheapest_prio = min(cheapest_plan.queue_priorities, key=lambda q: q.price_increase)
 
-    # 7. Create job
+    # 7. Create job (organization comes from the preparation)
     job = JobCreate(
-        organization_id=org.id,
         job_preparation_id=prep_resp.id,
         execution_plan_id=cheapest_plan.execution_plan_id,
         queue_priority_id=cheapest_prio.queue_priority_id,
@@ -305,7 +304,7 @@ finally:
 | `BackendClassRead` | `id`, `name`, `description`, `type`, `provider_id`, `short_code`, `queue_depth`, `accepting_jobs`, `status` |
 | `ErrorResponse` | `status_code`, `message: List[str]`, `type`, `error_code` (request id) |
 | `JobCategoryRead` | `id`, `name`, `short_code` |
-| `JobCreate` | `organization_id`, `job_preparation_id`, `execution_plan_id`, `queue_priority_id` |
+| `JobCreate` | `job_preparation_id`, `execution_plan_id`, `queue_priority_id`, optional `organization_id` |
 | `JobList` | `id`, `backend_class_id`, `name`, `status`, `backend_name`, `output_data_url`, `calibration_data_url`, `credits_used`, `submitted_at` |
 | `JobPreparationCreate` | `organization_id`, `backend_class_id`, `name`, `upload_endpoint_id`, `job_subcategory_id`, `shots`, `configuration_data`, `input_format`, `submitted_with` |
 | `JobPreparationResponse` | `id` |

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/openquantum_sdk/__init__.py

@@ -4,11 +4,13 @@ from .models import (
     ApiErrorType,
     TermsOfUseRequiredError,
     TERMS_OF_USE_REQUIRED_MESSAGE,
+    EmailVerificationRequiredError,
+    EMAIL_VERIFICATION_REQUIRED_MESSAGE,
     is_not_found_error,
 )
 from .utils import poll_for_status
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 __all__ = [
     "SchedulerClient",
     "ManagementClient",
@@ -17,5 +19,7 @@ __all__ = [
     "ApiErrorType",
     "TermsOfUseRequiredError",
     "TERMS_OF_USE_REQUIRED_MESSAGE",
+    "EmailVerificationRequiredError",
+    "EMAIL_VERIFICATION_REQUIRED_MESSAGE",
     "is_not_found_error",
 ]

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/openquantum_sdk/__main__.py

@@ -7,7 +7,7 @@ import argparse
 import requests
 from .auth import ClientCredentials, ClientCredentialsAuth
 from .clients import SchedulerClient, ManagementClient, JobSubmissionConfig
-from .models import APIError, TermsOfUseRequiredError
+from .models import APIError, TermsOfUseRequiredError, EmailVerificationRequiredError
 
 
 def load_creds_from_file(path: str) -> ClientCredentials:
@@ -194,6 +194,9 @@ def main():
     except TermsOfUseRequiredError as e:
         print(str(e), file=sys.stderr)
         sys.exit(1)
+    except EmailVerificationRequiredError as e:
+        print(str(e), file=sys.stderr)
+        sys.exit(1)
     except requests.exceptions.HTTPError as e:
         print(f"API error: {e.response.status_code} - {e.response.text}", file=sys.stderr)
         sys.exit(1)

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/openquantum_sdk/clients.py

@@ -12,6 +12,7 @@ from .utils import strip_gate_definitions
 from .models import (
     APIError,
     TermsOfUseRequiredError,
+    EmailVerificationRequiredError,
     error_from_response,
     is_not_found_error,
     BackendClassRead,
@@ -181,7 +182,7 @@ class BaseClient:
                         error_code=payload.get("error_code"),
                     )
                     raise error_from_response(err)
-            except (TermsOfUseRequiredError, APIError):
+            except (TermsOfUseRequiredError, EmailVerificationRequiredError, APIError):
                 raise
             except ValueError:
                 pass
@@ -590,10 +591,12 @@ class SchedulerClient(BaseClient):
         """Create and submit a job from a completed preparation.
 
         This deducts credits and places the job in the execution queue.
+        Organization is taken from the preparation; ``organization_id`` on
+        ``JobCreate`` is optional.
 
         Args:
-            job: A ``JobCreate`` with the organization ID, preparation ID,
-                chosen execution plan, and queue priority.
+            job: A ``JobCreate`` with the preparation ID, chosen execution
+                plan, and queue priority.
 
         Returns:
             A ``JobRead`` with the new job's ID and initial status.
@@ -611,7 +614,8 @@ class SchedulerClient(BaseClient):
             )
             self._public_plan_notice_shown = True
 
-        data = self._request("POST", "/v1/jobs", json=asdict(job))
+        payload = {k: v for k, v in asdict(job).items() if v is not None}
+        data = self._request("POST", "/v1/jobs", json=payload)
         return JobRead.from_dict(data)
 
     def get_job(self, job_id: str) -> JobRead:
@@ -779,7 +783,6 @@ class SchedulerClient(BaseClient):
             print(f"Step 3/5: Quote approved automatically ({reason})")
 
         job_create = JobCreate(
-            organization_id=organization_id,
             job_preparation_id=prep_resp.id,
             execution_plan_id=exec_plan_id,
             queue_priority_id=queue_prio_id,

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/openquantum_sdk/models.py

@@ -56,6 +56,7 @@ class ApiErrorType:
     INSUFFICIENT_PERMISSIONS = "INSUFFICIENT_PERMISSIONS"
     ORG_MEMBERSHIP_REQUIRED = "ORG_MEMBERSHIP_REQUIRED"
     TERMS_OF_USE_REQUIRED = "TERMS_OF_USE_REQUIRED"
+    EMAIL_VERIFICATION_REQUIRED = "EMAIL_VERIFICATION_REQUIRED"
     NOT_FOUND = "NOT_FOUND"
     CONFLICT = "CONFLICT"
     VALIDATION_ERROR = "VALIDATION_ERROR"
@@ -110,6 +111,10 @@ TERMS_OF_USE_REQUIRED_MESSAGE = (
     "Please visit https://www.openquantum.com to accept the Terms of Use before submitting jobs."
 )
 
+EMAIL_VERIFICATION_REQUIRED_MESSAGE = (
+    "Please verify your email address at https://www.openquantum.com before submitting jobs."
+)
+
 
 class TermsOfUseRequiredError(APIError):
     """Raised when job prepare/create is blocked until Terms of Use are accepted.
@@ -131,6 +136,25 @@ class TermsOfUseRequiredError(APIError):
         Exception.__init__(self, TERMS_OF_USE_REQUIRED_MESSAGE)
 
 
+class EmailVerificationRequiredError(APIError):
+    """Raised when job prepare/create is blocked until the user's email is verified.
+
+    Users must visit https://www.openquantum.com, sign in, and complete email
+    verification before submitting jobs. If an SDK key was created before
+    verification, create a new key after verifying.
+    """
+
+    def __init__(self, error_response: Optional[ErrorResponse] = None):
+        if error_response is None:
+            error_response = ErrorResponse(
+                status_code=403,
+                message=EMAIL_VERIFICATION_REQUIRED_MESSAGE,
+                type=ApiErrorType.EMAIL_VERIFICATION_REQUIRED,
+            )
+        self.error_response = error_response
+        Exception.__init__(self, EMAIL_VERIFICATION_REQUIRED_MESSAGE)
+
+
 def error_from_response(error_response: ErrorResponse) -> APIError:
     """Map an API ``ErrorResponse`` to the most specific SDK exception.
 
@@ -138,6 +162,8 @@ def error_from_response(error_response: ErrorResponse) -> APIError:
     """
     if error_response.type == ApiErrorType.TERMS_OF_USE_REQUIRED:
         return TermsOfUseRequiredError(error_response)
+    if error_response.type == ApiErrorType.EMAIL_VERIFICATION_REQUIRED:
+        return EmailVerificationRequiredError(error_response)
     return APIError(error_response)
 
 
@@ -466,16 +492,18 @@ class JobCreate:
     Sent to ``POST /v1/jobs`` to finalize and enqueue the job.
 
     Attributes:
-        organization_id: UUID of the organization submitting the job.
         job_preparation_id: ID of the completed preparation.
         execution_plan_id: UUID of the chosen execution plan from the quote.
         queue_priority_id: UUID of the chosen queue priority from the quote.
+        organization_id: Optional organization UUID. If omitted, the server
+            uses the organization from the job preparation. If provided, it
+            must match the preparation organization.
     """
 
-    organization_id: str
     job_preparation_id: str
     execution_plan_id: str
     queue_priority_id: str
+    organization_id: Optional[str] = None
 
 
 @dataclass

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/openquantum_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openquantum-sdk
-Version: 0.4.1
+Version: 0.4.2
 Summary: Python SDK for Open Quantum
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
@@ -227,9 +227,8 @@ try:
     cheapest_plan = min(result.quote, key=lambda p: p.price)
     cheapest_prio = min(cheapest_plan.queue_priorities, key=lambda q: q.price_increase)
 
-    # 7. Create job
+    # 7. Create job (organization comes from the preparation)
     job = JobCreate(
-        organization_id=org.id,
         job_preparation_id=prep_resp.id,
         execution_plan_id=cheapest_plan.execution_plan_id,
         queue_priority_id=cheapest_prio.queue_priority_id,
@@ -327,7 +326,7 @@ finally:
 | `BackendClassRead` | `id`, `name`, `description`, `type`, `provider_id`, `short_code`, `queue_depth`, `accepting_jobs`, `status` |
 | `ErrorResponse` | `status_code`, `message: List[str]`, `type`, `error_code` (request id) |
 | `JobCategoryRead` | `id`, `name`, `short_code` |
-| `JobCreate` | `organization_id`, `job_preparation_id`, `execution_plan_id`, `queue_priority_id` |
+| `JobCreate` | `job_preparation_id`, `execution_plan_id`, `queue_priority_id`, optional `organization_id` |
 | `JobList` | `id`, `backend_class_id`, `name`, `status`, `backend_name`, `output_data_url`, `calibration_data_url`, `credits_used`, `submitted_at` |
 | `JobPreparationCreate` | `organization_id`, `backend_class_id`, `name`, `upload_endpoint_id`, `job_subcategory_id`, `shots`, `configuration_data`, `input_format`, `submitted_with` |
 | `JobPreparationResponse` | `id` |

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "openquantum-sdk"
-version = "0.4.1"
+version = "0.4.2"
 description = "Python SDK for Open Quantum"
 readme = "README.md"
 requires-python = ">=3.8"

{openquantum_sdk-0.4.1 → openquantum_sdk-0.4.2}/tests/test_clients.py

@@ -20,6 +20,8 @@ from openquantum_sdk.models import (
     OrganizationRead,
     TERMS_OF_USE_REQUIRED_MESSAGE,
     TermsOfUseRequiredError,
+    EMAIL_VERIFICATION_REQUIRED_MESSAGE,
+    EmailVerificationRequiredError,
 )
 
 
@@ -499,7 +501,6 @@ def test_create_job_terms_of_use_required(mock_scheduler):
         },
     )
     job = JobCreate(
-        organization_id="org-123",
         job_preparation_id="prep-1",
         execution_plan_id="plan-1",
         queue_priority_id="prio-1",
@@ -508,6 +509,55 @@ def test_create_job_terms_of_use_required(mock_scheduler):
         mock_scheduler.create_job(job)
 
 
+def test_prepare_job_email_verification_required(mock_scheduler):
+    mock_scheduler.session.mocker.post(
+        "https://scheduler.openquantum.com/v1/jobs/prepare",
+        status_code=403,
+        json={
+            "status_code": 403,
+            "message": [EMAIL_VERIFICATION_REQUIRED_MESSAGE],
+            "type": "EMAIL_VERIFICATION_REQUIRED",
+            "error_code": "req-email",
+        },
+    )
+    prep = JobPreparationCreate(
+        organization_id="org-123",
+        backend_class_id="backend-1",
+        name="Test",
+        upload_endpoint_id="upload-1",
+        job_subcategory_id="sub-1",
+        shots=10,
+        configuration_data={},
+    )
+    with pytest.raises(
+        EmailVerificationRequiredError, match="verify your email"
+    ) as exc_info:
+        mock_scheduler.prepare_job(prep)
+    assert str(exc_info.value) == EMAIL_VERIFICATION_REQUIRED_MESSAGE
+    assert exc_info.value.error_response.status_code == 403
+    assert exc_info.value.error_response.type == "EMAIL_VERIFICATION_REQUIRED"
+
+
+def test_create_job_email_verification_required(mock_scheduler):
+    mock_scheduler.session.mocker.post(
+        "https://scheduler.openquantum.com/v1/jobs",
+        status_code=403,
+        json={
+            "status_code": 403,
+            "message": EMAIL_VERIFICATION_REQUIRED_MESSAGE,
+            "type": "EMAIL_VERIFICATION_REQUIRED",
+            "error_code": "req-email",
+        },
+    )
+    job = JobCreate(
+        job_preparation_id="prep-1",
+        execution_plan_id="plan-1",
+        queue_priority_id="prio-1",
+    )
+    with pytest.raises(EmailVerificationRequiredError, match="email"):
+        mock_scheduler.create_job(job)
+
+
 def test_prepare_job_org_membership_required(mock_scheduler):
     from openquantum_sdk.models import APIError, ApiErrorType
 
@@ -533,6 +583,7 @@ def test_prepare_job_org_membership_required(mock_scheduler):
     with pytest.raises(APIError) as exc_info:
         mock_scheduler.prepare_job(prep)
     assert not isinstance(exc_info.value, TermsOfUseRequiredError)
+    assert not isinstance(exc_info.value, EmailVerificationRequiredError)
     assert (
         exc_info.value.error_response.type
         == ApiErrorType.ORG_MEMBERSHIP_REQUIRED