gpp-client 26.7.3.dev2__tar.gz → 26.7.3.dev4__tar.gz

{gpp_client-26.7.3.dev2 → gpp_client-26.7.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpp-client
-Version: 26.7.3.dev2
+Version: 26.7.3.dev4
 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

{gpp_client-26.7.3.dev2 → gpp_client-26.7.3.dev4}/src/gpp_client/domains/scheduler.py

@@ -9,7 +9,10 @@ from typing import Any, AsyncIterator
 
 from gpp_client.domains.base import BaseDomain
 from gpp_client.rest.models import VisibilityChanges, parse_visibility_changes
-from gpp_client.generated import SchedulerObservationsUpdates
+from gpp_client.generated import (
+    SchedulerObservationsUpdates,
+    WhereOptionEqObservingModeType,
+)
 from gpp_client.generated.get_scheduler_all_programs_id import (
     GetSchedulerAllProgramsId,
 )
@@ -119,10 +122,10 @@ class SchedulerDomain(BaseDomain):
         node: dict[str, Any],
         obs_map: dict[str, Any],
         obs_sequence: dict[str, list],
-    ) -> None:
+    ) -> bool:
         """
         Maps the information between the groups tree and the observations retrieved
-        from a different query.
+        from a different query, dropping the elements that carry no observation.
 
         Parameters
         ----------
@@ -132,33 +135,45 @@ class SchedulerDomain(BaseDomain):
             Mapping of observation ids with observation raw data.
         obs_sequence: dict[str, list]
             Mapping of the atoms sequence with the observation id.
+
+        Returns
+        -------
+        bool
+            ``True`` if the node was filled with observation data, ``False`` if it
+            is an observation missing from the ODB response or a group left empty
+            once its children were trimmed.
         """
         obs = node.get("observation")
         group = node.get("group")
         if obs is not None:
             obs_id = obs["id"]
             obs_data = obs_map.get(obs_id)
-            if obs_data is not None:
-                obs_data["sequence"] = obs_sequence.get(obs_id)
-                node["observation"] = obs_data
-            else:
+            if obs_data is None:
                 # No information on the ODB about the observation but the structure
                 # remains in the program.
                 # Put to None so observation doesn't get parse.
                 node["observation"] = None
+                return False
 
-        elif group is not None:
-            if group.get("elements"):
-                for child in group["elements"]:
-                    self._traverse_for_observation(child, obs_map, obs_sequence)
-            else:
-                # Empty groups like Calibration might add elements later.
-                group["elements"] = []
+            obs_data["sequence"] = obs_sequence.get(obs_id)
+            node["observation"] = obs_data
+            return True
 
-        else:
-            # is the root
-            for child in node["elements"]:
-                self._traverse_for_observation(child, obs_map, obs_sequence)
+        if group is not None:
+            group["elements"] = [
+                child
+                for child in group.get("elements") or []
+                if self._traverse_for_observation(child, obs_map, obs_sequence)
+            ]
+            return bool(group["elements"])
+
+        # is the root
+        node["elements"] = [
+            child
+            for child in node["elements"]
+            if self._traverse_for_observation(child, obs_map, obs_sequence)
+        ]
+        return bool(node["elements"])
 
     async def get_all(
         self,
@@ -240,6 +255,9 @@ class SchedulerDomain(BaseDomain):
                     ]
                 )
             ),
+            observing_mode_type=WhereOptionEqObservingModeType(
+                is_null=False,
+            ),
         )
 
         # Get observation data

{gpp_client-26.7.3.dev2 → gpp_client-26.7.3.dev4}/src/gpp_client/generated/__init__.py

@@ -253,18 +253,12 @@ from .fragments import (
     Flamingos2LongSlitDetailsAcquisitionExposureTimeModeTimeAndCount,
     Flamingos2LongSlitDetailsAcquisitionExposureTimeModeTimeAndCountAt,
     Flamingos2LongSlitDetailsAcquisitionExposureTimeModeTimeAndCountTime,
-    Flamingos2LongSlitDetailsDefaultOffsets,
-    Flamingos2LongSlitDetailsDefaultOffsetsP,
-    Flamingos2LongSlitDetailsDefaultOffsetsQ,
     Flamingos2LongSlitDetailsExposureTimeMode,
     Flamingos2LongSlitDetailsExposureTimeModeSignalToNoise,
     Flamingos2LongSlitDetailsExposureTimeModeSignalToNoiseAt,
     Flamingos2LongSlitDetailsExposureTimeModeTimeAndCount,
     Flamingos2LongSlitDetailsExposureTimeModeTimeAndCountAt,
     Flamingos2LongSlitDetailsExposureTimeModeTimeAndCountTime,
-    Flamingos2LongSlitDetailsOffsets,
-    Flamingos2LongSlitDetailsOffsetsP,
-    Flamingos2LongSlitDetailsOffsetsQ,
     Flamingos2LongSlitDetailsTelluricType,
     GhostDetectorConfigDetails,
     GhostDetectorConfigDetailsExposureTimeMode,
@@ -290,22 +284,72 @@ from .fragments import (
     GmosSouthLongSlitDetails,
     GmosSouthLongSlitDetailsCentralWavelength,
     GmosSouthLongSlitDetailsOffsets,
+    GnirsDetails,
+    GnirsDetailsGnirsImaging,
+    GnirsDetailsGnirsSpectroscopy,
+    GnirsImagingDetails,
+    GnirsImagingDetailsFilters,
+    GnirsImagingDetailsFiltersExposureTimeMode,
+    GnirsImagingDetailsFiltersExposureTimeModeSignalToNoise,
+    GnirsImagingDetailsFiltersExposureTimeModeSignalToNoiseAt,
+    GnirsImagingDetailsFiltersExposureTimeModeTimeAndCount,
+    GnirsImagingDetailsFiltersExposureTimeModeTimeAndCountAt,
+    GnirsImagingDetailsFiltersExposureTimeModeTimeAndCountTime,
+    GnirsImagingDetailsInitialFilters,
+    GnirsImagingDetailsInitialFiltersExposureTimeMode,
+    GnirsImagingDetailsInitialFiltersExposureTimeModeSignalToNoise,
+    GnirsImagingDetailsInitialFiltersExposureTimeModeSignalToNoiseAt,
+    GnirsImagingDetailsInitialFiltersExposureTimeModeTimeAndCount,
+    GnirsImagingDetailsInitialFiltersExposureTimeModeTimeAndCountAt,
+    GnirsImagingDetailsInitialFiltersExposureTimeModeTimeAndCountTime,
+    GnirsSpectroscopyDetails,
+    GnirsSpectroscopyDetailsAcquisition,
+    GnirsSpectroscopyDetailsAcquisitionExposureTimeMode,
+    GnirsSpectroscopyDetailsAcquisitionExposureTimeModeSignalToNoise,
+    GnirsSpectroscopyDetailsAcquisitionExposureTimeModeSignalToNoiseAt,
+    GnirsSpectroscopyDetailsAcquisitionExposureTimeModeTimeAndCount,
+    GnirsSpectroscopyDetailsAcquisitionExposureTimeModeTimeAndCountAt,
+    GnirsSpectroscopyDetailsAcquisitionExposureTimeModeTimeAndCountTime,
+    GnirsSpectroscopyDetailsAcquisitionSkyOffset,
+    GnirsSpectroscopyDetailsAcquisitionSkyOffsetP,
+    GnirsSpectroscopyDetailsAcquisitionSkyOffsetQ,
+    GnirsSpectroscopyDetailsCentralWavelength,
+    GnirsSpectroscopyDetailsIfu,
+    GnirsSpectroscopyDetailsIfuTelescopeConfigs,
+    GnirsSpectroscopyDetailsIfuTelescopeConfigsOffset,
+    GnirsSpectroscopyDetailsIfuTelescopeConfigsOffsetP,
+    GnirsSpectroscopyDetailsIfuTelescopeConfigsOffsetQ,
+    GnirsSpectroscopyDetailsInitialCentralWavelength,
+    GnirsSpectroscopyDetailsSlit,
+    GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigs,
+    GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsAlongSlit,
+    GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsAlongSlitQ,
+    GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsToSky,
+    GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsToSkyOffset,
+    GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsToSkyOffsetP,
+    GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsToSkyOffsetQ,
+    GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigs,
+    GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsAlongSlit,
+    GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsAlongSlitQ,
+    GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsToSky,
+    GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsToSkyOffset,
+    GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsToSkyOffsetP,
+    GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsToSkyOffsetQ,
+    GnirsSpectroscopyDetailsSlitTelescopeConfigs,
+    GnirsSpectroscopyDetailsSlitTelescopeConfigsAlongSlit,
+    GnirsSpectroscopyDetailsSlitTelescopeConfigsAlongSlitQ,
+    GnirsSpectroscopyDetailsSlitTelescopeConfigsToSky,
+    GnirsSpectroscopyDetailsSlitTelescopeConfigsToSkyOffset,
+    GnirsSpectroscopyDetailsSlitTelescopeConfigsToSkyOffsetP,
+    GnirsSpectroscopyDetailsSlitTelescopeConfigsToSkyOffsetQ,
+    GnirsSpectroscopyDetailsTelluricType,
     Igrins2LongSlitDetails,
-    Igrins2LongSlitDetailsDefaultOffsets,
-    Igrins2LongSlitDetailsDefaultOffsetsP,
-    Igrins2LongSlitDetailsDefaultOffsetsQ,
-    Igrins2LongSlitDetailsExplicitOffsets,
-    Igrins2LongSlitDetailsExplicitOffsetsP,
-    Igrins2LongSlitDetailsExplicitOffsetsQ,
     Igrins2LongSlitDetailsExposureTimeMode,
     Igrins2LongSlitDetailsExposureTimeModeSignalToNoise,
     Igrins2LongSlitDetailsExposureTimeModeSignalToNoiseAt,
     Igrins2LongSlitDetailsExposureTimeModeTimeAndCount,
     Igrins2LongSlitDetailsExposureTimeModeTimeAndCountAt,
     Igrins2LongSlitDetailsExposureTimeModeTimeAndCountTime,
-    Igrins2LongSlitDetailsOffsets,
-    Igrins2LongSlitDetailsOffsetsP,
-    Igrins2LongSlitDetailsOffsetsQ,
     Igrins2LongSlitDetailsTelluricType,
     NonsiderealTargetDetails,
     ObservationCore,
@@ -339,6 +383,8 @@ from .fragments import (
     ObservingModeDetailsGmosNorthLongSlit,
     ObservingModeDetailsGmosSouthImaging,
     ObservingModeDetailsGmosSouthLongSlit,
+    ObservingModeDetailsGnirsImaging,
+    ObservingModeDetailsGnirsSpectroscopy,
     ObservingModeDetailsIgrins2LongSlit,
     ObservingModeDetailsVisitor,
     OpportunityTargetDetails,
@@ -828,6 +874,7 @@ from .input_types import (
     BandBrightnessSurfaceInput,
     BandNormalizedIntegratedInput,
     BandNormalizedSurfaceInput,
+    CallForProposalsExchangePartnerInput,
     CallForProposalsPartnerInput,
     CallForProposalsPropertiesInput,
     CatalogInfoInput,
@@ -920,6 +967,8 @@ from .input_types import (
     GnirsAtomInput,
     GnirsDynamicInput,
     GnirsIfuInput,
+    GnirsImagingFilterInput,
+    GnirsImagingInput,
     GnirsSlitInput,
     GnirsSpectroscopyAcquisitionInput,
     GnirsSpectroscopyInput,
@@ -935,6 +984,7 @@ from .input_types import (
     Igrins2LongSlitInput,
     Igrins2StaticInput,
     Igrins2StepInput,
+    Igrins2SvcInput,
     ImagingScienceRequirementsInput,
     ImagingVariantInput,
     InterleavedImagingVariantInput,
@@ -967,9 +1017,11 @@ from .input_types import (
     ProgramReferencePropertiesEngineeringInput,
     ProgramReferencePropertiesExampleInput,
     ProgramReferencePropertiesInput,
+    ProgramReferencePropertiesKeckInput,
     ProgramReferencePropertiesLibraryInput,
     ProgramReferencePropertiesMonitoringInput,
     ProgramReferencePropertiesScienceInput,
+    ProgramReferencePropertiesSubaruInput,
     ProgramReferencePropertiesSystemInput,
     ProgramUserPropertiesInput,
     ProperMotionComponentInput,
@@ -1359,6 +1411,7 @@ __all__ = [
     "CallForProposalsCoreSubaru",
     "CallForProposalsDetails",
     "CallForProposalsDetailsActive",
+    "CallForProposalsExchangePartnerInput",
     "CallForProposalsPartnerInput",
     "CallForProposalsPropertiesInput",
     "CassRotator",
@@ -1496,18 +1549,12 @@ __all__ = [
     "Flamingos2LongSlitDetailsAcquisitionExposureTimeModeTimeAndCount",
     "Flamingos2LongSlitDetailsAcquisitionExposureTimeModeTimeAndCountAt",
     "Flamingos2LongSlitDetailsAcquisitionExposureTimeModeTimeAndCountTime",
-    "Flamingos2LongSlitDetailsDefaultOffsets",
-    "Flamingos2LongSlitDetailsDefaultOffsetsP",
-    "Flamingos2LongSlitDetailsDefaultOffsetsQ",
     "Flamingos2LongSlitDetailsExposureTimeMode",
     "Flamingos2LongSlitDetailsExposureTimeModeSignalToNoise",
     "Flamingos2LongSlitDetailsExposureTimeModeSignalToNoiseAt",
     "Flamingos2LongSlitDetailsExposureTimeModeTimeAndCount",
     "Flamingos2LongSlitDetailsExposureTimeModeTimeAndCountAt",
     "Flamingos2LongSlitDetailsExposureTimeModeTimeAndCountTime",
-    "Flamingos2LongSlitDetailsOffsets",
-    "Flamingos2LongSlitDetailsOffsetsP",
-    "Flamingos2LongSlitDetailsOffsetsQ",
     "Flamingos2LongSlitDetailsTelluricType",
     "Flamingos2LongSlitInput",
     "Flamingos2LyotWheel",
@@ -1995,6 +2042,9 @@ __all__ = [
     "GnirsAtomInput",
     "GnirsCamera",
     "GnirsDecker",
+    "GnirsDetails",
+    "GnirsDetailsGnirsImaging",
+    "GnirsDetailsGnirsSpectroscopy",
     "GnirsDynamicInput",
     "GnirsFilter",
     "GnirsFpuIfu",
@@ -2002,10 +2052,68 @@ __all__ = [
     "GnirsFpuSlit",
     "GnirsGrating",
     "GnirsIfuInput",
+    "GnirsImagingDetails",
+    "GnirsImagingDetailsFilters",
+    "GnirsImagingDetailsFiltersExposureTimeMode",
+    "GnirsImagingDetailsFiltersExposureTimeModeSignalToNoise",
+    "GnirsImagingDetailsFiltersExposureTimeModeSignalToNoiseAt",
+    "GnirsImagingDetailsFiltersExposureTimeModeTimeAndCount",
+    "GnirsImagingDetailsFiltersExposureTimeModeTimeAndCountAt",
+    "GnirsImagingDetailsFiltersExposureTimeModeTimeAndCountTime",
+    "GnirsImagingDetailsInitialFilters",
+    "GnirsImagingDetailsInitialFiltersExposureTimeMode",
+    "GnirsImagingDetailsInitialFiltersExposureTimeModeSignalToNoise",
+    "GnirsImagingDetailsInitialFiltersExposureTimeModeSignalToNoiseAt",
+    "GnirsImagingDetailsInitialFiltersExposureTimeModeTimeAndCount",
+    "GnirsImagingDetailsInitialFiltersExposureTimeModeTimeAndCountAt",
+    "GnirsImagingDetailsInitialFiltersExposureTimeModeTimeAndCountTime",
+    "GnirsImagingFilterInput",
+    "GnirsImagingInput",
     "GnirsPrism",
     "GnirsReadMode",
     "GnirsSlitInput",
     "GnirsSpectroscopyAcquisitionInput",
+    "GnirsSpectroscopyDetails",
+    "GnirsSpectroscopyDetailsAcquisition",
+    "GnirsSpectroscopyDetailsAcquisitionExposureTimeMode",
+    "GnirsSpectroscopyDetailsAcquisitionExposureTimeModeSignalToNoise",
+    "GnirsSpectroscopyDetailsAcquisitionExposureTimeModeSignalToNoiseAt",
+    "GnirsSpectroscopyDetailsAcquisitionExposureTimeModeTimeAndCount",
+    "GnirsSpectroscopyDetailsAcquisitionExposureTimeModeTimeAndCountAt",
+    "GnirsSpectroscopyDetailsAcquisitionExposureTimeModeTimeAndCountTime",
+    "GnirsSpectroscopyDetailsAcquisitionSkyOffset",
+    "GnirsSpectroscopyDetailsAcquisitionSkyOffsetP",
+    "GnirsSpectroscopyDetailsAcquisitionSkyOffsetQ",
+    "GnirsSpectroscopyDetailsCentralWavelength",
+    "GnirsSpectroscopyDetailsIfu",
+    "GnirsSpectroscopyDetailsIfuTelescopeConfigs",
+    "GnirsSpectroscopyDetailsIfuTelescopeConfigsOffset",
+    "GnirsSpectroscopyDetailsIfuTelescopeConfigsOffsetP",
+    "GnirsSpectroscopyDetailsIfuTelescopeConfigsOffsetQ",
+    "GnirsSpectroscopyDetailsInitialCentralWavelength",
+    "GnirsSpectroscopyDetailsSlit",
+    "GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigs",
+    "GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsAlongSlit",
+    "GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsAlongSlitQ",
+    "GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsToSky",
+    "GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsToSkyOffset",
+    "GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsToSkyOffsetP",
+    "GnirsSpectroscopyDetailsSlitDefaultTelescopeConfigsToSkyOffsetQ",
+    "GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigs",
+    "GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsAlongSlit",
+    "GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsAlongSlitQ",
+    "GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsToSky",
+    "GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsToSkyOffset",
+    "GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsToSkyOffsetP",
+    "GnirsSpectroscopyDetailsSlitExplicitTelescopeConfigsToSkyOffsetQ",
+    "GnirsSpectroscopyDetailsSlitTelescopeConfigs",
+    "GnirsSpectroscopyDetailsSlitTelescopeConfigsAlongSlit",
+    "GnirsSpectroscopyDetailsSlitTelescopeConfigsAlongSlitQ",
+    "GnirsSpectroscopyDetailsSlitTelescopeConfigsToSky",
+    "GnirsSpectroscopyDetailsSlitTelescopeConfigsToSkyOffset",
+    "GnirsSpectroscopyDetailsSlitTelescopeConfigsToSkyOffsetP",
+    "GnirsSpectroscopyDetailsSlitTelescopeConfigsToSkyOffsetQ",
+    "GnirsSpectroscopyDetailsTelluricType",
     "GnirsSpectroscopyInput",
     "GnirsStepInput",
     "GnirsWellDepth",
@@ -2028,25 +2136,17 @@ __all__ = [
     "Igrins2AtomInput",
     "Igrins2DynamicInput",
     "Igrins2LongSlitDetails",
-    "Igrins2LongSlitDetailsDefaultOffsets",
-    "Igrins2LongSlitDetailsDefaultOffsetsP",
-    "Igrins2LongSlitDetailsDefaultOffsetsQ",
-    "Igrins2LongSlitDetailsExplicitOffsets",
-    "Igrins2LongSlitDetailsExplicitOffsetsP",
-    "Igrins2LongSlitDetailsExplicitOffsetsQ",
     "Igrins2LongSlitDetailsExposureTimeMode",
     "Igrins2LongSlitDetailsExposureTimeModeSignalToNoise",
     "Igrins2LongSlitDetailsExposureTimeModeSignalToNoiseAt",
     "Igrins2LongSlitDetailsExposureTimeModeTimeAndCount",
     "Igrins2LongSlitDetailsExposureTimeModeTimeAndCountAt",
     "Igrins2LongSlitDetailsExposureTimeModeTimeAndCountTime",
-    "Igrins2LongSlitDetailsOffsets",
-    "Igrins2LongSlitDetailsOffsetsP",
-    "Igrins2LongSlitDetailsOffsetsQ",
     "Igrins2LongSlitDetailsTelluricType",
     "Igrins2LongSlitInput",
     "Igrins2StaticInput",
     "Igrins2StepInput",
+    "Igrins2SvcInput",
     "ImageQualityPreset",
     "ImagingCapability",
     "ImagingScienceRequirementsInput",
@@ -2146,6 +2246,8 @@ __all__ = [
     "ObservingModeDetailsGmosNorthLongSlit",
     "ObservingModeDetailsGmosSouthImaging",
     "ObservingModeDetailsGmosSouthLongSlit",
+    "ObservingModeDetailsGnirsImaging",
+    "ObservingModeDetailsGnirsSpectroscopy",
     "ObservingModeDetailsIgrins2LongSlit",
     "ObservingModeDetailsVisitor",
     "ObservingModeInput",
@@ -2207,9 +2309,11 @@ __all__ = [
     "ProgramReferencePropertiesEngineeringInput",
     "ProgramReferencePropertiesExampleInput",
     "ProgramReferencePropertiesInput",
+    "ProgramReferencePropertiesKeckInput",
     "ProgramReferencePropertiesLibraryInput",
     "ProgramReferencePropertiesMonitoringInput",
     "ProgramReferencePropertiesScienceInput",
+    "ProgramReferencePropertiesSubaruInput",
     "ProgramReferencePropertiesSystemInput",
     "ProgramType",
     "ProgramUserPropertiesInput",