model-compose 0.1.6__tar.gz → 0.1.7__tar.gz

{model_compose-0.1.6/src/model_compose.egg-info → model_compose-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.1.6
+Version: 0.1.7
 Summary: model-compose: Declarative AI Model and Workflow Orchestrator (part of the Mindor project)
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT
@@ -15,6 +15,7 @@ Requires-Dist: aiohttp
 Requires-Dist: requests
 Requires-Dist: fastapi
 Requires-Dist: uvicorn
+Requires-Dist: mcp
 Requires-Dist: pyngrok
 Requires-Dist: ulid
 Requires-Dist: gradio

{model_compose-0.1.6 → model_compose-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "model-compose"
-version = "0.1.6"
+version = "0.1.7"
 description = "model-compose: Declarative AI Model and Workflow Orchestrator (part of the Mindor project)"
 authors = [
     { name = "Hanyeol Cho", email = "hanyeol.cho@gmail.com" }
@@ -16,6 +16,7 @@ dependencies = [
     "requests", 
     "fastapi", 
     "uvicorn",
+    "mcp",
     "pyngrok", 
     "ulid", 
     "gradio",

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/core/component/engine/__init__.py

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

model_compose-0.1.7/src/mindor/core/component/engine/mcp_client.py

@@ -0,0 +1,19 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from mindor.dsl.schema.component import McpClientComponentConfig
+from .base import ComponentEngine, ComponentType, ComponentEngineMap, ActionConfig
+from .context import ComponentContext
+
+class McpClientComponent(ComponentEngine):
+    def __init__(self, id: str, config: McpClientComponentConfig, env: Dict[str, str], daemon: bool):
+        super().__init__(id, config, env, daemon)
+
+    async def _serve(self) -> None:
+        pass
+
+    async def _shutdown(self) -> None:
+        pass
+
+    async def _run(self, action: ActionConfig, context: ComponentContext) -> Any:
+        return {}
+
+ComponentEngineMap[ComponentType.MCP_CLIENT] = McpClientComponent

model_compose-0.1.7/src/mindor/core/component/engine/mcp_server.py

@@ -0,0 +1,19 @@
+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 ComponentContext
+
+class McpServerComponent(ComponentEngine):
+    def __init__(self, id: str, config: McpServerComponentConfig, env: Dict[str, str], daemon: bool):
+        super().__init__(id, config, env, daemon)
+
+    async def _serve(self) -> None:
+        pass
+
+    async def _shutdown(self) -> None:
+        pass
+
+    async def _run(self, action: ActionConfig, context: ComponentContext) -> Any:
+        return {}
+
+ComponentEngineMap[ComponentType.MCP_SERVER] = McpServerComponent

model_compose-0.1.7/src/mindor/core/component/engine/shell.py

@@ -0,0 +1,69 @@
+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 ComponentContext
+import asyncio, os
+
+class ShellAction:
+    def __init__(self, base_dir: Optional[str], env: Optional[Dict[str, str]], config: ShellActionConfig):
+        self.base_dir: Optional[str] = base_dir
+        self.env: Optional[Dict[str, str]] = env
+        self.config: ShellActionConfig = config
+
+    async def run(self, context: ComponentContext) -> Any:
+        working_dir = self._resolve_working_directory()
+        env = { **(self.env or {}), **(self.config.env or {}) }
+
+        result = await self._run_command(self.config.command, working_dir, env, self.config.timeout)
+        context.register_source("result", result)
+
+        return (await context.render_template(self.config.output, ignore_files=True)) if self.config.output else result
+    
+    async def _run_command(self, command: List[str], working_dir: str, env: Dict[str, str], timeout: Optional[float]) -> Dict[str, Any]:
+        process = await asyncio.create_subprocess_exec(
+            *command,
+            cwd=working_dir,
+            env={**os.environ, **env},
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+
+        try:
+            stdout, stderr = await asyncio.wait_for(process.communicate(), timeout=timeout)
+        except asyncio.TimeoutError:
+            process.kill()
+            await process.wait()
+            raise RuntimeError(f"Command timed out: {' '.join(command)}")
+
+        return { 
+            "exit_code": process.returncode, 
+            "stdout": stdout.decode().strip(), 
+            "stderr": stderr.decode().strip() 
+        }
+
+    def _resolve_working_directory(self) -> str:
+        working_dir = self.config.working_dir
+        if working_dir:
+            if self.base_dir:
+                working_dir = os.path.abspath(os.path.join(self.base_dir, working_dir))
+            else:
+                working_dir = os.path.abspath(working_dir)
+        else:
+            working_dir = self.base_dir or os.getcwd()
+        return working_dir
+
+class ShellComponent(ComponentEngine):
+    def __init__(self, id: str, config: ShellComponentConfig, env: Dict[str, str], daemon: bool):
+        super().__init__(id, config, env, daemon)
+
+    async def _serve(self) -> None:
+        pass
+
+    async def _shutdown(self) -> None:
+        pass
+
+    async def _run(self, action: ActionConfig, context: ComponentContext) -> Any:
+        return await ShellAction(self.config.base_dir, self.config.env, action).run(context)
+
+ComponentEngineMap[ComponentType.SHELL] = ShellComponent

model_compose-0.1.7/src/mindor/core/controller/engine/mcp_server.py

@@ -0,0 +1,93 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Awaitable, Any
+from mindor.dsl.schema.controller import McpServerControllerConfig
+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 mindor.core.workflow.schema import WorkflowSchema, WorkflowVariableConfig, create_workflow_schema
+from .base import ControllerEngine, ControllerType, ControllerEngineMap
+from mcp.server.fastmcp.server import FastMCP
+import uvicorn
+
+class WorkflowToolGenerator():
+    def generate(self, workflow_id: str, workflow: WorkflowSchema, runner: Callable[[Optional[str], Any], Awaitable[Any]]) -> Tuple[Callable[[Any], Awaitable[Any]], str]:
+        async def _run_workflow(input: Any, workflow_id=workflow_id) -> Any:
+            return await runner(workflow_id, input)
+        
+        async def _build_input_value(*arguments, variables=workflow.input) -> Any:
+            return await self._build_input_value(arguments, variables)
+
+        arguments = ",".join([ variable.name or "input" for variable in workflow.input ])
+        code = f"async def _run_workflow_{workflow_id}({arguments}): return await _run_workflow(await _build_input_value({arguments}))"
+        context = { "_run_workflow": _run_workflow, "_build_input_value": _build_input_value }
+        exec(compile(code, f"<string>", "exec"), context)
+
+        description = ""
+
+        return (context[f"_run_workflow_{workflow_id}"], description)
+
+    async def _build_input_value(self, arguments: List[Any], variables: List[WorkflowVariableConfig]) -> Any:
+        if len(variables) == 1 and not variables[0].name:
+            return arguments[0]
+
+        input: Dict[str, Any] = {}
+        
+        for value, variable in zip(arguments, variables):
+            type, subtype, format = variable.type.value, variable.subtype, variable.format.value if variable.format else None
+            input[variable.name] = await self._convert_input_value(value, type, subtype, format, variable.internal)
+
+        return input
+
+    async def _convert_input_value(self, value: Any, type: str, subtype: Optional[str], format: Optional[str], internal: bool) -> Any:
+        if type in [ "image", "audio", "video", "file" ] and (not internal or not format):
+            pass
+
+        return value if value != "" else None
+
+class McpServerController(ControllerEngine):
+    def __init__(
+        self,
+        config: McpServerControllerConfig,
+        components: Dict[str, ComponentConfig],
+        listeners: List[ListenerConfig],
+        gateways: List[GatewayConfig],
+        workflows: Dict[str, WorkflowConfig],
+        env: Dict[str, str],
+        daemon: bool
+    ):
+        super().__init__(config, components, listeners, gateways, workflows, env, daemon)
+
+        self.server: Optional[uvicorn.Server] = None
+        self.app: FastMCP = FastMCP(self.config.name, settings={
+            "streamable_http_path": self.config.base_path
+        })
+
+        self._configure_tools()
+
+    def _configure_tools(self) -> None:
+        schema = create_workflow_schema(self.workflows, self.components)
+
+        for workflow_id, workflow in schema.items():
+            fn, description = WorkflowToolGenerator().generate(workflow_id, workflow, self._run_workflow)
+            self.app.add_tool(
+                fn=fn,
+                name=workflow.name or workflow_id,
+                annotations=None,
+                title=workflow.title,
+                description=description
+            )
+    
+    async def _serve(self) -> None:
+        self.server = uvicorn.Server(uvicorn.Config(
+            self.app.streamable_http_app(),
+            host=self.config.host,
+            port=self.config.port,
+            log_level="info"
+        ))
+        await self.server.serve()
+
+    async def _shutdown(self) -> None:
+        if self.server:
+            self.server.should_exit = True
+
+ControllerEngineMap[ControllerType.MCP_SERVER] = McpServerController

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/core/controller/runner/mcp_client.py

@@ -1,10 +1,13 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.controller import ControllerConfig
+from mindor.core.utils.mcp_client import McpClient
 from .runner import ControllerClient
 
 class McpControllerClient(ControllerClient):
     def __init__(self, config: ControllerConfig):
         super().__init__(config)
 
+        self.client: McpClient = McpClient()
+
     async def run_workflow(self, workflow_id: Optional[str], input: Any) -> Any:
         pass

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/core/controller/webui/gradio.py

@@ -1,14 +1,13 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Awaitable, Any
 from mindor.dsl.schema.workflow import WorkflowVariableConfig, WorkflowVariableGroupConfig
+from mindor.core.workflow.schema import WorkflowSchema
 from mindor.core.utils.streaming import StreamResource, Base64StreamResource
 from mindor.core.utils.streaming import save_stream_to_temporary_file
 from mindor.core.utils.http_request import create_upload_file
 from mindor.core.utils.http_client import HttpClient
 from mindor.core.utils.image import load_image_from_stream
-from .schema import WorkflowSchema
-from starlette.datastructures import UploadFile
 import gradio as gr
-import json, os
+import json
 
 class ComponentGroup:
     def __init__(self, group: gr.Component, components: List[gr.Component]):
@@ -48,9 +47,9 @@ class GradioWebUIBuilder:
                 output_components = gr.Textbox(label="", lines=8, interactive=False, show_copy_button=True)
 
             async def _run_workflow(*args):
-                input = await self._build_input_values(args, workflow.input)
+                input = await self._build_input_value(args, workflow.input)
                 output = await runner(input)
-                output = await self._flatten_output_values(output, workflow.output)
+                output = await self._flatten_output_value(output, workflow.output)
                 return output[0] if len(output) == 1 else output
 
             run_button.click(
@@ -95,7 +94,7 @@ class GradioWebUIBuilder:
 
         return gr.Textbox(label=label, value=default, info=f"Unsupported type: {variable.type}")
     
-    async def _build_input_values(self, arguments: List[Any], variables: List[WorkflowVariableConfig]) -> Any:
+    async def _build_input_value(self, arguments: List[Any], variables: List[WorkflowVariableConfig]) -> Any:
         if len(variables) == 1 and not variables[0].name:
             return arguments[0]
 
@@ -131,6 +130,9 @@ class GradioWebUIBuilder:
         if variable.type in [ "string", "base64" ]:
             return gr.Textbox(label=label, interactive=False, show_copy_button=True, info=info)
 
+        if variable.type == "markdown":
+            return gr.Markdown(label=label)
+
         if variable.type == "image":
             return gr.Image(label=label, interactive=False)
 
@@ -152,13 +154,13 @@ class GradioWebUIBuilder:
                 flattened.append(item)
         return flattened
     
-    async def _flatten_output_values(self, output: Any, variables: List[Union[WorkflowVariableConfig, WorkflowVariableGroupConfig]]) -> Any:
+    async def _flatten_output_value(self, output: Any, variables: List[Union[WorkflowVariableConfig, WorkflowVariableGroupConfig]]) -> Any:
         flattened = []
         for variable in variables:
             if isinstance(variable, WorkflowVariableGroupConfig):
                 group = output[variable.name] if variable.name else output
                 for value in group:
-                    flattened.extend(await self._flatten_output_values(value, variable.variables))
+                    flattened.extend(await self._flatten_output_value(value, variable.variables))
             else:
                 value = output[variable.name] if variable.name else output
                 type, subtype, format = variable.type.value, variable.subtype, variable.format.value if variable.format else None

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/core/controller/webui/webui.py

@@ -3,14 +3,13 @@ from mindor.dsl.schema.controller import ControllerWebUIConfig, ControllerConfig
 from mindor.dsl.schema.component import ComponentConfig
 from mindor.dsl.schema.workflow import WorkflowConfig
 from mindor.core.controller.runner import ControllerRunner
+from mindor.core.workflow.schema import create_workflow_schema
 from mindor.core.services import AsyncService
-from .schema import WorkflowSchema, WorkflowInputVariableResolver, WorkflowOutputVariableResolver
 from .gradio import GradioWebUIBuilder
 
-from fastapi import FastAPI, APIRouter, Body, HTTPException
-import asyncio, uvicorn
+from fastapi import FastAPI
 from gradio import mount_gradio_app
-import gradio
+import uvicorn, gradio
 
 class ControllerWebUI(AsyncService):
     def __init__(
@@ -38,7 +37,7 @@ class ControllerWebUI(AsyncService):
     def _configure_driver(self) -> None:
         if self.config.driver == "gradio":
             blocks: gradio.Blocks = GradioWebUIBuilder().build(
-                schema=self._resolve_workflow_schema(),
+                schema=create_workflow_schema(self.workflows, self.components),
                 runner=self._run_workflow
             )
             self.app = mount_gradio_app(self.app, blocks, path="")
@@ -59,17 +58,3 @@ class ControllerWebUI(AsyncService):
     
     async def _run_workflow(self, workflow_id: Optional[str], input: Any) -> Any:
         return await self.runner.run_workflow(workflow_id, input)
-
-    def _resolve_workflow_schema(self) -> Dict[str, WorkflowSchema]:
-        schema: Dict[str, WorkflowSchema] = {}
-
-        for workflow_id, workflow in self.workflows.items():
-            schema[workflow_id] = WorkflowSchema(
-                name=workflow.name,
-                title=workflow.title, 
-                description=workflow.description,
-                input=WorkflowInputVariableResolver().resolve(workflow, self.components),
-                output=WorkflowOutputVariableResolver().resolve(workflow, self.components)
-            )
-
-        return schema

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/core/utils/http_client.py

@@ -1,4 +1,4 @@
-from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, AsyncIterator, Any
+from typing import Optional, Dict, Tuple, AsyncIterator, Any
 from .http_request import build_request_body, parse_options_header
 from .streaming import StreamResource
 from requests.structures import CaseInsensitiveDict

model_compose-0.1.7/src/mindor/core/utils/mcp_client.py

@@ -0,0 +1,4 @@
+from typing import Optional, Dict, Tuple, AsyncIterator, Any
+
+class McpClient:
+    pass

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/core/utils/streaming.py

@@ -2,7 +2,7 @@ from typing import Optional, AsyncIterator
 from abc import ABC, abstractmethod
 from tempfile import NamedTemporaryFile
 from aiofiles.threadpool.binary import AsyncBufferedReader
-import aiofiles, io, base64
+import io, base64
 
 class StreamResource(ABC):
     def __init__(self, content_type: Optional[str], filename: Optional[str]):

{model_compose-0.1.6/src/mindor/core/controller/webui → model_compose-0.1.7/src/mindor/core/workflow}/schema.py

@@ -208,9 +208,30 @@ class WorkflowOutputVariableResolver(WorkflowVariableResolver):
         return all(job_id not in job.depends_on for other_id, job in workflow.jobs.items() if other_id != job_id)
 
 class WorkflowSchema:
-    def __init__(self, name: str, title: str, description: Optional[str], input: List[WorkflowVariableConfig], output: List[Union[WorkflowVariableConfig, WorkflowVariableGroupConfig]]):
+    def __init__(
+        self, 
+        name: Optional[str], 
+        title: Optional[str], 
+        description: Optional[str], 
+        input: List[WorkflowVariableConfig], 
+        output: List[Union[WorkflowVariableConfig, WorkflowVariableGroupConfig]]
+    ):
         self.name: str = name
         self.title: str = title
         self.description: Optional[str] = description
         self.input: List[WorkflowVariableConfig] = input
         self.output: List[Union[WorkflowVariableConfig, WorkflowVariableGroupConfig]] = output
+
+def create_workflow_schema(workflows: Dict[str, WorkflowConfig], components: Dict[str, ComponentConfig]) -> Dict[str, WorkflowSchema]:
+    schema: Dict[str, WorkflowSchema] = {}
+
+    for workflow_id, workflow in workflows.items():
+        schema[workflow_id] = WorkflowSchema(
+            name=workflow.name,
+            title=workflow.title, 
+            description=workflow.description,
+            input=WorkflowInputVariableResolver().resolve(workflow, components),
+            output=WorkflowOutputVariableResolver().resolve(workflow, components)
+        )
+
+    return schema

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/dsl/schema/action/impl/__init__.py

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

model_compose-0.1.7/src/mindor/dsl/schema/action/impl/shell.py

@@ -0,0 +1,10 @@
+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 ShellActionConfig(CommonActionConfig):
+    command: List[str] = Field(..., description="The shell command to execute, as a list of arguments.")
+    working_dir: Optional[str] = Field(default=None, description="Working directory for the command.")
+    env: Optional[Dict[str, str]] = Field(default_factory=dict, description="Environment variables to set when executing the command.")
+    timeout: Optional[float] = Field(default=None, description="Maximum time allowed for the command to run, in seconds.")

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/dsl/schema/component/component.py

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

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/dsl/schema/component/impl/__init__.py

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

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/dsl/schema/component/impl/http_server.py

@@ -7,5 +7,5 @@ from .common import ComponentType, CommonComponentConfig
 class HttpServerComponentConfig(CommonComponentConfig):
     type: Literal[ComponentType.HTTP_SERVER]
     port: Optional[int] = Field(None, ge=1, le=65535)
-    base_path: Optional[str]
+    base_path: Optional[str] = None
     actions: Optional[Dict[str, HttpServerActionConfig]] = Field(default_factory=dict)

model_compose-0.1.7/src/mindor/dsl/schema/component/impl/shell.py

@@ -0,0 +1,19 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from pydantic import BaseModel, Field
+from pydantic import model_validator
+from mindor.dsl.schema.action import ShellActionConfig
+from .common import ComponentType, CommonComponentConfig
+
+class ShellComponentConfig(CommonComponentConfig):
+    type: Literal[ComponentType.SHELL]
+    base_dir: Optional[str] = Field(default=None, description="Base working directory for all actions in this component.")
+    env: Optional[Dict[str, str]] = Field(default_factory=dict, description="Environment variables to set for all actions in this component.")
+    actions: Optional[Dict[str, ShellActionConfig]] = Field(default_factory=dict, description="Shell actions mapped by an identifier.")
+    
+    @model_validator(mode="before")
+    def inflate_single_action(cls, values: Dict[str, Any]):
+        if "actions" not in values:
+            action_keys = set(ShellActionConfig.model_fields.keys())
+            if any(k in values for k in action_keys):
+                values["actions"] = { "__default__": { k: values.pop(k) for k in action_keys if k in values } }
+        return values

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/dsl/schema/component/impl/types.py

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

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/dsl/schema/controller/impl/common.py

@@ -4,6 +4,7 @@ from .types import ControllerType
 from .webui import ControllerWebUIConfig
 
 class CommonControllerConfig(BaseModel):
+    name: Optional[str] = None
     type: ControllerType
     runtime: Literal[ "docker", "native" ] = "native"
     max_concurrent_count: int = 1

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/dsl/schema/controller/impl/mcp_server.py

@@ -5,4 +5,6 @@ from .common import ControllerType, CommonControllerConfig
 
 class McpServerControllerConfig(CommonControllerConfig):
     type: Literal[ControllerType.MCP_SERVER]
+    host: Optional[str] = "0.0.0.0"
     port: Optional[int] = 8080
+    base_path: Optional[str] = None

{model_compose-0.1.6 → model_compose-0.1.7}/src/mindor/dsl/schema/workflow.py

@@ -4,37 +4,24 @@ from pydantic import BaseModel, Field
 from pydantic import model_validator, field_validator
 from .component import ComponentConfig
 
-class JobConfig(BaseModel):
-    component: Optional[Union[str, ComponentConfig]] = Field(default="__default__", description="The component to execute. Can be a string identifier or a ComponentConfig object.")
-    action: Optional[str] = Field(default="__default__", description="The action to invoke within the component. Defaults to '__default__'.")
-    input: Optional[Any] = Field(default=None, description="The input data passed to the component. Can be of any type.")
-    output: Optional[Any] = Field(default=None, description="The expected output data from the component. Can be of any type.")
-    repeat_count: Optional[Union[int, str]] = Field(default=1, description="Number of times to repeat the component execution. Must be at least 1.")
-    depends_on: Optional[List[str]] = Field(default_factory=list, description="List of job names that this job depends on. Ensures execution order.")
-
-    @field_validator("repeat_count")
-    def validate_repeat_count(cls, value):
-        if isinstance(value, int) and value < 1:
-            raise ValueError("'repeat_count' must be at least 1")
-        return value
-
 class WorkflowVariableType(str, Enum):
     # Primitive data types
-    STRING  = "string"
-    TEXT    = "text"
-    INTEGER = "integer"
-    NUMBER  = "number"
-    BOOLEAN = "boolean"
-    JSON    = "json"
+    STRING   = "string"
+    TEXT     = "text"
+    INTEGER  = "integer"
+    NUMBER   = "number"
+    BOOLEAN  = "boolean"
+    JSON     = "json"
     # Encoded data
-    BASE64  = "base64"
+    BASE64   = "base64"
+    MARKDOWN = "markdown"
     # Media and files
-    IMAGE   = "image"
-    AUDIO   = "audio"
-    VIDEO   = "video"
-    FILE    = "file"
+    IMAGE    = "image"
+    AUDIO    = "audio"
+    VIDEO    = "video"
+    FILE     = "file"
     # UI-related types
-    SELECT  = "select"
+    SELECT   = "select"
 
 class WorkflowVariableFormat(str, Enum):
     BASE64 = "base64"
@@ -58,6 +45,20 @@ class WorkflowVariableGroupConfig(BaseModel):
     variables: List[WorkflowVariableConfig] = Field(default_factory=list, description="List of variables included in this group")
     repeat_count: int = Field(default=1, description="The number of times this group of variables should be repeated")
 
+class JobConfig(BaseModel):
+    component: Optional[Union[str, ComponentConfig]] = Field(default="__default__", description="The component to execute. Can be a string identifier or a ComponentConfig object.")
+    action: Optional[str] = Field(default="__default__", description="The action to invoke within the component. Defaults to '__default__'.")
+    input: Optional[Any] = Field(default=None, description="The input data passed to the component. Can be of any type.")
+    output: Optional[Any] = Field(default=None, description="The expected output data from the component. Can be of any type.")
+    repeat_count: Optional[Union[int, str]] = Field(default=1, description="Number of times to repeat the component execution. Must be at least 1.")
+    depends_on: Optional[List[str]] = Field(default_factory=list, description="List of job names that this job depends on. Ensures execution order.")
+
+    @field_validator("repeat_count")
+    def validate_repeat_count(cls, value):
+        if isinstance(value, int) and value < 1:
+            raise ValueError("'repeat_count' must be at least 1")
+        return value
+
 class WorkflowConfig(BaseModel):
     name: Optional[str] = None
     title: Optional[str] = None

{model_compose-0.1.6 → model_compose-0.1.7/src/model_compose.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.1.6
+Version: 0.1.7
 Summary: model-compose: Declarative AI Model and Workflow Orchestrator (part of the Mindor project)
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT
@@ -15,6 +15,7 @@ Requires-Dist: aiohttp
 Requires-Dist: requests
 Requires-Dist: fastapi
 Requires-Dist: uvicorn
+Requires-Dist: mcp
 Requires-Dist: pyngrok
 Requires-Dist: ulid
 Requires-Dist: gradio

{model_compose-0.1.6 → model_compose-0.1.7}/src/model_compose.egg-info/SOURCES.txt

@@ -12,6 +12,9 @@ src/mindor/core/component/engine/base.py
 src/mindor/core/component/engine/context.py
 src/mindor/core/component/engine/http_client.py
 src/mindor/core/component/engine/http_server.py
+src/mindor/core/component/engine/mcp_client.py
+src/mindor/core/component/engine/mcp_server.py
+src/mindor/core/component/engine/shell.py
 src/mindor/core/compose/__init__.py
 src/mindor/core/compose/compose.py
 src/mindor/core/compose/manager.py
@@ -28,7 +31,6 @@ src/mindor/core/controller/runner/mcp_client.py
 src/mindor/core/controller/runner/runner.py
 src/mindor/core/controller/webui/__init__.py
 src/mindor/core/controller/webui/gradio.py
-src/mindor/core/controller/webui/schema.py
 src/mindor/core/controller/webui/webui.py
 src/mindor/core/gateway/__init__.py
 src/mindor/core/gateway/gateway.py
@@ -49,6 +51,7 @@ src/mindor/core/utils/expiring.py
 src/mindor/core/utils/http_client.py
 src/mindor/core/utils/http_request.py
 src/mindor/core/utils/image.py
+src/mindor/core/utils/mcp_client.py
 src/mindor/core/utils/streaming.py
 src/mindor/core/utils/template.py
 src/mindor/core/utils/time.py
@@ -56,6 +59,7 @@ src/mindor/core/utils/workqueue.py
 src/mindor/core/workflow/__init__.py
 src/mindor/core/workflow/context.py
 src/mindor/core/workflow/job.py
+src/mindor/core/workflow/schema.py
 src/mindor/core/workflow/workflow.py
 src/mindor/dsl/__init__.py
 src/mindor/dsl/loader.py
@@ -70,6 +74,7 @@ src/mindor/dsl/schema/action/impl/http_client.py
 src/mindor/dsl/schema/action/impl/http_server.py
 src/mindor/dsl/schema/action/impl/mcp_client.py
 src/mindor/dsl/schema/action/impl/mcp_server.py
+src/mindor/dsl/schema/action/impl/shell.py
 src/mindor/dsl/schema/component/__init__.py
 src/mindor/dsl/schema/component/component.py
 src/mindor/dsl/schema/component/impl/__init__.py
@@ -78,6 +83,7 @@ src/mindor/dsl/schema/component/impl/http_client.py
 src/mindor/dsl/schema/component/impl/http_server.py
 src/mindor/dsl/schema/component/impl/mcp_client.py
 src/mindor/dsl/schema/component/impl/mcp_server.py
+src/mindor/dsl/schema/component/impl/shell.py
 src/mindor/dsl/schema/component/impl/types.py
 src/mindor/dsl/schema/controller/__init__.py
 src/mindor/dsl/schema/controller/controller.py

{model_compose-0.1.6 → model_compose-0.1.7}/src/model_compose.egg-info/requires.txt

@@ -6,6 +6,7 @@ aiohttp
 requests
 fastapi
 uvicorn
+mcp
 pyngrok
 ulid
 gradio

model_compose-0.1.6/src/mindor/core/controller/engine/mcp_server.py

@@ -1,28 +0,0 @@
-from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
-from mindor.dsl.schema.controller import McpServerControllerConfig
-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 .base import ControllerEngine, ControllerType, ControllerEngineMap
-
-class McpServerController(ControllerEngine):
-    def __init__(
-        self,
-        config: McpServerControllerConfig,
-        components: Dict[str, ComponentConfig],
-        listeners: List[ListenerConfig],
-        gateways: List[GatewayConfig],
-        workflows: Dict[str, WorkflowConfig],
-        env: Dict[str, str],
-        daemon: bool
-    ):
-        super().__init__(config, components, listeners, gateways, workflows, env, daemon)
-
-    async def _serve(self) -> None:
-        pass
-
-    async def _shutdown(self) -> None:
-        pass
-
-ControllerEngineMap[ControllerType.MCP_SERVER] = McpServerController