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

{gpp_client-26.1.0.dev2/src/gpp_client.egg-info → gpp_client-26.1.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpp-client
-Version: 26.1.0.dev2
+Version: 26.1.0.dev4
 Summary: Gemini Program Platform client.
 Author: NOIRLab
 License: Copyright (c) 2025 Association of Universities for Research in Astronomy, Inc. (AURA)

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "typer>=0.18.0",
     "websockets>=14.2",
 ]
-version = "26.1.0.dev2"
+version = "26.1.0.dev4"
 keywords = ["gemini", "gpp", "client", "program", "platform"]
 
 [tool.setuptools.packages.find]
@@ -88,20 +88,20 @@ exclude = [
 codegen = ["ariadne-codegen==0.16.0"]
 dev = [
     { include-group = "codegen" },
-    "polyfactory>=3.1.0",
+    "polyfactory>=3.2.0",
     "pytest-asyncio>=1.3.0",
     "pytest-cov>=7.0.0",
     "pytest-mock>=3.15.1",
     "pytest-remotedata>=0.4.1",
     "pytest-xdist>=3.8.0",
-    "ruff>=0.14.6",
+    "ruff>=0.14.10",
 ]
 docs = [
-    "furo>=2025.9.25",
+    "furo>=2025.12.19",
     "sphinx>=8.1.3",
     "sphinx-autobuild>=2024.10.3",
     "sphinx-copybutton>=0.5.2",
-    "sphinxcontrib-typer>=0.7.0",
+    "sphinxcontrib-typer>=0.7.2",
 ]
 schema = ["aiohttp>=3.12.13", "gql>=3.5.0"]
 

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4}/src/gpp_client/api/__init__.py

@@ -166,6 +166,12 @@ from .get_goats_observations import (
     GetGOATSObservationsObservationsMatchesObservingModeGmosSouthLongSlitWavelengthDithers,
     GetGOATSObservationsObservationsMatchesPosAngleConstraint,
     GetGOATSObservationsObservationsMatchesPosAngleConstraintAngle,
+    GetGOATSObservationsObservationsMatchesProgram,
+    GetGOATSObservationsObservationsMatchesProgramAllocations,
+    GetGOATSObservationsObservationsMatchesProgramAllocationsDuration,
+    GetGOATSObservationsObservationsMatchesProgramTimeCharge,
+    GetGOATSObservationsObservationsMatchesProgramTimeChargeTime,
+    GetGOATSObservationsObservationsMatchesProgramTimeChargeTimeProgram,
     GetGOATSObservationsObservationsMatchesReference,
     GetGOATSObservationsObservationsMatchesScienceRequirements,
     GetGOATSObservationsObservationsMatchesScienceRequirementsExposureTimeMode,
@@ -211,13 +217,6 @@ from .get_goats_programs import (
     GetGOATSProgramsPrograms,
     GetGOATSProgramsProgramsMatches,
     GetGOATSProgramsProgramsMatchesReference,
-    GetGOATSProgramsProgramsMatchesTimeCharge,
-    GetGOATSProgramsProgramsMatchesTimeChargeTime,
-    GetGOATSProgramsProgramsMatchesTimeChargeTimeNonCharged,
-    GetGOATSProgramsProgramsMatchesTimeEstimateBanded,
-    GetGOATSProgramsProgramsMatchesTimeEstimateBandedValue,
-    GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTime,
-    GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTimeNonCharged,
 )
 from .get_scheduler_all_programs_id import (
     GetSchedulerAllProgramsId,
@@ -687,6 +686,12 @@ __all__ = [
     "GetGOATSObservationsObservationsMatchesObservingModeGmosSouthLongSlitWavelengthDithers",
     "GetGOATSObservationsObservationsMatchesPosAngleConstraint",
     "GetGOATSObservationsObservationsMatchesPosAngleConstraintAngle",
+    "GetGOATSObservationsObservationsMatchesProgram",
+    "GetGOATSObservationsObservationsMatchesProgramAllocations",
+    "GetGOATSObservationsObservationsMatchesProgramAllocationsDuration",
+    "GetGOATSObservationsObservationsMatchesProgramTimeCharge",
+    "GetGOATSObservationsObservationsMatchesProgramTimeChargeTime",
+    "GetGOATSObservationsObservationsMatchesProgramTimeChargeTimeProgram",
     "GetGOATSObservationsObservationsMatchesReference",
     "GetGOATSObservationsObservationsMatchesScienceRequirements",
     "GetGOATSObservationsObservationsMatchesScienceRequirementsExposureTimeMode",
@@ -730,13 +735,6 @@ __all__ = [
     "GetGOATSProgramsPrograms",
     "GetGOATSProgramsProgramsMatches",
     "GetGOATSProgramsProgramsMatchesReference",
-    "GetGOATSProgramsProgramsMatchesTimeCharge",
-    "GetGOATSProgramsProgramsMatchesTimeChargeTime",
-    "GetGOATSProgramsProgramsMatchesTimeChargeTimeNonCharged",
-    "GetGOATSProgramsProgramsMatchesTimeEstimateBanded",
-    "GetGOATSProgramsProgramsMatchesTimeEstimateBandedValue",
-    "GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTime",
-    "GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTimeNonCharged",
     "GetSchedulerAllProgramsId",
     "GetSchedulerAllProgramsIdPrograms",
     "GetSchedulerAllProgramsIdProgramsMatches",

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4}/src/gpp_client/api/_client.py

@@ -45,24 +45,6 @@ class _GPPClient(AsyncBaseClient):
                   }
                   proposalStatus
                   type
-                  timeCharge {
-                    band
-                    time {
-                      nonCharged {
-                        hours
-                      }
-                    }
-                  }
-                  timeEstimateBanded {
-                    value {
-                      band
-                      time {
-                        nonCharged {
-                          hours
-                        }
-                      }
-                    }
-                  }
                 }
                 hasMore
               }
@@ -119,7 +101,6 @@ class _GPPClient(AsyncBaseClient):
                       validTransitions
                       validationErrors {
                         code
-                        messages
                       }
                     }
                   }
@@ -334,6 +315,22 @@ class _GPPClient(AsyncBaseClient):
                       }
                     }
                   }
+                  program {
+                    allocations {
+                      scienceBand
+                      duration {
+                        hours
+                      }
+                    }
+                    timeCharge {
+                      band
+                      time {
+                        program {
+                          hours
+                        }
+                      }
+                    }
+                  }
                 }
                 hasMore
               }

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4}/src/gpp_client/api/get_goats_observations.py

@@ -81,6 +81,7 @@ class GetGOATSObservationsObservationsMatches(BaseModel):
     observing_mode: Optional["GetGOATSObservationsObservationsMatchesObservingMode"] = (
         Field(alias="observingMode")
     )
+    program: "GetGOATSObservationsObservationsMatchesProgram"
 
 
 class GetGOATSObservationsObservationsMatchesReference(BaseModel):
@@ -135,7 +136,6 @@ class GetGOATSObservationsObservationsMatchesWorkflowValue(BaseModel):
 
 class GetGOATSObservationsObservationsMatchesWorkflowValueValidationErrors(BaseModel):
     code: ObservationValidationCode
-    messages: List[str]
 
 
 class GetGOATSObservationsObservationsMatchesAttachments(BaseModel):
@@ -630,6 +630,35 @@ class GetGOATSObservationsObservationsMatchesObservingModeGmosSouthLongSlitOffse
     arcseconds: Any
 
 
+class GetGOATSObservationsObservationsMatchesProgram(BaseModel):
+    allocations: List["GetGOATSObservationsObservationsMatchesProgramAllocations"]
+    time_charge: List["GetGOATSObservationsObservationsMatchesProgramTimeCharge"] = (
+        Field(alias="timeCharge")
+    )
+
+
+class GetGOATSObservationsObservationsMatchesProgramAllocations(BaseModel):
+    science_band: ScienceBand = Field(alias="scienceBand")
+    duration: "GetGOATSObservationsObservationsMatchesProgramAllocationsDuration"
+
+
+class GetGOATSObservationsObservationsMatchesProgramAllocationsDuration(BaseModel):
+    hours: Any
+
+
+class GetGOATSObservationsObservationsMatchesProgramTimeCharge(BaseModel):
+    band: Optional[ScienceBand]
+    time: "GetGOATSObservationsObservationsMatchesProgramTimeChargeTime"
+
+
+class GetGOATSObservationsObservationsMatchesProgramTimeChargeTime(BaseModel):
+    program: "GetGOATSObservationsObservationsMatchesProgramTimeChargeTimeProgram"
+
+
+class GetGOATSObservationsObservationsMatchesProgramTimeChargeTimeProgram(BaseModel):
+    hours: Any
+
+
 GetGOATSObservations.model_rebuild()
 GetGOATSObservationsObservations.model_rebuild()
 GetGOATSObservationsObservationsMatches.model_rebuild()
@@ -665,3 +694,7 @@ GetGOATSObservationsObservationsMatchesObservingModeGmosSouthLongSlit.model_rebu
 GetGOATSObservationsObservationsMatchesObservingModeGmosSouthLongSlitExposureTimeMode.model_rebuild()
 GetGOATSObservationsObservationsMatchesObservingModeGmosSouthLongSlitExposureTimeModeSignalToNoise.model_rebuild()
 GetGOATSObservationsObservationsMatchesObservingModeGmosSouthLongSlitExposureTimeModeTimeAndCount.model_rebuild()
+GetGOATSObservationsObservationsMatchesProgram.model_rebuild()
+GetGOATSObservationsObservationsMatchesProgramAllocations.model_rebuild()
+GetGOATSObservationsObservationsMatchesProgramTimeCharge.model_rebuild()
+GetGOATSObservationsObservationsMatchesProgramTimeChargeTime.model_rebuild()

gpp_client-26.1.0.dev4/src/gpp_client/api/get_goats_programs.py

@@ -0,0 +1,47 @@
+# Generated by ariadne-codegen
+# Source: src/queries
+
+from typing import Any, List, Literal, Optional
+
+from pydantic import Field
+
+from .base_model import BaseModel
+from .enums import ProgramType, ProposalStatus
+
+
+class GetGOATSPrograms(BaseModel):
+    programs: "GetGOATSProgramsPrograms"
+
+
+class GetGOATSProgramsPrograms(BaseModel):
+    matches: List["GetGOATSProgramsProgramsMatches"]
+    has_more: bool = Field(alias="hasMore")
+
+
+class GetGOATSProgramsProgramsMatches(BaseModel):
+    id: Any
+    name: Optional[Any]
+    description: Optional[Any]
+    reference: Optional["GetGOATSProgramsProgramsMatchesReference"]
+    proposal_status: ProposalStatus = Field(alias="proposalStatus")
+    type: ProgramType
+
+
+class GetGOATSProgramsProgramsMatchesReference(BaseModel):
+    typename__: Literal[
+        "CalibrationProgramReference",
+        "CommissioningProgramReference",
+        "EngineeringProgramReference",
+        "ExampleProgramReference",
+        "LibraryProgramReference",
+        "MonitoringProgramReference",
+        "ProgramReference",
+        "ScienceProgramReference",
+        "SystemProgramReference",
+    ] = Field(alias="__typename")
+    label: Any
+
+
+GetGOATSPrograms.model_rebuild()
+GetGOATSProgramsPrograms.model_rebuild()
+GetGOATSProgramsProgramsMatches.model_rebuild()

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4}/src/gpp_client/config/environment.py

@@ -10,15 +10,6 @@ from enum import Enum
 class GPPEnvironment(str, Enum):
     """
     Available GPP environments.
-
-    Attributes
-    ----------
-    DEVELOPMENT : str
-        Development environment.
-    STAGING : str
-        Staging environment.
-    PRODUCTION : str
-        Production environment.
     """
 
     DEVELOPMENT = "DEVELOPMENT"

gpp_client-26.1.0.dev4/src/gpp_client/directors/goats/coordinators/__init__.py

@@ -0,0 +1,4 @@
+from .observation import GOATSObservationCoordinator
+from .program import GOATSProgramCoordinator
+
+__all__ = ["GOATSObservationCoordinator", "GOATSProgramCoordinator"]

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4}/src/gpp_client/directors/goats/coordinators/observation.py

@@ -1,4 +1,4 @@
-__all__ = ["ObservationCoordinator"]
+__all__ = ["GOATSObservationCoordinator"]
 
 import logging
 from typing import Any
@@ -9,7 +9,7 @@ from gpp_client.exceptions import GPPClientError
 logger = logging.getLogger(__name__)
 
 
-class ObservationCoordinator(BaseCoordinator):
+class GOATSObservationCoordinator(BaseCoordinator):
     """
     Modifies the return of the observation manager to return the GOATS payload.
     """

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4}/src/gpp_client/directors/goats/coordinators/program.py

@@ -1,11 +1,11 @@
-__all__ = ["ProgramCoordinator"]
+__all__ = ["GOATSProgramCoordinator"]
 
 from typing import Any
 
 from ....coordinator import BaseCoordinator
 
 
-class ProgramCoordinator(BaseCoordinator):
+class GOATSProgramCoordinator(BaseCoordinator):
     """
     Modifies the return of the program manager to return the GOATS payload.
     """

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4}/src/gpp_client/directors/goats/goats.py

@@ -3,7 +3,7 @@ __all__ = ["GOATSDirector"]
 from dataclasses import dataclass
 
 from ..base import BaseDirector
-from .coordinators import ObservationCoordinator, ProgramCoordinator
+from .coordinators import GOATSObservationCoordinator, GOATSProgramCoordinator
 
 
 @dataclass
@@ -22,12 +22,14 @@ class GOATSDirector(BaseDirector):
 
     Attributes
     ----------
-    observation : ObservationCoordinator
+    observation : GOATSObservationCoordinator
         Coordinates observation data tailored for GOATS.
-    program : ProgramCoordinator
+    program : GOATSProgramCoordinator
         Coordinates program data tailored for GOATS.
     """
 
     def __post_init__(self) -> None:
-        self.observation: ObservationCoordinator = ObservationCoordinator(self.client)
-        self.program: ProgramCoordinator = ProgramCoordinator(self.client)
+        self.observation: GOATSObservationCoordinator = GOATSObservationCoordinator(
+            self.client
+        )
+        self.program: GOATSProgramCoordinator = GOATSProgramCoordinator(self.client)

{gpp_client-26.1.0.dev2 → gpp_client-26.1.0.dev4/src/gpp_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpp-client
-Version: 26.1.0.dev2
+Version: 26.1.0.dev4
 Summary: Gemini Program Platform client.
 Author: NOIRLab
 License: Copyright (c) 2025 Association of Universities for Research in Astronomy, Inc. (AURA)

gpp_client-26.1.0.dev2/src/gpp_client/api/get_goats_programs.py

@@ -1,92 +0,0 @@
-# Generated by ariadne-codegen
-# Source: src/queries
-
-from typing import Any, List, Literal, Optional
-
-from pydantic import Field
-
-from .base_model import BaseModel
-from .enums import ProgramType, ProposalStatus, ScienceBand
-
-
-class GetGOATSPrograms(BaseModel):
-    programs: "GetGOATSProgramsPrograms"
-
-
-class GetGOATSProgramsPrograms(BaseModel):
-    matches: List["GetGOATSProgramsProgramsMatches"]
-    has_more: bool = Field(alias="hasMore")
-
-
-class GetGOATSProgramsProgramsMatches(BaseModel):
-    id: Any
-    name: Optional[Any]
-    description: Optional[Any]
-    reference: Optional["GetGOATSProgramsProgramsMatchesReference"]
-    proposal_status: ProposalStatus = Field(alias="proposalStatus")
-    type: ProgramType
-    time_charge: List["GetGOATSProgramsProgramsMatchesTimeCharge"] = Field(
-        alias="timeCharge"
-    )
-    time_estimate_banded: List["GetGOATSProgramsProgramsMatchesTimeEstimateBanded"] = (
-        Field(alias="timeEstimateBanded")
-    )
-
-
-class GetGOATSProgramsProgramsMatchesReference(BaseModel):
-    typename__: Literal[
-        "CalibrationProgramReference",
-        "CommissioningProgramReference",
-        "EngineeringProgramReference",
-        "ExampleProgramReference",
-        "LibraryProgramReference",
-        "MonitoringProgramReference",
-        "ProgramReference",
-        "ScienceProgramReference",
-        "SystemProgramReference",
-    ] = Field(alias="__typename")
-    label: Any
-
-
-class GetGOATSProgramsProgramsMatchesTimeCharge(BaseModel):
-    band: Optional[ScienceBand]
-    time: "GetGOATSProgramsProgramsMatchesTimeChargeTime"
-
-
-class GetGOATSProgramsProgramsMatchesTimeChargeTime(BaseModel):
-    non_charged: "GetGOATSProgramsProgramsMatchesTimeChargeTimeNonCharged" = Field(
-        alias="nonCharged"
-    )
-
-
-class GetGOATSProgramsProgramsMatchesTimeChargeTimeNonCharged(BaseModel):
-    hours: Any
-
-
-class GetGOATSProgramsProgramsMatchesTimeEstimateBanded(BaseModel):
-    value: Optional["GetGOATSProgramsProgramsMatchesTimeEstimateBandedValue"]
-
-
-class GetGOATSProgramsProgramsMatchesTimeEstimateBandedValue(BaseModel):
-    band: Optional[ScienceBand]
-    time: "GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTime"
-
-
-class GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTime(BaseModel):
-    non_charged: (
-        "GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTimeNonCharged"
-    ) = Field(alias="nonCharged")
-
-
-class GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTimeNonCharged(BaseModel):
-    hours: Any
-
-
-GetGOATSPrograms.model_rebuild()
-GetGOATSProgramsPrograms.model_rebuild()
-GetGOATSProgramsProgramsMatches.model_rebuild()
-GetGOATSProgramsProgramsMatchesTimeCharge.model_rebuild()
-GetGOATSProgramsProgramsMatchesTimeChargeTime.model_rebuild()
-GetGOATSProgramsProgramsMatchesTimeEstimateBanded.model_rebuild()
-GetGOATSProgramsProgramsMatchesTimeEstimateBandedValue.model_rebuild()
-GetGOATSProgramsProgramsMatchesTimeEstimateBandedValueTime.model_rebuild()

gpp_client-26.1.0.dev2/src/gpp_client/directors/goats/coordinators/__init__.py

@@ -1,4 +0,0 @@
-from .observation import ObservationCoordinator
-from .program import ProgramCoordinator
-
-__all__ = ["ObservationCoordinator", "ProgramCoordinator"]