Sync OpenAPI spec with upstream fixes, remove overlay (#9)

* Sync OpenAPI spec with ionq/api#1146 and minimize overlay

Vendor the updated spec from the ionq/api sync PR which includes
Xiaoyun's upstream fixes: enum restrictions removed, gate schema
field names corrected (type->gate), expanded Job required fields,
results/probabilities endpoint added natively, and three new variant
result endpoints.

The overlay shrinks from 155 lines (22 actions) to 111 lines (25
actions), now covering only nullable field mismatches that remain
in the upstream spec:
- JsonObject, Failure, JobMetadata schemas: nullable
- Job/BaseJobSummary: 10 nullable primitive fields each
- GetCircuitJobResponse: settings/stats allOf+nullable
- Backend.degraded: removed from required (not all backends return it)

Generator config updated for renamed Gate schemas (Gate_QisGate_ ->
Gate_QisGate) and removed overrides for deleted Optional_* schemas.

Test fixtures updated to include newly-required nullable fields.
Verified end-to-end against production API.

* Fix overlay: remove unnecessary nullable patches

Remove JsonObject nullable (output/settings/stats are always {},
never null) and GetCircuitJobResponse settings/stats nullable.
Only results, failure, and metadata are actually null in the API.

Test fixtures corrected to match real API: output/settings/stats
use {} instead of null.

* Fix JobMetadata nullable: per-property, not schema-level

JobMetadata is used in creation payloads where null is invalid.
Move the nullable treatment to allOf+nullable on the response
properties (Job.metadata, BaseJobSummary.metadata) instead of
making the schema itself nullable.

* Sync spec with cloud-job-manager#980, overlay down to 1 action

Incorporate Xiaoyun's nullable fixes from CJM PR #980 which adds
proper nullable annotations to BaseJob fields using tsoa @nullable
jsdoc instead of Omit/Pick utility types.

The overlay now contains only Backend.degraded (ion-queue#1410).

- Job and Pick_BaseJob schemas replaced by BaseJob
- Optional_string_ removed (inline nullable used instead)
- project_id, parent_job_id, session_id, name: nullable in spec
- metadata, failure, results: allOf+nullable in spec
- started_at, completed_at: Optional_IsoTimestamp_ ref
- predicted/execution durations: Optional_number_ ref
- Generator config: removed Pick_BaseJob and Optional_string_ overrides

* Sync with final CJM#980 spec: remove Optional_ wrappers

Xiaoyun replaced Optional_IsoTimestamp_ and Optional_number_ with
inline allOf+nullable and nullable integer annotations directly on
the fields. Generator config simplified to just gate class overrides.

* Remove overlay: production spec now matches API behavior

All upstream fixes have landed in production (api.ionq.co/v0.4):
- CJM#980: nullable fields on BaseJob/GetCircuitJobResponse
- ion-queue#1406: enum restrictions removed
- ion-queue#1410: Backend.degraded optional
- ionq/api#1148: spec synced from GCS

The overlay file is no longer needed. Client regenerated directly
from the production spec without any patches.

Author: splch

ionq_core/_pagination.py

@@ -12,7 +12,7 @@
 
 if TYPE_CHECKING:
     from .client import AuthenticatedClient
-    from .models.job import Job
+    from .models.base_job import BaseJob as Job
     from .models.job_status import JobStatus
 
 logger = logging.getLogger("ionq_core")

ionq_core/api/default/estimate_job_cost.py

@@ -113,7 +113,8 @@ def sync_detailed(
 ) -> Response[Any | GetJobEstimateResponse]:
     """ 
     Args:
-        backend (str):
+        backend (str): Available options: `simulator`, `qpu.aria-1`, `qpu.aria-2`, `qpu.forte-1`,
+            `qpu.forte-enterprise-1`
         type_ (str | Unset):  Default: 'ionq.circuit.v1'.
         qubits (int | Unset):  Default: 25.
         shots (int | Unset):  Default: 1000.
@@ -161,7 +162,8 @@ def sync(
 ) -> Any | GetJobEstimateResponse | None:
     """ 
     Args:
-        backend (str):
+        backend (str): Available options: `simulator`, `qpu.aria-1`, `qpu.aria-2`, `qpu.forte-1`,
+            `qpu.forte-enterprise-1`
         type_ (str | Unset):  Default: 'ionq.circuit.v1'.
         qubits (int | Unset):  Default: 25.
         shots (int | Unset):  Default: 1000.
@@ -204,7 +206,8 @@ async def asyncio_detailed(
 ) -> Response[Any | GetJobEstimateResponse]:
     """ 
     Args:
-        backend (str):
+        backend (str): Available options: `simulator`, `qpu.aria-1`, `qpu.aria-2`, `qpu.forte-1`,
+            `qpu.forte-enterprise-1`
         type_ (str | Unset):  Default: 'ionq.circuit.v1'.
         qubits (int | Unset):  Default: 25.
         shots (int | Unset):  Default: 1000.
@@ -252,7 +255,8 @@ async def asyncio(
 ) -> Any | GetJobEstimateResponse | None:
     """ 
     Args:
-        backend (str):
+        backend (str): Available options: `simulator`, `qpu.aria-1`, `qpu.aria-2`, `qpu.forte-1`,
+            `qpu.forte-enterprise-1`
         type_ (str | Unset):  Default: 'ionq.circuit.v1'.
         qubits (int | Unset):  Default: 25.
         shots (int | Unset):  Default: 1000.

ionq_core/api/default/get_job_probabilities.py

@@ -8,7 +8,7 @@
 from ...types import Response, UNSET
 from ... import errors
 
-from ...models.get_job_probabilities_response_200 import GetJobProbabilitiesResponse200
+from ...models.get_results_response import GetResultsResponse
 from ...types import UNSET, Unset
 from typing import cast
 
@@ -43,9 +43,9 @@ def _get_kwargs(
 
 
 
-def _parse_response(*, client: AuthenticatedClient | Client, response: httpx.Response) -> Any | GetJobProbabilitiesResponse200 | None:
+def _parse_response(*, client: AuthenticatedClient | Client, response: httpx.Response) -> Any | GetResultsResponse | None:
     if response.status_code == 200:
-        response_200 = GetJobProbabilitiesResponse200.from_dict(response.json())
+        response_200 = GetResultsResponse.from_dict(response.json())
 
 
 
@@ -61,7 +61,7 @@ def _parse_response(*, client: AuthenticatedClient | Client, response: httpx.Res
         return None
 
 
-def _build_response(*, client: AuthenticatedClient | Client, response: httpx.Response) -> Response[Any | GetJobProbabilitiesResponse200]:
+def _build_response(*, client: AuthenticatedClient | Client, response: httpx.Response) -> Response[Any | GetResultsResponse]:
     return Response(
         status_code=HTTPStatus(response.status_code),
         content=response.content,
@@ -76,7 +76,7 @@ def sync_detailed(
     client: AuthenticatedClient,
     sharpen: bool | Unset = UNSET,
 
-) -> Response[Any | GetJobProbabilitiesResponse200]:
+) -> Response[Any | GetResultsResponse]:
     """ Fetch the probability distribution for a completed job.
 
     Args:
@@ -88,7 +88,7 @@ def sync_detailed(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Response[Any | GetJobProbabilitiesResponse200]
+        Response[Any | GetResultsResponse]
      """
 
 
@@ -110,7 +110,7 @@ def sync(
     client: AuthenticatedClient,
     sharpen: bool | Unset = UNSET,
 
-) -> Any | GetJobProbabilitiesResponse200 | None:
+) -> Any | GetResultsResponse | None:
     """ Fetch the probability distribution for a completed job.
 
     Args:
@@ -122,7 +122,7 @@ def sync(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Any | GetJobProbabilitiesResponse200
+        Any | GetResultsResponse
      """
 
 
@@ -139,7 +139,7 @@ async def asyncio_detailed(
     client: AuthenticatedClient,
     sharpen: bool | Unset = UNSET,
 
-) -> Response[Any | GetJobProbabilitiesResponse200]:
+) -> Response[Any | GetResultsResponse]:
     """ Fetch the probability distribution for a completed job.
 
     Args:
@@ -151,7 +151,7 @@ async def asyncio_detailed(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Response[Any | GetJobProbabilitiesResponse200]
+        Response[Any | GetResultsResponse]
      """
 
 
@@ -173,7 +173,7 @@ async def asyncio(
     client: AuthenticatedClient,
     sharpen: bool | Unset = UNSET,
 
-) -> Any | GetJobProbabilitiesResponse200 | None:
+) -> Any | GetResultsResponse | None:
     """ Fetch the probability distribution for a completed job.
 
     Args:
@@ -185,7 +185,7 @@ async def asyncio(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Any | GetJobProbabilitiesResponse200
+        Any | GetResultsResponse
      """
 
 

ionq_core/api/default/get_variant_histogram.py

@@ -0,0 +1,184 @@
+from http import HTTPStatus
+from typing import Any, cast
+from urllib.parse import quote
+
+import httpx
+
+from ...client import AuthenticatedClient, Client
+from ...types import Response, UNSET
+from ... import errors
+
+from ...models.get_variant_results_response import GetVariantResultsResponse
+from typing import cast
+
+
+
+def _get_kwargs(
+    uuid: str,
+    variant_id: str,
+
+) -> dict[str, Any]:
+    
+
+    
+
+    
+
+    _kwargs: dict[str, Any] = {
+        "method": "get",
+        "url": "/jobs/{uuid}/variants/{variant_id}/results/histogram".format(uuid=quote(str(uuid), safe=""),variant_id=quote(str(variant_id), safe=""),),
+    }
+
+
+    return _kwargs
+
+
+
+def _parse_response(*, client: AuthenticatedClient | Client, response: httpx.Response) -> Any | GetVariantResultsResponse | None:
+    if response.status_code == 200:
+        response_200 = GetVariantResultsResponse.from_dict(response.json())
+
+
+
+        return response_200
+
+    if response.status_code == 404:
+        response_404 = cast(Any, None)
+        return response_404
+
+    if client.raise_on_unexpected_status:
+        raise errors.UnexpectedStatus(response.status_code, response.content)
+    else:
+        return None
+
+
+def _build_response(*, client: AuthenticatedClient | Client, response: httpx.Response) -> Response[Any | GetVariantResultsResponse]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    uuid: str,
+    variant_id: str,
+    *,
+    client: AuthenticatedClient,
+
+) -> Response[Any | GetVariantResultsResponse]:
+    """ 
+    Args:
+        uuid (str):
+        variant_id (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[Any | GetVariantResultsResponse]
+     """
+
+
+    kwargs = _get_kwargs(
+        uuid=uuid,
+variant_id=variant_id,
+
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+def sync(
+    uuid: str,
+    variant_id: str,
+    *,
+    client: AuthenticatedClient,
+
+) -> Any | GetVariantResultsResponse | None:
+    """ 
+    Args:
+        uuid (str):
+        variant_id (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Any | GetVariantResultsResponse
+     """
+
+
+    return sync_detailed(
+        uuid=uuid,
+variant_id=variant_id,
+client=client,
+
+    ).parsed
+
+async def asyncio_detailed(
+    uuid: str,
+    variant_id: str,
+    *,
+    client: AuthenticatedClient,
+
+) -> Response[Any | GetVariantResultsResponse]:
+    """ 
+    Args:
+        uuid (str):
+        variant_id (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[Any | GetVariantResultsResponse]
+     """
+
+
+    kwargs = _get_kwargs(
+        uuid=uuid,
+variant_id=variant_id,
+
+    )
+
+    response = await client.get_async_httpx_client().request(
+        **kwargs
+    )
+
+    return _build_response(client=client, response=response)
+
+async def asyncio(
+    uuid: str,
+    variant_id: str,
+    *,
+    client: AuthenticatedClient,
+
+) -> Any | GetVariantResultsResponse | None:
+    """ 
+    Args:
+        uuid (str):
+        variant_id (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Any | GetVariantResultsResponse
+     """
+
+
+    return (await asyncio_detailed(
+        uuid=uuid,
+variant_id=variant_id,
+client=client,
+
+    )).parsed