digitalkin 1.0.2.dev6__tar.gz → 1.0.2.dev7__tar.gz

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

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

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

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

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

digitalkin-1.0.2.dev7/src/digitalkin/models/services/filesystem.py

@@ -0,0 +1,19 @@
+"""Filesystem service models."""
+
+from enum import Enum
+
+
+class ContextFile(Enum):
+    """Owner/scope of a file in the filesystem service.
+
+    Mirrors the filesystem proto context kinds. MISSIONS/SETUP are the read/write
+    owner contexts this strategy operates on; USERS/ORGANIZATIONS are read-only
+    cross-owner scopes whose concrete id is resolved server-side from the request
+    metadata (the client sends only the kind).
+    """
+
+    UNSPECIFIED = "unspecified"
+    MISSIONS = "mission"
+    SETUP = "setup"
+    USERS = "user"
+    ORGANIZATIONS = "organization"

{digitalkin-1.0.2.dev6 → digitalkin-1.0.2.dev7}/src/digitalkin/services/filesystem/default_filesystem.py

@@ -9,6 +9,7 @@ from typing import Any, Literal
 from anyio import Path as AsyncPath
 
 from digitalkin.logger import logger
+from digitalkin.models.services.filesystem import ContextFile
 from digitalkin.services.filesystem.exceptions import FilesystemServiceError
 from digitalkin.services.filesystem.filesystem_strategy import (
     FileFilter,
@@ -206,7 +207,7 @@ class DefaultFilesystem(FilesystemStrategy):
     async def get_file(
         self,
         file_id: str,
-        context: Literal["mission", "setup"] = "mission",  # noqa: ARG002
+        context: ContextFile = ContextFile.MISSIONS,  # noqa: ARG002
         *,
         include_content: bool = False,
     ) -> FilesystemRecord:

{digitalkin-1.0.2.dev6 → digitalkin-1.0.2.dev7}/src/digitalkin/services/filesystem/filesystem_strategy.py

@@ -6,6 +6,7 @@ from typing import Any, Literal
 
 from pydantic import BaseModel, Field
 
+from digitalkin.models.services.filesystem import ContextFile
 from digitalkin.services.base_strategy import BaseStrategy
 
 
@@ -29,8 +30,9 @@ class FilesystemRecord(BaseModel):
 class FileFilter(BaseModel):
     """Filter criteria for querying files."""
 
-    context: Literal["mission", "setup"] = Field(
-        default="mission", description="The context of the files (mission or setup)"
+    context: ContextFile = Field(
+        default=ContextFile.MISSIONS,
+        description="The context of the files: mission/setup (owner) or user/organization (read-only cross-owner)",
     )
     names: list[str] | None = Field(default=None, description="Filter by file names (exact matches)")
     file_ids: list[str] | None = Field(default=None, description="Filter by file IDs")
@@ -129,7 +131,7 @@ class FilesystemStrategy(BaseStrategy, ABC):
     async def get_file(
         self,
         file_id: str,
-        context: Literal["mission", "setup"] = "mission",
+        context: ContextFile = ContextFile.MISSIONS,
         *,
         include_content: bool = False,
     ) -> FilesystemRecord:
@@ -141,7 +143,7 @@ class FilesystemStrategy(BaseStrategy, ABC):
 
         Args:
             file_id: The ID of the file to be retrieved
-            context: The context of the files (mission or setup)
+            context: The context of the file (mission/setup, or user/organization for cross-owner reads)
             include_content: Whether to include file content in response
 
         Returns:

{digitalkin-1.0.2.dev6 → digitalkin-1.0.2.dev7}/src/digitalkin/services/filesystem/grpc_filesystem.py

@@ -10,6 +10,7 @@ from digitalkin.grpc_servers.utils.grpc_client_wrapper import GrpcClientWrapper
 from digitalkin.grpc_servers.utils.grpc_error_handler import GrpcErrorHandlerMixin
 from digitalkin.logger import logger
 from digitalkin.models.grpc_servers.models import ClientConfig
+from digitalkin.models.services.filesystem import ContextFile
 from digitalkin.services.filesystem.exceptions import FilesystemServiceError
 from digitalkin.services.filesystem.filesystem_strategy import (
     FileFilter,
@@ -80,26 +81,32 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper, GrpcErrorHandlerMixi
         )
 
     @staticmethod
-    def _context_enum(context: str) -> filesystem_pb2.ContextFile:
-        """Map a scope literal to the wire's context-kind enum.
+    def _context_enum(context: ContextFile) -> filesystem_pb2.ContextFile:
+        """Map a context kind 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 — only the kind is sent;
+        the server derives the owning user/organization from the request context (no id
+        is transmitted by the client).
 
         Args:
-            context: The scope literal ("mission" or "setup").
+            context: The context kind.
 
         Returns:
-            The matching ``ContextFile`` enum value, ``CONTEXT_UNSPECIFIED`` otherwise.
+            The matching ``ContextFile`` wire enum, ``CONTEXT_UNSPECIFIED`` otherwise.
         """
         # TODO(validate): remove after prod validation
         # [VALIDATE CTXENUM] server resolves the concrete id from metadata
         match context:
-            case "setup":
+            case ContextFile.SETUP:
                 return filesystem_pb2.CONTEXT_SETUP
-            case "mission":
+            case ContextFile.MISSIONS:
                 return filesystem_pb2.CONTEXT_MISSIONS
+            case ContextFile.USERS:
+                return filesystem_pb2.CONTEXT_USERS
+            case ContextFile.ORGANIZATIONS:
+                return filesystem_pb2.CONTEXT_ORGANIZATIONS
         return filesystem_pb2.CONTEXT_UNSPECIFIED
 
     def _filter_to_proto(self, filters: FileFilter) -> filesystem_pb2.FileFilter:
@@ -188,7 +195,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper, GrpcErrorHandlerMixi
     async def get_file(
         self,
         file_id: str,
-        context: Literal["mission", "setup"] = "mission",
+        context: ContextFile = ContextFile.MISSIONS,
         *,
         include_content: bool = False,
     ) -> FilesystemRecord:
@@ -196,7 +203,7 @@ class GrpcFilesystem(FilesystemStrategy, GrpcClientWrapper, GrpcErrorHandlerMixi
 
         Args:
             file_id: The ID of the file to be retrieved
-            context: The context of the files (mission or setup)
+            context: The context of the file (mission/setup, or user/organization for cross-owner reads)
             include_content: Whether to include file content in response
 
         Returns:

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

@@ -45,8 +45,9 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
 
         Since dev4 the request carries only the kind; the concrete id is resolved
         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.
+        USERS/ORGANIZATIONS are read-only cross-owner scopes — only the kind is sent;
+        the server derives the owning user/organization from the request context (no id
+        is transmitted by the client).
 
         Args:
             context: The resolved context string from ``_resolve_context``.
@@ -62,6 +63,8 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
             return data_pb2.CONTEXT_USERS
         if context.startswith("organizations:"):
             return data_pb2.CONTEXT_ORGANIZATIONS
+        if context.startswith("unspecified:"):
+            return data_pb2.CONTEXT_UNSPECIFIED
         return data_pb2.CONTEXT_MISSIONS
 
     def _build_record_from_proto(self, proto: data_pb2.StorageRecord) -> StorageRecord:
@@ -189,18 +192,6 @@ class GrpcStorage(StorageStrategy, GrpcClientWrapper):
                 logger.info("gRPC ReadRecord failed for %s:%s: %s", collection, record_id, e)
             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
-
-        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,

{digitalkin-1.0.2.dev6 → digitalkin-1.0.2.dev7}/src/digitalkin/services/storage/storage_strategy.py

@@ -47,27 +47,25 @@ class StorageStrategy(BaseStrategy, ABC):
         """Resolve a context kind to its storage context string.
 
         MISSIONS/SETUP_VERSIONS map to the owner contexts this strategy was built
-        with. USERS/ORGANIZATIONS are read-only cross-owner scopes (list only); the
-        strategy holds no user/org id, so it returns a kind-only marker
-        (`users:` / `organizations:`). The storage service resolves the concrete id
-        server-side from the request metadata stamped by the client interceptor.
+        with. USERS/ORGANIZATIONS (read-only cross-owner) and UNSPECIFIED hold no
+        concrete id here, so they return a kind-only marker (`users:`,
+        `organizations:`, `unspecified:`); the storage service resolves the id — or
+        applies its default for UNSPECIFIED — server-side from the request metadata.
 
         Args:
             context: The context kind to resolve.
 
         Returns:
             The context string: `missions:<id>`, `setup_versions:<id>`, or the
-            kind marker `users:` / `organizations:`.
+            kind marker `users:` / `organizations:` / `unspecified:`.
         """
         match context:
             case ContextStorage.MISSIONS:
                 return self.mission_id
             case ContextStorage.SETUP_VERSIONS:
                 return self.setup_version_id
-            case ContextStorage.USERS | ContextStorage.ORGANIZATIONS:
-                return f"{context.value}:"
             case _:
-                return self.mission_id
+                return f"{context.value}:"
 
     def _validate_data(self, collection: str, data: dict[str, Any]) -> BaseModel:
         """Validate data against the model schema for the given key.

{digitalkin-1.0.2.dev6 → digitalkin-1.0.2.dev7}/src/digitalkin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 1.0.2.dev6
+Version: 1.0.2.dev7
 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.dev6 → digitalkin-1.0.2.dev7}/src/digitalkin.egg-info/SOURCES.txt

@@ -147,6 +147,7 @@ src/digitalkin/models/module/tool_reference.py
 src/digitalkin/models/module/utility.py
 src/digitalkin/models/services/__init__.py
 src/digitalkin/models/services/cost.py
+src/digitalkin/models/services/filesystem.py
 src/digitalkin/models/services/registry.py
 src/digitalkin/models/services/services.py
 src/digitalkin/models/services/storage.py