digitalkin 0.3.2.dev30__py3-none-any.whl → 0.3.2.dev31__py3-none-any.whl

digitalkin/__version__.py

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

digitalkin/grpc_servers/module_server.py

@@ -13,7 +13,6 @@ from digitalkin.logger import logger
 from digitalkin.models.grpc_servers.models import (
     ClientConfig,
     ModuleServerConfig,
-    SecurityMode,
 )
 from digitalkin.modules._base_module import BaseModule
 from digitalkin.services.registry import GrpcRegistry
@@ -45,8 +44,8 @@ class ModuleServer(BaseServer):
 
         Args:
             module_class: The module instance to be served.
-            server_config: Server configuration including registry address if auto-registration is desired.
-            client_config: Client configuration used by services.
+            server_config: Server configuration.
+            client_config: Client configuration used by services and registry connection.
         """
         super().__init__(server_config)
         self.module_class = module_class
@@ -55,9 +54,6 @@ class ModuleServer(BaseServer):
         self.module_servicer: ModuleServicer | None = None
         self.registry: RegistryStrategy | None = None
 
-        self._registry_client_config: ClientConfig | None = None
-        if self.server_config.registry_address:
-            self._registry_client_config = self._build_registry_client_config()
         self._prepare_registry_config()
 
     def _register_servicers(self) -> None:
@@ -85,36 +81,17 @@ class ModuleServer(BaseServer):
         This ensures ServicesConfig created by JobManager will have registry config,
         allowing spawned module instances to inherit the registry configuration.
         """
-        if not self._registry_client_config:
+        if not self.client_config:
             return
 
-        self.module_class.services_config_params["registry"] = {"client_config": self._registry_client_config}
-
-    def _build_registry_client_config(self) -> ClientConfig:
-        """Build ClientConfig for registry from server_config.registry_address.
-
-        Returns:
-            ClientConfig configured for registry connection.
-        """
-        host, port = self.server_config.registry_address.rsplit(":", 1)
-        return ClientConfig(
-            host=host,
-            port=int(port),
-            mode=self.server_config.mode,
-            security=self.client_config.security if self.client_config else SecurityMode.INSECURE,
-            credentials=self.client_config.credentials if self.client_config else None,
-        )
+        self.module_class.services_config_params["registry"] = {"client_config": self.client_config}
 
     def _init_registry(self) -> None:
-        """Initialize server-level registry client for registration.
-
-        Note: services_config_params["registry"] is already set in _prepare_registry_config()
-        which runs in __init__(). This method only creates the server-level client instance.
-        """
-        if not self._registry_client_config:
+        """Initialize server-level registry client for registration."""
+        if not self.client_config:
             return
 
-        self.registry = GrpcRegistry("", "", "", self._registry_client_config)
+        self.registry = GrpcRegistry("", "", "", self.client_config)
 
     def start(self) -> None:
         """Start the module server and register with the registry if configured."""
@@ -170,20 +147,21 @@ class ModuleServer(BaseServer):
             )
             return
 
+        advertise_address = self.server_config.advertise_host or self.server_config.host
+
         logger.info(
             "Attempting to register module with registry",
             extra={
                 "module_id": module_id,
-                "address": self.server_config.host,
+                "address": advertise_address,
                 "port": self.server_config.port,
                 "version": version,
-                "registry_address": self.server_config.registry_address,
             },
         )
 
         result = self.registry.register(
             module_id=module_id,
-            address=self.server_config.host,
+            address=advertise_address,
             port=self.server_config.port,
             version=version,
         )
@@ -193,16 +171,12 @@ class ModuleServer(BaseServer):
                 "Module registered successfully",
                 extra={
                     "module_id": result.module_id,
-                    "address": self.server_config.host,
+                    "address": advertise_address,
                     "port": self.server_config.port,
-                    "registry_address": self.server_config.registry_address,
                 },
             )
         else:
             logger.warning(
                 "Module registration returned None (module may not exist in registry)",
-                extra={
-                    "module_id": module_id,
-                    "registry_address": self.server_config.registry_address,
-                },
+                extra={"module_id": module_id, "address": advertise_address},
             )

digitalkin/models/grpc_servers/models.py

@@ -344,10 +344,12 @@ class ModuleServerConfig(ServerConfig):
     """Configuration for Module gRPC server.
 
     Attributes:
-        registry_address: Address of the registry server
+        advertise_host: Public hostname/IP sent to registry for discovery. Falls back to host if not set.
     """
 
-    registry_address: str = Field(..., description="Address of the registry server")
+    advertise_host: str | None = Field(
+        None, description="Public hostname/IP sent to registry for discovery. Falls back to host if not set."
+    )
 
 
 class RegistryServerConfig(ServerConfig):

digitalkin/models/module/tool_reference.py

@@ -43,7 +43,7 @@ class _ToolReferenceInputSchema:
     def __init__(
         self,
         setup_ids: list[str],
-        module_ids: list[str],
+        module_ids: list[str] | None,
         tag_ids: list[str],
         categories: list[str],
         max_tools: int = 0,
@@ -77,16 +77,17 @@ class _ToolReferenceInputSchema:
         json_schema["ui:widget"] = "toolSelect"
         json_schema["ui:options"] = {
             "setupIds": self.setup_ids,
-            "moduleIds": self.module_ids,
             "tagIds": self.tag_ids,
             "categories": self.categories,
+            "moduleIds": self.module_ids or [],
+            "showModules": self.module_ids is not None,
         }
         return json_schema
 
 
 def tool_reference_input(
     setup_ids: list[str] = [],
-    module_ids: list[str] = [],
+    module_ids: list[str] | None = [],
     tag_ids: list[str] = [],
     categories: list[str] = [],
     max_tools: int = 0,

{digitalkin-0.3.2.dev30.dist-info → digitalkin-0.3.2.dev31.dist-info}/METADATA

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

{digitalkin-0.3.2.dev30.dist-info → digitalkin-0.3.2.dev31.dist-info}/RECORD

@@ -7,7 +7,7 @@ base_server/mock/__init__.py,sha256=YZFT-F1l_TpvJYuIPX-7kTeE1CfOjhx9YmNRXVoi-jQ,
 base_server/mock/mock_pb2.py,sha256=sETakcS3PAAm4E-hTCV1jIVaQTPEAIoVVHupB8Z_k7Y,1843
 base_server/mock/mock_pb2_grpc.py,sha256=BbOT70H6q3laKgkHfOx1QdfmCS_HxCY4wCOX84YAdG4,3180
 digitalkin/__init__.py,sha256=7LLBAba0th-3SGqcpqFO-lopWdUkVLKzLZiMtB-mW3M,162
-digitalkin/__version__.py,sha256=ae9RK0HSLfcT6PpMoP-U9CLQQeJH7Ej6t5Jw6ZGL7t8,196
+digitalkin/__version__.py,sha256=kDT339Iyebmk1kRj9jnBqCMyuRyXV0IOMP0tTsMAKAE,196
 digitalkin/logger.py,sha256=8ze_tjt2G6mDTuQcsf7-UTXWP3UHZ7LZVSs_iqF4rX4,4685
 digitalkin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalkin/core/__init__.py,sha256=FJRcJ-B1Viyn-38L8XpOpZ8KOnf1I7PCDOAmKXLQhqc,71
@@ -27,7 +27,7 @@ digitalkin/core/task_manager/task_executor.py,sha256=8xh5_1zuRAaGZIH_gWyNsA4T7YY
 digitalkin/core/task_manager/task_session.py,sha256=5jw21bT_SPXUzWE7tk6YG62EXqlRJcrSakFXDFDRy28,12730
 digitalkin/grpc_servers/__init__.py,sha256=ZIRMJ1Lcas8yQ106GCup6hn2UBOsx1sNk8ap0lpEDnY,72
 digitalkin/grpc_servers/_base_server.py,sha256=ZVeCDwI7w7fFbPTXPkeJb_SOuLfd2T7za3T4oCu2UWY,18680
-digitalkin/grpc_servers/module_server.py,sha256=Ec3izzV2YpdN8rGs_cX-iVulQ00FkLR5dBflHlQ8a6Y,7849
+digitalkin/grpc_servers/module_server.py,sha256=1zjOzLUyQS-y-GWdTJHH1v-JPxq6-ydd8eOYFqxOvaQ,6578
 digitalkin/grpc_servers/module_servicer.py,sha256=yhS5zOxxOTh3aXNVZBbgomRtFa5k6Q7jm-PZh54Gus8,21717
 digitalkin/grpc_servers/utils/__init__.py,sha256=ZnAIb_F8z4NhtPypqkdmzgRSzolKnJTk3oZx5GfWH5Y,38
 digitalkin/grpc_servers/utils/exceptions.py,sha256=LtaDtlqXCeT6iqApogs4pbtezotOVeg4fhnFzGBvFsY,692
@@ -48,7 +48,7 @@ digitalkin/models/core/__init__.py,sha256=jOMDmPX0uSfGA9zUi0u_kOvYJ46VdIssoIhVYv
 digitalkin/models/core/job_manager_models.py,sha256=wvf2dzRzAu0-zzzAXQe6XTC36cNA10sXRLt2p_TFqjk,1003
 digitalkin/models/core/task_monitor.py,sha256=CW-jydSgXMV464W0pqfar0HpgqlSxqdujmC-f8p9EQc,2639
 digitalkin/models/grpc_servers/__init__.py,sha256=0tA71nPSXgRrh9DoLvx-TSwZXdYIRUEItoadpTL1cTo,42
-digitalkin/models/grpc_servers/models.py,sha256=gRX94eL71a5mLIie-lCOwE7a0As_AuGduxPPzTHbAe4,13797
+digitalkin/models/grpc_servers/models.py,sha256=kuoH2QTZwbUa8HsB5e7hm9X2S5tCqKArFKhYxGmaozE,13917
 digitalkin/models/grpc_servers/types.py,sha256=rQ78s4nAet2jy-NIDj_PUWriT0kuGHr_w6ELjmjgBao,539
 digitalkin/models/module/__init__.py,sha256=YDOsaX-4fYaZR6Cs3ksTr6pa0LSzo7lvSzWftLZJuwU,913
 digitalkin/models/module/base_types.py,sha256=oIylVNqo0idTFj4dRgCt7P19daNZ-AlvgCPpL9TJvto,1850
@@ -57,7 +57,7 @@ digitalkin/models/module/module_context.py,sha256=kwaAobsA82Du6L0XH9Is9u6Qj1rEjh
 digitalkin/models/module/module_types.py,sha256=C9azCNBk76xMa-Mww8_6AiwQR8MLAsEyUOvBYxytovI,739
 digitalkin/models/module/setup_types.py,sha256=Jh6zkSoKTdRTU2YsSoLGrVquLcYHvSeFUX9jpEiZyLU,19268
 digitalkin/models/module/tool_cache.py,sha256=xCOH2tr7MN0-b3B_8If3mZvoingJsJB4M032ajfdmIA,6623
-digitalkin/models/module/tool_reference.py,sha256=l1g9p26adO93wSsvtXd4AEtwxceI82lJg96QMAsPjTI,5456
+digitalkin/models/module/tool_reference.py,sha256=ukcq5TdCbJ28ef41vAcNzTqYSH68Kz7h9hPYKwWutvE,5532
 digitalkin/models/module/utility.py,sha256=gnbYfWpXGbomUI0fWf7T-Qm_VvT-LXDv1OuA9zObwVg,5589
 digitalkin/models/services/__init__.py,sha256=jhfVw6egq0OcHmos_fypH9XFehbHTBw09wluVFVFEyw,226
 digitalkin/models/services/cost.py,sha256=9PXvd5RrIk9vCrRjcUGQ9ZyAokEbwLg4s0RfnE-aLP4,1616
@@ -123,7 +123,7 @@ digitalkin/utils/dynamic_schema.py,sha256=y5csxjuqVHjWDpnTUzxbcUuI_wou9-ibRVHQlB
 digitalkin/utils/llm_ready_schema.py,sha256=JjMug_lrQllqFoanaC091VgOqwAd-_YzcpqFlS7p778,2375
 digitalkin/utils/package_discover.py,sha256=sa6Zp5Kape1Zr4iYiNrnZxiHDnqM06ODk6yfWHom53w,13465
 digitalkin/utils/schema_splitter.py,sha256=lMaReyLD4kGAZSQ9MSxpNZ4D4luWANVArFqNWV_bsko,14040
-digitalkin-0.3.2.dev30.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin-0.3.2.dev31.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
 modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modules/archetype_with_tools_module.py,sha256=kJkVhAFWG0aDDqzupOXOnV3l8j3z5bEdWos_6Z9rUP8,7303
 modules/cpu_intensive_module.py,sha256=GZlirQDZdYuXrI46sv1q4RNAHZjL4EptHVQTvgK9zz8,8363
@@ -138,7 +138,7 @@ monitoring/digitalkin_observability/prometheus.py,sha256=gDmM9ySaVwPAe7Yg84pLxmE
 monitoring/tests/test_metrics.py,sha256=ugnYfAwqBPO6zA8z4afKTlyBWECTivacYSN-URQCn2E,5856
 services/filesystem_module.py,sha256=U4dgqtuDadaXz8PJ1d_uQ_1EPncBqudAQCLUICF9yL4,7421
 services/storage_module.py,sha256=Wz2MzLvqs2D_bnBBgtnujYcAKK2V2KFMk8K21RoepSE,6972
-digitalkin-0.3.2.dev30.dist-info/METADATA,sha256=p61ucL27xrbUi7r5PXTNAiQqdV5p_3a1PogbLEvK0mk,29725
-digitalkin-0.3.2.dev30.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-digitalkin-0.3.2.dev30.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
-digitalkin-0.3.2.dev30.dist-info/RECORD,,
+digitalkin-0.3.2.dev31.dist-info/METADATA,sha256=4pklHW30QXZCWTIYNLogl660JTW4KkN7CUbK52NfFE0,29725
+digitalkin-0.3.2.dev31.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+digitalkin-0.3.2.dev31.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
+digitalkin-0.3.2.dev31.dist-info/RECORD,,