arcsecond 3.7.3__tar.gz → 3.8.1__tar.gz

arcsecond-3.8.1/.github/workflows/docsdeploy.yml

@@ -0,0 +1,28 @@
+name: Deploy Docs
+
+on:
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - name: Setup node
+      uses: actions/setup-node@v5
+      with:
+        node-version: '24'
+        cache: 'npm'
+    - run: npm ci
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.READ_PACKAGE_TOKEN }}
+        CI: true
+    - name: Deploy docs
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: ./deploy.sh

{arcsecond-3.7.3 → arcsecond-3.8.1}/.github/workflows/pythonpublish.yml

@@ -22,7 +22,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Validate pyproject.toml version matches tag
         run: |
@@ -41,7 +41,7 @@ jobs:
           PY
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
 
@@ -54,4 +54,4 @@ jobs:
       - name: Publish to PyPI (OIDC)
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          packages-dir: dist
+          packages-dir: dist

{arcsecond-3.7.3 → arcsecond-3.8.1}/.github/workflows/tests.yml

@@ -14,10 +14,10 @@ jobs:
         python-version: [ '3.10', '3.11', '3.12', '3.13' ]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -39,7 +39,7 @@ jobs:
 
       - name: Upload coverage artifact (only on 3.12)
         if: matrix.python-version == '3.12'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: coverage
           path: coverage.xml
@@ -49,10 +49,10 @@ jobs:
     needs: tests
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Download coverage artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: coverage
           path: .
@@ -65,10 +65,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
 
@@ -87,4 +87,4 @@ jobs:
 
       - name: Check imports with isort
         run: |
-          isort --check-only --profile black arcsecond tests
+          isort --check-only --profile black arcsecond tests

{arcsecond-3.7.3 → arcsecond-3.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcsecond
-Version: 3.7.3
+Version: 3.8.1
 Summary: CLI for arcsecond.io
 Project-URL: Homepage, https://github.com/arcsecond-io/cli
 Project-URL: Issues, https://github.com/arcsecond-io/cli/issues
@@ -36,10 +36,12 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
+Requires-Dist: aiohttp>=3.9
 Requires-Dist: click>=8
 Requires-Dist: configparser
 Requires-Dist: docker
 Requires-Dist: httpx
+Requires-Dist: opencv-python-headless<5,>=4.10
 Requires-Dist: py-machineid
 Requires-Dist: tqdm<5.0.0,>=4.67.1
 Requires-Dist: wait-for-it

{arcsecond-3.7.3 → arcsecond-3.8.1}/arcsecond/__init__.py

@@ -1,4 +1,9 @@
-from .api import ArcsecondAPI, ArcsecondAPIEndpoint, ArcsecondConfig
+from .api import (
+    ArcsecondAPI,
+    ArcsecondAPIEndpoint,
+    ArcsecondConfig,
+    ArcsecondTargetListsResource,
+)
 from .cloud.uploader import (
     AllSkyCameraImageFileUploader,
     AllSkyCameraImageUploadContext,
@@ -7,6 +12,7 @@ from .cloud.uploader import (
 )
 from .cloud.uploader.walker import walk_folder_and_upload_files
 from .errors import ArcsecondError
+from .targets import ArcsecondTargetPayloadPlan, plan_target_payload
 
 name = "arcsecond"
 
@@ -15,9 +21,12 @@ __all__ = [
     "ArcsecondError",
     "ArcsecondConfig",
     "ArcsecondAPIEndpoint",
+    "ArcsecondTargetListsResource",
+    "ArcsecondTargetPayloadPlan",
     "DatasetUploadContext",
     "DatasetFileUploader",
     "AllSkyCameraImageFileUploader",
     "AllSkyCameraImageUploadContext",
+    "plan_target_payload",
     "walk_folder_and_upload_files",
 ]

arcsecond-3.8.1/arcsecond/api/__init__.py

@@ -0,0 +1,11 @@
+from .config import ArcsecondConfig
+from .endpoint import ArcsecondAPIEndpoint
+from .main import ArcsecondAPI
+from .resources import ArcsecondTargetListsResource
+
+__all__ = [
+    "ArcsecondAPI",
+    "ArcsecondConfig",
+    "ArcsecondAPIEndpoint",
+    "ArcsecondTargetListsResource",
+]

{arcsecond-3.7.3 → arcsecond-3.8.1}/arcsecond/api/endpoint.py

@@ -12,6 +12,13 @@ WRITABLE_MEMBERSHIPS = ["superadmin", "admin", "member"]
 
 
 class ArcsecondAPIEndpoint(object):
+    """
+    Generic REST endpoint wrapper for Arcsecond resources.
+
+    It owns transport-level CRUD plus resource-agnostic conveniences such as
+    payload merging, `find_one()`, and `upsert()`.
+    """
+
     def __init__(
         self,
         config: ArcsecondConfig,
@@ -57,6 +64,30 @@ class ArcsecondAPIEndpoint(object):
     def _detail_url(self, uuid_or_id):
         return self._build_url(self.__path, str(uuid_or_id))
 
+    def _build_payload(self, json=None, **fields):
+        payload = {}
+        if json:
+            payload.update(json)
+        payload.update({key: value for key, value in fields.items() if value is not None})
+        return payload or None
+
+    def _extract_results(self, response):
+        if isinstance(response, dict):
+            if isinstance(response.get("results"), list):
+                return response["results"]
+            if response:
+                return [response]
+        elif isinstance(response, list):
+            return response
+        return []
+
+    def _extract_identifier(self, resource, identifier_fields=("uuid", "id", "pk")):
+        for key in identifier_fields:
+            value = resource.get(key)
+            if value is not None:
+                return value
+        return None
+
     def list(self, **filters):
         return self._perform_request(self._list_url(**filters), "get")
 
@@ -65,16 +96,20 @@ class ArcsecondAPIEndpoint(object):
             self._detail_url(id_name_uuid), "get", headers=headers
         )
 
-    def create(self, json=None, files=None, headers=None):
+    def create(self, json=None, files=None, headers=None, **fields):
         return self._perform_request(
-            self._list_url(), "post", json=json, files=files, headers=headers
+            self._list_url(),
+            "post",
+            json=self._build_payload(json=json, **fields),
+            files=files,
+            headers=headers,
         )
 
-    def update(self, id_name_uuid, json=None, files=None, headers=None):
+    def update(self, id_name_uuid, json=None, files=None, headers=None, **fields):
         return self._perform_request(
             self._detail_url(id_name_uuid),
             "patch",
-            json=json,
+            json=self._build_payload(json=json, **fields),
             files=files,
             headers=headers,
         )
@@ -82,6 +117,44 @@ class ArcsecondAPIEndpoint(object):
     def delete(self, id_name_uuid):
         return self._perform_request(self._detail_url(id_name_uuid), "delete")
 
+    def find_one(self, **filters):
+        response, error = self.list(**filters)
+        if error:
+            return None, error
+
+        results = self._extract_results(response)
+        if len(results) == 0:
+            return None, None
+        if len(results) > 1:
+            return (
+                None,
+                ArcsecondError(
+                    f"Expected one '{self.path}' match for filters {filters}, got {len(results)}."
+                ),
+            )
+        return results[0], None
+
+    def upsert(self, match_field="name", json=None, **fields):
+        payload = self._build_payload(json=json, **fields)
+        if payload is None:
+            return None, ArcsecondError("Cannot upsert an empty payload.")
+
+        match_value = payload.get(match_field)
+        if match_value in (None, ""):
+            return self.create(json=payload)
+
+        existing, error = self.find_one(**{match_field: match_value})
+        if error:
+            return None, error
+        if existing is None:
+            return self.create(json=payload)
+
+        identifier = self._extract_identifier(existing)
+        if identifier is None:
+            return None, ArcsecondError(f"Could not find an identifier for '{match_value}'.")
+
+        return self.update(identifier, json=payload)
+
     def _perform_request(self, url, method_name, json=None, files=None, headers=None):
         if self.__config.verbose:
             click.echo(f"Sending {method_name} request to {url}")

{arcsecond-3.7.3 → arcsecond-3.8.1}/arcsecond/api/main.py

@@ -8,6 +8,7 @@ from arcsecond.options import State
 from .config import ArcsecondConfig
 from .constants import API_AUTH_PATH_VERIFY
 from .endpoint import ArcsecondAPIEndpoint
+from .resources import ArcsecondTargetListsResource
 
 __all__ = [
     "ArcsecondAPI",
@@ -40,6 +41,10 @@ class ArcsecondAPI(object):
         self.calibrations = ArcsecondAPIEndpoint(
             self.config, "calibrations", self.subdomain
         )
+        self.targets = ArcsecondAPIEndpoint(self.config, "targets", self.subdomain)
+        self.targetlists = ArcsecondTargetListsResource(
+            self.config, "targetlists", self.subdomain
+        )
 
         self.datapackages = ArcsecondAPIEndpoint(
             self.config, "datapackages", self.subdomain

arcsecond-3.8.1/arcsecond/api/resources.py

@@ -0,0 +1,149 @@
+from arcsecond.errors import ArcsecondError
+
+from .endpoint import ArcsecondAPIEndpoint
+
+
+class ArcsecondTargetListsResource(ArcsecondAPIEndpoint):
+    """Target-list specific helpers built on top of the generic endpoint contract."""
+
+    target_relation_key = "targets"
+    target_writable_fields = (
+        "id",
+        "pk",
+        "object",
+        "name",
+        "identifier",
+        "target_class",
+        "mode",
+        "color",
+        "notes",
+        "tags",
+        "profile",
+        "organisation",
+    )
+
+    def _ensure_iterable(self, values):
+        if values is None:
+            return None
+        if isinstance(values, dict):
+            return [values]
+        if isinstance(values, (str, int)):
+            return [values]
+        return list(values)
+
+    def _target_payload_identity(self, target):
+        if target.get("id") is not None:
+            return ("id", target["id"])
+        if target.get("pk") is not None:
+            return ("pk", target["pk"])
+        return (
+            "composite",
+            target.get("target_class"),
+            target.get("identifier"),
+            target.get("name"),
+            target.get("mode"),
+        )
+
+    def _normalise_target_payloads(self, targets):
+        values = self._ensure_iterable(targets)
+        if values is None:
+            return None
+
+        payloads = []
+        for target in values:
+            if not isinstance(target, dict):
+                raise ArcsecondError(
+                    "Target list helpers expect target payload dictionaries, not scalar IDs or UUIDs. "
+                    "Pass dictionaries such as `plan_target_payload(...).payload` or target objects returned "
+                    "by `api.targets.read()/list()/upsert()`."
+                )
+
+            payload = {
+                key: value
+                for key, value in target.items()
+                if key in self.target_writable_fields and value is not None
+            }
+            if not payload:
+                raise ArcsecondError(
+                    "Target dictionaries must include at least one writable target field."
+                )
+
+            payloads.append(payload)
+        return payloads
+
+    def _build_payload(self, json=None, targets=None, target_key=None, **fields):
+        payload = super()._build_payload(json=json, **fields) or {}
+        normalised_targets = self._normalise_target_payloads(targets)
+        if normalised_targets is not None:
+            payload[target_key or self.target_relation_key] = normalised_targets
+        return payload or None
+
+    def create(self, json=None, targets=None, target_key=None, **fields):
+        payload = self._build_payload(
+            json=json, targets=targets, target_key=target_key, **fields
+        )
+        return ArcsecondAPIEndpoint.create(self, json=payload)
+
+    def update(self, id_name_uuid, json=None, targets=None, target_key=None, **fields):
+        payload = self._build_payload(
+            json=json, targets=targets, target_key=target_key, **fields
+        )
+        return ArcsecondAPIEndpoint.update(self, id_name_uuid, json=payload)
+
+    def upsert(self, match_field="name", json=None, targets=None, target_key=None, **fields):
+        payload = self._build_payload(
+            json=json, targets=targets, target_key=target_key, **fields
+        )
+        return super().upsert(match_field=match_field, json=payload)
+
+    def _read_target_refs(self, target_list, target_key=None):
+        key = target_key or self.target_relation_key
+        raw_targets = (target_list or {}).get(key, [])
+        refs = self._normalise_target_payloads(raw_targets) or []
+        return key, refs
+
+    def set_targets(self, id_name_uuid, targets, target_key=None):
+        target_key = target_key or self.target_relation_key
+        return self.update(id_name_uuid, **{target_key: self._normalise_target_payloads(targets)})
+
+    def clear_targets(self, id_name_uuid, target_key=None):
+        return self.set_targets(id_name_uuid, [], target_key=target_key)
+
+    def add_targets(self, id_name_uuid, targets, target_key=None):
+        target_list, error = self.read(id_name_uuid)
+        if error:
+            return None, error
+
+        key, current_refs = self._read_target_refs(target_list, target_key=target_key)
+        current_identities = {
+            self._target_payload_identity(target): target for target in current_refs
+        }
+        for target in self._normalise_target_payloads(targets) or []:
+            identity = self._target_payload_identity(target)
+            if identity not in current_identities:
+                current_refs.append(target)
+                current_identities[identity] = target
+        return self.update(id_name_uuid, **{key: current_refs})
+
+    def remove_targets(self, id_name_uuid, targets, target_key=None):
+        target_list, error = self.read(id_name_uuid)
+        if error:
+            return None, error
+
+        key, current_refs = self._read_target_refs(target_list, target_key=target_key)
+        refs_to_remove = {
+            self._target_payload_identity(target)
+            for target in (self._normalise_target_payloads(targets) or [])
+        }
+        remaining_refs = [
+            ref
+            for ref in current_refs
+            if self._target_payload_identity(ref) not in refs_to_remove
+        ]
+        return self.update(id_name_uuid, **{key: remaining_refs})
+
+    def add_target(self, id_name_uuid, target, target_key=None):
+        return self.add_targets(id_name_uuid, [target], target_key=target_key)
+
+    def remove_target(self, id_name_uuid, target, target_key=None):
+        return self.remove_targets(id_name_uuid, [target], target_key=target_key)

{arcsecond-3.7.3 → arcsecond-3.8.1}/arcsecond/cli.py

@@ -10,6 +10,7 @@ from arcsecond.cloud import (
     upload_data,
 )
 from arcsecond.hosting import setup
+from arcsecond.webcam import commands as webcam
 
 from . import __version__
 from .options import State
@@ -59,3 +60,6 @@ main.add_command(upload_data)
 
 # Allow to try arcsecond by installing a local version
 main.add_command(setup)
+
+# Native webcam proxy — lets Docker containers reach USB webcams on the host.
+main.add_command(webcam.webcam)

{arcsecond-3.7.3 → arcsecond-3.8.1}/arcsecond/hosting/docker/docker-compose.yml

@@ -35,6 +35,12 @@ services:
     depends_on:
       - db
       - broker
+    # Allows the backend to reach the host machine via host.docker.internal.
+    # Required on Linux; Docker Desktop on Windows/macOS adds this automatically.
+    # Used by the webcam proxy: set WEBCAM_PROXY_URL=http://host.docker.internal:8765
+    # in your .env file and run `arcsecond webcam start` on the host.
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     env_file:
       # You must have a .env file with secret keys beside this yml file.
       - .env