cli-precedence (#857)

* cli-precedence

* allow passing global config to build

* shorter

Former-commit-id: ec3e850 [formerly ad9e527]
Former-commit-id: c7afdb5

Author: paul-nechifor

dimos/core/blueprints.py

@@ -268,10 +268,16 @@ def _connect_rpc_methods(self, module_coordinator: ModuleCoordinator) -> None:
                     requested_method_name, rpc_methods_dot[requested_method_name]
                 )
 
-    def build(self, global_config: GlobalConfig | None = None) -> ModuleCoordinator:
+    def build(
+        self,
+        global_config: GlobalConfig | None = None,
+        cli_config_overrides: Mapping[str, Any] | None = None,
+    ) -> ModuleCoordinator:
         if global_config is None:
             global_config = GlobalConfig()
-        global_config = global_config.model_copy(update=self.global_config_overrides)
+        global_config = global_config.model_copy(update=dict(self.global_config_overrides))
+        if cli_config_overrides:
+            global_config = global_config.model_copy(update=dict(cli_config_overrides))
 
         self._check_requirements()
         self._verify_no_name_conflicts()

dimos/core/test_blueprints.py

@@ -27,7 +27,6 @@
     autoconnect,
 )
 from dimos.core.core import rpc
-from dimos.core.global_config import GlobalConfig
 from dimos.core.module import Module
 from dimos.core.module_coordinator import ModuleCoordinator
 from dimos.core.rpc_client import RpcCall
@@ -162,7 +161,7 @@ def test_build_happy_path() -> None:
 
     blueprint_set = autoconnect(module_a(), module_b(), module_c())
 
-    coordinator = blueprint_set.build(GlobalConfig())
+    coordinator = blueprint_set.build()
 
     try:
         assert isinstance(coordinator, ModuleCoordinator)
@@ -298,7 +297,7 @@ class TargetModule(Module):
     assert ("color_image", Data1) not in blueprint_set._all_name_types
 
     # Build and verify connections work
-    coordinator = blueprint_set.build(GlobalConfig())
+    coordinator = blueprint_set.build()
 
     try:
         source_instance = coordinator.get_instance(SourceModule)
@@ -351,7 +350,7 @@ def test_future_annotations_autoconnect() -> None:
 
     blueprint_set = autoconnect(FutureModuleOut.blueprint(), FutureModuleIn.blueprint())
 
-    coordinator = blueprint_set.build(GlobalConfig())
+    coordinator = blueprint_set.build()
 
     try:
         out_instance = coordinator.get_instance(FutureModuleOut)

dimos/robot/cli/README.md

@@ -53,8 +53,8 @@ Configuration values can be set from multiple places in order of precedence (lat
 - Default value defined on GlobalConfig. (`simulation = False`)
 - Value defined in `.env` (`SIMULATION=true`)
 - Value in the environment variable (`SIMULATION=true`)
-- Value coming from the CLI (`--simulation` or `--no-simulation`)
 - Value defined on the blueprint (`blueprint.global_config(simulation=True)`)
+- Value coming from the CLI (`--simulation` or `--no-simulation`)
 
 For environment variables/`.env` values, you have to prefix the name with `DIMOS_`.
 

dimos/robot/cli/dimos.py

@@ -15,7 +15,7 @@
 from enum import Enum
 import inspect
 import sys
-from typing import Optional, get_args, get_origin
+from typing import Any, Optional, get_args, get_origin
 
 import typer
 
@@ -89,8 +89,7 @@ def create_dynamic_callback():  # type: ignore[no-untyped-def]
 
     def callback(**kwargs) -> None:  # type: ignore[no-untyped-def]
         ctx = kwargs.pop("ctx")
-        overrides = {k: v for k, v in kwargs.items() if v is not None}
-        ctx.obj = GlobalConfig().model_copy(update=overrides)
+        ctx.obj = {k: v for k, v in kwargs.items() if v is not None}
 
     callback.__signature__ = inspect.Signature(params)  # type: ignore[attr-defined]
 
@@ -111,22 +110,23 @@ def run(
     """Start a robot blueprint"""
     setup_exception_handler()
 
-    config: GlobalConfig = ctx.obj
+    cli_config_overrides: dict[str, Any] = ctx.obj
     pubsub.lcm.autoconf()  # type: ignore[attr-defined]
     blueprint = get_blueprint_by_name(robot_type.value)
 
     if extra_modules:
         loaded_modules = [get_module_by_name(mod_name) for mod_name in extra_modules]  # type: ignore[attr-defined]
         blueprint = autoconnect(blueprint, *loaded_modules)
 
-    dimos = blueprint.build(global_config=config)
+    dimos = blueprint.build(cli_config_overrides=cli_config_overrides)
     dimos.loop()
 
 
 @main.command()
 def show_config(ctx: typer.Context) -> None:
     """Show current config settings and their values."""
-    config: GlobalConfig = ctx.obj
+    cli_config_overrides: dict[str, Any] = ctx.obj
+    config = GlobalConfig().model_copy(update=cli_config_overrides)
 
     for field_name, value in config.model_dump().items():
         typer.echo(f"{field_name}: {value}")