model-compose 0.4.53__tar.gz → 0.4.54__tar.gz

{model_compose-0.4.53/src/model_compose.egg-info → model_compose-0.4.54}/PKG-INFO

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

{model_compose-0.4.53 → model_compose-0.4.54}/pyproject.toml

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

{model_compose-0.4.53 → model_compose-0.4.54}/src/mindor/core/component/services/workflow.py

@@ -9,7 +9,7 @@ class WorkflowAction:
         self.config: WorkflowActionConfig = config
 
     async def run(self, context: ComponentActionContext) -> Any:
-        input = await context.render_variable(self.config.input)
+        input = (await context.render_variable(self.config.input)) if self.config.input else context.input
         output = await context.workflow.workflow_delegate(self.config.workflow, input, context.workflow.interrupt_handler)
         context.register_source("output", output)
 

{model_compose-0.4.53 → model_compose-0.4.54}/src/mindor/core/utils/renderers.py

@@ -115,6 +115,8 @@ class VariableRenderer:
                 return await encode_stream_to_base64(UploadFileStreamResource(value))
             if isinstance(value, StreamResource):
                 return await encode_stream_to_base64(value)
+            if isinstance(value, str):
+                return base64.b64encode(value.encode("utf-8")).decode("ascii")
             return base64.b64encode(value)
 
         if type in [ "image", "audio", "video", "file" ]:

{model_compose-0.4.53 → model_compose-0.4.54}/src/mindor/core/workflow/context.py

@@ -8,11 +8,13 @@ class WorkflowContext:
     def __init__(
         self,
         task_id: str,
+        workflow_id: str,
         input: Dict[str, Any],
         interrupt_handler: InterruptHandler,
         workflow_delegate: WorkflowDelegate
     ):
         self.task_id: str = task_id
+        self.workflow_id: str = workflow_id
         self.input: Dict[str, Any] = input
         self.context: Dict[str, Any] = { "task_id": task_id }
         self.sources: Dict[str, Any] = { "jobs": {} }

{model_compose-0.4.53 → model_compose-0.4.54}/src/mindor/core/workflow/job/impl/component.py

@@ -29,10 +29,10 @@ class ComponentJob(Job):
             run_id: str = ulid.ulid()
 
             job_time_tracker = TimeTracker()
-            logging.debug("[task-%s] Component 'run-%s' started for job '%s'", context.task_id, run_id, self.id)
+            logging.debug("[task-%s] Run '%s:%s' for job '%s:%s' started.", context.task_id, run_id, component.id, self.id, context.workflow_id)
 
             if self.config.interrupt and self.config.interrupt.before:
-                logging.info("[task-%s] Job '%s' interrupted at 'before' phase.", context.task_id, self.id)
+                logging.info("[task-%s] Job '%s:%s' interrupted at 'before' phase.", context.task_id, self.id, context.workflow_id)
                 context.register_source("job", { "input": input })
                 answer = await self._interrupt(context, "before", self.config.interrupt.before)
                 if answer is not None:
@@ -42,14 +42,14 @@ class ComponentJob(Job):
             context.register_source("output", output)
 
             if self.config.interrupt and self.config.interrupt.after:
-                logging.info("[task-%s] Job '%s' interrupted at 'after' phase.", context.task_id, self.id)
+                logging.info("[task-%s] Job '%s:%s' interrupted at 'after' phase.", context.task_id, self.id, context.workflow_id)
                 context.register_source("job", { "input": input, "output": output })
                 answer = await self._interrupt(context, "after", self.config.interrupt.after)
                 if answer is not None:
                     output = answer
                 context.register_source("output", output)
 
-            logging.debug("[task-%s] Component 'run-%s' completed in %.2f seconds.", context.task_id, run_id, job_time_tracker.elapsed())
+            logging.debug("[task-%s] Run '%s:%s' for job '%s:%s' completed in %.2f seconds.", context.task_id, run_id, component.id, self.id, context.workflow_id, job_time_tracker.elapsed())
 
             output = (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else output
             outputs.append(output)
@@ -67,7 +67,7 @@ class ComponentJob(Job):
             input  = await context.render_variable(point.condition.input)
             value  = await context.render_variable(point.condition.value)
             if not evaluate_condition(point.condition.operator, input, value):
-                logging.debug("[task-%s] Job '%s' interrupt at '%s' phase skipped: condition not met.", context.task_id, self.id, phase)
+                logging.debug("[task-%s] Job '%s:%s' interrupt at '%s' phase skipped: condition not met.", context.task_id, self.id, context.workflow_id, phase)
                 return None
 
         message  = (await context.render_variable(point.message) ) if point.message  else None

{model_compose-0.4.53 → model_compose-0.4.54}/src/mindor/core/workflow/schema.py

@@ -259,7 +259,7 @@ class WorkflowInputVariableResolver(WorkflowVariableResolver):
     ) -> List[WorkflowVariable]:
         variables: List[WorkflowVariable] = []
 
-        if component.type == ComponentType.WORKFLOW:
+        if component.type == ComponentType.WORKFLOW and (not action.input or action.input == "${input}"):
             _, workflow = WorkflowResolver(workflows).resolve(action.workflow, raise_on_error=False)
             if workflow:
                 variables.extend(self._resolve_workflow(workflow, workflows, components))

{model_compose-0.4.53 → model_compose-0.4.54}/src/mindor/core/workflow/workflow.py

@@ -102,7 +102,8 @@ class WorkflowRunner:
                     running_job_ids.add(job.id)
 
                     job_time_trackers[job.id] = TimeTracker()
-                    logging.info("[task-%s] Job '%s' started.", context.task_id, job.id)
+                    logging.info("[task-%s] Job '%s:%s' started.", context.task_id, job.id, self.id)
+                    logging.debug("[task-%s] Job '%s:%s' input: %s", context.task_id, job.id, self.id, context.input)
 
             if not scheduled_job_tasks:
                 raise RuntimeError("No runnable jobs but pending jobs remain.")
@@ -124,10 +125,11 @@ class WorkflowRunner:
                         job_time_trackers[next_job_id] = TimeTracker()
                     else:
                         context.complete_job(completed_job_id, completed_job_output)
-                        logging.info("[task-%s] Job '%s' completed without routing.", context.task_id, completed_job_id)
+                        logging.info("[task-%s] Job '%s:%s' completed without routing.", context.task_id, completed_job_id, self.id)
                 else:
                     context.complete_job(completed_job_id, completed_job_output)
-                    logging.info("[task-%s] Job '%s' completed in %.2f seconds.", context.task_id, completed_job_id, job_time_trackers[completed_job_id].elapsed())
+                    logging.info("[task-%s] Job '%s:%s' completed in %.2f seconds.", context.task_id, completed_job_id, self.id, job_time_trackers[completed_job_id].elapsed())
+                    logging.debug("[task-%s] Job '%s:%s' output: %s", context.task_id, completed_job_id, self.id, completed_job_output)
 
                     if self._is_terminal_job(completed_job_id):
                         if isinstance(output, dict) and isinstance(completed_job_output, dict):
@@ -183,7 +185,7 @@ class Workflow:
         workflow_delegate: WorkflowDelegate = None
     ) -> Any:
         runner = WorkflowRunner(self.id, self.config.jobs, self.global_configs)
-        context = WorkflowContext(task_id, input, interrupt_handler, workflow_delegate)
+        context = WorkflowContext(task_id, self.id, input, interrupt_handler, workflow_delegate)
 
         return await runner.run(context)
 

{model_compose-0.4.53 → model_compose-0.4.54/src/model_compose.egg-info}/PKG-INFO

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