model-compose 0.4.0__tar.gz → 0.4.2__tar.gz

{model_compose-0.4.0 → model_compose-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.4.0
+Version: 0.4.2
 Summary: model-compose: Declarative AI Model and Workflow Orchestrator
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT
@@ -153,7 +153,7 @@ By default, `model-compose` automatically looks for a file named `model-compose.
 
 #### 🧪 Minimal Example (with Components and Workflows)
 
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -174,7 +174,7 @@ components:
       model: gpt-4o
       messages:
         - role: user
-          content: Write an inspiring quote.
+          content: "Write an inspiring quote."
     output:
       quote: ${response.choices[0].message.content}
 
@@ -197,7 +197,7 @@ You can easily expand this example by adding more components (e.g., text-to-spee
 
 #### 📡 Listener Example
 
-```yaml
+```
 listener:
   type: http-callback
   port: 8090
@@ -214,7 +214,7 @@ This listener sets up an HTTP callback endpoint at `http://localhost:8090/callba
 
 #### 🌐 Gateway Example
 
-```yaml
+```
 gateway:
   type: http-tunnel
   driver: ngrok
@@ -233,7 +233,7 @@ This gateway configuration exposes the local listener defined above to the publi
 
 #### ✅ Enabling the Web UI
 To enable the Web UI, simply add the `webui` section under your `controller` in the `model-compose.yml` file:
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -253,7 +253,7 @@ By default, `model-compose` uses [Gradio](https://www.gradio.app) as the interac
 
 Here’s how you can do it:
 
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -292,7 +292,7 @@ You can also expose your workflows via the **Model Context Protocol (MCP)** serv
 
 #### ✅ Minimal MCP Server Example
 
-```yaml
+```
 controller:
   type: mcp-server
   port: 8080
@@ -311,7 +311,7 @@ components:
       model: gpt-4o
       messages:
         - role: user
-          content: Write an inspiring quote.
+          content: "Write an inspiring quote."
     output:
       quote: ${response.choices[0].message.content}
 
@@ -326,7 +326,7 @@ This configuration launches the controller as an **MCP server**, which listens o
 
 Once running, you can invoke workflows remotely using a standard MCP request:
 
-```json
+```
 {
   "jsonrpc": "2.0",
   "id": 1,
@@ -349,7 +349,7 @@ You can run the workflow controller inside a Docker container by specifying the
 
 #### ✅ Minimal Docker Runtime Example
 
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -361,7 +361,7 @@ This configuration will launch the controller inside a lightweight Docker contai
 #### ⚙️ Advanced Docker Runtime Options
 You can fully configure the Docker runtime by using an object under the `runtime` key:
 
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -373,11 +373,11 @@ controller:
       - ./models:/models
       - ./cache:/cache
     ports:
-      - 5000:8080
-      - 5001:8081
+      - "5000:8080"
+      - "5001:8081"
     env:
       MODEL_STORAGE_PATH: /models
-    command: [python, -m, mindor.cli.compose, up]
+    command: [ "python", "-m", "mindor.cli.compose", "up" ]
     ...
 ```
 

{model_compose-0.4.0 → model_compose-0.4.2}/README.md

@@ -128,7 +128,7 @@ By default, `model-compose` automatically looks for a file named `model-compose.
 
 #### 🧪 Minimal Example (with Components and Workflows)
 
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -149,7 +149,7 @@ components:
       model: gpt-4o
       messages:
         - role: user
-          content: Write an inspiring quote.
+          content: "Write an inspiring quote."
     output:
       quote: ${response.choices[0].message.content}
 
@@ -172,7 +172,7 @@ You can easily expand this example by adding more components (e.g., text-to-spee
 
 #### 📡 Listener Example
 
-```yaml
+```
 listener:
   type: http-callback
   port: 8090
@@ -189,7 +189,7 @@ This listener sets up an HTTP callback endpoint at `http://localhost:8090/callba
 
 #### 🌐 Gateway Example
 
-```yaml
+```
 gateway:
   type: http-tunnel
   driver: ngrok
@@ -208,7 +208,7 @@ This gateway configuration exposes the local listener defined above to the publi
 
 #### ✅ Enabling the Web UI
 To enable the Web UI, simply add the `webui` section under your `controller` in the `model-compose.yml` file:
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -228,7 +228,7 @@ By default, `model-compose` uses [Gradio](https://www.gradio.app) as the interac
 
 Here’s how you can do it:
 
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -267,7 +267,7 @@ You can also expose your workflows via the **Model Context Protocol (MCP)** serv
 
 #### ✅ Minimal MCP Server Example
 
-```yaml
+```
 controller:
   type: mcp-server
   port: 8080
@@ -286,7 +286,7 @@ components:
       model: gpt-4o
       messages:
         - role: user
-          content: Write an inspiring quote.
+          content: "Write an inspiring quote."
     output:
       quote: ${response.choices[0].message.content}
 
@@ -301,7 +301,7 @@ This configuration launches the controller as an **MCP server**, which listens o
 
 Once running, you can invoke workflows remotely using a standard MCP request:
 
-```json
+```
 {
   "jsonrpc": "2.0",
   "id": 1,
@@ -324,7 +324,7 @@ You can run the workflow controller inside a Docker container by specifying the
 
 #### ✅ Minimal Docker Runtime Example
 
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -336,7 +336,7 @@ This configuration will launch the controller inside a lightweight Docker contai
 #### ⚙️ Advanced Docker Runtime Options
 You can fully configure the Docker runtime by using an object under the `runtime` key:
 
-```yaml
+```
 controller:
   type: http-server
   port: 8080
@@ -348,11 +348,11 @@ controller:
       - ./models:/models
       - ./cache:/cache
     ports:
-      - 5000:8080
-      - 5001:8081
+      - "5000:8080"
+      - "5001:8081"
     env:
       MODEL_STORAGE_PATH: /models
-    command: [python, -m, mindor.cli.compose, up]
+    command: [ "python", "-m", "mindor.cli.compose", "up" ]
     ...
 ```
 

{model_compose-0.4.0 → model_compose-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "model-compose"
-version = "0.4.0"
+version = "0.4.2"
 description = "model-compose: Declarative AI Model and Workflow Orchestrator"
 authors = [
     { name = "Hanyeol Cho", email = "hanyeol.cho@gmail.com" }

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/cli/compose.py

@@ -183,7 +183,7 @@ def run_command(
             env = merge_env_data(env, env_data)
             config = load_compose_config(".", config_files, env)
             input = json.loads(input_json) if input_json else {}
-            state = await run_workflow(config, workflow_id, input, output_path, verbose)
+            state = await run_workflow(config, workflow_id or "__default__", input, output_path, verbose)
             if isinstance(state.output, (dict, list)) or state.error:
                 click.echo(json.dumps(
                     state.output or state.error,

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/component/base.py

@@ -15,25 +15,20 @@ class ActionResolver:
     def __init__(self, actions: List[ActionConfig]):
         self.actions: List[ActionConfig] = actions
 
-    def resolve(self, action_id: Optional[str]) -> Tuple[str, ActionConfig]:
-        action_id = action_id or self._find_default_id(self.actions)
-        action = next((action for action in self.actions if action.id == action_id), None)
+    def resolve(self, action_id: str, raise_on_error: bool = True) -> Union[Tuple[str, ActionConfig], Tuple[None, None]]:
+        if action_id == "__default__":
+            action = self.actions[0] if len(self.actions) == 1 else None
+            action = action or next((action for action in self.actions if action.default), None)
+        else:
+            action = next((action for action in self.actions if action.id == action_id), None)
 
         if action is None:
-            raise ValueError(f"Action not found: {action_id}")
+            if raise_on_error:
+                raise ValueError(f"Action not found: {action_id}")
+            else:
+                return (None, None)
 
-        return action_id, action
-
-    def _find_default_id(self, actions: List[ActionConfig]) -> str:
-        default_ids = [ action.id for action in actions if action.default or action.id == "__default__" ]
-
-        if len(default_ids) > 1: 
-            raise ValueError("Multiple actions have default: true")
-
-        if not default_ids:
-            raise ValueError("No default action defined.")
-
-        return default_ids[0]
+        return action.id, action
 
 class ComponentGlobalConfigs:
     def __init__(
@@ -74,7 +69,7 @@ class ComponentService(AsyncService):
         await super().start(background)
         await self.wait_until_ready()
 
-    async def run(self, action_id: Union[str, None], run_id: str, input: Dict[str, Any]) -> Dict[str, Any]:
+    async def run(self, action_id: str, run_id: str, input: Dict[str, Any]) -> Dict[str, Any]:
         _, action = ActionResolver(self.config.actions).resolve(action_id)
         context = ComponentActionContext(run_id, input)
 

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/component/component.py

@@ -1,6 +1,6 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.component import ComponentConfig
-from .base import ComponentService, ComponentGlobalConfigs, ComponentRegistry
+from .base import ComponentService, ComponentGlobalConfigs, ComponentRegistry, ActionResolver
 
 ComponentInstances: Dict[str, ComponentService] = {}
 
@@ -8,25 +8,20 @@ class ComponentResolver:
     def __init__(self, components: List[ComponentConfig]):
         self.components: List[ComponentConfig] = components
 
-    def resolve(self, component_id: Optional[str]) -> Tuple[str, ComponentConfig]:
-        component_id = component_id or self._find_default_id(self.components)
-        component = next((component for component in self.components if component.id == component_id), None)
+    def resolve(self, component_id: str, raise_on_error: bool = True)  -> Union[Tuple[str, ComponentConfig], Tuple[None, None]]:
+        if component_id == "__default__":
+            component = self.components[0] if len(self.components) == 1 else None
+            component = component or next((component for component in self.components if component.default), None)
+        else:
+            component = next((component for component in self.components if component.id == component_id), None)
 
         if component is None:
-            raise ValueError(f"Component not found: {component_id}")
+            if raise_on_error:
+                raise ValueError(f"Component not found: {component_id}")
+            else:
+                return None, None
 
-        return component_id, component
-
-    def _find_default_id(self, components: List[ComponentConfig]) -> str:
-        default_ids = [ component.id for component in components if component.default or component.id == "__default__" ]
-
-        if len(default_ids) > 1:
-            raise ValueError("Multiple components have default: true")
-
-        if not default_ids:
-            raise ValueError("No default component defined.")
-
-        return default_ids[0]
+        return component.id, component
 
 def create_component(id: str, config: ComponentConfig, global_configs: ComponentGlobalConfigs, daemon: bool) -> ComponentService:
     try:

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/component/services/http_server.py

@@ -57,7 +57,7 @@ class HttpServerPollingCompletion(HttpServerCompletion):
 
 class HttpServerCallbackCompletion(HttpServerCompletion):
     async def run(self, context: ComponentActionContext, client: HttpClient) -> Any:
-        callback_id = await context.render_variable(self.config.wait_for) if self.config.wait_for else "__default__"
+        callback_id = await context.render_variable(self.config.wait_for) if self.config.wait_for else "__callback__"
         future: asyncio.Future = asyncio.get_running_loop().create_future()
         HttpCallbackListener.register_pending_future(callback_id, future)
 

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/component/services/workflow.py

@@ -12,16 +12,15 @@ class WorkflowAction:
         self.global_configs: ComponentGlobalConfigs = global_configs
 
     async def run(self, context: ComponentActionContext) -> Any:
-        workflow_id = await context.render_variable(self.config.workflow)
+        workflow = self._create_workflow(self.config.workflow)
         input = await context.render_variable(self.config.input)
 
-        workflow = self._create_workflow(workflow_id)
         output = await workflow.run(context.run_id, input)
         context.register_source("output", output)
 
         return (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else output
 
-    def _create_workflow(self, workflow_id: Optional[str]) -> Workflow:
+    def _create_workflow(self, workflow_id: str) -> Workflow:
         return create_workflow(*WorkflowResolver(self.global_configs.workflows).resolve(workflow_id), self.global_configs)
 
 @register_component(ComponentType.WORKFLOW)

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/compose/compose.py

@@ -14,5 +14,5 @@ async def start_services(config: ComposeConfig, verbose: bool):
 async def stop_services(config: ComposeConfig, verbose: bool):
     await ComposeManager(config, daemon=False).stop_services(verbose)
 
-async def run_workflow(config: ComposeConfig, workflow_id: Optional[str], input: Dict[str, Any], output_path: Optional[str], verbose: bool) -> TaskState:
+async def run_workflow(config: ComposeConfig, workflow_id: str, input: Dict[str, Any], output_path: Optional[str], verbose: bool) -> TaskState:
     return await ComposeManager(config, daemon=False).run_workflow(workflow_id, input, output_path, verbose)

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/compose/manager.py

@@ -27,7 +27,7 @@ class ComposeManager:
     async def stop_services(self, verbose: bool):
         await self.controller.stop_services(verbose)
 
-    async def run_workflow(self, workflow_id: Optional[str], input: Dict[str, Any], output_path: Optional[str], verbose: bool) -> TaskState:
+    async def run_workflow(self, workflow_id: str, input: Dict[str, Any], output_path: Optional[str], verbose: bool) -> TaskState:
         if not self.controller.started:
             await self.controller.start()
 

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/controller/base.py

@@ -127,7 +127,7 @@ class ControllerService(AsyncService):
             await self._stop_loggers()
             return
 
-    async def run_workflow(self, workflow_id: Optional[str], input: Dict[str, Any], wait_for_completion: bool = True) -> TaskState:
+    async def run_workflow(self, workflow_id: str, input: Dict[str, Any], wait_for_completion: bool = True) -> TaskState:
         task_id = ulid.ulid()
         state = TaskState(task_id=task_id, status=TaskStatus.PENDING)
         with self.task_states_lock:
@@ -232,7 +232,7 @@ class ControllerService(AsyncService):
 
     def _create_components(self) -> List[ComponentService]:
         global_configs = self._get_component_global_configs()
-        return [ create_component(component.id, component, global_configs, self.daemon) for component in self.components ]
+        return [ create_component(component.id or "__default__", component, global_configs, self.daemon) for component in self.components ]
     
     def _create_loggers(self) -> List[LoggerService]:
         return [ create_logger(f"logger-{index}", config, self.daemon) for index, config in enumerate(self.loggers or [ self._get_default_logger_config() ]) ]
@@ -253,7 +253,7 @@ class ControllerService(AsyncService):
     def _get_default_logger_config(self) -> LoggerConfig:
         return ConsoleLoggerConfig(type=LoggerType.CONSOLE)
 
-    async def _run_workflow(self, task_id: str, workflow_id: Optional[str], input: Dict[str, Any]) -> TaskState:
+    async def _run_workflow(self, task_id: str, workflow_id: str, input: Dict[str, Any]) -> TaskState:
         state = TaskState(task_id=task_id, status=TaskStatus.PROCESSING)
         with self.task_states_lock:
             self.task_states.set(task_id, state)

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/controller/runner/http_client.py

@@ -12,6 +12,7 @@ class HttpControllerClient(ControllerClient):
         self.client: HttpClient = HttpClient(self._resolve_controller_url())
 
     async def run_workflow(self, workflow_id: Optional[str], input: Any, workflow: WorkflowSchema) -> Any:
+        url = f"/workflows/{workflow_id or '__default__'}/runs"
         body = {
             "input": input,
             "wait_for_completion": True,
@@ -27,7 +28,7 @@ class HttpControllerClient(ControllerClient):
                 "Content-Type": "multipart/form-data"
             }
 
-        return await self.client.request(f"/workflows/{workflow_id}/runs", "POST", None, body, headers)
+        return await self.client.request(url, "POST", None, body, headers)
 
     async def close(self) -> None:
         await self.client.close()

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/controller/services/http_server.py

@@ -124,11 +124,11 @@ class HttpServerController(ControllerService):
         )
 
     def _configure_routes(self) -> None:
-        @self.router.post("/workflows/runs")
+        @self.router.post("/workflows/__default__/runs")
         async def run_default_workflow(
             request: Request
         ):
-            return await self._handle_workflow_run_request(request, None)
+            return await self._handle_workflow_run_request(request, "__default__")
 
         @self.router.post("/workflows/{workflow_id}/runs")
         async def run_workflow(

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/listener/services/http_callback.py

@@ -76,7 +76,7 @@ class HttpCallbackListener(ListenerService):
             succeeded = await self._is_callback_succeeded(callback, context)
 
             async for item in context.items():
-                callback_id = await item.render_variable(callback.identify_by) if callback.identify_by else "__default__"
+                callback_id = await item.render_variable(callback.identify_by) if callback.identify_by else "__callback__"
                 future: asyncio.Future = self._get_pending_future(callback_id)
 
                 if future:

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/workflow/job/impl/action.py

@@ -14,7 +14,7 @@ class ActionJob(Job):
         super().__init__(id, config, global_configs)
 
     async def run(self, context: WorkflowContext) -> Union[Any, RoutingTarget]:
-        component: ComponentService = self._create_component(self.id, await context.render_variable(self.config.component))
+        component: ComponentService = self._create_component(self.id, self.config.component)
 
         if not component.started:
             await component.start()
@@ -28,7 +28,7 @@ class ActionJob(Job):
             job_time_tracker = TimeTracker()
             logging.debug("[task-%s] Action 'run-%s' started for job '%s'", context.task_id, run_id, self.id)
 
-            output = await component.run(await context.render_variable(self.config.action), run_id, input)
+            output = await component.run(self.config.action, run_id, input)
             context.register_source("output", output)
 
             logging.debug("[task-%s] Action 'run-%s' completed in %.2f seconds.", context.task_id, run_id, job_time_tracker.elapsed())

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/workflow/schema.py

@@ -5,6 +5,8 @@ from mindor.dsl.schema.workflow import WorkflowConfig, WorkflowVariableConfig, W
 from mindor.dsl.schema.job import ActionJobConfig, OutputJobConfig
 from mindor.dsl.schema.component import ComponentConfig, ComponentType
 from mindor.dsl.schema.action import ActionConfig
+from mindor.core.component import ComponentResolver, ActionResolver
+from mindor.core.workflow import WorkflowResolver
 import re, json
 
 @dataclass
@@ -203,15 +205,14 @@ class WorkflowInputVariableResolver(WorkflowVariableResolver):
 
         for job in workflow.jobs:
             if isinstance(job, ActionJobConfig) and (not job.input or job.input == "${input}"):
-                action_id = job.action or "__default__"
                 if isinstance(job.component, str):
-                    component = next((component for component in components if component.id == job.component), None)
+                    _, component = ComponentResolver(components).resolve(job.component, raise_on_error=False)
                     if component:
-                        action = next((action for action in component.actions if action.id == action_id), None)
+                        _, action = ActionResolver(component.actions).resolve(job.action, raise_on_error=False)
                         if action:
                             variables.extend(self._resolve_component(component, action, workflows, components))
                 else:
-                    action = next((action for action in job.component.actions if action.id == action_id), None)
+                    _, action = ActionResolver(job.component.actions).resolve(job.action, raise_on_error=False)
                     if action:
                         variables.extend(self._resolve_component(job.component, action, workflows, components))
             else:
@@ -223,8 +224,7 @@ class WorkflowInputVariableResolver(WorkflowVariableResolver):
         variables: List[WorkflowVariable] = []
      
         if component.type == ComponentType.WORKFLOW:
-            workflow_id = action.workflow or "__default__"
-            workflow = next((workflow for workflow in workflows if workflow.id == workflow_id), None)
+            _, workflow = WorkflowResolver(workflows).resolve(action.workflow, raise_on_error=False)
             if workflow:
                 variables.extend(self._resolve_workflow(workflow, workflows, components))
         else:
@@ -251,17 +251,16 @@ class WorkflowOutputVariableResolver(WorkflowVariableResolver):
                 variables.append(WorkflowVariableGroup(variables=(job_variables := []), repeat_count=repeat_count))
 
             if isinstance(job, ActionJobConfig) and (not job.output or job.output == "${output}"):
-                action_id = job.action or "__default__"
                 if isinstance(job.component, str):
-                    component = next((component for component in components if component.id == job.component), None)
+                    _, component = ComponentResolver(components).resolve(job.component, raise_on_error=False)
                     if component:
-                        action = next((action for action in component.actions if action.id == action_id), None)
+                        _, action = ActionResolver(component.actions).resolve(job.action, raise_on_error=False)
                         if action:
-                            job_variables.extend(self._resolve_component(component, action, workflows, components))           
+                            job_variables.extend(self._resolve_component(component, action, workflows, components))
                 else:
-                    action = next((action for action in job.component.actions if action.id == action_id), None)
+                    _, action = ActionResolver(job.component.actions).resolve(job.action, raise_on_error=False)
                     if action:
-                        job_variables.extend(self._resolve_component(component, action, workflows, components))           
+                        job_variables.extend(self._resolve_component(job.component, action, workflows, components))
             else:
                 if isinstance(job, OutputJobConfig):
                     job_variables.extend(self._enumerate_output_variables(None, job.output, internal=internal))
@@ -272,8 +271,7 @@ class WorkflowOutputVariableResolver(WorkflowVariableResolver):
         variables: List[Union[WorkflowVariable, WorkflowVariableGroup]] = []
 
         if component.type == ComponentType.WORKFLOW:
-            workflow_id = action.workflow or "__default__"
-            workflow = next((workflow for workflow in workflows if workflow.id == workflow_id), None)
+            _, workflow = WorkflowResolver(workflows).resolve(action.workflow)
             if workflow:
                 variables.extend(self._resolve_workflow(workflow, workflows, components, internal=True))
         else:

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/core/workflow/workflow.py

@@ -57,25 +57,20 @@ class WorkflowResolver:
     def __init__(self, workflows: List[WorkflowConfig]):
         self.workflows: List[WorkflowConfig] = workflows
 
-    def resolve(self, workflow_id: Optional[str]) -> Tuple[str, WorkflowConfig]:
-        workflow_id = workflow_id or self._find_default_id(self.workflows)
-        workflow = next((workflow for workflow in self.workflows if workflow.id == workflow_id), None)
+    def resolve(self, workflow_id: str, raise_on_error: bool = True) -> Union[Tuple[str, WorkflowConfig], Tuple[None, None]]:
+        if workflow_id == "__default__":
+            workflow = self.workflows[0] if len(self.workflows) == 1 else None
+            workflow = workflow or next((workflow for workflow in self.workflows if workflow.default), None)
+        else:
+            workflow = next((workflow for workflow in self.workflows if workflow.id == workflow_id), None)
 
         if workflow is None:
-            raise ValueError(f"Workflow not found: {workflow_id}")
+            if raise_on_error:
+                raise ValueError(f"Workflow not found: {workflow_id}")
+            else:
+                return (None, None)
 
-        return workflow_id, workflow
-
-    def _find_default_id(self, workflows: List[WorkflowConfig]) -> str:
-        default_ids = [ workflow.id for workflow in workflows if workflow.default or workflow.id == "__default__" ]
-
-        if len(default_ids) > 1:
-            raise ValueError("Multiple workflows have default: true")
-
-        if not default_ids:
-            raise ValueError("No default workflow defined.")
-
-        return default_ids[0]
+        return workflow.id, workflow
 
 class WorkflowRunner:
     def __init__(self, id: str, jobs: List[JobConfig], global_configs: ComponentGlobalConfigs):

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/dsl/schema/action/impl/common.py

@@ -1,7 +1,14 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from pydantic import BaseModel, Field
+from pydantic import field_validator
 
 class CommonActionConfig(BaseModel):
-    id: str = Field(default="__default__", description="ID of action.")
+    id: str = Field(default="__action__", description="ID of action.")
     output: Optional[Any] = Field(default=None, description="Output mapping to transform and extract specific values from the action result.")
     default: bool = Field(default=False, description="Whether this action should be used as the default.")
+
+    @field_validator("id")
+    def validate_id(cls, value):
+        if value == "__default__":
+            raise ValueError("Action id cannot be '__default__'")
+        return value

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/dsl/schema/action/impl/mcp_client.py

@@ -4,6 +4,6 @@ from pydantic import model_validator
 from .common import CommonActionConfig
 
 class McpClientActionConfig(CommonActionConfig):
-    tool: str = Field(default="__default__", description="Name of the tool to invoke.")
+    tool: str = Field(default="__tool__", description="Name of the tool to invoke.")
     arguments: Dict[str, Any] = Field(default_factory=dict, description="Arguments to pass to the tool.")
     headers: Dict[str, str] = Field(default_factory=dict, description="Optional HTTP headers to include in the tool call.")

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/dsl/schema/action/impl/mcp_server.py

@@ -4,6 +4,6 @@ from pydantic import model_validator
 from .common import CommonActionConfig
 
 class McpServerActionConfig(CommonActionConfig):
-    tool: str = Field(default="__default__", description="Name of the tool to invoke.")
+    tool: str = Field(default="__tool__", description="Name of the tool to invoke.")
     arguments: Dict[str, Any] = Field(default_factory=dict, description="Arguments to pass to the tool.")
     headers: Dict[str, str] = Field(default_factory=dict, description="Optional HTTP headers to include in the tool call.")

{model_compose-0.4.0 → model_compose-0.4.2}/src/mindor/dsl/schema/component/impl/common.py

@@ -1,14 +1,21 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from enum import Enum
 from pydantic import BaseModel, Field
+from pydantic import field_validator
 from mindor.dsl.schema.action import CommonActionConfig
 from mindor.dsl.schema.runtime import RuntimeType
 from .types import ComponentType
 
 class CommonComponentConfig(BaseModel):
-    id: str = Field(default="__default__", description="ID of component.")
+    id: str = Field(default="__component__", description="ID of component.")
     type: ComponentType = Field(..., description="Type of component.")
     runtime: RuntimeType = Field(default=RuntimeType.NATIVE, description="Runtime environment used to execute this component.")
     max_concurrent_count: int = Field(default=1, description="Maximum number of concurrent actions this component can handle.")
     default: bool = Field(default=False, description="Whether to use this component when no component is explicitly specified.")
     actions: List[CommonActionConfig] = Field(default_factory=list, description="Actions available within this component.")
+
+    @field_validator("id")
+    def validate_id(cls, value):
+        if value == "__default__":
+            raise ValueError("Component id cannot be '__default__'")
+        return value