gpp-client 26.7.3.dev3__tar.gz → 26.7.3.dev5__tar.gz

{gpp_client-26.7.3.dev3 → gpp_client-26.7.3.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpp-client
-Version: 26.7.3.dev3
+Version: 26.7.3.dev5
 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.dev3 → gpp_client-26.7.3.dev5}/src/gpp_client/domains/scheduler.py

@@ -122,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
         ----------
@@ -135,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,

{gpp_client-26.7.3.dev3 → gpp_client-26.7.3.dev5}/src/gpp_client/generated/__init__.py

@@ -73,6 +73,7 @@ from .delete_target_by_id import (
     DeleteTargetByIdUpdateTargetsTargetsProgram,
 )
 from .enums import (
+    ArchiveDuplicationState,
     ArcType,
     AtomExecutionState,
     AtomStage,
@@ -245,6 +246,20 @@ from .fragments import (
     ConstraintSetDetailsElevationRange,
     ConstraintSetDetailsElevationRangeAirMass,
     ConstraintSetDetailsElevationRangeHourAngle,
+    Flamingos2ImagingDetails,
+    Flamingos2ImagingDetailsFilters,
+    Flamingos2ImagingDetailsFiltersExposureTimeMode,
+    Flamingos2ImagingDetailsFiltersExposureTimeModeSignalToNoise,
+    Flamingos2ImagingDetailsFiltersExposureTimeModeSignalToNoiseAt,
+    Flamingos2ImagingDetailsFiltersExposureTimeModeTimeAndCount,
+    Flamingos2ImagingDetailsFiltersExposureTimeModeTimeAndCountTime,
+    Flamingos2ImagingDetailsInitialFilters,
+    Flamingos2ImagingDetailsInitialFiltersExposureTimeMode,
+    Flamingos2ImagingDetailsInitialFiltersExposureTimeModeSignalToNoise,
+    Flamingos2ImagingDetailsInitialFiltersExposureTimeModeSignalToNoiseAt,
+    Flamingos2ImagingDetailsInitialFiltersExposureTimeModeTimeAndCount,
+    Flamingos2ImagingDetailsInitialFiltersExposureTimeModeTimeAndCountAt,
+    Flamingos2ImagingDetailsInitialFiltersExposureTimeModeTimeAndCountTime,
     Flamingos2LongSlitDetails,
     Flamingos2LongSlitDetailsAcquisition,
     Flamingos2LongSlitDetailsAcquisitionExposureTimeMode,
@@ -377,6 +392,7 @@ from .fragments import (
     ObservationWorkflowDetails,
     ObservationWorkflowDetailsValidationErrors,
     ObservingModeDetails,
+    ObservingModeDetailsFlamingos2Imaging,
     ObservingModeDetailsFlamingos2LongSlit,
     ObservingModeDetailsGhostIfu,
     ObservingModeDetailsGmosNorthImaging,
@@ -861,6 +877,8 @@ from .get_target_by_id import GetTargetById, GetTargetByIdTarget
 from .get_targets import GetTargets, GetTargetsTargets, GetTargetsTargetsMatches
 from .input_types import (
     AddDatasetEventInput,
+    AddEventBatchEntryInput,
+    AddEventBatchInput,
     AddProgramUserInput,
     AddSequenceEventInput,
     AddSlewEventInput,
@@ -938,8 +956,12 @@ from .input_types import (
     GaussianInput,
     GeminiCallPropertiesInput,
     GeminiProposalTypeInput,
+    GhostAtomInput,
     GhostDetectorConfigInput,
+    GhostDetectorInput,
+    GhostDynamicInput,
     GhostIfuInput,
+    GhostStepInput,
     GmosCcdModeInput,
     GmosCustomMaskInput,
     GmosNodAndShuffleInput,
@@ -951,6 +973,7 @@ from .input_types import (
     GmosNorthImagingInput,
     GmosNorthLongSlitAcquisitionInput,
     GmosNorthLongSlitInput,
+    GmosNorthMosInput,
     GmosNorthStaticInput,
     GmosNorthStepInput,
     GmosSouthAtomInput,
@@ -961,6 +984,7 @@ from .input_types import (
     GmosSouthImagingInput,
     GmosSouthLongSlitAcquisitionInput,
     GmosSouthLongSlitInput,
+    GmosSouthMosInput,
     GmosSouthStaticInput,
     GmosSouthStepInput,
     GnirsAcquisitionMirrorOutInput,
@@ -984,6 +1008,7 @@ from .input_types import (
     Igrins2LongSlitInput,
     Igrins2StaticInput,
     Igrins2StepInput,
+    Igrins2SvcInput,
     ImagingScienceRequirementsInput,
     ImagingVariantInput,
     InterleavedImagingVariantInput,
@@ -1036,8 +1061,10 @@ from .input_types import (
     RecordIgrins2VisitInput,
     RecordVisitInput,
     RedeemUserInvitationInput,
+    RefreshArchiveDuplicationInput,
     RegionInput,
     ReplaceFlamingos2SequenceInput,
+    ReplaceGhostSequenceInput,
     ReplaceGmosNorthSequenceInput,
     ReplaceGmosSouthSequenceInput,
     ReplaceGnirsSequenceInput,
@@ -1153,6 +1180,7 @@ from .input_types import (
     WhereOptionEqSpectroscopyCapability,
     WhereOptionEqTacCategory,
     WhereOptionOrderScienceBand,
+    WhereOptionOrderTimestamp,
     WhereOptionString,
     WhereOrderAttachmentId,
     WhereOrderBigDecimal,
@@ -1376,6 +1404,8 @@ from .update_targets import (
 
 __all__ = [
     "AddDatasetEventInput",
+    "AddEventBatchEntryInput",
+    "AddEventBatchInput",
     "AddProgramUserInput",
     "AddSequenceEventInput",
     "AddSlewEventInput",
@@ -1385,6 +1415,7 @@ __all__ = [
     "AllocationInput",
     "AngleInput",
     "ArcType",
+    "ArchiveDuplicationState",
     "AsyncBaseClient",
     "AtomExecutionState",
     "AtomStage",
@@ -1537,6 +1568,20 @@ __all__ = [
     "Flamingos2Filter",
     "Flamingos2Fpu",
     "Flamingos2FpuMaskInput",
+    "Flamingos2ImagingDetails",
+    "Flamingos2ImagingDetailsFilters",
+    "Flamingos2ImagingDetailsFiltersExposureTimeMode",
+    "Flamingos2ImagingDetailsFiltersExposureTimeModeSignalToNoise",
+    "Flamingos2ImagingDetailsFiltersExposureTimeModeSignalToNoiseAt",
+    "Flamingos2ImagingDetailsFiltersExposureTimeModeTimeAndCount",
+    "Flamingos2ImagingDetailsFiltersExposureTimeModeTimeAndCountTime",
+    "Flamingos2ImagingDetailsInitialFilters",
+    "Flamingos2ImagingDetailsInitialFiltersExposureTimeMode",
+    "Flamingos2ImagingDetailsInitialFiltersExposureTimeModeSignalToNoise",
+    "Flamingos2ImagingDetailsInitialFiltersExposureTimeModeSignalToNoiseAt",
+    "Flamingos2ImagingDetailsInitialFiltersExposureTimeModeTimeAndCount",
+    "Flamingos2ImagingDetailsInitialFiltersExposureTimeModeTimeAndCountAt",
+    "Flamingos2ImagingDetailsInitialFiltersExposureTimeModeTimeAndCountTime",
     "Flamingos2ImagingFilterInput",
     "Flamingos2ImagingInput",
     "Flamingos2LongSlitAcquisitionInput",
@@ -1961,6 +2006,7 @@ __all__ = [
     "GetTargets",
     "GetTargetsTargets",
     "GetTargetsTargetsMatches",
+    "GhostAtomInput",
     "GhostBinning",
     "GhostDetectorConfigDetails",
     "GhostDetectorConfigDetailsExposureTimeMode",
@@ -1970,6 +2016,8 @@ __all__ = [
     "GhostDetectorConfigDetailsExposureTimeModeTimeAndCountAt",
     "GhostDetectorConfigDetailsExposureTimeModeTimeAndCountTime",
     "GhostDetectorConfigInput",
+    "GhostDetectorInput",
+    "GhostDynamicInput",
     "GhostIfu1FiberAgitator",
     "GhostIfu2FiberAgitator",
     "GhostIfuDetails",
@@ -1983,6 +2031,7 @@ __all__ = [
     "GhostIfuMappingType",
     "GhostReadMode",
     "GhostResolutionMode",
+    "GhostStepInput",
     "GmosAmpCount",
     "GmosAmpGain",
     "GmosAmpReadMode",
@@ -2012,6 +2061,7 @@ __all__ = [
     "GmosNorthLongSlitDetailsCentralWavelength",
     "GmosNorthLongSlitDetailsOffsets",
     "GmosNorthLongSlitInput",
+    "GmosNorthMosInput",
     "GmosNorthStageMode",
     "GmosNorthStaticInput",
     "GmosNorthStepInput",
@@ -2033,6 +2083,7 @@ __all__ = [
     "GmosSouthLongSlitDetailsCentralWavelength",
     "GmosSouthLongSlitDetailsOffsets",
     "GmosSouthLongSlitInput",
+    "GmosSouthMosInput",
     "GmosSouthStageMode",
     "GmosSouthStaticInput",
     "GmosSouthStepInput",
@@ -2145,6 +2196,7 @@ __all__ = [
     "Igrins2LongSlitInput",
     "Igrins2StaticInput",
     "Igrins2StepInput",
+    "Igrins2SvcInput",
     "ImageQualityPreset",
     "ImagingCapability",
     "ImagingScienceRequirementsInput",
@@ -2238,6 +2290,7 @@ __all__ = [
     "Observatory",
     "ObserveClass",
     "ObservingModeDetails",
+    "ObservingModeDetailsFlamingos2Imaging",
     "ObservingModeDetailsFlamingos2LongSlit",
     "ObservingModeDetailsGhostIfu",
     "ObservingModeDetailsGmosNorthImaging",
@@ -2332,8 +2385,10 @@ __all__ = [
     "RecordIgrins2VisitInput",
     "RecordVisitInput",
     "RedeemUserInvitationInput",
+    "RefreshArchiveDuplicationInput",
     "RegionInput",
     "ReplaceFlamingos2SequenceInput",
+    "ReplaceGhostSequenceInput",
     "ReplaceGmosNorthSequenceInput",
     "ReplaceGmosSouthSequenceInput",
     "ReplaceGnirsSequenceInput",
@@ -2605,6 +2660,7 @@ __all__ = [
     "WhereOptionEqSpectroscopyCapability",
     "WhereOptionEqTacCategory",
     "WhereOptionOrderScienceBand",
+    "WhereOptionOrderTimestamp",
     "WhereOptionString",
     "WhereOrderAttachmentId",
     "WhereOrderBigDecimal",