model-compose 0.3.10__tar.gz → 0.3.12__tar.gz

{model_compose-0.3.10/src/model_compose.egg-info → model_compose-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.3.10
+Version: 0.3.12
 Summary: model-compose: Declarative AI Model and Workflow Orchestrator
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT
@@ -165,7 +165,7 @@ controller:
     port: 8081
 
 components:
-  chatgpt:
+  - id: chatgpt
     type: http-client
     base_url: https://api.openai.com/v1
     path: /chat/completions
@@ -182,10 +182,10 @@ components:
       quote: ${response.choices[0].message.content}
 
 workflows:
-  generate-quote:
+  - id: generate-quote
     default: true
     jobs:
-      get-quote:
+      - id: get-quote
         component: chatgpt
 ```
 
@@ -302,7 +302,7 @@ controller:
   base_path: /mcp
 
 components:
-  chatgpt:
+  - id: chatgpt
     type: http-client
     base_url: https://api.openai.com/v1
     path: /chat/completions
@@ -319,10 +319,10 @@ components:
       quote: ${response.choices[0].message.content}
 
 workflows:
-  generate-quote:
+  - id: generate-quote
     default: true
     jobs:
-      get-quote:
+      - id: get-quote
         component: chatgpt
 ```
 This configuration launches the controller as an **MCP server**, which listens on port 8080 and exposes your workflows over a **JSON-RPC API**.

{model_compose-0.3.10 → model_compose-0.3.12}/README.md

@@ -136,7 +136,7 @@ controller:
     port: 8081
 
 components:
-  chatgpt:
+  - id: chatgpt
     type: http-client
     base_url: https://api.openai.com/v1
     path: /chat/completions
@@ -153,10 +153,10 @@ components:
       quote: ${response.choices[0].message.content}
 
 workflows:
-  generate-quote:
+  - id: generate-quote
     default: true
     jobs:
-      get-quote:
+      - id: get-quote
         component: chatgpt
 ```
 
@@ -273,7 +273,7 @@ controller:
   base_path: /mcp
 
 components:
-  chatgpt:
+  - id: chatgpt
     type: http-client
     base_url: https://api.openai.com/v1
     path: /chat/completions
@@ -290,10 +290,10 @@ components:
       quote: ${response.choices[0].message.content}
 
 workflows:
-  generate-quote:
+  - id: generate-quote
     default: true
     jobs:
-      get-quote:
+      - id: get-quote
         component: chatgpt
 ```
 This configuration launches the controller as an **MCP server**, which listens on port 8080 and exposes your workflows over a **JSON-RPC API**.

{model_compose-0.3.10 → model_compose-0.3.12}/pyproject.toml

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

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/base.py

@@ -10,40 +10,41 @@ from mindor.core.utils.workqueue import WorkQueue
 from .context import ComponentActionContext
 
 class ActionResolver:
-    def __init__(self, actions: Dict[str, ActionConfig]):
-        self.actions = actions
+    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)
 
-        if not action_id in self.actions:
+        if action is None:
             raise ValueError(f"Action not found: {action_id}")
 
-        return action_id, self.actions[action_id]
+        return action_id, action
 
-    def _find_default_id(self, actions: Dict[str, ActionConfig]) -> str:
-        default_ids = [ action_id for action_id, action in actions.items() if action.default ]
+    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 and "__default__" not in actions:
+        if not default_ids:
             raise ValueError("No default action defined.")
 
-        return default_ids[0] if default_ids else "__default__"
+        return default_ids[0]
 
 class ComponentGlobalConfigs:
     def __init__(
         self, 
-        components: Dict[str, ComponentConfig],
+        components: List[ComponentConfig],
         listeners: List[ListenerConfig],
         gateways: List[GatewayConfig],
-        workflows: Dict[str, WorkflowConfig]
+        workflows: List[WorkflowConfig]
     ):
-        self.components: Dict[str, ComponentConfig] = components
+        self.components: List[ComponentConfig] = components
         self.listeners: List[ListenerConfig] = listeners
         self.gateways: List[GatewayConfig] = gateways
-        self.workflows: Dict[str, WorkflowConfig] = workflows
+        self.workflows: List[WorkflowConfig] = workflows
 
 class ComponentService(AsyncService):
     def __init__(self, id: str, config: ComponentConfig, global_configs: ComponentGlobalConfigs, daemon: bool):

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/component.py

@@ -5,27 +5,28 @@ from .base import ComponentService, ComponentGlobalConfigs, ComponentRegistry
 ComponentInstances: Dict[str, ComponentService] = {}
 
 class ComponentResolver:
-    def __init__(self, components: Dict[str, ComponentConfig]):
-        self.components: Dict[str, ComponentConfig] = components
+    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)
 
-        if not component_id in self.components:
+        if component is None:
             raise ValueError(f"Component not found: {component_id}")
 
-        return component_id, self.components[component_id]
+        return component_id, component
 
-    def _find_default_id(self, components: Dict[str, ComponentConfig]) -> str:
-        default_ids = [ component_id for component_id, component in components.items() if component.default ]
+    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 and "__default__" not in components:
+        if not default_ids:
             raise ValueError("No default component defined.")
 
-        return default_ids[0] if default_ids else "__default__"
+        return default_ids[0]
 
 def create_component(id: str, config: ComponentConfig, global_configs: ComponentGlobalConfigs, daemon: bool) -> ComponentService:
     try:

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/context.py

@@ -13,15 +13,15 @@ class ComponentActionContext:
     def register_source(self, key: str, source: Any) -> None:
         self.sources[key] = source
 
-    def has_reference(self, key: str, value: Any) -> bool:
-        return self.renderer.has_reference(key, value)
-
     async def render_variable(self, value: Any, ignore_files: bool = False) -> Any:
         return await self.renderer.render(value, ignore_files)
 
     async def render_image(self, value: Any) -> Any:
         return await ImageValueRenderer().render(await self.render_variable(value))
 
+    def contains_variable_reference(self, key: str, value: Any) -> bool:
+        return self.renderer.contains_reference(key, value)
+
     async def _resolve_source(self, key: str, index: Optional[int]) -> Any:
         if key in self.sources:
             return self.sources[key][index] if index is not None else self.sources[key]

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/services/http_client.py

@@ -2,14 +2,15 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from abc import ABC, abstractmethod
 from mindor.dsl.schema.component import HttpClientComponentConfig
 from mindor.dsl.schema.action import ActionConfig, HttpClientActionConfig, HttpClientCompletionType, HttpClientCompletionConfig
+from mindor.dsl.schema.transport.http import HttpStreamFormat
 from mindor.core.listener import HttpCallbackListener
-from mindor.core.utils.http_client import HttpClient
+from mindor.core.utils.http_client import HttpClient, HttpEventStreamResource
 from mindor.core.utils.http_status import is_status_code_matched
 from mindor.core.utils.time import parse_duration
 from ..base import ComponentService, ComponentType, ComponentGlobalConfigs, register_component
 from ..context import ComponentActionContext
 from datetime import datetime, timezone
-import asyncio
+import asyncio, json
 
 class HttpClientCompletion(ABC):
     def __init__(self, config: HttpClientCompletionConfig):
@@ -94,10 +95,28 @@ class HttpClientAction:
         headers     = await context.render_variable(self.config.headers)
 
         response, result = await client.request(url_or_path, method, params, body, headers), None
+
+        if isinstance(response, HttpEventStreamResource) and context.contains_variable_reference("response[]", self.config.output):
+            async def _stream_generator(stream: HttpEventStreamResource):
+                async for chunk in stream:
+                    context.register_source("response[]", self._convert_stream_chunk(chunk))
+                    yield await context.render_variable(self.config.output, ignore_files=True)
+
+            return _stream_generator(response)
+
         context.register_source("response", response)
 
         if self.completion:
             result = await self.completion.run(context, client)
+
+            if isinstance(result, HttpEventStreamResource) and context.contains_variable_reference("result[]", self.config.output):
+                async def _stream_generator(stream: HttpEventStreamResource):
+                    async for chunk in stream:
+                        context.register_source("result[]", self._convert_stream_chunk(chunk))
+                        yield await context.render_variable(self.config.output, ignore_files=True)
+
+                return _stream_generator(result)
+
             context.register_source("result", result)
 
         return (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else (result or response)
@@ -108,6 +127,18 @@ class HttpClientAction:
 
         return await context.render_variable(self.config.endpoint)
 
+    def _convert_stream_chunk(self, chunk: bytes) -> Any:
+        if self.config.stream_format == HttpStreamFormat.JSON:
+            try:
+                return json.loads(chunk)
+            except:
+                return None
+
+        if self.config.stream_format == HttpStreamFormat.TEXT:
+            return chunk.decode("utf-8", errors="replace")
+
+        return chunk
+
 @register_component(ComponentType.HTTP_CLIENT)
 class HttpClientComponent(ComponentService):
     def __init__(self, id: str, config: HttpClientComponentConfig, global_configs: ComponentGlobalConfigs, daemon: bool):

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/services/http_server.py

@@ -2,15 +2,16 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from abc import ABC, abstractmethod
 from mindor.dsl.schema.component import HttpServerComponentConfig
 from mindor.dsl.schema.action import ActionConfig, HttpServerActionConfig, HttpServerCompletionType, HttpServerCompletionConfig
+from mindor.dsl.schema.transport.http import HttpStreamFormat
 from mindor.core.listener import HttpCallbackListener
-from mindor.core.utils.http_client import HttpClient
+from mindor.core.utils.http_client import HttpClient, HttpEventStreamResource
 from mindor.core.utils.http_status import is_status_code_matched
 from mindor.core.utils.time import parse_duration
 from mindor.core.utils.shell import run_command_streaming
 from ..base import ComponentService, ComponentType, ComponentGlobalConfigs, register_component
 from ..context import ComponentActionContext
 from datetime import datetime, timezone
-import asyncio
+import asyncio, json
 
 class HttpServerCompletion(ABC):
     def __init__(self, config: HttpServerCompletionConfig):
@@ -56,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)
+        callback_id = await context.render_variable(self.config.wait_for) if self.config.wait_for else "__default__"
         future: asyncio.Future = asyncio.get_running_loop().create_future()
         HttpCallbackListener.register_pending_future(callback_id, future)
 
@@ -89,14 +90,44 @@ class HttpServerAction:
         headers = await context.render_variable(self.config.headers)
 
         response, result = await client.request(path or "", method, params, body, headers), None
+
+        if isinstance(response, HttpEventStreamResource) and context.contains_variable_reference("response[]", self.config.output):
+            async def _stream_generator(stream: HttpEventStreamResource):
+                async for chunk in stream:
+                    context.register_source("response[]", self._convert_stream_chunk(chunk))
+                    yield await context.render_variable(self.config.output, ignore_files=True)
+
+            return _stream_generator(response)
+
         context.register_source("response", response)
 
         if self.completion:
             result = await self.completion.run(context, client)
+
+            if isinstance(result, HttpEventStreamResource) and context.contains_variable_reference("result[]", self.config.output):
+                async def _stream_generator(stream: HttpEventStreamResource):
+                    async for chunk in stream:
+                        context.register_source("result[]", self._convert_stream_chunk(chunk))
+                        yield await context.render_variable(self.config.output, ignore_files=True)
+
+                return _stream_generator(result)
+
             context.register_source("result", result)
 
         return (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else (result or response)
 
+    def _convert_stream_chunk(self, chunk: bytes) -> Any:
+        if self.config.stream_format == HttpStreamFormat.JSON:
+            try:
+                return json.loads(chunk)
+            except:
+                return None
+
+        if self.config.stream_format == HttpStreamFormat.TEXT:
+            return chunk.decode("utf-8", errors="replace")
+
+        return chunk
+
 @register_component(ComponentType.HTTP_SERVER)
 class HttpServerComponent(ComponentService):
     def __init__(self, id: str, config: HttpServerComponentConfig, global_configs: ComponentGlobalConfigs, daemon: bool):

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/image_to_text.py

@@ -63,8 +63,9 @@ class ImageToTextTaskAction:
         if stream:
             async def _stream_generator():
                 async for chunk in AsyncStreamer(streamer, loop):
-                    context.register_source("result", chunk)
-                    yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
+                    if chunk:
+                        context.register_source("result[]", chunk)
+                        yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
 
             return _stream_generator()
         else:

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/summarization.py

@@ -75,8 +75,9 @@ class SummarizationTaskAction:
         if stream:
             async def _stream_generator():
                 async for chunk in AsyncStreamer(streamer, loop):
-                    context.register_source("result", chunk)
-                    yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
+                    if chunk:
+                        context.register_source("result[]", chunk)
+                        yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
 
             return _stream_generator()
         else:

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/text_classification.py

@@ -1,7 +1,6 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.component import ModelComponentConfig
 from mindor.dsl.schema.action import ModelActionConfig, TextClassificationModelActionConfig
-from mindor.core.utils.streamer import AsyncStreamer
 from mindor.core.logger import logging
 from ..base import ModelTaskService, ModelTaskType, register_model_task_service
 from ..base import ComponentActionContext
@@ -26,7 +25,7 @@ class TextClassificationTaskAction:
         stream               = await context.render_variable(self.config.stream)
 
         is_single_input: bool = True if not isinstance(text, list) else False
-        has_iterable_result: bool = context.has_reference("result[]", self.config.output)
+        is_output_array_mode: bool = context.contains_variable_reference("result[]", self.config.output)
         texts: List[str] = [ text ] if is_single_input else text
         results = []
 
@@ -38,7 +37,7 @@ class TextClassificationTaskAction:
 
                 with torch.inference_mode():
                     outputs: SequenceClassifierOutput = self.model(**inputs)
-                    logits = outputs.logits  # shape: (batch_size, num_classes)
+                    logits = outputs.logits # shape: (batch_size, num_classes)
                     predictions = []
 
                     if return_probabilities:
@@ -54,7 +53,7 @@ class TextClassificationTaskAction:
                         for predicted_index in predicted_indices:
                             predictions.append(labels[predicted_index] if labels else predicted_index)
 
-                if self.config.output and has_iterable_result:
+                if self.config.output and is_output_array_mode:
                     rendered_outputs = []
                     for prediction in predictions:
                         context.register_source("result[]", prediction)
@@ -67,7 +66,7 @@ class TextClassificationTaskAction:
         if stream:
             async def _stream_generator():
                 async for predictions in _predict():
-                    if not has_iterable_result:
+                    if not is_output_array_mode:
                         for prediction in predictions:
                             context.register_source("result", prediction)
                             yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else result
@@ -80,7 +79,7 @@ class TextClassificationTaskAction:
             async for predictions in _predict():
                 results.extend(predictions)
 
-            if not has_iterable_result:
+            if not is_output_array_mode:
                 result = results[0] if is_single_input else results
                 context.register_source("result", result)
 

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/text_embedding.py

@@ -1,7 +1,6 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.component import ModelComponentConfig
 from mindor.dsl.schema.action import ModelActionConfig, TextEmbeddingModelActionConfig
-from mindor.core.utils.streamer import AsyncStreamer
 from mindor.core.logger import logging
 from ..base import ModelTaskService, ModelTaskType, register_model_task_service
 from ..base import ComponentActionContext
@@ -27,7 +26,7 @@ class TextEmbeddingTaskAction:
         stream           = await context.render_variable(self.config.stream)
 
         is_single_input: bool = True if not isinstance(text, list) else False
-        has_iterable_result: bool = context.has_reference("result[]", self.config.output)
+        is_output_array_mode: bool = context.contains_variable_reference("result[]", self.config.output)
         texts: List[str] = [ text ] if is_single_input else text
         results = []
 
@@ -39,7 +38,7 @@ class TextEmbeddingTaskAction:
 
                 with torch.inference_mode():
                     outputs: BaseModelOutput = self.model(**inputs)
-                    last_hidden_state = outputs.last_hidden_state  # (batch_size, seq_len, hidden_size)
+                    last_hidden_state = outputs.last_hidden_state # (batch_size, seq_len, hidden_size)
 
                 attention_mask = inputs.get("attention_mask", None)
                 embeddings = self._pool_hidden_state(last_hidden_state, attention_mask, pooling)
@@ -49,7 +48,7 @@ class TextEmbeddingTaskAction:
 
                 embeddings = embeddings.cpu().tolist()
 
-                if self.config.output and has_iterable_result:
+                if self.config.output and is_output_array_mode:
                     rendered_outputs = []
                     for embedding in embeddings:
                         context.register_source("result[]", embedding)
@@ -62,7 +61,7 @@ class TextEmbeddingTaskAction:
         if stream:
             async def _stream_generator():
                 async for embeddings in _embed():
-                    if not has_iterable_result:
+                    if not is_output_array_mode:
                         for embedding in embeddings:
                             context.register_source("result", embedding)
                             yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else result
@@ -75,7 +74,7 @@ class TextEmbeddingTaskAction:
             async for embeddings in _embed():
                 results.extend(embeddings)
 
-            if not has_iterable_result:
+            if not is_output_array_mode:
                 result = results[0] if is_single_input else results
                 context.register_source("result", result)
 

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/text_generation.py

@@ -67,8 +67,9 @@ class TextGenerationTaskAction:
         if stream:
             async def _stream_generator():
                 async for chunk in AsyncStreamer(streamer, loop):
-                    context.register_source("result", chunk)
-                    yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
+                    if chunk:
+                        context.register_source("result[]", chunk)
+                        yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
 
             return _stream_generator()
         else:

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/translation.py

@@ -75,8 +75,9 @@ class TranslationTaskAction:
         if stream:
             async def _stream_generator():
                 async for chunk in AsyncStreamer(streamer, loop):
-                    context.register_source("result", chunk)
-                    yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
+                    if chunk:
+                        context.register_source("result[]", chunk)
+                        yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
 
             return _stream_generator()
         else:

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/controller/base.py

@@ -42,8 +42,8 @@ class ControllerService(AsyncService):
     def __init__(
         self,
         config: ControllerConfig,
-        workflows: Dict[str, WorkflowConfig],
-        components: Dict[str, ComponentConfig],
+        workflows: List[WorkflowConfig],
+        components: List[ComponentConfig],
         listeners: List[ListenerConfig],
         gateways: List[GatewayConfig],
         loggers: List[LoggerConfig],
@@ -52,8 +52,8 @@ class ControllerService(AsyncService):
         super().__init__(daemon)
 
         self.config: ControllerConfig = config
-        self.workflows: Dict[str, WorkflowConfig] = workflows
-        self.components: Dict[str, ComponentConfig] = components
+        self.workflows: List[WorkflowConfig] = workflows
+        self.components: List[ComponentConfig] = components
         self.listeners: List[ListenerConfig] = listeners
         self.gateways: List[GatewayConfig] = gateways
         self.loggers: List[LoggerConfig] = loggers
@@ -233,7 +233,7 @@ class ControllerService(AsyncService):
 
     def _create_components(self) -> List[ComponentService]:
         global_configs = self._get_component_global_configs()
-        return [ create_component(component_id, config, global_configs, self.daemon) for component_id, config in self.components.items() ]
+        return [ create_component(component.id, 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() ]) ]

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/controller/controller.py

@@ -9,8 +9,8 @@ from .base import ControllerService, ControllerRegistry, TaskStatus
 
 def create_controller(
     config: ControllerConfig,
-    workflows: Dict[str, WorkflowConfig],
-    components: Dict[str, ComponentConfig],
+    workflows: List[WorkflowConfig],
+    components: List[ComponentConfig],
     listeners: List[ListenerConfig],
     gateways: List[GatewayConfig],
     loggers: List[LoggerConfig],

{model_compose-0.3.10 → model_compose-0.3.12}/src/mindor/core/controller/runtime/specs.py

@@ -11,22 +11,21 @@ class ControllerRuntimeSpecs:
     def __init__(
         self,
         controller: ControllerConfig,
-        components: Dict[str, ComponentConfig],
+        components: List[ComponentConfig],
         listeners: List[ListenerConfig],
         gateways: List[GatewayConfig],
-        workflows: Dict[str, WorkflowConfig]
+        workflows: List[WorkflowConfig]
     ):
         self.controller: ControllerConfig = controller
-        self.components: Dict[str, ComponentConfig] = components
+        self.components: List[ComponentConfig] = components
         self.listeners: List[ListenerConfig] = listeners
         self.gateways: List[GatewayConfig] = gateways
-        self.workflows: Dict[str, WorkflowConfig] = workflows
+        self.workflows: List[WorkflowConfig] = workflows
 
     def generate_native_runtime_specs(self) -> Dict[str, Any]:
         specs: Dict[str, Any] = {}
 
-        specs["controller"] = self.controller.model_dump()
-        specs["controller"]["runtime"] = "native"
+        specs["controller"] = { **self.controller.model_dump(), "runtime": "native" }
 
         if getattr(self.controller.webui, "server_dir", None):
             specs["controller"]["webui"]["server_dir"] = "webui/server"
@@ -34,13 +33,12 @@ class ControllerRuntimeSpecs:
         if getattr(self.controller.webui, "static_dir", None):
             specs["controller"]["webui"]["static_dir"] = "webui/static"
 
-        specs["components"] = {}
-        for id, component in self.components.items():
-            specs["components"][id] = component.model_dump()
-            specs["components"][id]["runtime"] = "native"
+        specs["components"] = [
+            { **component.model_dump(), "runtime": "native" } for component in self.components
+        ]
 
         specs["listeners"] = [ listener.model_dump() for listener in self.listeners ]
         specs["gateways" ] = [ gateway.model_dump()  for gateway  in self.gateways  ]
-        specs["workflows"] = { id: workflow.model_dump() for id, workflow in self.workflows.items() }
+        specs["workflows"] = [ workflow.model_dump() for workflow in self.workflows ]
 
         return enum_union_to_str(specs)