gpp-client 26.7.3.dev7__tar.gz → 26.7.3.dev9__tar.gz

{gpp_client-26.7.3.dev7 → gpp_client-26.7.3.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: gpp-client
-Version: 26.7.3.dev7
+Version: 26.7.3.dev9
 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.dev7 → gpp_client-26.7.3.dev9}/src/gpp_client/client.py

@@ -7,6 +7,7 @@ __all__ = ["GPPClient"]
 import logging
 from typing import Any, Optional
 
+import httpx
 from typing_extensions import Self
 
 from gpp_client.domains import (
@@ -29,6 +30,10 @@ from gpp_client.urls import get_graphql_url, get_ws_url
 
 logger = logging.getLogger(__name__)
 
+# httpx defaults to 5 seconds, which is too aggressive for slow GPP operations
+# such as cloning observations.
+_HTTP_TIMEOUT = httpx.Timeout(60.0, connect=10.0)
+
 
 class GPPClient:
     """
@@ -141,6 +146,9 @@ class GPPClient:
         return GraphQLClient(
             url=graphql_url,
             headers=headers,
+            # The generated client only applies `headers` when it builds its own
+            # http client, so they must be set on the custom one as well.
+            http_client=httpx.AsyncClient(headers=headers, timeout=_HTTP_TIMEOUT),
             ws_url=ws_url,
             ws_headers=headers,
             ws_connection_init_payload=headers,

{gpp_client-26.7.3.dev7 → gpp_client-26.7.3.dev9}/src/gpp_client/domains/base.py

@@ -67,7 +67,9 @@ class BaseDomain:
             The raised exception of the specified type.
         """
         class_name = self.__class__.__name__
-        message = f"{class_name}: {exc}"
+        # Fall back to the type name so an exception raised without a message
+        # does not end up as an empty error.
+        message = f"{class_name}: {str(exc) or type(exc).__name__}"
         logger.error(message, exc_info=include_traceback)
 
         if include_traceback:

{gpp_client-26.7.3.dev7 → gpp_client-26.7.3.dev9}/src/gpp_client/domains/scheduler.py

@@ -269,10 +269,9 @@ class SchedulerDomain(BaseDomain):
 
         # Get sequence
         if observations:
-            async with self._rest as client:
-                atom_digest_response = (
-                    await client.get_atom_digests(observations)
-                ).split("\n")
+            atom_digest_response = (
+                await self._rest.get_atom_digests(observations)
+            ).split("\n")
             obs_atoms_mapping = self._parse_atom_digest(atom_digest_response)
         else:
             obs_atoms_mapping = {}
@@ -332,9 +331,8 @@ class SchedulerDomain(BaseDomain):
         aiohttp.ClientError
             For HTTP errors, connection failures, or timeouts.
         """
-        async with self._rest as client:
-            body = await client.get_visibility_changes(since)
-            return parse_visibility_changes(body)
+        body = await self._rest.get_visibility_changes(since)
+        return parse_visibility_changes(body)
 
     async def subscribe_to_calculation_updates(
         self,

{gpp_client-26.7.3.dev7 → gpp_client-26.7.3.dev9}/src/gpp_client/generated/__init__.py

@@ -105,7 +105,6 @@ from .enums import (
     ExchangeObservingModeType,
     ExchangePartner,
     ExecutionEventType,
-    ExecutionRequirement,
     ExecutionState,
     Existence,
     Flamingos2CustomSlitWidth,
@@ -197,6 +196,7 @@ from .enums import (
     ProgramUserSupportRoleType,
     ProposalStatus,
     QuasarSpectrum,
+    SchedulingMode,
     ScienceBand,
     ScienceMode,
     ScienceSubtype,
@@ -952,6 +952,8 @@ from .input_types import (
     Flamingos2ImagingInput,
     Flamingos2LongSlitAcquisitionInput,
     Flamingos2LongSlitInput,
+    Flamingos2MosAcquisitionInput,
+    Flamingos2MosInput,
     Flamingos2StaticInput,
     Flamingos2StepInput,
     FluxDensity,
@@ -1107,6 +1109,7 @@ from .input_types import (
     TargetEditInput,
     TargetEnvironmentInput,
     TargetPropertiesInput,
+    TargetResolutionInput,
     TelescopeConfigAlongSlitInput,
     TelescopeConfigGeneratorInput,
     TelescopeConfigInput,
@@ -1570,7 +1573,6 @@ __all__ = [
     "ExchangePartner",
     "ExecutionEventAddedInput",
     "ExecutionEventType",
-    "ExecutionRequirement",
     "ExecutionState",
     "Existence",
     "ExposureTimeModeInput",
@@ -1618,6 +1620,8 @@ __all__ = [
     "Flamingos2LongSlitDetailsTelluricType",
     "Flamingos2LongSlitInput",
     "Flamingos2LyotWheel",
+    "Flamingos2MosAcquisitionInput",
+    "Flamingos2MosInput",
     "Flamingos2ReadMode",
     "Flamingos2ReadoutMode",
     "Flamingos2Reads",
@@ -2479,6 +2483,7 @@ __all__ = [
     "SchedulerProposalCallSubaru",
     "SchedulerProposalGemini",
     "SchedulingConstraintsInput",
+    "SchedulingMode",
     "ScienceBand",
     "ScienceMode",
     "ScienceRequirementsDetails",
@@ -2551,6 +2556,7 @@ __all__ = [
     "TargetProgramSummary",
     "TargetProgramSummaryProgram",
     "TargetPropertiesInput",
+    "TargetResolutionInput",
     "TelescopeConfigAlongSlitInput",
     "TelescopeConfigGeneratorInput",
     "TelescopeConfigGeneratorType",

{gpp_client-26.7.3.dev7 → gpp_client-26.7.3.dev9}/src/gpp_client/generated/client.py

@@ -10303,7 +10303,9 @@ class GraphQLClient(AsyncBaseClient):
     ) -> AsyncIterator[SchedulerObservationsUpdates]:
         query = gql("""
             subscription SchedulerObservationsUpdates($executableOnly: Boolean) {
-              obscalcUpdate(input: {executableOnly: $executableOnly}) {
+              obscalcUpdate(
+                input: {executableOnly: $executableOnly, newCalculationState: {EQ: READY}}
+              ) {
                 oldCalculationState
                 newCalculationState
                 editType