splime 0.2.3__tar.gz → 0.2.4__tar.gz

{splime-0.2.3/src/splime.egg-info → splime-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splime
-Version: 0.2.3
+Version: 0.2.4
 Summary: Reuse Python functions across projects without rewriting or redeploying them.
 Author-email: Yastrebov Kirill <yastrebovks@gmail.com>
 License-Expression: Apache-2.0

{splime-0.2.3 → splime-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "splime"
-version = "0.2.3"
+version = "0.2.4"
 
 description = "Reuse Python functions across projects without rewriting or redeploying them."
 readme = "README.md"

{splime-0.2.3 → splime-0.2.4}/src/spl/_client.py

@@ -40,6 +40,11 @@ ObjectScope = Literal["auto", "local", "server", "all"]
 RunSource = Literal["auto", "local"]
 ProgressOption = bool | RunStateCallback
 _NO_SERVER_CONNECTION_MESSAGE = "active server connection is not found"
+_LIBRARY_DELETE_UNSUPPORTED_MESSAGE = (
+    "Deleting central-server libraries is not supported by the SPL server API. "
+    "Use the Console archive action to hide a library, or remove individual "
+    "entries with client.library.remove_entry()."
+)
 
 
 def _preview(value: Any, *, limit: int = 80) -> str:
@@ -552,10 +557,10 @@ class _LibraryAdmin:
         return self._c._daemon.update_server_library(ref, payload)
 
     def delete(self, ref: str) -> dict[str, Any]:
-        """Delete or archive one central-server library when supported upstream."""
+        """Raise a clear error because server-side library delete is unsupported."""
 
         self._c._require_server_connection("deleting a library")
-        return self._c._daemon.delete_server_library(ref)
+        raise NotImplementedError(_LIBRARY_DELETE_UNSUPPORTED_MESSAGE)
 
     def grant(
         self,

{splime-0.2.3 → splime-0.2.4}/src/spl/daemon/remote_client.py

@@ -15,6 +15,11 @@ from spl._http import urlopen_verified, verified_https_context
 
 DEFAULT_SERVER_URL = "https://splime.io/api"
 DEFAULT_HEARTBEAT_INTERVAL_SECONDS = 60.0
+LIBRARY_DELETE_UNSUPPORTED_MESSAGE = (
+    "Deleting central-server libraries is not supported by the SPL server API. "
+    "Use the Console archive action to hide a library, or remove individual "
+    "entries with client.library.remove_entry()."
+)
 
 
 class ServerClientError(RuntimeError):
@@ -40,12 +45,22 @@ class ServerClient:
         self.machine_token = machine_token
         self.user_token = user_token
 
-    def _headers(self) -> dict[str, str]:
+    def _headers(self, *, auth: str = "machine") -> dict[str, str]:
+        token = self.machine_token
+        if auth == "user":
+            if not self.user_token:
+                raise ServerClientError(
+                    401,
+                    "central SPL daemon server user token is required for this operation",
+                )
+            token = self.user_token
+        elif auth != "machine":
+            raise ValueError("auth must be 'machine' or 'user'")
         headers = {
             "Accept": "application/json",
-            "Authorization": f"Bearer {self.machine_token}",
+            "Authorization": f"Bearer {token}",
         }
-        if self.user_token:
+        if auth == "machine" and self.user_token:
             headers["X-SPL-User-Token"] = self.user_token
         return headers
 
@@ -54,9 +69,11 @@ class ServerClient:
         method: str,
         path: str,
         payload: dict[str, Any] | None = None,
+        *,
+        auth: str = "machine",
     ) -> Any:
         body = None
-        headers = self._headers()
+        headers = self._headers(auth=auth)
         if payload is not None:
             body = json.dumps(payload, ensure_ascii=False).encode("utf-8")
             headers["Content-Type"] = "application/json; charset=utf-8"
@@ -229,34 +246,53 @@ class ServerClient:
 
     def list_libraries(self, *, include_accessible: bool = True) -> list[dict[str, Any]]:
         query = {"include_accessible": "1" if include_accessible else "0"}
-        return self._json_request("GET", f"/libraries?{urlencode(query)}")
+        return self._json_request(
+            "GET",
+            f"/libraries?{urlencode(query)}",
+            auth="user" if self.user_token else "machine",
+        )
 
     def create_library(self, payload: dict[str, Any]) -> dict[str, Any]:
-        return self._json_request("POST", "/libraries", payload)
+        return self._json_request("POST", "/libraries", payload, auth="user")
 
     def get_library(self, library_ref: str) -> dict[str, Any]:
-        return self._json_request("GET", f"/libraries/{quote(library_ref)}")
+        return self._json_request(
+            "GET",
+            f"/libraries/{quote(library_ref)}",
+            auth="user" if self.user_token else "machine",
+        )
 
     def update_library(self, library_ref: str, payload: dict[str, Any]) -> dict[str, Any]:
-        return self._json_request("PUT", f"/libraries/{quote(library_ref)}", payload)
+        return self._json_request(
+            "PUT",
+            f"/libraries/{quote(library_ref)}",
+            payload,
+            auth="user",
+        )
 
     def delete_library(self, library_ref: str) -> dict[str, Any]:
-        return self._json_request("DELETE", f"/libraries/{quote(library_ref)}")
+        raise NotImplementedError(LIBRARY_DELETE_UNSUPPORTED_MESSAGE)
 
     def list_library_grants(self, library_ref: str) -> list[dict[str, Any]]:
-        return self._json_request("GET", f"/libraries/{quote(library_ref)}/grants")
+        return self._json_request(
+            "GET",
+            f"/libraries/{quote(library_ref)}/grants",
+            auth="user",
+        )
 
     def grant_library(self, library_ref: str, payload: dict[str, Any]) -> dict[str, Any]:
         return self._json_request(
             "POST",
             f"/libraries/{quote(library_ref)}/grants",
             payload,
+            auth="user",
         )
 
     def revoke_library_grant(self, library_ref: str, grantee: str) -> dict[str, Any]:
         return self._json_request(
             "POST",
             f"/libraries/{quote(library_ref)}/grants/{quote(grantee)}/revoke",
+            auth="user",
         )
 
     def add_library_reference(
@@ -268,6 +304,7 @@ class ServerClient:
             "POST",
             f"/libraries/{quote(library_ref)}/references",
             payload,
+            auth="user",
         )
 
     def copy_object_into_library(
@@ -279,12 +316,14 @@ class ServerClient:
             "POST",
             f"/libraries/{quote(library_ref)}/copies",
             payload,
+            auth="user",
         )
 
     def remove_library_entry(self, library_ref: str, name: str) -> dict[str, Any]:
         return self._json_request(
             "DELETE",
             f"/libraries/{quote(library_ref)}/entries/{quote(name)}",
+            auth="user",
         )
 
     def list_objects(

{splime-0.2.3 → splime-0.2.4}/src/spl/daemon/routes/libraries.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from http import HTTPStatus
 from typing import Any
 
+from spl.daemon_client import LIBRARY_DELETE_UNSUPPORTED_MESSAGE
 from spl.daemon.routes._helpers import RouteContext
 from spl.daemon.store import validate_name
 
@@ -61,8 +62,11 @@ def register_library_routes(
     @app.delete("/server/libraries/<library_ref>")
     @route_errors
     async def delete_server_library(library_ref: str) -> Any:
-        _, server = context.connected_server_client()
-        return json_response(server.delete_library(validate_name(library_ref)))
+        validate_name(library_ref)
+        return json_response(
+            {"error": LIBRARY_DELETE_UNSUPPORTED_MESSAGE},
+            HTTPStatus.NOT_IMPLEMENTED,
+        )
 
     @app.get("/server/libraries/<library_ref>/grants")
     @route_errors

{splime-0.2.3 → splime-0.2.4}/src/spl/daemon/runtime_dependencies.py

@@ -228,7 +228,7 @@ class ServerClientProtocol(Protocol):
         ...
 
     def delete_library(self, library_ref: str) -> dict[str, Any]:
-        """Delete a server library."""
+        """Delete a server library when upstream support is added."""
         ...
 
     def list_library_grants(self, library_ref: str) -> list[dict[str, Any]]:

{splime-0.2.3 → splime-0.2.4}/src/spl/daemon/server.py

@@ -26,7 +26,7 @@ Endpoints:
     POST /server/libraries
     GET  /server/libraries/<ref>
     PUT  /server/libraries/<ref>
-    DELETE /server/libraries/<ref>
+    DELETE /server/libraries/<ref>  (501 until upstream archive/delete exists)
     GET  /server/libraries/<ref>/grants
     POST /server/libraries/<ref>/grants
     POST /server/libraries/<ref>/grants/<grantee>/revoke

{splime-0.2.3 → splime-0.2.4}/src/spl/daemon_client.py

@@ -26,6 +26,11 @@ DEFAULT_SERVER_URL = "https://splime.io/api"
 DEFAULT_HEARTBEAT_INTERVAL_SECONDS = 60.0
 DAEMON_ENDPOINT_FILENAME = "daemon-endpoint.json"
 DAEMON_API_TOKEN_ENV = "SPL_DAEMON_API_TOKEN"
+LIBRARY_DELETE_UNSUPPORTED_MESSAGE = (
+    "Deleting central-server libraries is not supported by the SPL server API. "
+    "Use the Console archive action to hide a library, or remove individual "
+    "entries with client.library.remove_entry()."
+)
 
 OfflinePolicy = Literal["queue", "wait", "fail_fast"]
 RunSource = Literal["auto", "local"]
@@ -544,9 +549,9 @@ class Client:
         )
 
     def delete_server_library(self, library_ref: str) -> dict[str, Any]:
-        """Delete or archive one central-server library when supported upstream."""
+        """Raise a clear error because server-side library delete is unsupported."""
 
-        return self._json_request("DELETE", f"/server/libraries/{quote(library_ref)}")
+        raise NotImplementedError(LIBRARY_DELETE_UNSUPPORTED_MESSAGE)
 
     def server_library_grants(self, library_ref: str) -> list[dict[str, Any]]:
         """Return grants for one central-server library."""

{splime-0.2.3 → splime-0.2.4/src/splime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splime
-Version: 0.2.3
+Version: 0.2.4
 Summary: Reuse Python functions across projects without rewriting or redeploying them.
 Author-email: Yastrebov Kirill <yastrebovks@gmail.com>
 License-Expression: Apache-2.0