digitalkin 0.3.2.dev21__tar.gz → 0.3.2.dev23__tar.gz

{digitalkin-0.3.2.dev21 → digitalkin-0.3.2.dev23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.2.dev21
+Version: 0.3.2.dev23
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International
@@ -437,18 +437,18 @@ License: Attribution-NonCommercial-ShareAlike 4.0 International
 Project-URL: Homepage, https://github.com/DigitalKin-ai/digitalkin
 Project-URL: Documentation, https://github.com/DigitalKin-ai/digitalkin
 Project-URL: Issues, https://github.com/DigitalKin-ai/digitalkin/issues
-Keywords: digitalkin,kin,agent,gprc,sdk
+Keywords: agent,digitalkin,gprc,kin,sdk
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
+Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: License :: Other/Proprietary License
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE

{digitalkin-0.3.2.dev21 → digitalkin-0.3.2.dev23}/examples/modules/archetype_with_tools_module.py

@@ -8,11 +8,7 @@ from pydantic import BaseModel, Field
 from digitalkin.models.grpc_servers.models import ClientConfig, SecurityMode, ServerMode
 from digitalkin.models.module.module_context import ModuleContext
 from digitalkin.models.module.setup_types import SetupModel
-from digitalkin.models.module.tool_reference import (
-    ToolReference,
-    ToolReferenceConfig,
-    ToolSelectionMode,
-)
+from digitalkin.models.module.tool_reference import ToolReference
 from digitalkin.modules._base_module import BaseModule  # noqa: PLC2701
 from digitalkin.services.services_models import ServicesStrategy
 
@@ -64,29 +60,21 @@ class ArchetypeSetup(SetupModel):
 
     search_tool: ToolReference = Field(
         default_factory=lambda: ToolReference(
-            config=ToolReferenceConfig(
-                mode=ToolSelectionMode.FIXED,
-                module_id="search-tool-v1",
-            )
+            module_ids=["search-tool-v1"],
         ),
         json_schema_extra={"config": True},
     )
 
     calculator_tool: ToolReference = Field(
         default_factory=lambda: ToolReference(
-            config=ToolReferenceConfig(
-                mode=ToolSelectionMode.TAG,
-                tag="math-calculator",
-            )
+            tags=["math-calculator"],
         ),
         json_schema_extra={"config": True},
     )
 
     dynamic_tool: ToolReference = Field(
         default_factory=lambda: ToolReference(
-            config=ToolReferenceConfig(
-                mode=ToolSelectionMode.DISCOVERABLE,
-            )
+            tags=["discoverable"],
         ),
         json_schema_extra={"config": True},
     )

digitalkin-0.3.2.dev23/pyproject.toml

@@ -0,0 +1,279 @@
+[build-system]
+requires      = ["setuptools >= 75.8.2", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+
+name            = "digitalkin"
+description     = "SDK to build kin used in DigitalKin"
+readme          = "README.md"
+requires-python = ">=3.10"
+license         = { file = "LICENSE" }
+
+keywords = ["agent", "digitalkin", "gprc", "kin", "sdk"]
+
+version = "0.3.2.dev23"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "License :: Other/Proprietary License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python",
+    "Topic :: Software Development :: Libraries",
+]
+
+dependencies = [
+    "agentic-mesh-protocol==0.2.1.dev0",
+    "grpcio-health-checking>=1.76.0",
+    "grpcio-reflection>=1.76.0",
+    "grpcio-status>=1.76.0",
+    "pydantic>=2.12.5",
+    "surrealdb>=1.0.7",
+]
+
+    [project.optional-dependencies]
+    taskiq = [
+        "rstream>=0.40.0",
+        "taskiq-aio-pika>=0.5.0",
+        "taskiq-redis>=1.2.0",
+        "taskiq[reload]>=0.12.1",
+    ]
+
+    [project.urls]
+    Homepage      = "https://github.com/DigitalKin-ai/digitalkin"
+    Documentation = "https://github.com/DigitalKin-ai/digitalkin"
+    Issues        = "https://github.com/DigitalKin-ai/digitalkin/issues"
+
+    [[project.authors]]
+    name  = "DigitalKin.ai"
+    email = "contact@digitalkin.ai"
+
+[dependency-groups]
+dev = [
+    "build>=1.3.0",
+    "bump-my-version>=1.2.5",
+    "cryptography>=46.0.3",
+    "mypy>=1.19.1",
+    "pre-commit>=4.5.1",
+    "pyright>=1.1.407",
+    "ruff>=0.14.9",
+    "twine>=6.2.0",
+    "typos>=1.40.0",
+]
+tests = [
+    "freezegun>=1.5.5",
+    "grpcio-testing>=1.76.0",
+    "hdrhistogram>=0.10.3",
+    "psutil>=7.1.3",
+    "pytest-asyncio>=1.3.0",
+    "pytest-cov>=7.0.0",
+    "pytest-html==4.1.1",
+    "pytest-json-report==1.5.0",
+    "pytest-timeout>=2.4.0",
+    "pytest>=9.0.2",
+]
+docs = [
+    "griffe-inherited-docstrings>=1.1.2",
+    "markdown-callouts>=0.4.0",
+    "markdown-exec>=1.12.1",
+    "mike>=2.1.3",
+    "mkdocs-autorefs>=1.4.3",
+    "mkdocs-awesome-pages-plugin>=2.10.1",
+    "mkdocs-coverage>=2.0.0",
+    "mkdocs-git-committers-plugin-2>=2.5.0",
+    "mkdocs-git-revision-date-localized-plugin>=1.5.0",
+    "mkdocs-glightbox>=0.5.2",
+    "mkdocs-include-markdown-plugin>=7.2.0",
+    "mkdocs-literate-nav>=0.6.2",
+    "mkdocs-llmstxt>=0.5.0",
+    "mkdocs-material[imaging]>=9.7.0",
+    "mkdocs-minify-plugin>=0.8.0",
+    "mkdocs-open-in-new-tab>=1.0.8",
+    "mkdocs-redirects>=1.2.2",
+    "mkdocs-section-index>=0.3.10",
+    "mkdocs>=1.6.1",
+    "mkdocstrings-python>=2.0.1",
+    "mkdocstrings>=1.0.0",
+    "tomli>=2.3.0",
+]
+[tool.setuptools]
+package-dir = { "" = "src" }
+
+    [tool.setuptools.packages.find]
+    where = ["examples", "src"]
+
+[tool.ruff]
+src            = ["src"]
+target-version = "py310"
+line-length    = 120
+indent-width   = 4
+show-fixes     = true
+unsafe-fixes   = true
+# Enable preview features.
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".git-rewrite",
+    ".hg",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "docs/*",
+    "examples/*",
+    "factory.py",
+    "generate_certificates.py",
+    "node_modules",
+    "tests/*",
+    "venv",
+]
+preview = true
+
+    [tool.ruff.lint]
+    select = [
+        "A",     # flake8-builtins
+        "ANN",   # flake8-annotations
+        "ARG",   # flake8-unused-arguments
+        "ASYNC", # flake8-async
+        "C4",    # flake8-comprehensions
+        "C90",   # mccabe (complex-structure)
+        "COM",   # flake8-commas
+        "D",     # pydocstyle
+        "DOC",   # pydoclint
+        "DTZ",   # flake8-datetimez
+        "E",     # pycodestyle-errors
+        "EM",    # flake8-errmsg
+        "ERA",   # eradicate
+        "F",     # pyflakes
+        "FBT",   # flake8-boolean-trap
+        "FLY",   # flynt
+        "FURB",  # Refurb
+        "G",     # flake8-logging-format
+        "I",     # isort
+        "ICN",   # flake8-import-conventions
+        "ISC",   # flake8-implicit-str-concat
+        "LOG",   # flake8-logging
+        "N",     # pep8-naming
+        "PERF",  # Perflint
+        "PIE",   # flake8-pie
+        "PL",    # Pylint
+        "PL",    # Pylint
+        "PT",    # flake8-pytest-style
+        "PYI",   # flake8-pyi
+        "Q",     # flake8-quotes
+        "RET",   # flake8-return
+        "RSE",   # flake8-raise
+        "RUF",   # Ruff-specific rules
+        "S",     # flake8-bandit
+        "SIM",   # flake8-simplify
+        "SLF",   # flake8-self
+        "T20",   # flake8-print
+        "TC",    # flake8-type-checking
+        "TRY",   # tryceratops
+        "UP",    # pyupgrade
+        "W",     # pycodestyle-warnings
+    ]
+
+    ignore = [
+        "COM812", # Disable because of formatter incompatibility
+        "DOC502", # Allow extraneous-exception in docstring
+        "S105",   # Hardcoded-password
+    ]
+
+    fixable = ["ALL"]
+
+        [tool.ruff.lint.pydocstyle]
+        convention = "google"
+
+        [tool.ruff.lint.per-file-ignores]
+        "tests/**/*.py" = [
+            "ANN001",
+            "ANN002",
+            "ANN003",
+            "ANN201",
+            "ANN401",
+            "ARG001",
+            "ARG002",
+            "C901",
+            "D100",
+            "D101",
+            "D102",
+            "D103",
+            "D107",
+            "D417",
+            "DOC201",
+            "DOC501",
+            "E501",
+            "ERA001",
+            "FBT001",
+            "FBT002",
+            "G004",
+            "N802",
+            "PERF203",
+            "PLC2701",
+            "PLR0911",
+            "PLR0912",
+            "PLR0914",
+            "PLR0915",
+            "PLR1702",
+            "PLR2004",
+            "PLR6301",
+            "S101",
+            "SLF001",
+            "TRY002",
+        ]
+
+        [tool.ruff.lint.pylint]
+        max-args = 10
+
+    [tool.ruff.format]
+    quote-style               = "double"
+    indent-style              = "space"
+    line-ending               = "auto"
+    docstring-code-format     = true
+    skip-magic-trailing-comma = false
+
+[tool.pyright]
+include = ["src"]
+exclude = ["**/.venv", "**/__pycache__"]
+
+[tool.mypy]
+exclude = ["examples", "tests"]
+
+[tool.pytest.ini_options]
+testpaths    = ["tests"]
+python_files = "test_*.py"
+asyncio_mode = "auto"
+
+log_cli   = false
+log_level = "ERROR"
+
+# Default timeout for tests (in seconds)
+timeout        = 10
+timeout_method = "signal" # More reliable for asyncio tests on Linux
+
+# Custom markers
+markers = [
+    "edge_case: marks tests for boundary conditions and edge cases",
+    "grpc: marks tests for gRPC service functionality",
+    "integration: marks tests that require real SurrealDB connection (deselect with '-m \"not integration\"')",
+    "regression: marks tests for previously fixed bugs",
+    "smoke: marks critical path tests that should always pass",
+    "validation: marks tests for input validation and schema checking",
+]

{digitalkin-0.3.2.dev21 → digitalkin-0.3.2.dev23}/src/digitalkin/__version__.py

@@ -5,4 +5,4 @@ from importlib.metadata import PackageNotFoundError, version
 try:
     __version__ = version("digitalkin")
 except PackageNotFoundError:
-    __version__ = "0.3.2.dev21"
+    __version__ = "0.3.2.dev23"

{digitalkin-0.3.2.dev21 → digitalkin-0.3.2.dev23}/src/digitalkin/grpc_servers/module_servicer.py

@@ -165,7 +165,7 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
         if isinstance(updated_setup_data, ModuleCodeModel):
             logger.error(
                 "Config setup failed",
-                extra={"job_id": job_id, "code": updated_setup_data.code, "message": updated_setup_data.message},
+                extra={"job_id": job_id, "code": updated_setup_data.code, "error_message": updated_setup_data.message},
             )
             context.set_code(grpc.StatusCode.INTERNAL)
             context.set_details(updated_setup_data.message or "Config setup failed")
@@ -178,7 +178,7 @@ class ModuleServicer(module_service_pb2_grpc.ModuleServiceServicer, ArgParser):
                 extra={
                     "job_id": job_id,
                     "code": updated_setup_data["code"],
-                    "message": updated_setup_data.get("message"),
+                    "error_message": updated_setup_data.get("message"),
                 },
             )
             context.set_code(grpc.StatusCode.INTERNAL)

{digitalkin-0.3.2.dev21 → digitalkin-0.3.2.dev23}/src/digitalkin/models/module/__init__.py

@@ -14,8 +14,7 @@ from digitalkin.models.module.tool_cache import (
 )
 from digitalkin.models.module.tool_reference import (
     ToolReference,
-    ToolReferenceConfig,
-    ToolSelectionMode,
+    tool_reference_input,
 )
 from digitalkin.models.module.utility import (
     EndOfStreamOutput,
@@ -36,8 +35,7 @@ __all__ = [
     "ToolModuleInfo",
     "ToolParameter",
     "ToolReference",
-    "ToolReferenceConfig",
-    "ToolSelectionMode",
     "UtilityProtocol",
     "UtilityRegistry",
+    "tool_reference_input",
 ]

{digitalkin-0.3.2.dev21 → digitalkin-0.3.2.dev23}/src/digitalkin/models/module/module_context.py

@@ -227,21 +227,19 @@ class ModuleContext:
             llm_format=llm_format,
         )
 
-    async def create_openai_style_tools(self, module_id: str) -> list[dict[str, Any]]:
+    def create_openai_style_tools(self, slug: str) -> list[dict[str, Any]]:
         """Create OpenAI-style function calling schemas for a tool module.
 
         Uses tool cache (fast path) with registry fallback. Returns one schema
         per ToolDefinition (protocol) in the module.
 
         Args:
-            module_id: Module ID to look up (checks cache first, then registry).
+            slug: Module ID to look up (checks cache first, then registry).
 
         Returns:
             List of OpenAI-style tool schemas, one per protocol. Empty if not found.
         """
-        tool_module_info = await self.tool_cache.get(
-            module_id, registry=self.registry, communication=self.communication
-        )
+        tool_module_info = self.tool_cache.get(slug)
         if not tool_module_info:
             return []
 
@@ -250,8 +248,8 @@ class ModuleContext:
                 "type": "function",
                 "function": {
                     "module_id": tool_module_info.module_id,
-                    "toolkit_name": tool_module_info.name or "undefined",
-                    "name": tool_def.name,
+                    "toolkit_name": tool_module_info.tool_name or "undefined",
+                    "name": tool_module_info.slug + "_" + tool_def.name,
                     "description": tool_def.description,
                     "parameters": ModuleContext._build_parameters_schema(tool_def.parameters),
                 },
@@ -277,9 +275,9 @@ class ModuleContext:
 
     def create_tool_functions(
         self,
-        module_id: str,
+        slug: str,
     ) -> list[tuple[ToolDefinition, Callable[..., AsyncGenerator[dict, None]]]]:
-        """Create tool functions for all protocols in a tool module.
+        """Create tool functions for all protocols in a tool setup.
 
         Returns an async generator per ToolDefinition that calls the remote tool
         module via gRPC with the protocol auto-injected.
@@ -288,12 +286,12 @@ class ModuleContext:
         in sync contexts like __init__ methods.
 
         Args:
-            module_id: Module ID to look up in cache.
+            slug: Setup ID to look up in cache.
 
         Returns:
             List of (ToolDefinition, async_generator_function) tuples. Empty if not found.
         """
-        tool_module_info = self.tool_cache.entries.get(module_id)
+        tool_module_info = self.tool_cache.entries.get(slug)
         if not tool_module_info:
             return []
 

{digitalkin-0.3.2.dev21 → digitalkin-0.3.2.dev23}/src/digitalkin/models/module/setup_types.py

@@ -29,7 +29,6 @@ SetupModelT = TypeVar("SetupModelT", bound="SetupModel")
 class SetupModel(BaseModel, Generic[SetupModelT]):
     """Base setup model with dynamic schema and tool cache support."""
 
-    model_config = ConfigDict(extra="allow")
     _clean_model_cache: ClassVar[dict[tuple[type, bool, bool], type]] = {}
     resolved_tools: dict[str, ToolModuleInfo] = Field(
         default_factory=dict,
@@ -347,7 +346,7 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
             resolved_tools: Cache of already resolved tools.
         """
         if isinstance(field_value, ToolReference):
-            await cls._resolve_single_tool_reference(
+            await cls._resolve_tool_reference(
                 field_name,
                 field_value,
                 registry,
@@ -377,7 +376,7 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
             )
 
     @classmethod
-    async def _resolve_single_tool_reference(
+    async def _resolve_tool_reference(
         cls,
         field_name: str,
         tool_ref: ToolReference,
@@ -385,7 +384,7 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
         communication: "CommunicationStrategy",
         resolved_tools: dict[str, ToolModuleInfo],
     ) -> None:
-        """Resolve a single ToolReference.
+        """Resolve a ToolReference (may contain multiple selected tools).
 
         Args:
             field_name: Name of the field for logging.
@@ -394,21 +393,23 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
             communication: Communication service for module schemas.
             resolved_tools: Cache of already resolved tools.
         """
-        logger.info("Resolving ToolReference '%s' with setup_id='%s'", field_name, tool_ref.config.setup_id)
+        logger.info("Resolving ToolReference '%s' with %d selected tools", field_name, len(tool_ref.selected_tools))
 
-        slug = tool_ref.slug
-        if slug:
-            cached = resolved_tools.get(slug)
-            if cached:
-                tool_ref._cached_info = cached  # noqa: SLF001
-                logger.info("ToolReference '%s' resolved from cache -> %s", field_name, cached)
-                return
+        if not tool_ref.selected_tools:
+            logger.info("ToolReference '%s' has no selected tools, skipping", field_name)
+            return
+
+        tools_to_resolve = [tool for tool in tool_ref.selected_tools if tool.slug and tool.slug not in resolved_tools]
+
+        if not tools_to_resolve:
+            logger.info("All tools for '%s' already cached", field_name)
+            return
 
         try:
-            info = await tool_ref.resolve(registry, communication)
-            if info and info.setup_id:
+            infos = await tool_ref.resolve(registry, communication)
+            for info in infos:
                 resolved_tools[info.setup_id] = info
-            logger.info("Resolved ToolReference '%s' -> %s", field_name, tool_ref.tool_module_info)
+                logger.info("Resolved tool '%s' -> module_id=%s", info.setup_id, info.module_id)
         except Exception:
             logger.exception("Failed to resolve ToolReference '%s'", field_name)
 
@@ -430,7 +431,7 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
         """
         for item in items:
             if isinstance(item, ToolReference):
-                await cls._resolve_single_tool_reference(
+                await cls._resolve_tool_reference(
                     "list_item",
                     item,
                     registry,
@@ -463,7 +464,7 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
         """
         for item in mapping.values():
             if isinstance(item, ToolReference):
-                await cls._resolve_single_tool_reference(
+                await cls._resolve_tool_reference(
                     "dict_value",
                     item,
                     registry,
@@ -500,10 +501,10 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
             if field_value is None:
                 continue
             if isinstance(field_value, ToolReference):
-                module_info = self.resolved_tools.get(field_value.slug or "") or field_value.tool_module_info
-                if module_info:
-                    self.resolved_tools[module_info.setup_id] = module_info
-                    cache.add(module_info.module_id, module_info)
+                for tool in field_value.selected_tools:
+                    tool_module_info = self.resolved_tools.get(tool.slug or "")
+                    if tool_module_info:
+                        cache.add(tool_module_info)
             elif isinstance(field_value, BaseModel):
                 self._build_tool_cache_recursive(field_value, cache)
             elif isinstance(field_value, list):
@@ -520,10 +521,10 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
         """
         for item in items:
             if isinstance(item, ToolReference):
-                module_info = self.resolved_tools.get(item.slug or "") or item.tool_module_info
-                if module_info:
-                    self.resolved_tools[module_info.setup_id] = module_info
-                    cache.add(module_info.module_id, module_info)
+                for tool in item.selected_tools:
+                    tool_module_info = self.resolved_tools.get(tool.slug or "")
+                    if tool_module_info:
+                        cache.add(tool_module_info)
             elif isinstance(item, BaseModel):
                 self._build_tool_cache_recursive(item, cache)
 
@@ -536,9 +537,9 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
         """
         for item in mapping.values():
             if isinstance(item, ToolReference):
-                module_info = self.resolved_tools.get(item.slug or "") or item.tool_module_info
-                if module_info:
-                    self.resolved_tools[module_info.setup_id] = module_info
-                    cache.add(module_info.module_id, module_info)
+                for tool in item.selected_tools:
+                    tool_module_info = self.resolved_tools.get(tool.slug or "")
+                    if tool_module_info:
+                        cache.add(tool_module_info)
             elif isinstance(item, BaseModel):
                 self._build_tool_cache_recursive(item, cache)