gpp-client 26.5.0.dev1__tar.gz → 26.5.1.dev1__tar.gz

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpp-client
-Version: 26.5.0.dev1
+Version: 26.5.1.dev1
 Summary: Gemini Program Platform client.
 Project-URL: Homepage, https://github.com/gemini-hlsw/gpp-client
 Project-URL: Source, https://github.com/gemini-hlsw/gpp-client
@@ -44,7 +44,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.11.0
-Requires-Dist: aiohttp>=3.13.3
+Requires-Dist: aiohttp>=3.13.4
 Requires-Dist: beautifulsoup4>=4.11.0
 Requires-Dist: graphql-core>=3.2.0
 Requires-Dist: httpx>=0.23

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Astronomy",
 ]
 dependencies = [
-    "aiohttp>=3.13.3",
+    "aiohttp>=3.13.4",
     "beautifulsoup4>=4.11.0",
     "graphql-core>=3.2.0",
     "httpx>=0.23",
@@ -41,6 +41,10 @@ style = "pep440"
 pattern = '^v(?P<base>\d{2}\.\d{1,2}\.\d+)(?:\.(?P<stage>dev)(?P<revision>\d+))?$'
 strict = true
 metadata = false
+fallback-version = "0.0.0"
+
+[tool.uv]
+cache-keys = [{ file = "pyproject.toml" }, { git = { commit = true, tags = true }}]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/gpp_client"]
@@ -95,13 +99,13 @@ codegen = [
 dev = [
     { include-group = "codegen" },
     "polyfactory>=3.2.0",
-    "pytest>=9.0.1",
+    "pytest>=9.0.3",
     "pytest-asyncio>=1.3.0",
-    "pytest-cov>=7.0.0",
+    "pytest-cov>=7.1.0",
     "pytest-mock>=3.15.1",
     "pytest-remotedata>=0.4.1",
     "pytest-xdist>=3.8.0",
-    "ruff>=0.15.0",
+    "ruff>=0.15.12",
 ]
 docs = [
     "furo==2025.12.19",
@@ -110,14 +114,7 @@ docs = [
     "sphinx-copybutton>=0.5.2",
     "sphinxcontrib-typer>=0.7.2",
 ]
-notebook = [
-    "ipykernel>=7.2.0",
-    "jupyter>=1.1.1",
-]
-schema = [
-    "aiohttp>=3.13.3",
-    "gql>=3.5.0,<4.0.0",
-]
+schema = [{ include-group = "codegen" }]
 
 [project.urls]
 Homepage = "https://github.com/gemini-hlsw/gpp-client"

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/src/gpp_client/client.py

@@ -142,6 +142,8 @@ class GPPClient:
             url=graphql_url,
             headers=headers,
             ws_url=ws_url,
+            ws_headers=headers,
+            ws_connection_init_payload=headers,
         )
 
     def _build_rest_client(self) -> RESTClient:

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/src/gpp_client/domains/scheduler.py

@@ -5,9 +5,10 @@ Module for retrieving scheduler information.
 __all__ = ["SchedulerDomain"]
 
 from datetime import datetime
-from typing import Any
+from typing import Any, AsyncIterator
 
 from gpp_client.domains.base import BaseDomain
+from gpp_client.generated import SchedulerObservationsUpdates
 from gpp_client.generated.get_scheduler_all_programs_id import (
     GetSchedulerAllProgramsId,
 )
@@ -278,3 +279,20 @@ class SchedulerDomain(BaseDomain):
         today = datetime.today().date().isoformat() if date is None else date
         response = await self.get_program_ids(today=today)
         return [(p.reference.label, p.id) for p in response.programs.matches]
+
+    async def subscribe_to_calculation_updates(
+        self,
+    ) -> AsyncIterator[SchedulerObservationsUpdates]:
+        """
+        Subscribe to observation calculation update events with the
+        execution flag set to true so only executed events are sent.
+
+        Yields
+        ------
+        SchedulerObservationsUpdates
+            Observation calculation update events.
+        """
+        async for event in self._graphql.scheduler_observations_updates(
+            executable_only=True
+        ):
+            yield event

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/src/gpp_client/generated/__init__.py

@@ -154,12 +154,15 @@ from .enums import (
     GnirsFpuSlit,
     GnirsGrating,
     GnirsPrism,
+    GnirsReadMode,
+    GnirsWellDepth,
     GuideProbe,
     GuideState,
     HiiRegionSpectrum,
     Ignore,
     Igrins2OffsetMode,
     ImageQualityPreset,
+    ImagingCapability,
     Instrument,
     ItcType,
     LineFluxIntegratedUnits,
@@ -192,7 +195,7 @@ from .enums import (
     SkyBackground,
     SlewStage,
     SmartGcalType,
-    SpectroscopyCapabilities,
+    SpectroscopyCapability,
     StellarLibrarySpectrum,
     StepExecutionState,
     StepStage,
@@ -988,11 +991,12 @@ from .input_types import (
     WhereOptionEqCalibrationRole,
     WhereOptionEqEducationalStatus,
     WhereOptionEqGender,
+    WhereOptionEqImagingCapability,
     WhereOptionEqInstrument,
     WhereOptionEqPartner,
     WhereOptionEqQaState,
     WhereOptionEqSite,
-    WhereOptionEqSpectroscopyCapabilities,
+    WhereOptionEqSpectroscopyCapability,
     WhereOptionEqTacCategory,
     WhereOptionOrderScienceBand,
     WhereOptionString,
@@ -1123,6 +1127,17 @@ from .restore_target_by_id import (
     RestoreTargetByIdUpdateTargetsTargets,
     RestoreTargetByIdUpdateTargetsTargetsProgram,
 )
+from .scheduler_observations_updates import (
+    SchedulerObservationsUpdates,
+    SchedulerObservationsUpdatesObscalcUpdate,
+    SchedulerObservationsUpdatesObscalcUpdateValue,
+    SchedulerObservationsUpdatesObscalcUpdateValueExecution,
+    SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisits,
+    SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatches,
+    SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecords,
+    SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecordsMatches,
+    SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesObservation,
+)
 from .set_observation_workflow_state import (
     SetObservationWorkflowState,
     SetObservationWorkflowStateSetObservationWorkflowState,
@@ -1830,6 +1845,8 @@ __all__ = [
     "GnirsFpuSlit",
     "GnirsGrating",
     "GnirsPrism",
+    "GnirsReadMode",
+    "GnirsWellDepth",
     "GoaPropertiesInput",
     "GraphQLClient",
     "GraphQLClientError",
@@ -1852,6 +1869,7 @@ __all__ = [
     "Igrins2StaticInput",
     "Igrins2StepInput",
     "ImageQualityPreset",
+    "ImagingCapability",
     "ImagingScienceRequirementsInput",
     "Instrument",
     "ItcType",
@@ -2038,6 +2056,15 @@ __all__ = [
     "RevokeUserInvitationInput",
     "RightAscensionArcInput",
     "RightAscensionInput",
+    "SchedulerObservationsUpdates",
+    "SchedulerObservationsUpdatesObscalcUpdate",
+    "SchedulerObservationsUpdatesObscalcUpdateValue",
+    "SchedulerObservationsUpdatesObscalcUpdateValueExecution",
+    "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisits",
+    "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatches",
+    "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecords",
+    "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecordsMatches",
+    "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesObservation",
     "ScienceBand",
     "ScienceMode",
     "ScienceRequirementsDetails",
@@ -2066,7 +2093,7 @@ __all__ = [
     "SourceProfileInput",
     "SpectralDefinitionIntegratedInput",
     "SpectralDefinitionSurfaceInput",
-    "SpectroscopyCapabilities",
+    "SpectroscopyCapability",
     "SpectroscopyScienceRequirementsInput",
     "SpiralTelescopeConfigGeneratorInput",
     "StellarLibrarySpectrum",
@@ -2216,11 +2243,12 @@ __all__ = [
     "WhereOptionEqCalibrationRole",
     "WhereOptionEqEducationalStatus",
     "WhereOptionEqGender",
+    "WhereOptionEqImagingCapability",
     "WhereOptionEqInstrument",
     "WhereOptionEqPartner",
     "WhereOptionEqQaState",
     "WhereOptionEqSite",
-    "WhereOptionEqSpectroscopyCapabilities",
+    "WhereOptionEqSpectroscopyCapability",
     "WhereOptionEqTacCategory",
     "WhereOptionOrderScienceBand",
     "WhereOptionString",

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/src/gpp_client/generated/client.py

@@ -80,6 +80,7 @@ from .restore_observation_by_id import RestoreObservationById
 from .restore_observation_by_reference import RestoreObservationByReference
 from .restore_program_by_id import RestoreProgramById
 from .restore_target_by_id import RestoreTargetById
+from .scheduler_observations_updates import SchedulerObservationsUpdates
 from .set_observation_workflow_state import SetObservationWorkflowState
 from .target_edit import TargetEdit
 from .update_call_for_proposals_by_id import UpdateCallForProposalsById
@@ -98,6 +99,46 @@ def gql(q: str) -> str:
 
 
 class GraphQLClient(AsyncBaseClient):
+    async def scheduler_observations_updates(
+        self, executable_only: Union[Optional[bool], UnsetType] = UNSET, **kwargs: Any
+    ) -> AsyncIterator[SchedulerObservationsUpdates]:
+        query = gql("""
+            subscription SchedulerObservationsUpdates($executableOnly: Boolean) {
+              obscalcUpdate(input: {executableOnly: $executableOnly}) {
+                oldCalculationState
+                newCalculationState
+                editType
+                value {
+                  id
+                  observationTime
+                  execution {
+                    visits {
+                      matches {
+                        observation {
+                          id
+                        }
+                        atomRecords {
+                          matches {
+                            executionState
+                            id
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            """)
+        variables: dict[str, object] = {"executableOnly": executable_only}
+        async for data in self.execute_ws(
+            query=query,
+            operation_name="SchedulerObservationsUpdates",
+            variables=variables,
+            **kwargs,
+        ):
+            yield SchedulerObservationsUpdates.model_validate(data)
+
     async def get_observation_attachments_by_id(
         self, observation_id: Any, **kwargs: Any
     ) -> GetObservationAttachmentsById:

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/src/gpp_client/generated/custom_fields.py

@@ -4302,6 +4302,11 @@ class GhostIfuFields(GraphQLField):
         """Blue detector config."""
         return GhostDetectorConfigFields("blue")
 
+    @classmethod
+    def sky_position(cls) -> "CoordinatesFields":
+        """Sky position, if any."""
+        return CoordinatesFields("skyPosition")
+
     @classmethod
     def slit_viewing_camera_exposure_time(cls) -> "TimeSpanFields":
         """Slit viewing camera exposure time (if specified)."""
@@ -4331,7 +4336,10 @@ class GhostIfuFields(GraphQLField):
     def fields(
         self,
         *subfields: Union[
-            GhostIfuGraphQLField, "GhostDetectorConfigFields", "TimeSpanFields"
+            GhostIfuGraphQLField,
+            "CoordinatesFields",
+            "GhostDetectorConfigFields",
+            "TimeSpanFields",
         ],
     ) -> "GhostIfuFields":
         """Subfields should come from the GhostIfuFields class"""
@@ -6212,8 +6220,16 @@ class Igrins2DynamicFields(GraphQLField):
         """IGRINS-2 exposure time"""
         return TimeSpanFields("exposure")
 
+    @classmethod
+    def central_wavelength(cls) -> "WavelengthFields":
+        """Central wavelength, which is fixed at 2.1 microns."""
+        return WavelengthFields("centralWavelength")
+
     def fields(
-        self, *subfields: Union[Igrins2DynamicGraphQLField, "TimeSpanFields"]
+        self,
+        *subfields: Union[
+            Igrins2DynamicGraphQLField, "TimeSpanFields", "WavelengthFields"
+        ],
     ) -> "Igrins2DynamicFields":
         """Subfields should come from the Igrins2DynamicFields class"""
         self._subfields.extend(subfields)
@@ -6441,6 +6457,10 @@ class ImagingConfigOptionFields(GraphQLField):
     adaptive_optics: "ImagingConfigOptionGraphQLField" = (
         ImagingConfigOptionGraphQLField("adaptiveOptics")
     )
+    capability: "ImagingConfigOptionGraphQLField" = ImagingConfigOptionGraphQLField(
+        "capability"
+    )
+    "A special capability (if any) that the configuration may have."
     site: "ImagingConfigOptionGraphQLField" = ImagingConfigOptionGraphQLField("site")
 
     @classmethod

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/src/gpp_client/generated/enums.py

@@ -876,6 +876,18 @@ class GnirsFpuSlit(str, Enum):
     LONG_SLIT_1_00 = "LONG_SLIT_1_00"
 
 
+class GnirsReadMode(str, Enum):
+    VERY_BRIGHT = "VERY_BRIGHT"
+    BRIGHT = "BRIGHT"
+    FAINT = "FAINT"
+    VERY_FAINT = "VERY_FAINT"
+
+
+class GnirsWellDepth(str, Enum):
+    SHALLOW = "SHALLOW"
+    DEEP = "DEEP"
+
+
 class ItcType(str, Enum):
     GHOST_IFU = "GHOST_IFU"
     GMOS_NORTH_IMAGING = "GMOS_NORTH_IMAGING"
@@ -1037,7 +1049,12 @@ class SlewStage(str, Enum):
     END_SLEW = "END_SLEW"
 
 
-class SpectroscopyCapabilities(str, Enum):
+class ImagingCapability(str, Enum):
+    SPECKLE = "SPECKLE"
+    WIDE_FIELD = "WIDE_FIELD"
+
+
+class SpectroscopyCapability(str, Enum):
     NOD_AND_SHUFFLE = "NOD_AND_SHUFFLE"
     POLARIMETRY = "POLARIMETRY"
     CORONAGRAPHY = "CORONAGRAPHY"

{gpp_client-26.5.0.dev1 → gpp_client-26.5.1.dev1}/src/gpp_client/generated/input_types.py

@@ -78,6 +78,7 @@ from .enums import (
     Ignore,
     Igrins2OffsetMode,
     ImageQualityPreset,
+    ImagingCapability,
     Instrument,
     LineFluxIntegratedUnits,
     LineFluxSurfaceUnits,
@@ -102,7 +103,7 @@ from .enums import (
     SkyBackground,
     SlewStage,
     SmartGcalType,
-    SpectroscopyCapabilities,
+    SpectroscopyCapability,
     StellarLibrarySpectrum,
     StepStage,
     TacCategory,
@@ -1801,7 +1802,7 @@ class SpectroscopyScienceRequirementsInput(BaseModel):
         alias=str("focalPlaneAngle"), default=None
     )
     "The focalPlaneAngle field may be unset by assigning a null value, or ignored by skipping it altogether"
-    capability: Optional[SpectroscopyCapabilities] = None
+    capability: Optional[SpectroscopyCapability] = None
     "The capabilities field may be unset by assigning a null value, or ignored by skipping it altogether"
 
 
@@ -2462,6 +2463,10 @@ class GhostIfuInput(BaseModel):
     "Red config.  If not specified, defaults will be applied. Cannot be unset with\na null value."
     blue: Optional["GhostDetectorConfigInput"] = None
     "Blue config.  If not specified, defaults will be applied. Cannot be unset with\na null value."
+    sky_position: Optional["CoordinatesInput"] = Field(
+        alias=str("skyPosition"), default=None
+    )
+    "Coordinates for taking sky images.  When specified, the observation is\nconsidered to be a Target + Sky and is validated to ensure that only a single\ntarget exists in its asterism.  If not specified, this will remain null.  May\nbe unset with a null value."
     slit_viewing_camera_exposure_time: Optional["TimeSpanInput"] = Field(
         alias=str("slitViewingCameraExposureTime"), default=None
     )
@@ -3358,21 +3363,35 @@ class WhereEqScienceSubtype(BaseModel):
     "Matches if the subtype is none of the supplied values."
 
 
-class WhereOptionEqSpectroscopyCapabilities(BaseModel):
-    """Filters on equality (or not) of the SpectroscopyCapabilities property. All
+class WhereOptionEqImagingCapability(BaseModel):
+    """Filters on equality (or not) of the ImagingCapability property. All
+    supplied criteria must match, but usually only one is selected."""
+
+    is_null: Optional[bool] = Field(alias=str("IS_NULL"), default=None)
+    "When `true`, matches if the imaging capability value is not defined."
+    eq: Optional[ImagingCapability] = Field(alias=str("EQ"), default=None)
+    "Matches if the imaging capability is the supplied value."
+    neq: Optional[ImagingCapability] = Field(alias=str("NEQ"), default=None)
+    "Matches if the imaging capability is anything other than the supplied\nvalue."
+    in_: Optional[list[ImagingCapability]] = Field(alias=str("IN"), default=None)
+    "Matches if the imaging capability is any one of the supplied values."
+    nin: Optional[list[ImagingCapability]] = Field(alias=str("NIN"), default=None)
+    "Matches if the imaging capability is not any one of the supplied values."
+
+
+class WhereOptionEqSpectroscopyCapability(BaseModel):
+    """Filters on equality (or not) of the SpectroscopyCapability property. All
     supplied criteria must match, but usually only one is selected."""
 
     is_null: Optional[bool] = Field(alias=str("IS_NULL"), default=None)
     "When `true`, matches if the spectroscopy capability value is not defined."
-    eq: Optional[SpectroscopyCapabilities] = Field(alias=str("EQ"), default=None)
+    eq: Optional[SpectroscopyCapability] = Field(alias=str("EQ"), default=None)
     "Matches if the spectroscopy capability is the supplied value."
-    neq: Optional[SpectroscopyCapabilities] = Field(alias=str("NEQ"), default=None)
+    neq: Optional[SpectroscopyCapability] = Field(alias=str("NEQ"), default=None)
     "Matches if the spectroscopy capability is anything other than the supplied\nvalue."
-    in_: Optional[list[SpectroscopyCapabilities]] = Field(alias=str("IN"), default=None)
+    in_: Optional[list[SpectroscopyCapability]] = Field(alias=str("IN"), default=None)
     "Matches if the spectroscopy capability is any one of the supplied values."
-    nin: Optional[list[SpectroscopyCapabilities]] = Field(
-        alias=str("NIN"), default=None
-    )
+    nin: Optional[list[SpectroscopyCapability]] = Field(alias=str("NIN"), default=None)
     "Matches if the spectroscopy capability is not any one of the supplied values."
 
 
@@ -4210,7 +4229,7 @@ class WhereSpectroscopyConfigOption(BaseModel):
     adaptive_optics: Optional["WhereBoolean"] = Field(
         alias=str("adaptiveOptics"), default=None
     )
-    capability: Optional["WhereOptionEqSpectroscopyCapabilities"] = None
+    capability: Optional["WhereOptionEqSpectroscopyCapability"] = None
     focal_plane: Optional["WhereEqFocalPlane"] = Field(
         alias=str("focalPlane"), default=None
     )
@@ -4249,6 +4268,7 @@ class WhereImagingConfigOption(BaseModel):
     instrument: Optional["WhereEqInstrument"] = None
     fov: Optional["WhereAngle"] = None
     site: Optional["WhereEqSite"] = None
+    capability: Optional["WhereOptionEqImagingCapability"] = None
 
 
 class WhereString(BaseModel):

gpp_client-26.5.1.dev1/src/gpp_client/generated/scheduler_observations_updates.py

@@ -0,0 +1,76 @@
+from typing import Any, Optional
+
+from pydantic import Field
+
+from .base_model import BaseModel
+from .enums import AtomExecutionState, CalculationState, EditType
+
+
+class SchedulerObservationsUpdates(BaseModel):
+    obscalc_update: "SchedulerObservationsUpdatesObscalcUpdate" = Field(
+        alias="obscalcUpdate"
+    )
+
+
+class SchedulerObservationsUpdatesObscalcUpdate(BaseModel):
+    old_calculation_state: Optional[CalculationState] = Field(
+        alias="oldCalculationState"
+    )
+    new_calculation_state: Optional[CalculationState] = Field(
+        alias="newCalculationState"
+    )
+    edit_type: EditType = Field(alias="editType")
+    value: Optional["SchedulerObservationsUpdatesObscalcUpdateValue"]
+
+
+class SchedulerObservationsUpdatesObscalcUpdateValue(BaseModel):
+    id: Any
+    observation_time: Optional[Any] = Field(alias="observationTime")
+    execution: "SchedulerObservationsUpdatesObscalcUpdateValueExecution"
+
+
+class SchedulerObservationsUpdatesObscalcUpdateValueExecution(BaseModel):
+    visits: "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisits"
+
+
+class SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisits(BaseModel):
+    matches: list[
+        "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatches"
+    ]
+
+
+class SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatches(BaseModel):
+    observation: "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesObservation"
+    atom_records: "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecords" = Field(
+        alias="atomRecords"
+    )
+
+
+class SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesObservation(
+    BaseModel
+):
+    id: Any
+
+
+class SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecords(
+    BaseModel
+):
+    matches: list[
+        "SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecordsMatches"
+    ]
+
+
+class SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecordsMatches(
+    BaseModel
+):
+    execution_state: AtomExecutionState = Field(alias="executionState")
+    id: Any
+
+
+SchedulerObservationsUpdates.model_rebuild()
+SchedulerObservationsUpdatesObscalcUpdate.model_rebuild()
+SchedulerObservationsUpdatesObscalcUpdateValue.model_rebuild()
+SchedulerObservationsUpdatesObscalcUpdateValueExecution.model_rebuild()
+SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisits.model_rebuild()
+SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatches.model_rebuild()
+SchedulerObservationsUpdatesObscalcUpdateValueExecutionVisitsMatchesAtomRecords.model_rebuild()