digitalkin 1.0.2.dev4__tar.gz → 1.0.2.dev6__tar.gz

{digitalkin-1.0.2.dev4 → digitalkin-1.0.2.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 1.0.2.dev4
+Version: 1.0.2.dev6
 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.2.dev4 → digitalkin-1.0.2.dev6}/pyproject.toml

@@ -37,7 +37,7 @@
         "pydantic>=2.12.4",
         "redis[hiredis]>=7.4.0,<9",
     ]
-    version = "1.0.2.dev4"
+version = "1.0.2.dev6"
 
     [project.optional-dependencies]
         agno = [ "agno>=2.6" ]

{digitalkin-1.0.2.dev4 → digitalkin-1.0.2.dev6}/src/digitalkin/__version__.py

@@ -5,4 +5,4 @@ from importlib.metadata import PackageNotFoundError, version
 try:
     __version__ = version("digitalkin")
 except PackageNotFoundError:
-    __version__ = "1.0.2.dev4"
+    __version__ = "1.0.2.dev6"

{digitalkin-1.0.2.dev4 → digitalkin-1.0.2.dev6}/src/digitalkin/grpc_servers/_base_server.py

@@ -3,6 +3,7 @@
 import abc
 import asyncio
 import os
+import sys
 
 from digitalkin.models.settings.profiling import get_profiling_settings
 
@@ -196,10 +197,16 @@ class BaseServer(abc.ABC):
         try:  # noqa: PLW0717
             grpc_compression = get_server_settings().grpc.compression.to_grpc()
 
-            try:
-                cpu_count = len(os.sched_getaffinity(0))
-                logger.info("vCPU count: %d", cpu_count)
-            except (AttributeError, OSError):
+            # sched_getaffinity is Linux-only; the sys.platform guard lets mypy skip
+            # it as unreachable on other platforms without a type: ignore.
+            if sys.platform == "linux":
+                try:
+                    cpu_count = len(os.sched_getaffinity(0))
+                    logger.info("vCPU count: %d", cpu_count)
+                except OSError:
+                    cpu_count = os.cpu_count() or 1
+                    logger.info("CPU count: %d", cpu_count)
+            else:
                 cpu_count = os.cpu_count() or 1
                 logger.info("CPU count: %d", cpu_count)
 

{digitalkin-1.0.2.dev4 → digitalkin-1.0.2.dev6}/src/digitalkin/mixins/storage_mixin.py

@@ -3,6 +3,7 @@
 from typing import Any, Literal
 
 from digitalkin.models.module.module_context import ModuleContext
+from digitalkin.models.services.storage import DataType
 from digitalkin.services.storage.storage_strategy import StorageRecord
 
 
@@ -36,7 +37,7 @@ class StorageMixin:
         Raises:
             StorageServiceError: If storage operation fails
         """
-        return await context.storage.store(collection, record_id, data, data_type=data_type)
+        return await context.storage.store(collection, record_id, data, data_type=DataType[data_type])
 
     @staticmethod
     async def read_storage(context: ModuleContext, collection: str, record_id: str) -> StorageRecord | None:
@@ -101,4 +102,4 @@ class StorageMixin:
         Raises:
             StorageServiceError: If upsert operation fails
         """
-        return await context.storage.upsert(collection, record_id, data, data_type=data_type)
+        return await context.storage.upsert(collection, record_id, data, data_type=DataType[data_type])

{digitalkin-1.0.2.dev4 → digitalkin-1.0.2.dev6}/src/digitalkin/models/services/registry.py

@@ -18,7 +18,11 @@ class RegistryModuleStatus(str, Enum):
 
 
 class RegistryModuleType(str, Enum):
-    """Module type in the registry."""
+    """Module type in the registry.
+
+    Member names mirror the proto ``ModuleType`` enum (minus the ``MODULE_TYPE_``
+    prefix): they are looked up by name from the wire value, so they must match.
+    """
 
     UNSPECIFIED = "unspecified"
     ARCHETYPE = "archetype"

{digitalkin-1.0.2.dev4 → digitalkin-1.0.2.dev6}/src/digitalkin/models/services/storage.py

@@ -51,3 +51,26 @@ class DataType(Enum):
     VIEW = "VIEW"
     LOGS = "LOGS"
     OTHER = "OTHER"
+
+
+class ContextStorage(Enum):
+    """Enum defining the context of data in storage."""
+
+    UNSPECIFIED = "unspecified"
+    MISSIONS = "missions"
+    SETUP_VERSIONS = "setup_versions"
+    USERS = "users"
+    ORGANIZATIONS = "organizations"
+
+
+class Visibility(Enum):
+    """Read-access scope of a record, mirroring the storage proto by integer value.
+
+    Ownership (who may edit) stays keyed on the record context; this only governs
+    who may read. UNSPECIFIED lets the storage service apply its server-side default.
+    """
+
+    UNSPECIFIED = 0
+    PUBLIC = 1
+    PRIVATE = 2
+    INTERNAL = 3

{digitalkin-1.0.2.dev4 → digitalkin-1.0.2.dev6}/src/digitalkin/services/storage/default_storage.py

@@ -9,7 +9,7 @@ from typing import Any
 from pydantic import BaseModel
 
 from digitalkin.logger import logger
-from digitalkin.models.services.storage import DataType
+from digitalkin.models.services.storage import DataType, Visibility
 from digitalkin.services.storage.storage_strategy import (
     StorageRecord,
     StorageStrategy,
@@ -67,6 +67,7 @@ class DefaultStorage(StorageStrategy):
                     record_id=rd["record_id"],
                     data=data_model,
                     data_type=DataType[rd["data_type"]],
+                    visibility=Visibility[rd["visibility"]] if rd.get("visibility") else Visibility.UNSPECIFIED,
                     creation_date=datetime.datetime.fromisoformat(rd["creation_date"])
                     if rd.get("creation_date")
                     else None,
@@ -97,6 +98,7 @@ class DefaultStorage(StorageStrategy):
                         "collection": record.collection,
                         "record_id": record.record_id,
                         "data_type": record.data_type.name,
+                        "visibility": record.visibility.name,
                         "data": record.data.model_dump(),
                         "creation_date": record.creation_date.isoformat() if record.creation_date else None,
                         "update_date": record.update_date.isoformat() if record.update_date else None,
@@ -141,21 +143,29 @@ class DefaultStorage(StorageStrategy):
         Args:
             collection: The unique name to retrieve data for
             record_id: The unique ID of the record
-            context: Owner context scoping the lookup.
+            context: Resolved owner context scoping the lookup.
 
         Returns:
             StorageRecord: The corresponding record
         """
         return self.storage.get(self._key(context, collection, record_id))
 
-    async def _update(self, collection: str, record_id: str, data: BaseModel, context: str) -> StorageRecord | None:
+    async def _update(
+        self,
+        collection: str,
+        record_id: str,
+        data: BaseModel,
+        context: str,
+        visibility: Visibility = Visibility.UNSPECIFIED,
+    ) -> StorageRecord | None:
         """Update a record in the database scoped to a specific context.
 
         Args:
             collection: The unique name to retrieve data for
             record_id: The unique ID of the record
             data: The data to modify
-            context: Owner context scoping the update.
+            context: Resolved owner context scoping the update.
+            visibility: New read-access scope; UNSPECIFIED leaves it unchanged.
 
         Returns:
             StorageRecord: The modified record
@@ -165,6 +175,8 @@ class DefaultStorage(StorageStrategy):
         if not rec:
             return None
         rec.data = data
+        if visibility is not Visibility.UNSPECIFIED:
+            rec.visibility = visibility
         rec.update_date = datetime.datetime.now(datetime.timezone.utc)
         self._save_to_file()
         logger.debug("Modified %s", key)
@@ -176,7 +188,7 @@ class DefaultStorage(StorageStrategy):
         Args:
             collection: The unique name to retrieve data for
             record_id: The unique ID of the record
-            context: Owner context scoping the deletion.
+            context: Resolved owner context scoping the deletion.
 
         Returns:
             bool: True if the record was removed, False otherwise
@@ -189,25 +201,32 @@ class DefaultStorage(StorageStrategy):
         logger.debug("Removed %s", key)
         return True
 
-    async def _list(self, collection: str, context: str) -> list[StorageRecord]:
+    async def _list(
+        self, collection: str, context: str, visibilities: list[Visibility] | None = None
+    ) -> list[StorageRecord]:
         """List records in a collection scoped to a specific context.
 
         Args:
             collection: The unique name to retrieve data for
-            context: Owner context scoping the listing.
+            context: Resolved owner context scoping the listing.
+            visibilities: Optional read-access scopes to filter by (None = no filter).
 
         Returns:
             A list of storage records
         """
         prefix = f"{context}|{collection}:"
-        return [r for k, r in self.storage.items() if k.startswith(prefix)]
+        records = [r for k, r in self.storage.items() if k.startswith(prefix)]
+        if visibilities:
+            allowed = set(visibilities)
+            records = [r for r in records if r.visibility in allowed]
+        return records
 
     async def _remove_collection(self, collection: str, context: str) -> bool:
         """Wipe a collection scoped to a specific context.
 
         Args:
             collection: The unique name to retrieve data for
-            context: Owner context scoping the wipe.
+            context: Resolved owner context scoping the wipe.
 
         Returns:
             bool: True if the collection was removed, False otherwise

{digitalkin-1.0.2.dev4 → digitalkin-1.0.2.dev6}/src/digitalkin/services/storage/grpc_storage.py

@@ -1,5 +1,7 @@
 """This module implements the default storage strategy."""
 
+from typing import cast
+
 from agentic_mesh_protocol.storage.v1 import data_pb2, storage_service_pb2_grpc
 from google.protobuf.struct_pb2 import Struct
 from pydantic import BaseModel
@@ -8,7 +10,7 @@ from digitalkin.grpc_servers.exceptions import CircuitOpenError, PermissionDenie
 from digitalkin.grpc_servers.utils.grpc_client_wrapper import GrpcClientWrapper
 from digitalkin.logger import logger
 from digitalkin.models.grpc_servers.models import ClientConfig
-from digitalkin.models.services.storage import DataType
+from digitalkin.models.services.storage import DataType, Visibility
 from digitalkin.services.storage.exceptions import StorageServiceError
 from digitalkin.services.storage.storage_strategy import (
     StorageRecord,
@@ -39,22 +41,27 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
         return isinstance(error.__cause__, CircuitOpenError)
 
     def _context_enum(self, context: str) -> data_pb2.ContextStorage:
-        """Map a resolved context id-string to the wire's context-kind enum.
+        """Map a resolved context string to the wire's context-kind enum.
 
         Since dev4 the request carries only the kind; the concrete id is resolved
-        server-side from the x-mission-id / x-setup-id task metadata stamped by
-        ``RequestIdClientInterceptor``.
+        server-side from the request metadata stamped by ``RequestIdClientInterceptor``.
+        USERS/ORGANIZATIONS are read-only cross-owner scopes whose id is resolved
+        server-side from the x-user-id / x-organization-id metadata.
 
         Args:
-            context: The resolved context id (``self.mission_id`` or ``self.setup_version_id``).
+            context: The resolved context string from ``_resolve_context``.
 
         Returns:
-            ``CONTEXT_SETUP_VERSIONS`` for the setup-version scope, else ``CONTEXT_MISSIONS``.
+            The matching ``CONTEXT_*`` wire enum.
         """
         # TODO(validate): remove after prod validation
         # [VALIDATE CTXENUM] server resolves the concrete id (incl. setup->current version) from metadata
         if context == self.setup_version_id or context.startswith("setup_versions:"):
             return data_pb2.CONTEXT_SETUP_VERSIONS
+        if context.startswith("users:"):
+            return data_pb2.CONTEXT_USERS
+        if context.startswith("organizations:"):
+            return data_pb2.CONTEXT_ORGANIZATIONS
         return data_pb2.CONTEXT_MISSIONS
 
     def _build_record_from_proto(self, proto: data_pb2.StorageRecord) -> StorageRecord:
@@ -74,6 +81,7 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
         coll = proto.collection
         rid = proto.record_id
         dtype = DataType[data_pb2.DataType.Name(proto.data_type)]
+        visibility = Visibility(proto.visibility)
 
         # Selective deserialization: only the nested Struct payload
         payload = ProtoUtils.proto_to_dict(proto.data) if proto.HasField("data") else {}
@@ -89,6 +97,7 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
             record_id=rid,
             data=validated,
             data_type=dtype,
+            visibility=visibility,
             creation_date=creation_date,
             update_date=update_date,
         )
@@ -127,16 +136,17 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
             StorageServiceError: If there is an error while storing the record
         """
         logger.debug("debug:_store collection=%s id=%s", record.collection, record.record_id)
+        data_struct = Struct()
+        data_struct.update(record.data.model_dump())
+        req = data_pb2.StoreRecordRequest(
+            data=data_struct,
+            context=self._context_enum(record.context),
+            collection=record.collection,
+            record_id=record.record_id,
+            data_type=record.data_type.name,
+            visibility=cast("data_pb2.Visibility", record.visibility.value),
+        )
         try:
-            data_struct = Struct()
-            data_struct.update(record.data.model_dump())
-            req = data_pb2.StoreRecordRequest(
-                data=data_struct,
-                context=self._context_enum(record.context),
-                collection=record.collection,
-                record_id=record.record_id,
-                data_type=record.data_type.name,
-            )
             resp = await self.exec_grpc_query("StoreRecord", req)
             return self._build_record_from_proto(resp.stored_data)
         except PermissionDeniedError:
@@ -185,12 +195,19 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
             logger.warning("Invalid record data for %s:%s in ReadRecord", collection, record_id, exc_info=True)
             return None
 
+        try:
+            return self._build_record_from_proto(resp.stored_data)
+        except Exception:
+            logger.warning("Invalid record data for %s:%s in ReadRecord", collection, record_id, exc_info=True)
+            return None
+
     async def _update(
         self,
         collection: str,
         record_id: str,
         data: BaseModel,
         context: str,
+        visibility: Visibility = Visibility.UNSPECIFIED,
     ) -> StorageRecord | None:
         """Overwrite a document via gRPC scoped to a specific context.
 
@@ -201,15 +218,16 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
             PermissionDeniedError: If the service rejects the call with PERMISSION_DENIED.
         """
         logger.debug("debug:_update context=%s collection=%s id=%s", context, collection, record_id)
+        struct = Struct()
+        struct.update(data.model_dump())
+        req = data_pb2.UpdateRecordRequest(
+            data=struct,
+            context=self._context_enum(context),
+            collection=collection,
+            record_id=record_id,
+            visibility=cast("data_pb2.Visibility", visibility.value),
+        )
         try:
-            struct = Struct()
-            struct.update(data.model_dump())
-            req = data_pb2.UpdateRecordRequest(
-                data=struct,
-                context=self._context_enum(context),
-                collection=collection,
-                record_id=record_id,
-            )
             resp = await self.exec_grpc_query("UpdateRecord", req)
             return self._build_record_from_proto(resp.stored_data)
         except PermissionDeniedError:
@@ -252,7 +270,9 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
             return False
         return True
 
-    async def _list(self, collection: str, context: str) -> list[StorageRecord]:
+    async def _list(
+        self, collection: str, context: str, visibilities: list[Visibility] | None = None
+    ) -> list[StorageRecord]:
         """List all documents in a collection via gRPC scoped to a specific context.
 
         Returns:
@@ -267,6 +287,8 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
                 context=self._context_enum(context),
                 collection=collection,
             )
+            if visibilities:
+                req.visibilities.extend(cast("data_pb2.Visibility", v.value) for v in visibilities)
             resp = await self.exec_grpc_query("ListRecords", req)
         except PermissionDeniedError:
             # TODO(validate): remove after prod validation