arcsecond 4.3.2__tar.gz → 4.3.3__tar.gz

{arcsecond-4.3.2 → arcsecond-4.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: arcsecond
-Version: 4.3.2
+Version: 4.3.3
 Summary: CLI for arcsecond.io
 Project-URL: Homepage, https://github.com/arcsecond-io/cli
 Project-URL: Issues, https://github.com/arcsecond-io/cli/issues

{arcsecond-4.3.2 → arcsecond-4.3.3}/arcsecond/api/endpoint.py

@@ -8,7 +8,16 @@ from arcsecond.api.constants import API_AUTH_PATH_VERIFY, API_AUTH_PATH_VERIFY_P
 from arcsecond.errors import ArcsecondError
 
 SAFE_METHODS = ["GET", "OPTIONS"]
-WRITABLE_MEMBERSHIPS = ["superadmin", "admin", "member"]
+
+# The portal roles allowed to write. Both "owner" and "superadmin" are listed
+# because they are the same role: the backend renamed "superadmin" to "owner",
+# and this tool talks to installations on either side of that update.
+# Observatories update the tool independently of their installation, so a
+# freshly updated tool can still be pointed at an installation that has not
+# been updated yet and answers "superadmin".
+#
+# "superadmin" can go once no supported installation predates the rename.
+WRITABLE_MEMBERSHIPS = ["owner", "superadmin", "admin", "member"]
 
 
 class ArcsecondAPIEndpoint(object):

{arcsecond-4.3.2 → arcsecond-4.3.3}/arcsecond/api/resources.py

@@ -11,6 +11,7 @@ class ArcsecondTargetListsResource(ArcsecondAPIEndpoint):
         "id",
         "pk",
         "object",
+        "coordinates",
         "name",
         "identifier",
         "target_class",

{arcsecond-4.3.2 → arcsecond-4.3.3}/arcsecond/targets.py

@@ -116,9 +116,12 @@ def _plan_manual(
 ) -> "ArcsecondTargetPayloadPlan":
     """The plan for coordinates the user gave us themselves.
 
-    The backend takes manual coordinates only as an 'AstronomicalObject', so
-    that class is assumed here and anything inferred is set aside — with a
-    warning, since silently ignoring what was inferred would be worse.
+    They go as the target's own `coordinates`, which take precedence over the
+    catalogue's — offset or not, the user is assumed right — and need no
+    object: the backend names one after the fact when the catalogue knows the
+    name. Only an 'AstronomicalObject' may carry them, so that class is
+    assumed here and anything inferred is set aside — with a warning, since
+    silently ignoring what was inferred would be worse.
     """
     if user_target_class and user_target_class != TARGET_CLASS_ASTRONOMICAL_OBJECT:
         errors.append(
@@ -142,11 +145,7 @@ def _plan_manual(
         errors.append("Manual coordinates require a target name.")
 
     payload["target_class"] = effective_target_class
-    payload["mode"] = TARGET_MODE_MANUAL
-    payload["object"] = {
-        "name": effective_name or effective_identifier,
-        "equatorial_coordinates": effective_coordinates,
-    }
+    payload["coordinates"] = effective_coordinates
 
     return ArcsecondTargetPayloadPlan(
         payload=payload,

{arcsecond-4.3.2 → arcsecond-4.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arcsecond"
-version = "4.3.2"
+version = "4.3.3"
 authors = [
     { name = "Cedric Foellmi", email = "cedric@arcsecond.io" },
 ]

{arcsecond-4.3.2 → arcsecond-4.3.3}/tests/api/test_config.py

@@ -4,6 +4,7 @@ from pathlib import Path
 import pytest
 
 from arcsecond.api.config import CONFIG_DIR_ENV_VAR, ArcsecondConfig
+from arcsecond.api.endpoint import WRITABLE_MEMBERSHIPS
 from arcsecond.errors import ArcsecondError
 from arcsecond.options import State
 from tests.utils import random_string, save_test_credentials
@@ -145,11 +146,22 @@ def test_config_memberships():
     config = ArcsecondConfig(api_name=random_api_name)
     assert config.memberships == {}
     ms = [
-        {"organisation": "oma", "role": "superadmin"},
+        {"organisation": "oma", "role": "owner"},
         {"organisation": "arcsecond", "role": "member"},
     ]
     config.save_memberships(ms)
-    assert config.memberships == {"oma": "superadmin", "arcsecond": "member"}
+    assert config.memberships == {"oma": "owner", "arcsecond": "member"}
+
+
+def test_owner_membership_is_writable():
+    assert "owner" in WRITABLE_MEMBERSHIPS
+
+
+def test_superadmin_membership_is_still_writable():
+    # An installation that predates the rename of "superadmin" to "owner"
+    # still answers with the old name, and the tool must keep treating it as
+    # the same role until no supported installation does.
+    assert "superadmin" in WRITABLE_MEMBERSHIPS
 
 
 def test_config_access_key():
@@ -192,10 +204,8 @@ def test_default_logged_in_state():
 def test_default_logged_in_with_membership_state():
     random_api_name = random_string()
     save_test_credentials(
-        random_api_name, "cedric", [{"organisation": "saao", "role": "superadmin"}]
+        random_api_name, "cedric", [{"organisation": "saao", "role": "owner"}]
     )
     assert ArcsecondConfig(api_name=random_api_name).is_logged_in is True
     assert ArcsecondConfig(api_name=random_api_name).username == "cedric"
-    assert ArcsecondConfig(api_name=random_api_name).memberships == {
-        "saao": "superadmin"
-    }
+    assert ArcsecondConfig(api_name=random_api_name).memberships == {"saao": "owner"}

{arcsecond-4.3.2 → arcsecond-4.3.3}/tests/test_hosting_database.py

@@ -330,13 +330,17 @@ def test_failed_recreate_reports_but_keeps_the_new_password(tmp_path, monkeypatc
     assert "password was changed successfully" in result.output
 
 
-def test_the_data_worker_is_recreated_only_where_the_compose_file_has_it(tmp_path, monkeypatch):
+def test_the_data_worker_is_recreated_only_where_the_compose_file_has_it(
+    tmp_path, monkeypatch
+):
     """docker-compose.yml 7.3 added it; naming it on an older install would
     make `docker compose up` fail outright."""
     monkeypatch.chdir(tmp_path)
     compose = Path(tmp_path) / "docker-compose.yml"
 
-    compose.write_text("services:\n  worker:\n    container_name: arcsecond-worker\n", encoding="utf-8")
+    compose.write_text(
+        "services:\n  worker:\n    container_name: arcsecond-worker\n", encoding="utf-8"
+    )
     assert database._services_to_recreate() == ["backend", "worker", "beat"]
 
     compose.write_text(
@@ -344,4 +348,10 @@ def test_the_data_worker_is_recreated_only_where_the_compose_file_has_it(tmp_pat
         "  # >>> arcsecond:alerts\n  alerts:\n  # <<< arcsecond:alerts\n",
         encoding="utf-8",
     )
-    assert database._services_to_recreate() == ["backend", "worker", "beat", "dataworker", "alerts"]
+    assert database._services_to_recreate() == [
+        "backend",
+        "worker",
+        "beat",
+        "dataworker",
+        "alerts",
+    ]

{arcsecond-4.3.2 → arcsecond-4.3.3}/tests/test_targets_planning.py

@@ -13,11 +13,14 @@ def test_plan_target_payload_uses_manual_astroobject_when_coordinates_are_provid
     assert plan.target_class == "AstronomicalObject"
     assert plan.mode == "manual"
     assert plan.payload["target_class"] == "AstronomicalObject"
-    assert plan.payload["mode"] == "manual"
-    assert plan.payload["object"]["equatorial_coordinates"] == {
+    # The user's coordinates are the target's own; no object is sent, the
+    # backend names one when the catalogue knows the name.
+    assert plan.payload["coordinates"] == {
         "right_ascension": 344.366,
         "declination": 20.768,
     }
+    assert "mode" not in plan.payload
+    assert "object" not in plan.payload
     assert "ignored" in plan.warnings[0]
 
 

{arcsecond-4.3.2 → arcsecond-4.3.3}/uv.lock

@@ -155,7 +155,7 @@ wheels = [
 
 [[package]]
 name = "arcsecond"
-version = "4.3.2"
+version = "4.3.3"
 source = { editable = "." }
 dependencies = [
     { name = "alpyca" },