digitalkin 1.0.0.dev24__tar.gz → 1.0.0.dev25__tar.gz

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 1.0.0.dev24
+Version: 1.0.0.dev25
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/pyproject.toml

@@ -37,7 +37,7 @@
         "pydantic-settings>=2.14.1",
         "redis[hiredis]>=7.4.0,<9",
     ]
-    version = "1.0.0.dev24"
+    version = "1.0.0.dev25"
 
     [project.optional-dependencies]
         performance = [ "uvloop>=0.21" ]

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/src/digitalkin/__version__.py

@@ -5,4 +5,4 @@ from importlib.metadata import PackageNotFoundError, version
 try:
     __version__ = version("digitalkin")
 except PackageNotFoundError:
-    __version__ = "1.0.0.dev24"
+    __version__ = "1.0.0.dev25"

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/src/digitalkin/grpc_servers/gateway_servicer.py

@@ -7,7 +7,6 @@ import contextlib
 import json
 import random
 import time
-import uuid
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any
 
@@ -159,44 +158,13 @@ class GatewayServicer:
         await self._m2m.stop()
         await self._registry.shutdown()
 
-    async def AssociateTask(
-        self,
-        request: Any,
-        context: grpc.aio.ServicerContext,  # noqa: ARG002
-    ) -> Any:
-        """Mint a sub-task id linked to a running parent task.
+    async def AssociateTask(self, request: Any, context: grpc.aio.ServicerContext) -> Any:  # noqa: ARG002, PLR6301
+        """Not served by the SDK — the backend mints sub-tasks.
 
-        Args:
-            request: AssociateTaskRequest proto.
-            context: gRPC service context.
-
-        Returns:
-            AssociateTaskResponse(task_id, parent_task_id); empty ``task_id`` on rejection.
+        Present only so the generated ``add_GatewayServiceServicer_to_server`` finds all
+        four RPCs; nothing dials the module for it. Callers use the backend endpoint.
         """
-        parent_task_id = request.parent_task_id
-        err = GatewayValidator.validate_id(parent_task_id, "parent_task_id")
-        if err is not None:
-            logger.warning("AssociateTask rejected: %s", err)
-            return gateway_pb2.AssociateTaskResponse(task_id="", parent_task_id=parent_task_id)
-
-        child_task_id = str(uuid.uuid4())
-        ttl = get_gateway_settings().stream.redis_stream_initial_ttl
-        try:
-            await self._redis_client.sadd(f"task:{parent_task_id}:children", child_task_id)
-            await self._redis_client.expire(f"task:{parent_task_id}:children", ttl)
-            await self._redis_client.set(f"task:{child_task_id}:parent", parent_task_id, ex=ttl)
-        except RedisError:
-            logger.warning(
-                "[VALIDATE AT1] AssociateTask persist failed parent=%s → task_id=''",
-                parent_task_id,
-                exc_info=True,
-            )  # TODO(validate): remove after prod validation
-            return gateway_pb2.AssociateTaskResponse(task_id="", parent_task_id=parent_task_id)
-
-        logger.info(
-            "[VALIDATE AT1] AssociateTask: parent=%s child=%s", parent_task_id, child_task_id
-        )  # TODO(validate): remove after prod validation
-        return gateway_pb2.AssociateTaskResponse(task_id=child_task_id, parent_task_id=parent_task_id)
+        await context.abort(grpc.StatusCode.UNIMPLEMENTED, "AssociateTask is served by the backend")
 
     async def StartStream(  # noqa: PLR0911
         self,

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/src/digitalkin/grpc_servers/module_servicer.py

@@ -253,7 +253,12 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
 
         from digitalkin.services.communication.grpc_communication import GrpcCommunication
 
-        self._communication_cache = GrpcCommunication("", "", "", client_config)
+        gateway_backend_config = (self.module_class.services_config_params.get("user_profile") or {}).get(
+            "client_config"
+        )
+        self._communication_cache = GrpcCommunication(
+            "", "", "", client_config, gateway_backend_config=gateway_backend_config
+        )
         return self._communication_cache
 
     def _cache_setup(self, setup_id: str, version_data: SetupVersionData) -> None:

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/src/digitalkin/grpc_servers/utils/grpc_client_wrapper.py

@@ -230,6 +230,7 @@ class GrpcClientWrapper:
         query_endpoint: str,
         request: Any,
         timeout: float | None = None,
+        metadata: tuple[tuple[str, str], ...] | None = None,
     ) -> Any:
         """Execute a gRPC query with circuit breaker protection and retry.
 
@@ -245,6 +246,8 @@ class GrpcClientWrapper:
             query_endpoint: rpc query name (e.g., "GetSetup", "CreateSetupVersion")
             request: gRPC protobuf request object
             timeout: Per-call timeout in seconds. ``None`` applies no client-side deadline.
+            metadata: Optional gRPC metadata pairs (e.g. an idempotency key); the same
+                metadata is sent on every retry attempt.
 
         Returns:
             gRPC protobuf response object.
@@ -279,7 +282,7 @@ class GrpcClientWrapper:
                     await asyncio.sleep(backoff_delays[attempt - 1])
 
                 try:
-                    response = await rpc_method(request, timeout=eff_timeout)
+                    response = await rpc_method(request, timeout=eff_timeout, metadata=metadata)
                 except grpc.RpcError as e:
                     last_error = e
                     if e.code() in self._RETRYABLE_CODES and attempt < max_retries:

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/src/digitalkin/models/settings/gateway.py

@@ -93,6 +93,10 @@ class GatewayM2MSettings(BaseSettings):
         default=2.0,
         description="Best-effort SendSignal(CANCEL) deadline when call_module is cancelled.",
     )
+    call_associate_timeout_s: float = Field(
+        default=5.0,
+        description="Per-call deadline on the backend AssociateTask mint (bounded, not the 30s default).",
+    )
     call_queue_maxsize: int = Field(
         default=1024,
         gt=0,

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/src/digitalkin/services/communication/grpc_communication.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import asyncio
 import time
+import uuid
 from typing import TYPE_CHECKING, Any
 
 import grpc.aio
@@ -36,6 +37,21 @@ if TYPE_CHECKING:
     from digitalkin.grpc_servers.m2m_call_registry import M2MCallRegistry
 
 
+class _GatewayBackendClient(GrpcClientWrapper):
+    """Resilient client to the backend GatewayService (own circuit breaker) for AssociateTask."""
+
+    service_name: str = "GatewayBackendService"
+
+    def __init__(self, client_config: ClientConfig) -> None:
+        """Dial the backend GatewayService and cache its stub.
+
+        Args:
+            client_config: Backend services-provider config (same host as user_profile).
+        """
+        self._init_channel(client_config)
+        self.stub = self._get_or_create_stub(gateway_service_pb2_grpc.GatewayServiceStub)
+
+
 class GrpcCommunication(CommunicationStrategy, GrpcClientWrapper):
     """gRPC client for module-to-module communication."""
 
@@ -95,6 +111,7 @@ class GrpcCommunication(CommunicationStrategy, GrpcClientWrapper):
         setup_version_id: str,
         client_config: ClientConfig,
         m2m_calls: M2MCallRegistry | None = None,
+        gateway_backend_config: ClientConfig | None = None,
     ) -> None:
         """Initialize the gRPC communication client.
 
@@ -105,11 +122,16 @@ class GrpcCommunication(CommunicationStrategy, GrpcClientWrapper):
             client_config: gRPC client config.
             m2m_calls: Optional ``M2MCallRegistry``; falls back to the
                 class-level slot from :meth:`set_m2m_call_registry`.
+            gateway_backend_config: Backend GatewayService config for AssociateTask
+                (same host as user_profile). Required for M2M tool calls.
         """
         BaseStrategy.__init__(self, mission_id, setup_id, setup_version_id)
         self.client_config = client_config
         self._m2m_calls = m2m_calls if m2m_calls is not None else self._shared_m2m_calls
         self._pool_keys: set[str] = set()
+        self._gateway_backend = (
+            _GatewayBackendClient(gateway_backend_config) if gateway_backend_config is not None else None
+        )
 
         logger.debug("Initialized GrpcCommunication (security=%s)", client_config.security)
 
@@ -146,6 +168,8 @@ class GrpcCommunication(CommunicationStrategy, GrpcClientWrapper):
     async def close(self) -> None:
         """Release all pooled gRPC channels."""
         await self.close_all_channels()
+        if self._gateway_backend is not None:
+            await self._gateway_backend.close_channel()
 
     def dial_consumer_stream(
         self,
@@ -341,37 +365,28 @@ class GrpcCommunication(CommunicationStrategy, GrpcClientWrapper):
             timer.mark("acquire_slot")
             last_mark = "acquire_slot"
 
-            self._get_or_create_channel(module_address, module_port)
-            timer.mark("channel_create")
-            last_mark = "channel_create"
-            stub = self._get_or_create_stub(gateway_service_pb2_grpc.GatewayServiceStub)
-            timer.mark("stub_create")
-            last_mark = "stub_create"
-
-            # The gateway mints the sub-task id and links it to the running parent task.
-            try:
-                assoc = await stub.AssociateTask(
-                    gateway_pb2.AssociateTaskRequest(
-                        parent_task_id=RequestContext.current().get("task_id", ""),
-                    ),
-                )
-            except grpc.aio.AioRpcError as exc:
-                breaker.record_failure()
-                logger.warning(
-                    "[m2m] AssociateTask failed: [%s] %s",
-                    exc.code().name,
-                    exc.details() or "",
-                    extra=log_extra,
-                )
-                raise
+            # The BACKEND mints + registers the sub-task (linked to the running parent's
+            # mission), so it is a real task the tool module's CheckResourceAccess accepts.
+            # Resilient: deadline + retry + own breaker via exec_grpc_query; retries are safe
+            # because the idempotency nonce dedupes them backend-side. Fail-closed on error.
+            if self._gateway_backend is None:
+                msg = "gateway_backend_config is required for M2M AssociateTask"
+                raise RuntimeError(msg)  # noqa: TRY301
+            parent_task_id = RequestContext.current().get("task_id", "")
+            idem_key = uuid.uuid4().hex  # idempotency nonce, NOT a task_id (backend mints the id)
+            assoc = await self._gateway_backend.exec_grpc_query(
+                "AssociateTask",
+                gateway_pb2.AssociateTaskRequest(parent_task_id=parent_task_id),
+                timeout=m2m_settings.call_associate_timeout_s,
+                metadata=(("x-idempotency-key", idem_key),),
+            )
             task_id = assoc.task_id
             if not task_id:
-                breaker.record_failure()
-                msg = f"target {target_key} returned no task_id from AssociateTask"
+                msg = f"backend returned no task_id from AssociateTask (parent={parent_task_id})"
                 raise RuntimeError(msg)  # noqa: TRY301
             logger.info(
                 "[VALIDATE AT2] AssociateTask minted: parent=%s child=%s target=%s",
-                RequestContext.current().get("task_id", ""),
+                parent_task_id,
                 task_id,
                 target_key,
                 extra=log_extra,
@@ -380,6 +395,13 @@ class GrpcCommunication(CommunicationStrategy, GrpcClientWrapper):
             timer.mark("associate_task")
             last_mark = "associate_task"
 
+            self._get_or_create_channel(module_address, module_port)
+            timer.mark("channel_create")
+            last_mark = "channel_create"
+            stub = self._get_or_create_stub(gateway_service_pb2_grpc.GatewayServiceStub)
+            timer.mark("stub_create")
+            last_mark = "stub_create"
+
             output_queue: asyncio.Queue[struct_pb2.Struct | None] = asyncio.Queue(
                 maxsize=m2m_settings.call_queue_maxsize,
             )

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/src/digitalkin/services/services_config.py

@@ -84,6 +84,14 @@ class ServicesConfig(BaseModel):
         if not self._configs.get("secret"):
             self._configs["secret"] = self._configs.get("user_profile") or {}
 
+        # AssociateTask is minted by the backend (same services-provider as user_profile /
+        # CheckResourceAccess). In REMOTE mode, give the communication client that backend
+        # address so it can dial AssociateTask for M2M tool calls. Skipped in LOCAL (no backend,
+        # and DefaultCommunication takes no such arg).
+        up_client_config = (self._configs.get("user_profile") or {}).get("client_config")
+        if up_client_config is not None:
+            self._configs["communication"].setdefault("gateway_backend_config", up_client_config)
+
     @classmethod
     def valid_strategy_names(cls) -> set[str]:
         """Get the list of valid strategy names.

{digitalkin-1.0.0.dev24 → digitalkin-1.0.0.dev25}/src/digitalkin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 1.0.0.dev24
+Version: 1.0.0.dev25
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International