bec-lib 4.3.1__tar.gz → 4.3.2__tar.gz

{bec_lib-4.3.1 → bec_lib-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bec_lib
-Version: 4.3.1
+Version: 4.3.2
 Summary: BEC library
 Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
 Project-URL: Homepage, https://github.com/bec-project/bec

{bec_lib-4.3.1 → bec_lib-4.3.2}/bec_lib/endpoints.py

@@ -1470,15 +1470,19 @@ class MessageEndpoints:
         )
 
     @staticmethod
-    def procedure_request():
+    def procedure_request(username: str) -> EndpointInfo:
         """
-        Endpoint for requesting new procedures.
+        Endpoint for requesting new procedures, scoped to the submitting user through Redis ACLs.
         The request is sent using a messages.ProcedureRequestMessage message.
+        Its metadata.client_info.acl_user must match the username in this endpoint.
+
+        Args:
+            username (str): Username of the user making the request.
 
         Returns:
             EndpointInfo: Endpoint for procedure request.
         """
-        endpoint = f"{EndpointType.USER.value}/procedures/procedure_request"
+        endpoint = f"{EndpointType.PERSONAL.value}/{username}/procedures/procedure_request"
         return EndpointInfo(
             endpoint=endpoint,
             message_type=messages.ProcedureRequestMessage,
@@ -1503,6 +1507,32 @@ class MessageEndpoints:
             message_op=MessageOp.SEND,
         )
 
+    @staticmethod
+    def procedure_workers() -> EndpointInfo:
+        """Return the public registry of workers and their owning queues.
+
+        Returns:
+            EndpointInfo: Worker registry.
+        """
+        return EndpointInfo(
+            endpoint=f"{EndpointType.INFO.value}/procedures/workers",
+            message_type=messages.AvailableResourceMessage,
+            message_op=MessageOp.KEY_VALUE,
+        )
+
+    @staticmethod
+    def procedure_queues() -> EndpointInfo:
+        """Return the registry of logical queues, including empty queues.
+
+        Returns:
+            EndpointInfo: Queue registry.
+        """
+        return EndpointInfo(
+            endpoint=f"{EndpointType.INFO.value}/procedures/queues",
+            message_type=messages.AvailableResourceMessage,
+            message_op=MessageOp.KEY_VALUE,
+        )
+
     @staticmethod
     def procedure_execution(queue_id: str):
         """

{bec_lib-4.3.1 → bec_lib-4.3.2}/bec_lib/messages.py

@@ -1937,9 +1937,11 @@ class ProcedureWorkerStatusMessage(BECMessage):
     """Message type for sending procedure worker status updates
 
     Args:
-        worker_queue (str): Worker queue ID
+        worker_queue (str): Worker identifier; legacy actor workers use their queue ID.
         status (str): Worker status
         current_execution_id (str | None): ID of the current job, only allowed for RUNNING
+        completed_execution_id (str | None): Completed pooled execution, if any.
+        error (str | None): Error from the completed execution.
     """
 
     msg_type: ClassVar[str] = "procedure_worker_status_message"
@@ -1947,6 +1949,9 @@ class ProcedureWorkerStatusMessage(BECMessage):
     status: ProcedureWorkerStatus
     current_execution_id: str | None = None
 
+    completed_execution_id: str | None = None
+    error: str | None = None
+
     @model_validator(mode="after")
     def check_id(self) -> Self:
         if self.current_execution_id is not None and self.status != ProcedureWorkerStatus.RUNNING:

{bec_lib-4.3.1 → bec_lib-4.3.2}/bec_lib/procedures/helper.py

@@ -87,6 +87,11 @@ class ProcedureStatus:
             return
         # The request can be accepted or denied
         if self._state is ProcedureState.REQUESTED:
+            # Cancellation can finish an admission before its acknowledgement arrives.
+            if state == ProcedureState.FAILED:
+                self._state = state
+                self._done.set()
+                return
             if state not in [ProcedureState.REJECTED, ProcedureState.SCHEDULED]:
                 raise ValueError(f"Improper transition from {self._state} to {state}")
             self._state = state
@@ -185,9 +190,14 @@ class _Request(_HelperBase):
         return self._procedure(msg)
 
     def _procedure(self, msg):
+        from bec_lib.acl_login import BECAccess
+
+        credentials = BECAccess(self._conn).current_credentials()
+        username = credentials["username"] or "default"
+        msg.metadata["client_info"] = {"acl_user": username, "acl_token": credentials["token"]}
         st = ProcedureStatus(self._conn, msg.execution_id, msg.identifier)
         self._set_callbacks(msg.execution_id, st)
-        self._conn.send(ME.procedure_request(), msg)
+        self._conn.send(ME.procedure_request(username), msg)
         return st
 
     def abort_execution(self, execution_id: str):
@@ -256,7 +266,29 @@ class _Get(_HelperBase):
             else ME.unhandled_procedure_execution
         )
         raw: list[str] = [s.decode() for s in self._conn.keys(ep("*"))]
-        return [s.split("/")[-1] for s in raw]
+        names = {s.split("/")[-1] for s in raw}
+        if queue_type == "execution":
+            registry = self._conn.get(ME.procedure_queues())
+            if registry is not None:
+                names.update(registry.resource)
+        return sorted(names)
+
+    def workers(self, queue: str | None = None) -> dict[str, dict]:
+        """Return workers, optionally filtered by their owning logical queue.
+
+        Args:
+            queue (str | None): Queue name, or None for all queues.
+        Returns:
+            dict[str, dict]: Worker IDs mapped to queue, status, and current execution.
+        """
+        registry = self._conn.get(ME.procedure_workers())
+        if registry is None:
+            return {}
+        return {
+            identifier: worker
+            for identifier, worker in registry.resource.items()
+            if queue is None or worker["queue"] == queue
+        }
 
     def log_queue_names(self) -> list[str]:
         """Get the names of queues currently containing logs from procedures."""

{bec_lib-4.3.1 → bec_lib-4.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_lib"
-version = "4.3.1"
+version = "4.3.2"
 description = "BEC library"
 requires-python = ">=3.11"
 classifiers = [

bec_lib-4.3.2/tests/test_procedure_submission.py

@@ -0,0 +1,39 @@
+"""Procedure requests use the authenticated user's personal endpoint."""
+
+from unittest.mock import MagicMock
+
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.messages import ProcedureRequestMessage
+from bec_lib.procedures.helper import FrontendProcedureHelper
+
+
+def test_procedure_submission_tracks_current_acl_user():
+    conn = MagicMock()
+    conn._managed_connection._redis_conn.connection_pool.connection_kwargs = {"password": "secret"}
+    helper = FrontendProcedureHelper(conn)
+    for username in ["alice", "bob", "default"]:
+        conn.username = username
+        status = helper.request.procedure("sleep", args_kwargs=((), {"time_s": 1}))
+        endpoint, message = conn.send.call_args.args
+        assert endpoint == MessageEndpoints.procedure_request(username)
+        assert endpoint.endpoint == f"personal/{username}/procedures/procedure_request"
+        assert message.metadata["client_info"]["acl_user"] == username
+        assert message.execution_id == status._id
+        assert message.args_kwargs == ((), {"time_s": 1})
+
+
+def test_submission_replaces_untrusted_acl_identity():
+    conn = MagicMock()
+    conn._managed_connection._redis_conn.connection_pool.connection_kwargs = {"password": "secret"}
+    conn.username = "alice"
+    helper = FrontendProcedureHelper(conn)
+    message = ProcedureRequestMessage(
+        identifier="sleep", metadata={"client_info": {"acl_user": "bob"}, "custom": "preserved"}
+    )
+    helper.request._procedure(message)
+    endpoint, submitted = conn.send.call_args.args
+    assert endpoint == MessageEndpoints.procedure_request("alice")
+    assert submitted.metadata == {
+        "client_info": {"acl_user": "alice", "acl_token": "secret"},
+        "custom": "preserved",
+    }