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

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

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

@@ -984,6 +984,7 @@ from .input_types import (
     Igrins2LongSlitInput,
     Igrins2StaticInput,
     Igrins2StepInput,
+    Igrins2SvcInput,
     ImagingScienceRequirementsInput,
     ImagingVariantInput,
     InterleavedImagingVariantInput,
@@ -2145,6 +2146,7 @@ __all__ = [
     "Igrins2LongSlitInput",
     "Igrins2StaticInput",
     "Igrins2StepInput",
+    "Igrins2SvcInput",
     "ImageQualityPreset",
     "ImagingCapability",
     "ImagingScienceRequirementsInput",

{gpp_client-26.7.3.dev3 → gpp_client-26.7.3.dev4}/src/gpp_client/generated/client.py

@@ -2168,9 +2168,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -2780,9 +2777,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -3393,9 +3387,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -4008,9 +3999,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -4626,9 +4614,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -5244,9 +5229,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -5859,9 +5841,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -6474,9 +6453,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -7089,9 +7065,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -7705,9 +7678,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes
@@ -8328,9 +8298,6 @@ class GraphQLClient(AsyncBaseClient):
                   }
                 }
               }
-              saveSVCImages
-              defaultSaveSVCImages
-              explicitSaveSVCImages
               telluricType {
                 tag
                 starTypes

{gpp_client-26.7.3.dev3 → gpp_client-26.7.3.dev4}/src/gpp_client/generated/custom_fields.py

@@ -206,6 +206,7 @@ from .custom_typing_fields import (
     Igrins2LongSlitGraphQLField,
     Igrins2StaticGraphQLField,
     Igrins2StepGraphQLField,
+    Igrins2SvcConfigGraphQLField,
     ImagingConfigOptionFlamingos2GraphQLField,
     ImagingConfigOptionGmosNorthGraphQLField,
     ImagingConfigOptionGmosSouthGraphQLField,
@@ -7343,18 +7344,13 @@ class Igrins2LongSlitFields(GraphQLField):
         """The exposure time mode used for ITC lookup for the science sequence."""
         return ExposureTimeModeFields("exposureTimeMode")
 
-    save_svc_images: "Igrins2LongSlitGraphQLField" = Igrins2LongSlitGraphQLField(
-        "saveSVCImages"
-    )
-    "Whether to save SVC images, either explicitly specified in\nexplicitSaveSVCImages or else taken from defaultSaveSVCImages"
-    default_save_svc_images: "Igrins2LongSlitGraphQLField" = (
-        Igrins2LongSlitGraphQLField("defaultSaveSVCImages")
-    )
-    "Default save SVC images setting"
-    explicit_save_svc_images: "Igrins2LongSlitGraphQLField" = (
-        Igrins2LongSlitGraphQLField("explicitSaveSVCImages")
-    )
-    "Optional explicitly specified save SVC images setting. If set it overrides\nthe default."
+    @classmethod
+    def svc(cls) -> "Igrins2SvcConfigFields":
+        """Slit-Viewing Camera (SVC) acquisition configuration. Null (the default) means
+        SVC images are not saved.
+        A non-null value means SVC images are saved using the
+        given exposure time and telescope offset positions."""
+        return Igrins2SvcConfigFields("svc")
 
     @classmethod
     def telescope_configs(cls) -> "SlitTelescopeConfigsFields":
@@ -7383,6 +7379,7 @@ class Igrins2LongSlitFields(GraphQLField):
         *subfields: Union[
             Igrins2LongSlitGraphQLField,
             "ExposureTimeModeFields",
+            "Igrins2SvcConfigFields",
             "SlitTelescopeConfigsFields",
             "TelluricTypeFields",
         ],
@@ -7466,6 +7463,59 @@ class Igrins2StepFields(GraphQLField):
         return self
 
 
+class Igrins2SvcConfigFields(GraphQLField):
+    """IGRINS-2 Slit-Viewing Camera (SVC) acquisition configuration. A non-null value
+    means SVC images are saved using the given exposure duration and telescope dither
+    positions; null means SVC images are not saved."""
+
+    @classmethod
+    def exposure(cls) -> "TimeSpanFields":
+        """SVC exposure time, either explicitly specified in explicitExposure or else
+        taken from defaultExposure."""
+        return TimeSpanFields("exposure")
+
+    @classmethod
+    def default_exposure(cls) -> "TimeSpanFields":
+        """Default SVC exposure time (3.08 s)."""
+        return TimeSpanFields("defaultExposure")
+
+    @classmethod
+    def explicit_exposure(cls) -> "TimeSpanFields":
+        """Optional explicitly specified SVC exposure time. If set it overrides the default."""
+        return TimeSpanFields("explicitExposure")
+
+    @classmethod
+    def telescope_configs(cls) -> "TelescopeConfigFields":
+        """Effective SVC telescope configs (explicit override coalesced with the default)."""
+        return TelescopeConfigFields("telescopeConfigs")
+
+    @classmethod
+    def default_telescope_configs(cls) -> "TelescopeConfigFields":
+        """Default SVC telescope configs: the p-offset dither (0,0) and (5,0) arcsec,
+        both guided."""
+        return TelescopeConfigFields("defaultTelescopeConfigs")
+
+    @classmethod
+    def explicit_telescope_configs(cls) -> "TelescopeConfigFields":
+        """Optional explicitly specified SVC telescope configs. If set they override the
+        default."""
+        return TelescopeConfigFields("explicitTelescopeConfigs")
+
+    def fields(
+        self,
+        *subfields: Union[
+            Igrins2SvcConfigGraphQLField, "TelescopeConfigFields", "TimeSpanFields"
+        ],
+    ) -> "Igrins2SvcConfigFields":
+        """Subfields should come from the Igrins2SvcConfigFields class"""
+        self._subfields.extend(subfields)
+        return self
+
+    def alias(self, alias: str) -> "Igrins2SvcConfigFields":
+        self._alias = alias
+        return self
+
+
 class ImagingConfigOptionFields(GraphQLField):
     """Describes an instrument configuration option for imaging."""
 
@@ -10799,6 +10849,7 @@ class SpectroscopyConfigOptionGmosNorthFields(GraphQLField):
     fpu: "SpectroscopyConfigOptionGmosNorthGraphQLField" = (
         SpectroscopyConfigOptionGmosNorthGraphQLField("fpu")
     )
+    "The builtin FPU, present for single-slit configurations. Null for multislit\n(MOS) configurations, where the focal-plane unit is a custom mask."
     grating: "SpectroscopyConfigOptionGmosNorthGraphQLField" = (
         SpectroscopyConfigOptionGmosNorthGraphQLField("grating")
     )
@@ -10822,6 +10873,7 @@ class SpectroscopyConfigOptionGmosSouthFields(GraphQLField):
     fpu: "SpectroscopyConfigOptionGmosSouthGraphQLField" = (
         SpectroscopyConfigOptionGmosSouthGraphQLField("fpu")
     )
+    "The builtin FPU, present for single-slit configurations. Null for multislit\n(MOS) configurations, where the focal-plane unit is a custom mask."
     grating: "SpectroscopyConfigOptionGmosSouthGraphQLField" = (
         SpectroscopyConfigOptionGmosSouthGraphQLField("grating")
     )

{gpp_client-26.7.3.dev3 → gpp_client-26.7.3.dev4}/src/gpp_client/generated/custom_typing_fields.py

@@ -1285,6 +1285,12 @@ class Igrins2LongSlitGraphQLField(GraphQLField):
         return self
 
 
+class Igrins2SvcConfigGraphQLField(GraphQLField):
+    def alias(self, alias: str) -> "Igrins2SvcConfigGraphQLField":
+        self._alias = alias
+        return self
+
+
 class GnirsImagingFilterGraphQLField(GraphQLField):
     def alias(self, alias: str) -> "GnirsImagingFilterGraphQLField":
         self._alias = alias

{gpp_client-26.7.3.dev3 → gpp_client-26.7.3.dev4}/src/gpp_client/generated/enums.py

@@ -324,10 +324,12 @@ class TimeAccountingCategory(str, Enum):
     AR = "AR"
     BR = "BR"
     CA = "CA"
+    CAL = "CAL"
     CFHT = "CFHT"
     CL = "CL"
     DD = "DD"
     DS = "DS"
+    ENG = "ENG"
     GT = "GT"
     JP = "JP"
     KECK = "KECK"

{gpp_client-26.7.3.dev3 → gpp_client-26.7.3.dev4}/src/gpp_client/generated/fragments.py

@@ -659,9 +659,6 @@ class Igrins2LongSlitDetails(BaseModel):
     exposure_time_mode: "Igrins2LongSlitDetailsExposureTimeMode" = Field(
         alias="exposureTimeMode"
     )
-    save_svc_images: bool = Field(alias="saveSVCImages")
-    default_save_svc_images: bool = Field(alias="defaultSaveSVCImages")
-    explicit_save_svc_images: Optional[bool] = Field(alias="explicitSaveSVCImages")
     telluric_type: "Igrins2LongSlitDetailsTelluricType" = Field(alias="telluricType")
 
 

{gpp_client-26.7.3.dev3 → gpp_client-26.7.3.dev4}/src/gpp_client/generated/input_types.py

@@ -2727,10 +2727,8 @@ class Igrins2LongSlitInput(BaseModel):
         alias=str("exposureTimeMode"), default=None
     )
     "The exposureTimeMode field may be unset by assigning a null value, or ignored\nby skipping it altogether"
-    explicit_save_svc_images: Optional[bool] = Field(
-        alias=str("explicitSaveSVCImages"), default=None
-    )
-    "The save SVC images field may be unset by assigning a null value, or ignored\nby skipping it altogether"
+    svc: Optional["Igrins2SvcInput"] = None
+    "Slit-Viewing Camera (SVC) configuration."
     explicit_telescope_configs: Optional["SlitTelescopeConfigsInput"] = Field(
         alias=str("explicitTelescopeConfigs"), default=None
     )
@@ -2741,6 +2739,22 @@ class Igrins2LongSlitInput(BaseModel):
     "The telluricType field must be either specified or skipped altogether. It cannot be unset with a null value.\nOn create the default is HOT."
 
 
+class Igrins2SvcInput(BaseModel):
+    """Edit or create IGRINS-2 Slit-Viewing Camera (SVC) configuration. A non-null
+    object enables SVC image saving (turning it on if necessary) and applies the
+    given sub-field overrides; a null value disables SVC image saving. Omitting the
+    field leaves SVC state unchanged."""
+
+    explicit_exposure: Optional["TimeSpanInput"] = Field(
+        alias=str("explicitExposure"), default=None
+    )
+    "The SVC exposure time may be unset by assigning a null value, or ignored by\nskipping it altogether."
+    explicit_telescope_configs: Optional[list["TelescopeConfigInput"]] = Field(
+        alias=str("explicitTelescopeConfigs"), default=None
+    )
+    "Explicit SVC telescope configs. May be unset by assigning a null value, or\nignored by skipping."
+
+
 class GnirsImagingFilterInput(BaseModel):
     """Defines a GNIRS imaging filter to use along with its exposure time mode."""
 
@@ -5152,6 +5166,7 @@ Flamingos2ImagingInput.model_rebuild()
 GhostDetectorConfigInput.model_rebuild()
 GhostIfuInput.model_rebuild()
 Igrins2LongSlitInput.model_rebuild()
+Igrins2SvcInput.model_rebuild()
 GnirsImagingFilterInput.model_rebuild()
 GnirsImagingInput.model_rebuild()
 GnirsSpectroscopyAcquisitionInput.model_rebuild()