arcsecond 3.12.0__tar.gz → 3.14.0__tar.gz

{arcsecond-3.12.0 → arcsecond-3.14.0}/.github/workflows/pythonpublish.yml

@@ -25,14 +25,15 @@ jobs:
 
       - uses: actions/checkout@v5
 
-      - name: Set up Python
-        uses: actions/setup-python@v6
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: '3.12'
+          enable-cache: true
 
       - name: Validate pyproject.toml version matches tag
         run: |
-          python - <<'PY'
+          uv run python - <<'PY'
           import os, pathlib, tomllib
 
           tag = os.environ["GITHUB_REF_NAME"]
@@ -45,10 +46,7 @@ jobs:
           PY
 
       - name: Build distributions
-        run: |
-          python -m pip install --upgrade pip
-          pip install build
-          python -m build
+        run: uv build
 
       - name: Publish to PyPI (OIDC)
         uses: pypa/gh-action-pypi-publish@release/v1

{arcsecond-3.12.0 → arcsecond-3.14.0}/.github/workflows/tests.yml

@@ -16,26 +16,22 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
+          enable-cache: true
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          pip install pytest pytest-cov respx
-          pip install -e .
+        run: uv sync --extra webcam --group dev
 
       - name: Test with coverage (only on 3.12)
         if: matrix.python-version == '3.12'
-        run: |
-          pytest -vvs tests/ --cov=arcsecond --cov-report=xml:coverage.xml
+        run: uv run pytest -vvs tests/ --cov=arcsecond --cov-report=xml:coverage.xml
 
       - name: Test without coverage
         if: matrix.python-version != '3.12'
-        run: pytest -vvs tests/
+        run: uv run pytest -vvs tests/
 
       - name: Upload coverage artifact (only on 3.12)
         if: matrix.python-version == '3.12'
@@ -58,7 +54,7 @@ jobs:
           path: .
 
       - name: SonarQube Scan
-        uses: SonarSource/sonarqube-scan-action@v5
+        uses: SonarSource/sonarqube-scan-action@v6
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
@@ -67,24 +63,20 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - name: Set up Python
-        uses: actions/setup-python@v6
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: '3.12'
+          enable-cache: true
 
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install flake8 black isort
+      - name: Install dev dependencies
+        run: uv sync --group dev
 
       - name: Lint with flake8
-        run: |
-          flake8 arcsecond tests --count --select=E9,F63,F7,F82 --show-source --statistics
+        run: uv run flake8 arcsecond tests --count --select=E9,F63,F7,F82 --show-source --statistics
 
       - name: Check formatting with black
-        run: |
-          black --check arcsecond tests
+        run: uv run black --check arcsecond tests
 
       - name: Check imports with isort
-        run: |
-          isort --check-only --profile black arcsecond tests
+        run: uv run isort --check-only --profile black arcsecond tests

{arcsecond-3.12.0 → arcsecond-3.14.0}/.gitignore

@@ -12,9 +12,6 @@ build/
 venv
 /env
 .DS_Store
-node_modules
-
-/docs/.vitepress/cache
 
 *.tar
 

{arcsecond-3.12.0 → arcsecond-3.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcsecond
-Version: 3.12.0
+Version: 3.14.0
 Summary: CLI for arcsecond.io
 Project-URL: Homepage, https://github.com/arcsecond-io/cli
 Project-URL: Issues, https://github.com/arcsecond-io/cli/issues
@@ -49,7 +49,7 @@ Requires-Dist: aiohttp>=3.9; extra == 'webcam'
 Requires-Dist: opencv-python-headless<5,>=4.10; extra == 'webcam'
 Description-Content-Type: text/markdown
 
-[![Deploy Docs](https://github.com/arcsecond-io/cli/actions/workflows/docsdeploy.yml/badge.svg)](https://github.com/arcsecond-io/cli/actions/workflows/docsdeploy.yml) [![Downloads](http://pepy.tech/badge/arcsecond)](http://pepy.tech/project/arcsecond)
+[![Downloads](http://pepy.tech/badge/arcsecond)](http://pepy.tech/project/arcsecond)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Farcsecond-io%2Fcli.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Farcsecond-io%2Fcli?ref=badge_shield)
 
 # Arcsecond CLI
@@ -62,20 +62,19 @@ public and private ones.
 
 # Development
 
-To start developing the arcsecond CLI, fork the project, `git clone` it, 
-then, in the arcsecond-cli folder, do 
-(assuming [virtualenv](https://virtualenv.pypa.io/en/stable/) is installed):
+The project uses [uv](https://docs.astral.sh/uv/) for environment and
+dependency management. After forking and cloning:
 
 ```bash
 $ cd ~/arcsecond-cli
-$ virtualenv --python=pythonX.Y env
-$ source env/bin/activate
-$ pip install -e .
-``` 
+$ uv sync --extra webcam --group dev
+$ uv run arcsecond --help
+$ uv run pytest
+```
 
-The last line ensure you can call the "locally installed" version of the 
-code of that folder. Once done one first time, only the `source 
-env/bin/activate` is needed when you restart a debugging session.
+`uv sync` creates `.venv/` and installs the project with its `webcam` extra
+and the `dev` dependency group (pytest, black, flake8, isort). Prefix
+commands with `uv run` or activate the venv with `source .venv/bin/activate`.
 
 
 ## License

arcsecond-3.14.0/README.md

@@ -0,0 +1,30 @@
+[![Downloads](http://pepy.tech/badge/arcsecond)](http://pepy.tech/project/arcsecond)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Farcsecond-io%2Fcli.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Farcsecond-io%2Fcli?ref=badge_shield)
+
+# Arcsecond CLI
+
+The Command-line interface (CLI) for Arcsecond. It can be used as Python 
+module too. The CLI makes it easy to login/register and access Arcsecond resources,
+public and private ones.
+
+[Read the docs](https://docs.arcsecond.io/cli)
+
+# Development
+
+The project uses [uv](https://docs.astral.sh/uv/) for environment and
+dependency management. After forking and cloning:
+
+```bash
+$ cd ~/arcsecond-cli
+$ uv sync --extra webcam --group dev
+$ uv run arcsecond --help
+$ uv run pytest
+```
+
+`uv sync` creates `.venv/` and installs the project with its `webcam` extra
+and the `dev` dependency group (pytest, black, flake8, isort). Prefix
+commands with `uv run` or activate the venv with `source .venv/bin/activate`.
+
+
+## License
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Farcsecond-io%2Fcli.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Farcsecond-io%2Fcli?ref=badge_large)

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/__init__.py

@@ -5,8 +5,6 @@ from .api import (
     ArcsecondTargetListsResource,
 )
 from .cloud.uploader import (
-    AllSkyCameraImageFileUploader,
-    AllSkyCameraImageUploadContext,
     DatasetFileUploader,
     DatasetUploadContext,
 )
@@ -25,8 +23,6 @@ __all__ = [
     "ArcsecondTargetPayloadPlan",
     "DatasetUploadContext",
     "DatasetFileUploader",
-    "AllSkyCameraImageFileUploader",
-    "AllSkyCameraImageUploadContext",
     "plan_target_payload",
     "walk_folder_and_upload_files",
 ]

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/alpaca/commands.py

@@ -167,20 +167,14 @@ def probe_dome_cmd(
             json.dump(result.report, fp, indent=2, sort_keys=False)
             fp.write("\n")
     except OSError as exc:
-        raise ArcsecondError(
-            f"Could not write report to {output_path}: {exc}"
-        ) from exc
+        raise ArcsecondError(f"Could not write report to {output_path}: {exc}") from exc
 
     counts = result.counts
     supported = result.report.get("supported_actions", {})
-    supported_n = (
-        len(supported.get("value") or []) if supported.get("ok") else 0
-    )
+    supported_n = len(supported.get("value") or []) if supported.get("ok") else 0
 
     click.echo("")
     click.echo(click.style("Summary", bold=True))
     click.echo(f"  Probes:           {counts.ok}/{counts.total} OK")
     click.echo(f"  SupportedActions: {supported_n} entries")
-    click.echo(
-        f"  Report written to {click.style(os.fspath(output_path), fg='cyan')}"
-    )
+    click.echo(f"  Report written to {click.style(os.fspath(output_path), fg='cyan')}")

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/alpaca/dome_probe.py

@@ -71,9 +71,7 @@ _READ_ONLY_COMMANDS: tuple[str, ...] = (
 # Active commands: kept separate and only sent when allow_active=True.
 # ``XQ#STATUS`` jumps to a label called STATUS if it exists; whether that
 # label has side effects depends on the driver, hence "active".
-_ACTIVE_COMMANDS: tuple[str, ...] = (
-    "XQ#STATUS",
-)
+_ACTIVE_COMMANDS: tuple[str, ...] = ("XQ#STATUS",)
 
 _RESPONSE_TRUNCATE = 2000
 
@@ -116,6 +114,7 @@ def _coerce_jsonable(value: Any) -> Any:
     # IntEnum is a subclass of int, so check it *before* the primitive branch.
     # We want {"name": "shutterClosed", "value": 1} not just 1.
     from enum import Enum
+
     if isinstance(value, Enum):
         return {"name": value.name, "value": value.value}
     if isinstance(value, (str, int, float, bool)) or value is None:
@@ -384,15 +383,15 @@ def probe_dome(
         raise RuntimeError(
             f"Could not construct Alpaca Dome client for "
             f"{protocol}://{address} (device {device_number}): "
-            f"{type(exc).__name__}: {exc}\n"
-            + traceback.format_exc()
+            f"{type(exc).__name__}: {exc}\n" + traceback.format_exc()
         ) from exc
 
     connected_outcome = _capture(lambda: dome.Connected)
     counts.total += 1
     counts.ok += 1 if connected_outcome["ok"] else 0
     progress.emit(
-        "Connected", connected_outcome["ok"],
+        "Connected",
+        connected_outcome["ok"],
         connected_outcome.get("error") or str(connected_outcome.get("value")),
     )
 

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/api/main.py

@@ -52,10 +52,6 @@ class ArcsecondAPI(object):
         self.datasets = ArcsecondAPIEndpoint(self.config, "datasets", self.subdomain)
         self.datafiles = ArcsecondAPIEndpoint(self.config, "datafiles", self.subdomain)
 
-        self.allskycameras = ArcsecondAPIEndpoint(
-            self.config, "allskycameras", self.subdomain
-        )
-
     def login(self, username, access_key=None, upload_key=None):
         assert access_key or upload_key
         assert not (access_key and upload_key)

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/cli.py

@@ -2,7 +2,6 @@ import click
 
 from arcsecond.alpaca.commands import alpaca_group
 from arcsecond.cloud import (
-    allskycameras,
     api,
     datasets,
     login,
@@ -10,7 +9,7 @@ from arcsecond.cloud import (
     telescopes,
     upload_data,
 )
-from arcsecond.hosting import backups, setup
+from arcsecond.hosting import backups, db, setup
 from arcsecond.imagesources import commands as imagesources
 
 from . import __version__
@@ -53,9 +52,6 @@ main.add_command(datasets)
 # Read the list of existing telescopes (for upload purposes).
 main.add_command(telescopes)
 
-# Read the list of existing allskycameras (for upload purposes).
-main.add_command(allskycameras)
-
 # Upload a folder of files to a given dataset.
 main.add_command(upload_data)
 
@@ -65,10 +61,14 @@ main.add_command(setup)
 # Browse and restore Arcsecond.local DB backups.
 main.add_command(backups)
 
-# Native live-image proxy — exposes USB webcams and all-sky cameras to
-# Arcsecond.local Docker containers via host.docker.internal.
+# Manage the Arcsecond.local database (e.g. `arcsecond db set-password`).
+main.add_command(db)
+
+# Native live-image proxy — exposes USB webcams, all-sky cameras and network
+# cameras to Arcsecond.local Docker containers via host.docker.internal.
 main.add_command(imagesources.webcam)
 main.add_command(imagesources.allsky)
+main.add_command(imagesources.netcam)
 
 # Local ASCOM Alpaca diagnostics (e.g. `arcsecond alpaca probe dome ...`).
 main.add_command(alpaca_group)

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/cloud/__init__.py

@@ -1,8 +1,6 @@
 from .auth import api, login, me
-from .resources import allskycameras, datasets, telescopes
+from .resources import datasets, telescopes
 from .uploader import (
-    AllSkyCameraImageFileUploader,
-    AllSkyCameraImageUploadContext,
     DatasetFileUploader,
     DatasetUploadContext,
 )

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/cloud/resources.py

@@ -78,38 +78,3 @@ def telescopes(state, portal=None):
         s += f"(uuid: {telescope_dict['uuid']}) "
         s += f"[ObservingSite UUID: {telescope_dict['observing_site']}]"
         click.echo(s)
-
-
-@click.command(help="Display the list of (portal) all-sky cameras.")
-@click.option(
-    "-p",
-    "--portal",
-    required=False,
-    nargs=1,
-    help="The portal subdomain, if uploading for an Observatory Portal.",
-)
-@basic_options
-@pass_state
-def allskycameras(state, portal=None):
-    org_subdomain = portal or ""
-    if org_subdomain:
-        click.echo(f" • Fetching allskycameras for portal '{org_subdomain}'...")
-    else:
-        click.echo(" • Fetching allskycameras...")
-
-    cameras_list, error = ArcsecondAPI(
-        ArcsecondConfig.from_state(state), org_subdomain
-    ).allskycameras.list()
-    if error is not None:
-        raise ArcsecondError(str(error))
-
-    if isinstance(cameras_list, dict) and "results" in cameras_list.keys():
-        cameras_list = cameras_list["results"]
-
-    click.echo(
-        f" • Found {len(cameras_list)} all-sky camera{'s' if len(cameras_list) > 1 else ''}."
-    )
-    for camera_list in cameras_list:
-        s = f" 💾 \"{camera_list['name']}\" "
-        s += f"(uuid: {camera_list['uuid']}) "
-        click.echo(s)

arcsecond-3.14.0/arcsecond/cloud/uploader/__init__.py

@@ -0,0 +1,8 @@
+from .datafiles.context import DatasetUploadContext
+from .datafiles.uploader import DatasetFileUploader
+from .datafiles.utils import display_upload_datafiles_command_summary
+
+__all__ = [
+    "DatasetUploadContext",
+    "DatasetFileUploader",
+]

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/hosting/__init__.py

@@ -1,3 +1,4 @@
 # from .main import install, status, stop
 from .backups import backups
+from .database import db
 from .local import setup

{arcsecond-3.12.0 → arcsecond-3.14.0}/arcsecond/hosting/backups.py

@@ -12,7 +12,7 @@ import click
 
 from arcsecond.options import basic_options
 
-from .utils import _read_env_value
+from .utils import _container_running, _read_env_value
 
 DB_CONTAINER = "arcsecond-db"
 API_CONTAINER = "arcsecond-api"
@@ -105,19 +105,6 @@ def _human_size(num_bytes):
     return f"{num_bytes:.1f} PB"
 
 
-def _container_running(name):
-    try:
-        out = subprocess.run(
-            ["docker", "inspect", "-f", "{{.State.Running}}", name],
-            capture_output=True,
-            text=True,
-            check=False,
-        )
-    except FileNotFoundError:
-        return False
-    return out.returncode == 0 and out.stdout.strip() == "true"
-
-
 def _classify_dump_health(backup_path):
     """Quick check that a dump file looks usable before we try to parse it.