gpp-client 26.4.1.dev1__tar.gz → 26.5.0.dev2__tar.gz

gpp_client-26.5.0.dev2/.gitignore

@@ -0,0 +1,178 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#uv.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
+
+# macOS files
+*.DS_Store
+
+.vscode

{gpp_client-26.4.1.dev1/src/gpp_client.egg-info → gpp_client-26.5.0.dev2}/PKG-INFO

@@ -1,7 +1,11 @@
 Metadata-Version: 2.4
 Name: gpp-client
-Version: 26.4.1.dev1
+Version: 26.5.0.dev2
 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
+Project-URL: Issues, https://github.com/gemini-hlsw/gpp-client/issues
+Project-URL: Documentation, https://gpp-client.readthedocs.io/en/latest/
 Author: NOIRLab
 License: Copyright (c) 2025 Association of Universities for Research in Astronomy, Inc. (AURA)
         All rights reserved.
@@ -28,34 +32,27 @@ License: Copyright (c) 2025 Association of Universities for Research in Astronom
         HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
         LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
         THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
-Project-URL: Homepage, https://github.com/gemini-hlsw/gpp-client
-Project-URL: Source, https://github.com/gemini-hlsw/gpp-client
-Project-URL: Issues, https://github.com/gemini-hlsw/gpp-client/issues
-Project-URL: Documentation, https://gpp-client.readthedocs.io/en/latest/
-Keywords: gemini,gpp,client,program,platform
+License-File: LICENSE
+Keywords: client,gemini,gpp,platform,program
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Astronomy
-Requires-Python: >=3.10.0
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp>=3.13.3
+Requires-Python: >=3.11.0
+Requires-Dist: aiohttp>=3.13.4
 Requires-Dist: beautifulsoup4>=4.11.0
 Requires-Dist: graphql-core>=3.2.0
 Requires-Dist: httpx>=0.23
+Requires-Dist: pydantic-settings>=2.13.1
 Requires-Dist: pydantic>=2.12.0
-Requires-Dist: toml>=0.10
 Requires-Dist: typer>=0.21.1
 Requires-Dist: websockets>=14.2
-Dynamic: license-file
+Description-Content-Type: text/markdown
 
 # GPP Client
 

gpp_client-26.5.0.dev2/graphql/README.md

@@ -0,0 +1,39 @@
+## GraphQL Operations Structure
+
+GraphQL operations are now organized to support both shared and environment-specific behavior.
+
+### Directory Layout
+
+- `graphql/operations/shared/`
+  - Contains all operations and fragments used in both development and production.
+- `graphql/operations/development_only.graphql`
+  - Contains operations and fragments that exist only in the development schema.
+
+### How It Works
+
+- **Production**
+  - Uses only the contents of `shared/`.
+
+- **Development**
+  - Uses `shared/` + `development_only.graphql`.
+
+- During code generation, these are assembled into a temporary build directory and passed to `ariadne-codegen`.
+
+### Rules
+
+- `development_only.graphql` must be **additive only**.
+  - No operation or fragment names may collide with anything in `shared/`.
+  - Violations will fail code generation.
+
+- If `development_only.graphql` is empty or missing, it is ignored.
+
+### Guidelines
+
+- Put anything stable and supported in both environments into `shared/`.
+- Put experimental, dev-only, or not-yet-released schema usage into `development_only.graphql`.
+- Once a dev-only operation is promoted to production, move it into `shared/` and remove it from `development_only.graphql`.
+
+### Notes
+
+- The `build/` directory is temporary and is recreated on each codegen run.
+- Generated client code reflects the environment used during codegen.

{gpp_client-26.4.1.dev1 → gpp_client-26.5.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "uv-dynamic-versioning"]
+build-backend = "hatchling.build"
 
 [project]
 name = "gpp-client"
@@ -8,13 +8,12 @@ description = "Gemini Program Platform client."
 readme = "README.md"
 authors = [{ name = "NOIRLab" }]
 license = { file = "LICENSE" }
-requires-python = ">=3.10.0"
+requires-python = ">=3.11.0"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Science/Research",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -22,20 +21,41 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Astronomy",
 ]
 dependencies = [
-    "aiohttp>=3.13.3",
+    "aiohttp>=3.13.4",
     "beautifulsoup4>=4.11.0",
     "graphql-core>=3.2.0",
     "httpx>=0.23",
     "pydantic>=2.12.0",
-    "toml>=0.10",
+    "pydantic-settings>=2.13.1",
     "typer>=0.21.1",
     "websockets>=14.2",
 ]
-version = "26.4.1.dev1"
+dynamic = ["version"]
 keywords = ["gemini", "gpp", "client", "program", "platform"]
 
-[tool.setuptools.packages.find]
-where = ["src"]
+[tool.hatch.version]
+source = "uv-dynamic-versioning"
+
+[tool.uv-dynamic-versioning]
+style = "pep440"
+pattern = '^v(?P<base>\d{2}\.\d{1,2}\.\d+)(?:\.(?P<stage>dev)(?P<revision>\d+))?$'
+strict = true
+metadata = false
+fallback-version = "0.0.0"
+
+[tool.uv]
+cache-keys = [{ file = "pyproject.toml" }, { git = { commit = true, tags = true }}]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/gpp_client"]
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "src/gpp_client",
+    "README.md",
+    "LICENSE",
+    "pyproject.toml",
+]
 
 [project.scripts]
 gpp = "gpp_client.cli.cli:main"
@@ -50,23 +70,13 @@ docstring-code-line-length = "dynamic"
 
 [tool.ruff]
 # Ignore generated code.
-extend-exclude = ["api"]
+extend-exclude = ["generated"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = "-r A -v -n auto"
 asyncio_default_fixture_loop_scope = "session"
 
-[tool.ariadne-codegen]
-client_name = "_GPPClient"
-client_file_name = "_client"
-enable_custom_operations = true
-target_package_name = "api"
-target_package_path = "src/gpp_client"
-convert_to_snake_case = true
-plugins = ["custom_plugins.AliasStrWrapperPlugin"]
-queries_path = "src/queries"
-
 [tool.numpydoc_validation]
 checks = [
     "all",  # All except the rules listed below.
@@ -89,13 +99,13 @@ codegen = [
 dev = [
     { include-group = "codegen" },
     "polyfactory>=3.2.0",
-    "pytest>=9.0.1",
+    "pytest>=9.0.3",
     "pytest-asyncio>=1.3.0",
-    "pytest-cov>=7.0.0",
+    "pytest-cov>=7.1.0",
     "pytest-mock>=3.15.1",
     "pytest-remotedata>=0.4.1",
     "pytest-xdist>=3.8.0",
-    "ruff>=0.15.0",
+    "ruff>=0.15.12",
 ]
 docs = [
     "furo==2025.12.19",
@@ -104,10 +114,7 @@ docs = [
     "sphinx-copybutton>=0.5.2",
     "sphinxcontrib-typer>=0.7.2",
 ]
-schema = [
-    "aiohttp>=3.13.3",
-    "gql>=3.5.0,<4.0.0",
-]
+schema = [{ include-group = "codegen" }]
 
 [project.urls]
 Homepage = "https://github.com/gemini-hlsw/gpp-client"

gpp_client-26.5.0.dev2/src/gpp_client/__init__.py

@@ -0,0 +1,47 @@
+"""
+Top-level package for gpp_client.
+"""
+
+import importlib.metadata
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from .client import GPPClient
+
+__all__ = ["GPPClient", "__version__"]
+
+_FALLBACK_VERSION = "0.0.0"
+
+
+try:
+    __version__ = importlib.metadata.version(__name__)
+except importlib.metadata.PackageNotFoundError:
+    # Have fallback version for development environments.
+    __version__ = _FALLBACK_VERSION
+
+
+def __getattr__(name: str) -> Any:
+    """
+    Lazily import top-level package attributes.
+
+    Parameters
+    ----------
+    name : str
+        The attribute name being accessed.
+
+    Returns
+    -------
+    Any
+        The resolved attribute.
+
+    Raises
+    ------
+    AttributeError
+        If the attribute is not supported.
+    """
+    if name == "GPPClient":
+        from .client import GPPClient
+
+        return GPPClient
+
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{gpp_client-26.4.1.dev1 → gpp_client-26.5.0.dev2}/src/gpp_client/cli/cli.py

@@ -4,35 +4,33 @@ CLI entry point for GPP Client.
 
 __all__ = ["app"]
 
-from importlib.metadata import version as get_version
-from typing import Annotated
 from dataclasses import dataclass
+from typing import Annotated
+
 import typer
 
+from gpp_client import GPPClient, __version__
 from gpp_client.cli import output
 from gpp_client.cli.commands import (
-    attachment,
-    call_for_proposals,
-    config,
-    configuration_request,
-    goats,
-    group,
-    observation,
-    program,
-    program_note,
-    scheduler,
-    site_status,
-    target,
-    workflow_state,
+    attachment_app,
+    goats_app,
+    observation_app,
+    program_app,
+    scheduler_app,
+    site_status_app,
+    target_app,
+    workflow_state_app,
 )
 from gpp_client.cli.utils import async_command
-from gpp_client.client import GPPClient
-
-__version__ = get_version("gpp-client").strip()
+from gpp_client.settings import get_config_path as _get_config_path
 
 
 @dataclass(slots=True)
 class CLIState:
+    """
+    Shared CLI state.
+    """
+
     debug: bool = False
 
 
@@ -41,9 +39,17 @@ app = typer.Typer(
 )
 
 
-def version_callback(value: bool):
+def version_callback(value: bool) -> None:
+    """
+    Callback to print version and exit.
+
+    Parameters
+    ----------
+    value : bool
+        Whether to print the version and exit.
+    """
     if value:
-        print(f"{__version__}")
+        output.info(f"{__version__}")
         raise typer.Exit()
 
 
@@ -69,22 +75,6 @@ def main_callback(
 ):
     """Main entry point callback for GPP Client CLI."""
     ctx.obj = CLIState(debug=debug)
-    pass
-
-
-app.add_typer(config.app)
-app.add_typer(program_note.app)
-app.add_typer(target.app)
-app.add_typer(program.app)
-app.add_typer(call_for_proposals.app)
-app.add_typer(observation.app)
-app.add_typer(site_status.app)
-app.add_typer(group.app)
-app.add_typer(configuration_request.app)
-app.add_typer(workflow_state.app)
-app.add_typer(scheduler.app)
-app.add_typer(goats.app)
-app.add_typer(attachment.app)
 
 
 @app.command("ping")
@@ -92,7 +82,7 @@ app.add_typer(attachment.app)
 async def ping() -> None:
     """Ping GPP. Requires valid credentials."""
     client = GPPClient()
-    success, error = await client.is_reachable()
+    success, error = await client.ping()
     if not success:
         output.fail(f"Failed to reach GPP: {error}")
         raise typer.Exit(code=1)
@@ -100,6 +90,24 @@ async def ping() -> None:
     output.success("GPP is reachable. Credentials are valid.")
 
 
+@app.command("get-config-path")
+def get_config_path() -> None:
+    """Get the path to the GPP Client configuration file."""
+
+    config_path = _get_config_path()
+    output.info(f"{config_path.resolve()}")
+
+
+app.add_typer(observation_app)
+app.add_typer(program_app)
+app.add_typer(attachment_app)
+app.add_typer(target_app)
+app.add_typer(workflow_state_app)
+app.add_typer(site_status_app)
+app.add_typer(goats_app)
+app.add_typer(scheduler_app)
+
+
 def main() -> None:
     """Main entry point for GPP Client CLI."""
     app()

gpp_client-26.5.0.dev2/src/gpp_client/cli/commands/__init__.py

@@ -0,0 +1,23 @@
+"""
+Commands for the GPP CLI.
+"""
+
+from .attachment import attachment_app
+from .goats import goats_app
+from .observation import observation_app
+from .program import program_app
+from .scheduler import scheduler_app
+from .site_status import site_status_app
+from .target import target_app
+from .workflow_state import workflow_state_app
+
+__all__ = [
+    "observation_app",
+    "program_app",
+    "attachment_app",
+    "target_app",
+    "workflow_state_app",
+    "site_status_app",
+    "goats_app",
+    "scheduler_app",
+]

gpp_client-26.5.0.dev2/src/gpp_client/cli/commands/attachment.py

@@ -0,0 +1,97 @@
+"""
+Attachment CLI commands.
+"""
+
+__all__ = ["attachment_app"]
+
+from typing import Annotated
+
+import typer
+
+from gpp_client.cli import output
+from gpp_client.cli.utils import async_command, require_exactly_one
+from gpp_client.client import GPPClient
+
+attachment_app = typer.Typer(
+    name="attachment",
+    help="Attachment operations.",
+)
+
+
+@attachment_app.command("list")
+@async_command
+async def list_attachments(
+    observation_id: Annotated[
+        str | None,
+        typer.Option(
+            "--observation-id",
+            help="List attachments by observation ID.",
+        ),
+    ] = None,
+    observation_reference: Annotated[
+        str | None,
+        typer.Option(
+            "--observation-reference",
+            help="List attachments by observation reference.",
+        ),
+    ] = None,
+    program_id: Annotated[
+        str | None,
+        typer.Option(
+            "--program-id",
+            help="List attachments by program ID.",
+        ),
+    ] = None,
+    program_reference: Annotated[
+        str | None,
+        typer.Option(
+            "--program-reference",
+            help="List attachments by program reference.",
+        ),
+    ] = None,
+    proposal_reference: Annotated[
+        str | None,
+        typer.Option(
+            "--proposal-reference",
+            help="List attachments by proposal reference.",
+        ),
+    ] = None,
+) -> None:
+    """
+    List attachments using exactly one selector.
+    """
+    selector_name, selector_value = require_exactly_one(
+        observation_id=observation_id,
+        observation_reference=observation_reference,
+        program_id=program_id,
+        program_reference=program_reference,
+        proposal_reference=proposal_reference,
+    )
+
+    with output.status("Fetching attachments..."):
+        async with GPPClient() as client:
+            match selector_name:
+                case "observation_id":
+                    result = await client.attachment.get_all_by_observation_id(
+                        observation_id=selector_value
+                    )
+                case "observation_reference":
+                    result = await client.attachment.get_all_by_observation_reference(
+                        observation_reference=selector_value
+                    )
+                case "program_id":
+                    result = await client.attachment.get_all_by_program_id(
+                        program_id=selector_value
+                    )
+                case "program_reference":
+                    result = await client.attachment.get_all_by_program_reference(
+                        program_reference=selector_value
+                    )
+                case "proposal_reference":
+                    result = await client.attachment.get_all_by_proposal_reference(
+                        proposal_reference=selector_value
+                    )
+                case _:
+                    raise typer.BadParameter(f"Unsupported selector: {selector_name}")
+
+    output.json_pydantic(result)