model-compose 0.1.2__tar.gz → 0.1.3__tar.gz

{model_compose-0.1.2 → model_compose-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.1.2
+Version: 0.1.3
 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

{model_compose-0.1.2 → model_compose-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "model-compose"
-version = "0.1.2"
+version = "0.1.3"
 description = "model-compose: Declarative AI Model and Workflow Orchestrator (part of the Mindor project)"
 authors = [
     { name = "Hanyeol Cho", email = "hanyeol.cho@gmail.com" }

{model_compose-0.1.2 → model_compose-0.1.3}/src/mindor/core/controller/engine/http_server.py

@@ -15,7 +15,7 @@ from fastapi import FastAPI, APIRouter, Request, Body, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import Response, JSONResponse, StreamingResponse
 from starlette.background import BackgroundTask
-import asyncio, uvicorn
+import uvicorn
 
 class WorkflowTaskRequestBody(BaseModel):
     workflow_id: Optional[str] = None
@@ -50,7 +50,7 @@ class HttpServerController(ControllerEngine):
         daemon: bool
     ):
         super().__init__(config, components, listeners, gateways, workflows, env, daemon)
-        
+
         self.server: Optional[uvicorn.Server] = None
         self.app: FastAPI = FastAPI(openapi_url=None, docs_url=None, redoc_url=None)
         self.router: APIRouter = APIRouter()

{model_compose-0.1.2 → model_compose-0.1.3}/src/mindor/core/controller/webui/gradio.py

@@ -1,6 +1,6 @@
 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.utils.http_client import HttpStreamResource
+from mindor.core.utils.http_client import HttpClient, HttpStreamResource
 from mindor.core.utils.image import load_image_from_stream
 from mindor.core.utils.streaming import Base64StreamResource, save_stream_to_temporary_file
 from .schema import WorkflowSchema
@@ -29,8 +29,8 @@ class GradioWebUIBuilder:
 
     def _build_workflow_section(self, workflow: WorkflowSchema, runner: Callable[[Any], Awaitable[Any]]) -> gr.Column:
         with gr.Column() as section:
-            gr.Markdown(f"## **{workflow.title or 'Untitled Workflow'}**")  
-
+            gr.Markdown(f"## **{workflow.title or 'Untitled Workflow'}**")
+ 
             if workflow.description:
                 gr.Markdown(f"📝 {workflow.description}")
 
@@ -74,13 +74,19 @@ class GradioWebUIBuilder:
         
         if variable.type == "boolean":
             return gr.Checkbox(label=label, value=default or False, info=info)
+        
+        if variable.type == "image":
+            return gr.Image(label=label, type="filepath")
+
+        if variable.type == "video":
+            return gr.Video(label=label)
 
         if variable.type == "file":
-            return gr.File(label=label, file_types=["*"], info=info)
+            return gr.File(label=label)
 
         if variable.type == "select":
             return gr.Dropdown(choices=variable.options or [], label=label, value=default, info=info)
-        
+
         return gr.Textbox(label=label, value=default, info=f"Unsupported type: {variable.type}")
 
     def _build_output_component(self, variable: Union[WorkflowVariableConfig, WorkflowVariableGroupConfig]) -> Union[gr.Component, List[ComponentGroup]]:
@@ -105,6 +111,9 @@ class GradioWebUIBuilder:
         if variable.type == "audio":
             return gr.Audio(label=label)
     
+        if variable.type == "video":
+            return gr.Video(label=label)
+
         return gr.Textbox(label=label, info=f"Unsupported type: {variable.type}")
 
     def _flatten_output_components(self, components: List[Union[gr.Component, List[ComponentGroup]]]) -> List[gr.Component]:
@@ -136,13 +145,17 @@ class GradioWebUIBuilder:
             return str(value)
         
         if type == "image":
+            if format == "url" and isinstance(value, str):
+                return await load_image_from_stream(await HttpClient().request(value), subtype)
             if format == "base64" and isinstance(value, str):
                 return await load_image_from_stream(Base64StreamResource(value), subtype)
             if isinstance(value, HttpStreamResource):
                 return await load_image_from_stream(value, subtype)
             return None
 
-        if type == "audio":
+        if type in [ "audio", "video" ]:
+            if format == "url" and isinstance(value, str):
+                return await save_stream_to_temporary_file(await HttpClient().request(value), subtype)
             if format == "base64" and isinstance(value, str):
                 return await save_stream_to_temporary_file(Base64StreamResource(value), subtype)
             if isinstance(value, HttpStreamResource):

{model_compose-0.1.2 → model_compose-0.1.3}/src/mindor/core/controller/webui/schema.py

@@ -111,17 +111,25 @@ class WorkflowVariableResolver:
             if isinstance(item, WorkflowVariableGroup):
                 group: List[WorkflowVariableConfig] = []
                 seen_in_group: Set[WorkflowVariable] = set()
-                for v in item.variables:
-                    if v not in seen_in_group:
-                        seen_in_group.add(v)
-                        group.append(WorkflowVariableConfig(**v.to_dict()))
+                for variable in item.variables:
+                    if variable not in seen_in_group:
+                        group.append(self._to_variable_config(variable))
+                        seen_in_group.add(variable)
                 configs.append(WorkflowVariableGroupConfig(name=item.name, variables=group, repeat_count=item.repeat_count))
             else:
                 if item not in seen_single:
+                    configs.append(self._to_variable_config(item))
                     seen_single.add(item)
-                    configs.append(WorkflowVariableConfig(**item.to_dict()))
 
         return configs
+    
+    def _to_variable_config(self, variable: WorkflowVariable) -> WorkflowVariableConfig:
+        config_dict = variable.to_dict()
+
+        if variable.type == "select" and variable.subtype:
+            config_dict["options"] = variable.subtype.split(",")
+
+        return WorkflowVariableConfig(**config_dict)
 
     def _parse_as_type(self, value: Any, type: str) -> Any:
         if type == "number":
@@ -138,7 +146,7 @@ class WorkflowVariableResolver:
  
         return value
 
-class WorkflowInputResolver(WorkflowVariableResolver):
+class WorkflowInputVariableResolver(WorkflowVariableResolver):
     def resolve(self, workflow: WorkflowConfig, components: Dict[str, ComponentConfig]) -> List[WorkflowVariableConfig]:
         variables: List[WorkflowVariable] = []
 
@@ -154,12 +162,12 @@ class WorkflowInputResolver(WorkflowVariableResolver):
             else:
                 variables.extend(self._enumerate_input_variables(job.input, "input"))
 
-            for value in [ job.repeat_count ]:
+            for value in [ job.component, job.action, job.repeat_count ]:
                 variables.extend(self._enumerate_input_variables(value, "input"))
 
         return self._to_variable_config_list(variables)
 
-class WorkflowOutputResolver(WorkflowVariableResolver):
+class WorkflowOutputVariableResolver(WorkflowVariableResolver):
     def resolve(self, workflow: WorkflowConfig, components: Dict[str, ComponentConfig]) -> List[Union[WorkflowVariableConfig, WorkflowVariableGroupConfig]]:
         variables: List[Union[WorkflowVariable, WorkflowVariableGroup]] = []
 

{model_compose-0.1.2 → model_compose-0.1.3}/src/mindor/core/controller/webui/webui.py

@@ -4,7 +4,7 @@ from mindor.dsl.schema.component import ComponentConfig
 from mindor.dsl.schema.workflow import WorkflowConfig
 from mindor.core.controller.runner import ControllerRunner
 from mindor.core.services import AsyncService
-from .schema import WorkflowSchema, WorkflowInputResolver, WorkflowOutputResolver
+from .schema import WorkflowSchema, WorkflowInputVariableResolver, WorkflowOutputVariableResolver
 from .gradio import GradioWebUIBuilder
 
 from fastapi import FastAPI, APIRouter, Body, HTTPException
@@ -68,8 +68,8 @@ class ControllerWebUI(AsyncService):
                 name=workflow.name,
                 title=workflow.title, 
                 description=workflow.description,
-                input=WorkflowInputResolver().resolve(workflow, self.components),
-                output=WorkflowOutputResolver().resolve(workflow, self.components)
+                input=WorkflowInputVariableResolver().resolve(workflow, self.components),
+                output=WorkflowOutputVariableResolver().resolve(workflow, self.components)
             )
 
         return schema

{model_compose-0.1.2 → model_compose-0.1.3}/src/mindor/core/utils/http_client.py

@@ -1,9 +1,7 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, AsyncIterator, Any
 from .http_request import serialize_request_body, parse_options_header
 from .streaming import StreamResource
-
-from urllib.parse import urlencode
-import aiohttp, json
+import aiohttp
 
 class HttpStreamResource(StreamResource):
     def __init__(self, session: aiohttp.ClientSession, stream: aiohttp.StreamReader, content_type: Optional[str] = None, filename: Optional[str] = None):
@@ -28,7 +26,7 @@ class HttpStreamResource(StreamResource):
             yield chunk
 
 class HttpClient:
-    async def request(self, url: str, method: str, params: Optional[Dict[str, Any]], body: Optional[Any], headers: Optional[Dict[str, str]]) -> Any:
+    async def request(self, url: str, method: Optional[str] = "GET", params: Optional[Dict[str, Any]] = None, body: Optional[Any] = None, headers: Optional[Dict[str, str]] = None) -> Any:
         session = aiohttp.ClientSession()
         try:
             response = await session.request(
@@ -57,7 +55,7 @@ class HttpClient:
 
         if content_type and body:
             return await serialize_request_body(body, content_type)
-        
+
         return body
 
     async def _parse_response_content(self, session: aiohttp.ClientSession, response: aiohttp.ClientResponse) -> Any:

{model_compose-0.1.2 → model_compose-0.1.3}/src/mindor/core/workflow/job.py

@@ -12,7 +12,7 @@ class Job:
         self.component_provider: Callable[[str, Union[ComponentConfig, str]], ComponentEngine] = component_provider
 
     async def run(self, context: WorkflowContext) -> Any:
-        component: ComponentEngine = self.component_provider(self.id, self.config.component)
+        component: ComponentEngine = self.component_provider(self.id, await context.render_template(self.config.component))
 
         if not component.started:
             await component.start()
@@ -22,7 +22,7 @@ class Job:
 
         async def _run_once():
             call_id = ulid.ulid()
-            output = await component.run(self.config.action, call_id, input)
+            output = await component.run(await context.render_template(self.config.action), call_id, input)
             context.register_source("output", output)
 
             output = (await context.render_template(self.config.output)) if self.config.output else output

{model_compose-0.1.2 → model_compose-0.1.3}/src/mindor/dsl/schema/workflow.py

@@ -31,6 +31,7 @@ class WorkflowVariableType(str, Enum):
     # Media and files
     IMAGE   = "image"
     AUDIO   = "audio"
+    VIDEO   = "video"
     FILE    = "file"
     # UI-related types
     SELECT  = "select"
@@ -39,16 +40,17 @@ class WorkflowVariableFormat(str, Enum):
     BASE64 = "base64"
     URL    = "url"
     PATH   = "path"
+    STREAM = "stream"
 
 class WorkflowVariableConfig(BaseModel):
     name: Optional[str] = Field(default=None, description="The name of the variable")
     type: WorkflowVariableType = Field(..., description="Type of the variable")
     subtype: Optional[str] = Field(default=None, description="Subtype of the variable")
     format: Optional[WorkflowVariableFormat] = Field(default=None, description="Format of the variable")
+    options: Optional[List[str]] = Field(default=None, description="List of valid options for select type")
     required: bool = Field(default=False, description="Whether this variable is required")
     default: Optional[Any] = Field(default=None, description="Default value if not provided")
     description: Optional[str] = Field(default=None, description="Description of the variable")
-    options: Optional[List[Any]] = Field(default=None, description="List of valid options for select type")
 
 class WorkflowVariableGroupConfig(BaseModel):
     name: Optional[str] = Field(default=None, description="The name of the group of variables")

{model_compose-0.1.2 → model_compose-0.1.3}/src/model_compose.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.1.2
+Version: 0.1.3
 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