model-compose 0.2.0__tar.gz → 0.2.1__tar.gz

{model_compose-0.2.0 → model_compose-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.2.0
+Version: 0.2.1
 Summary: model-compose: Declarative AI Model and Workflow Orchestrator
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT

{model_compose-0.2.0 → model_compose-0.2.1}/pyproject.toml

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

{model_compose-0.2.0/src/mindor/core/component/engine → model_compose-0.2.1/src/mindor/core/component}/base.py

@@ -1,6 +1,5 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Any
 from abc import ABC, abstractmethod
-
 from mindor.dsl.schema.component import ComponentConfig, ComponentType
 from mindor.dsl.schema.action import ActionConfig
 from mindor.core.services import AsyncService
@@ -66,4 +65,10 @@ class ComponentEngine(AsyncService):
     async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:
         pass
 
-ComponentEngineMap: Dict[ComponentType, Type[ComponentEngine]] = {}
+def register_component(type: ComponentType):
+    def decorator(cls: Type[ComponentEngine]) -> Type[ComponentEngine]:
+        ComponentRegistry[type] = cls
+        return cls
+    return decorator
+
+ComponentRegistry: Dict[ComponentType, Type[ComponentEngine]] = {}

{model_compose-0.2.0 → model_compose-0.2.1}/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 .engine import ComponentEngine, ComponentEngineMap
+from .base import ComponentEngine, ComponentRegistry
 
 ComponentInstances: Dict[str, ComponentEngine] = {}
 
@@ -32,7 +32,9 @@ def create_component(id: str, config: ComponentConfig, daemon: bool) -> Componen
         component = ComponentInstances[id] if id in ComponentInstances else None
 
         if not component:
-            component = ComponentEngineMap[config.type](id, config, daemon)
+            if not ComponentRegistry:
+                from . import engine
+            component = ComponentRegistry[config.type](id, config, daemon)
             ComponentInstances[id] = component
 
         return component

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/component/engine/__init__.py

@@ -1,6 +1,6 @@
-from .base import *
 from .http_server import *
 from .http_client import *
 from .mcp_server import *
 from .mcp_client import *
+from .workflow import *
 from .shell import *

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/component/engine/http_client.py

@@ -6,8 +6,8 @@ from mindor.core.listener import HttpCallbackListener
 from mindor.core.utils.http_client import HttpClient
 from mindor.core.utils.http_status import is_status_code_matched
 from mindor.core.utils.time import parse_duration
-from .base import ComponentEngine, ComponentType, ComponentEngineMap
-from .context import ComponentActionContext
+from ..base import ComponentEngine, ComponentType, register_component
+from ..context import ComponentActionContext
 from datetime import datetime, timezone
 import asyncio
 
@@ -111,6 +111,7 @@ class HttpClientAction:
 
         return await context.render_variable(self.config.endpoint)
 
+@register_component(ComponentType.HTTP_CLIENT)
 class HttpClientComponent(ComponentEngine):
     def __init__(self, id: str, config: HttpClientComponentConfig, daemon: bool):
         super().__init__(id, config, daemon)
@@ -126,5 +127,3 @@ class HttpClientComponent(ComponentEngine):
 
     async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:
         return await HttpClientAction(action).run(context, self.client)
-
-ComponentEngineMap[ComponentType.HTTP_CLIENT] = HttpClientComponent

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/component/engine/http_server.py

@@ -1,8 +1,9 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.component import HttpServerComponentConfig
-from .base import ComponentEngine, ComponentType, ComponentEngineMap, ActionConfig
-from .context import ComponentActionContext
+from ..base import ComponentEngine, ComponentType, ActionConfig, register_component
+from ..context import ComponentActionContext
 
+@register_component(ComponentType.HTTP_SERVER)
 class HttpServerComponent(ComponentEngine):
     def __init__(self, id: str, config: HttpServerComponentConfig, daemon: bool):
         super().__init__(id, config, daemon)
@@ -15,5 +16,3 @@ class HttpServerComponent(ComponentEngine):
 
     async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:
         return {}
-
-ComponentEngineMap[ComponentType.HTTP_SERVER] = HttpServerComponent

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/component/engine/mcp_client.py

@@ -2,8 +2,8 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from mindor.dsl.schema.component import McpClientComponentConfig
 from mindor.dsl.schema.action import ActionConfig, McpClientActionConfig
 from mindor.core.utils.mcp_client import McpClient, ContentBlock, TextContent, ImageContent, AudioContent
-from .base import ComponentEngine, ComponentType, ComponentEngineMap, ActionConfig
-from .context import ComponentActionContext
+from ..base import ComponentEngine, ComponentType, ActionConfig, register_component
+from ..context import ComponentActionContext
 
 class McpClientAction():
     def __init__(self, config: McpClientActionConfig):
@@ -27,6 +27,7 @@ class McpClientAction():
 
         return None
 
+@register_component(ComponentType.MCP_CLIENT)
 class McpClientComponent(ComponentEngine):
     def __init__(self, id: str, config: McpClientComponentConfig, daemon: bool):
         super().__init__(id, config, daemon)
@@ -40,5 +41,3 @@ class McpClientComponent(ComponentEngine):
 
     async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:
         return await McpClientAction(action).run(context, self.client)
-
-ComponentEngineMap[ComponentType.MCP_CLIENT] = McpClientComponent

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/component/engine/mcp_server.py

@@ -1,8 +1,9 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.component import McpServerComponentConfig
-from .base import ComponentEngine, ComponentType, ComponentEngineMap, ActionConfig
-from .context import ComponentActionContext
+from ..base import ComponentEngine, ComponentType, ActionConfig, register_component
+from ..context import ComponentActionContext
 
+@register_component(ComponentType.MCP_SERVER)
 class McpServerComponent(ComponentEngine):
     def __init__(self, id: str, config: McpServerComponentConfig, daemon: bool):
         super().__init__(id, config, daemon)
@@ -15,5 +16,3 @@ class McpServerComponent(ComponentEngine):
 
     async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:
         return {}
-
-ComponentEngineMap[ComponentType.MCP_SERVER] = McpServerComponent

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/component/engine/shell.py

@@ -1,8 +1,8 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.component import ShellComponentConfig
 from mindor.dsl.schema.action import ActionConfig, ShellActionConfig
-from .base import ComponentEngine, ComponentType, ComponentEngineMap, ActionConfig
-from .context import ComponentActionContext
+from ..base import ComponentEngine, ComponentType, ActionConfig, register_component
+from ..context import ComponentActionContext
 from asyncio.subprocess import Process
 import asyncio, os
 
@@ -64,6 +64,7 @@ class ShellAction:
             working_dir = self.base_dir or os.getcwd()
         return working_dir
 
+@register_component(ComponentType.SHELL)
 class ShellComponent(ComponentEngine):
     def __init__(self, id: str, config: ShellComponentConfig, daemon: bool):
         super().__init__(id, config, daemon)
@@ -76,5 +77,3 @@ class ShellComponent(ComponentEngine):
 
     async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:
         return await ShellAction(action, self.config.base_dir, self.config.env).run(context)
-
-ComponentEngineMap[ComponentType.SHELL] = ShellComponent

model_compose-0.2.1/src/mindor/core/component/engine/workflow.py

@@ -0,0 +1,41 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from mindor.dsl.schema.component import ComponentConfig, WorkflowComponentConfig
+from mindor.dsl.schema.action import ActionConfig, WorkflowActionConfig
+from mindor.dsl.schema.workflow import WorkflowConfig
+from mindor.core.workflow import Workflow, WorkflowResolver, create_workflow
+from ..base import ComponentEngine, ComponentType, ActionConfig, register_component
+from ..context import ComponentActionContext
+import asyncio, os
+
+class WorkflowAction:
+    def __init__(self, config: WorkflowActionConfig):
+        self.config: WorkflowActionConfig = config
+        self.components: Dict[str, ComponentConfig] = None
+        self.workflows: Dict[str, WorkflowConfig] = None
+
+    async def run(self, context: ComponentActionContext) -> Any:
+        workflow_id = await context.render_variable(self.config.workflow)
+        input = await context.render_variable(self.config.input)
+
+        workflow = self._create_workflow(workflow_id)
+        output = await workflow.run(context.call_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:
+        return create_workflow(*WorkflowResolver(self.workflows).resolve(workflow_id), self.components)
+
+@register_component(ComponentType.WORKFLOW)
+class WorkflowComponent(ComponentEngine):
+    def __init__(self, id: str, config: WorkflowComponentConfig, daemon: bool):
+        super().__init__(id, config, daemon)
+
+    async def _serve(self) -> None:
+        pass
+
+    async def _shutdown(self) -> None:
+        pass
+
+    async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:
+        return await WorkflowAction(action).run(context)

{model_compose-0.2.0/src/mindor/core/controller/engine → model_compose-0.2.1/src/mindor/core/controller}/base.py

@@ -127,7 +127,7 @@ class ControllerEngine(AsyncService):
             self.task_states.set(task_id, state)
         
         try:
-            workflow = create_workflow(*WorkflowResolver(self.workflows).resolve(workflow_id), self.components)
+            workflow = self._create_workflow(workflow_id)
             output = await workflow.run(task_id, input)
             state = TaskState(task_id=task_id, status="completed", output=output)
         except Exception as e:
@@ -153,4 +153,10 @@ class ControllerEngine(AsyncService):
     def _create_workflow(self, workflow_id: Optional[str]) -> Workflow:
         return create_workflow(*WorkflowResolver(self.workflows).resolve(workflow_id), self.components)
 
-ControllerEngineMap: Dict[ControllerType, Type[ControllerEngine]] = {}
+def register_controller(type: ControllerType):
+    def decorator(cls: Type[ControllerEngine]) -> Type[ControllerEngine]:
+        ControllerRegistry[type] = cls
+        return cls
+    return decorator
+
+ControllerRegistry: Dict[ControllerType, Type[ControllerEngine]] = {}

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/controller/controller.py

@@ -4,7 +4,7 @@ from mindor.dsl.schema.component import ComponentConfig
 from mindor.dsl.schema.listener import ListenerConfig
 from mindor.dsl.schema.gateway import GatewayConfig
 from mindor.dsl.schema.workflow import WorkflowConfig
-from .engine import ControllerEngine, ControllerEngineMap
+from .base import ControllerEngine, ControllerRegistry
 
 def create_controller(
     config: ControllerConfig, 
@@ -15,6 +15,8 @@ def create_controller(
     daemon: bool
 ) -> ControllerEngine:
     try:
-        return ControllerEngineMap[config.type](config, components, listeners, gateways, workflows, daemon)
+        if not ControllerRegistry:
+            from . import engine
+        return ControllerRegistry[config.type](config, components, listeners, gateways, workflows, daemon)
     except KeyError:
         raise ValueError(f"Unsupported controller type: {config.type}")

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/controller/engine/__init__.py

@@ -1,3 +1,2 @@
-from .base import *
 from .http_server import *
 from .mcp_server import *

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/controller/engine/http_server.py

@@ -1,7 +1,6 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from typing_extensions import Self
 from pydantic import BaseModel
-
 from mindor.dsl.schema.controller import HttpServerControllerConfig
 from mindor.dsl.schema.component import ComponentConfig
 from mindor.dsl.schema.listener import ListenerConfig
@@ -9,8 +8,7 @@ from mindor.dsl.schema.gateway import GatewayConfig
 from mindor.dsl.schema.workflow import WorkflowConfig
 from mindor.core.utils.http_request import parse_request_body, parse_options_header
 from mindor.core.utils.streaming import StreamResource
-from .base import ControllerEngine, ControllerType, ControllerEngineMap, TaskState
-
+from ..base import ControllerEngine, ControllerType, TaskState, register_controller
 from fastapi import FastAPI, APIRouter, Request, Body, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import Response, JSONResponse, StreamingResponse
@@ -38,6 +36,7 @@ class TaskResult(BaseModel):
             error=instance.error
         )
 
+@register_controller(ControllerType.HTTP_SERVER)
 class HttpServerController(ControllerEngine):
     def __init__(
         self,
@@ -160,5 +159,3 @@ class HttpServerController(ControllerEngine):
             headers["Content-Disposition"] = f'attachment; filename="{filename}"'
 
         return headers
-
-ControllerEngineMap[ControllerType.HTTP_SERVER] = HttpServerController

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/controller/engine/mcp_server.py

@@ -8,7 +8,7 @@ from mindor.core.workflow.schema import WorkflowSchema, create_workflow_schema
 from mindor.core.utils.streaming import StreamResource, Base64StreamResource
 from mindor.core.utils.streaming import save_stream_to_temporary_file
 from mindor.core.utils.http_client import create_stream_with_url
-from .base import ControllerEngine, ControllerType, ControllerEngineMap, TaskState
+from ..base import ControllerEngine, ControllerType, TaskState, register_controller
 from mcp.server.fastmcp.server import FastMCP
 from mcp.types import TextContent, ImageContent, AudioContent
 import uvicorn, re, json
@@ -132,6 +132,7 @@ class WorkflowToolGenerator():
 
         return "str"
 
+@register_controller(ControllerType.MCP_SERVER)
 class McpServerController(ControllerEngine):
     def __init__(
         self,
@@ -180,5 +181,3 @@ class McpServerController(ControllerEngine):
     async def _shutdown(self) -> None:
         if self.server:
             self.server.should_exit = True
-
-ControllerEngineMap[ControllerType.MCP_SERVER] = McpServerController

model_compose-0.2.1/src/mindor/core/gateway/__init__.py

@@ -0,0 +1,2 @@
+from .gateway import *
+from .engine import HttpTunnelGateway, SshTunnelGateway

{model_compose-0.2.0/src/mindor/core/gateway/engine → model_compose-0.2.1/src/mindor/core/gateway}/base.py

@@ -14,4 +14,10 @@ class GatewayEngine(AsyncService):
     def get_context(self) -> Dict[str, Any]:
         pass
 
-GatewayEngineMap: Dict[GatewayType, Type[GatewayEngine]] = {}
+def register_gateway(type: GatewayType):
+    def decorator(cls: Type[GatewayEngine]) -> Type[GatewayEngine]:
+        GatewayRegistry[type] = cls
+        return cls
+    return decorator
+
+GatewayRegistry: Dict[GatewayType, Type[GatewayEngine]] = {}

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/gateway/engine/__init__.py

@@ -1,2 +1,2 @@
-from .base import *
 from .http_tunnel import *
+from .ssh_tunnel import *

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/gateway/engine/http_tunnel.py

@@ -1,8 +1,9 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Iterator, Any
 from mindor.dsl.schema.gateway import HttpTunnelGatewayConfig
-from .base import GatewayEngine, GatewayType, GatewayEngineMap
+from ..base import GatewayEngine, GatewayType, register_gateway
 from pyngrok import ngrok
 
+@register_gateway(GatewayType.HTTP_TUNNEL)
 class HttpTunnelGateway(GatewayEngine):
     def __init__(self, id: str, config: HttpTunnelGatewayConfig, daemon: bool):
         super().__init__(id, config, daemon)
@@ -29,5 +30,3 @@ class HttpTunnelGateway(GatewayEngine):
                 self.tunnel = None
                 self.public_url = None
             return
-  
-GatewayEngineMap[GatewayType.HTTP_TUNNEL] = HttpTunnelGateway

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/gateway/engine/ssh_tunnel.py

@@ -1,8 +1,9 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Iterator, Any
 from mindor.dsl.schema.gateway import SshTunnelGatewayConfig
-from .base import GatewayEngine, GatewayType, GatewayEngineMap
+from ..base import GatewayEngine, GatewayType, register_gateway
 from pyngrok import ngrok
 
+@register_gateway(GatewayType.SSH_TUNNEL)
 class SshTunnelGateway(GatewayEngine):
     def __init__(self, id: str, config: SshTunnelGatewayConfig, daemon: bool):
         super().__init__(id, config, daemon)
@@ -21,5 +22,3 @@ class SshTunnelGateway(GatewayEngine):
 
     async def _shutdown(self) -> None:
         pass
-  
-GatewayEngineMap[GatewayType.SSH_TUNNEL] = SshTunnelGateway

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/gateway/gateway.py

@@ -1,6 +1,6 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.gateway import GatewayConfig
-from .engine import GatewayEngine, GatewayEngineMap
+from .base import GatewayEngine, GatewayRegistry
 
 GatewayInstances: Dict[str, GatewayEngine] = {}
 
@@ -9,7 +9,9 @@ def create_gateway(id: str, config: GatewayConfig, daemon: bool) -> GatewayEngin
         gateway = GatewayInstances[id] if id in GatewayInstances else None
 
         if not gateway:
-            gateway = GatewayEngineMap[config.type](id, config, daemon)
+            if not GatewayRegistry:
+                from . import engine
+            gateway = GatewayRegistry[config.type](id, config, daemon)
             GatewayInstances[id] = gateway
 
         return gateway

{model_compose-0.2.0/src/mindor/core/listener/engine → model_compose-0.2.1/src/mindor/core/listener}/base.py

@@ -26,4 +26,10 @@ class ListenerEngine(AsyncService):
 
         await super()._stop()
 
-ListenerEngineMap: Dict[ListenerType, Type[ListenerEngine]] = {}
+def register_listener(type: ListenerType):
+    def decorator(cls: Type[ListenerEngine]) -> Type[ListenerEngine]:
+        ListenerRegistry[type] = cls
+        return cls
+    return decorator
+
+ListenerRegistry: Dict[ListenerType, Type[ListenerEngine]] = {}

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/listener/engine/__init__.py

@@ -1,2 +1 @@
-from .base import *
 from .http_callback import *

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/listener/engine/http_callback.py

@@ -3,7 +3,7 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from mindor.dsl.schema.listener import HttpCallbackListenerConfig, HttpCallbackConfig
 from mindor.core.utils.http_request import parse_request_body, parse_options_header
 from mindor.core.utils.renderer import VariableRenderer
-from .base import ListenerEngine, ListenerType, ListenerEngineMap
+from ..base import ListenerEngine, ListenerType, register_listener
 
 from fastapi import FastAPI, APIRouter, Body, HTTPException, Request
 from fastapi.responses import Response, JSONResponse
@@ -45,6 +45,7 @@ class HttpCallbackContext:
             return self.query
         raise KeyError(f"Unknown source: {key}")
 
+@register_listener(ListenerType.HTTP_CALLBACK)
 class HttpCallbackListener(ListenerEngine):
     def __init__(self, id: str, config: HttpCallbackListenerConfig, daemon: bool):
         super().__init__(id, config, daemon)
@@ -124,5 +125,3 @@ class HttpCallbackListener(ListenerEngine):
     def register_pending_future(cls, id: str, future: asyncio.Future) -> None:
         with _pending_futures_lock:
             _pending_futures[id] = future
-
-ListenerEngineMap[ListenerType.HTTP_CALLBACK] = HttpCallbackListener

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/listener/listener.py

@@ -1,6 +1,6 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.listener import ListenerConfig
-from .engine import ListenerEngine, ListenerEngineMap
+from .base import ListenerEngine, ListenerRegistry
 
 ListenerInstances: Dict[str, ListenerEngine] = {}
 
@@ -9,7 +9,9 @@ def create_listener(id: str, config: ListenerConfig, daemon: bool) -> ListenerEn
         listener = ListenerInstances[id] if id in ListenerInstances else None
 
         if not listener:
-            listener = ListenerEngineMap[config.type](id, config, daemon)
+            if not ListenerEngine:
+                from . import engine
+            listener = ListenerRegistry[config.type](id, config, daemon)
             ListenerInstances[id] = listener
 
         return listener

{model_compose-0.2.0/src/mindor/core/workflow/job/impl → model_compose-0.2.1/src/mindor/core/workflow/job}/base.py

@@ -14,4 +14,10 @@ class Job(ABC):
     async def run(self, context: WorkflowContext) -> Any:
         pass
 
-JobMap: Dict[JobType, Type[Job]] = {}
+def register_job(type: JobType):
+    def decorator(cls: Type[Job]) -> Type[Job]:
+        JobRegistry[type] = cls
+        return cls
+    return decorator
+
+JobRegistry: Dict[JobType, Type[Job]] = {}

model_compose-0.2.1/src/mindor/core/workflow/job/impl/__init__.py

@@ -0,0 +1,2 @@
+from .action import *
+from .delay import *

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/workflow/job/impl/action.py

@@ -2,9 +2,10 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from mindor.dsl.schema.job import ActionJobConfig, JobType
 from mindor.dsl.schema.component import ComponentConfig
 from mindor.core.component import ComponentEngine, ComponentResolver, create_component
-from .base import Job, JobMap, WorkflowContext
+from ..base import Job, JobType, WorkflowContext, register_job
 import asyncio, ulid
 
+@register_job(JobType.ACTION)
 class ActionJob(Job):
     def __init__(self, id: str, config: ActionJobConfig, components: Dict[str, ComponentConfig]):
         super().__init__(id, config, components)
@@ -42,5 +43,3 @@ class ActionJob(Job):
             return ComponentResolver(self.components).resolve(component)
     
         return id, component
-
-JobMap[JobType.ACTION] = ActionJob

model_compose-0.2.0/src/mindor/core/workflow/job/impl/wait.py → model_compose-0.2.1/src/mindor/core/workflow/job/impl/delay.py

@@ -1,25 +1,26 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Any
-from mindor.dsl.schema.job import WaitJobConfig, WaitJobType
+from mindor.dsl.schema.job import DelayJobConfig, DelayJobMode
 from mindor.dsl.schema.component import ComponentConfig
 from mindor.core.utils.time import parse_duration, parse_datetime
-from .base import Job, JobType, JobMap, WorkflowContext
+from ..base import Job, JobType, WorkflowContext, register_job
 from datetime import datetime
 import asyncio
 
-class WaitJob(Job):
-    def __init__(self, id: str, config: WaitJobConfig, components: Dict[str, ComponentConfig]):
+@register_job(JobType.DELAY)
+class DelayJob(Job):
+    def __init__(self, id: str, config: DelayJobConfig, components: Dict[str, ComponentConfig]):
         super().__init__(id, config, components)
 
     async def run(self, context: WorkflowContext) -> Any:
-        if self.config.mode == WaitJobType.TIME_INTERVAL:
-            return await self._wait_until_time_interval(context)
+        if self.config.mode == DelayJobMode.TIME_INTERVAL:
+            return await self._delay_for_time_interval(context)
 
-        if self.config.mode == WaitJobType.SPECIFIC_TIME:
-            return await self._wait_until_specific_time(context)
+        if self.config.mode == DelayJobMode.SPECIFIC_TIME:
+            return await self._delay_until_specific_time(context)
 
         return None
     
-    async def _wait_until_time_interval(self, context: WorkflowContext) -> Any:
+    async def _delay_for_time_interval(self, context: WorkflowContext) -> Any:
         duration = parse_duration((await context.render_variable(self.config.duration)) or 0.0)
         duration = duration.total_seconds()
         
@@ -28,7 +29,7 @@ class WaitJob(Job):
 
         return None
 
-    async def _wait_until_specific_time(self, context: WorkflowContext) -> Any:
+    async def _delay_until_specific_time(self, context: WorkflowContext) -> Any:
         timezone = await context.render_variable(self.config.timezone)
         time = parse_datetime((await context.render_variable(self.config.time)) or datetime(2000, 1, 1, 0, 0, 0), timezone)
         
@@ -39,5 +40,3 @@ class WaitJob(Job):
             await asyncio.sleep(duration)
 
         return None
-
-JobMap[JobType.WAIT] = WaitJob

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/workflow/job/job.py

@@ -1,7 +1,9 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Any
 from mindor.dsl.schema.workflow import JobConfig
 from mindor.dsl.schema.component import ComponentConfig
-from .impl import Job, JobMap
+from .base import Job, JobRegistry
 
 def create_job(id: str, config: JobConfig, components: Dict[str, ComponentConfig]) -> Job:
-    return JobMap[config.type](id, config, components)
+    if not JobRegistry:
+        from . import impl
+    return JobRegistry[config.type](id, config, components)

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/core/workflow/workflow.py

@@ -1,7 +1,6 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Any
 from mindor.dsl.schema.workflow import WorkflowConfig, JobConfig
 from mindor.dsl.schema.component import ComponentConfig
-from mindor.core.component import ComponentEngine, ComponentResolver, create_component
 from .context import WorkflowContext
 from .job import Job, create_job
 import asyncio
@@ -130,8 +129,8 @@ class Workflow:
         self.components: Dict[str, ComponentConfig] = components
 
     async def run(self, task_id: str, input: Dict[str, Any]) -> Any:
-        context = WorkflowContext(task_id, input)
         runner = WorkflowRunner(self.config.jobs, self.components)
+        context = WorkflowContext(task_id, input)
 
         return await runner.run(context)
 

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/dsl/schema/action/action.py

@@ -7,7 +7,9 @@ ActionConfig = Annotated[
         HttpServerActionConfig,
         HttpClientActionConfig,
         McpServerActionConfig,
-        McpClientActionConfig
+        McpClientActionConfig,
+        WorkflowActionConfig,
+        ShellActionConfig
     ],
     Field(discriminator="type")
 ]

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/dsl/schema/action/impl/__init__.py

@@ -3,4 +3,5 @@ from .http_server import *
 from .http_client import *
 from .mcp_server import *
 from .mcp_client import *
+from .workflow import *
 from .shell import *

model_compose-0.2.1/src/mindor/dsl/schema/action/impl/workflow.py

@@ -0,0 +1,8 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from pydantic import BaseModel, Field
+from pydantic import model_validator
+from .common import CommonActionConfig
+
+class WorkflowActionConfig(CommonActionConfig):
+    workflow: str = Field(default="__default__", description="The workflow to run. Defaults to '__default__'.")
+    input: Optional[Any] = Field(default=None, description="Input data supplied to the workflow. Accepts any type.")

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/dsl/schema/component/component.py

@@ -8,6 +8,7 @@ ComponentConfig = Annotated[
         HttpClientComponentConfig,
         McpServerComponentConfig,
         McpClientComponentConfig,
+        WorkflowComponentConfig,
         ShellComponentConfig
     ],
     Field(discriminator="type")

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/dsl/schema/component/impl/__init__.py

@@ -3,4 +3,5 @@ from .http_server import *
 from .http_client import *
 from .mcp_server import *
 from .mcp_client import *
+from .workflow import *
 from .shell import *

{model_compose-0.2.0 → model_compose-0.2.1}/src/mindor/dsl/schema/component/impl/types.py

@@ -5,4 +5,5 @@ class ComponentType(str, Enum):
     HTTP_CLIENT = "http-client"
     MCP_SERVER  = "mcp-server"
     MCP_CLIENT  = "mcp-client"
+    WORKFLOW    = "workflow"
     SHELL       = "shell"