flock-core 0.5.0b25__py3-none-any.whl → 0.5.0b27__py3-none-any.whl

flock/components/evaluation/declarative_evaluation_component.py

@@ -121,6 +121,14 @@ class DeclarativeEvaluationConfig(AgentComponentConfig):
         default=False,
         description="Include the reasoning in the output.",
     )
+    status_output_field: str = Field(
+        default="_status_output",
+        description="The field name for the status output.",
+    )
+    include_status_output: bool = Field(
+        default=False,
+        description="Include the status output in the finaloutput.",
+    )
     adapter: Literal["chat", "json", "xml", "two_step"] | None = Field(
         default=None,
         description="Optional DSPy adapter to use for formatting/parsing.",
@@ -296,6 +304,7 @@ class DeclarativeEvaluationComponent(
         from rich.live import Live
 
         signature_order = []
+        status_field = self.config.status_output_field
         try:
             signature_order = list(signature.output_fields.keys())
         except Exception:
@@ -309,7 +318,10 @@ class DeclarativeEvaluationComponent(
             if field_name not in display_data:
                 display_data[field_name] = ""
 
+        display_data[status_field] = ""
+
         stream_buffers: defaultdict[str, list[str]] = defaultdict(list)
+        stream_buffers[status_field] = []
 
         formatter = theme_dict = styles = agent_label = None
         live_cm = nullcontext()
@@ -359,9 +371,14 @@ class DeclarativeEvaluationComponent(
                     _d = None
 
                 if isinstance(value, StatusMessage):
-                    message = getattr(value, "message", "")
-                    if message and live is not None:
-                        live.console.log(f"[status] {message}")
+                    token = getattr(value, "message", "")
+                    if token:
+                        stream_buffers[status_field].append(str(token) + "\n")
+                        display_data[status_field] = "".join(
+                            stream_buffers[status_field]
+                        )
+                        if formatter is not None:
+                            _refresh_panel()
                     continue
 
                 if isinstance(value, StreamResponse):
@@ -387,14 +404,37 @@ class DeclarativeEvaluationComponent(
                     continue
 
                 if isinstance(value, ModelResponseStream):
-                    try:
-                        chunk = value
-                        text = chunk.choices[0].delta.content or ""
-                        if text and live is not None:
-                            live.console.log(text)
-                    except Exception:
-                        pass
+                    for callback in self.config.stream_callbacks or []:
+                        try:
+                            callback(value)
+                        except Exception as e:
+                            logger.warning(f"Stream callback error: {e}")
+
+                    chunk = value
+                    token = chunk.choices[0].delta.content or ""
+                    signature_field = getattr(
+                        value, "signature_field_name", None
+                    )
+                    if signature_field:
+                        if signature_field not in display_data:
+                            display_data[signature_field] = ""
+                        if token:
+                            stream_buffers[signature_field].append(str(token))
+                            display_data[signature_field] = "".join(
+                                stream_buffers[signature_field]
+                            )
+                        if formatter is not None:
+                            _refresh_panel()
+                    else:
+                        if token:
+                            stream_buffers[status_field].append(str(token))
+                            display_data[status_field] = "".join(
+                                stream_buffers[status_field]
+                            )
+                        if formatter is not None:
+                            _refresh_panel()
                     continue
+                    
 
                 if _d and isinstance(value, _d.Prediction):
                     result_dict, cost, lm_history = self._process_result(
@@ -414,9 +454,14 @@ class DeclarativeEvaluationComponent(
                                 ordered_final[field_name] = final_result[
                                     field_name
                                 ]
+                            
+                        
                         for key, val in final_result.items():
                             if key not in ordered_final:
                                 ordered_final[key] = val
+                        
+                        if self.config.include_status_output:   
+                            ordered_final[self.config.status_output_field] = display_data[self.config.status_output_field]
                         display_data.clear()
                         display_data.update(ordered_final)
                         _refresh_panel()
@@ -533,6 +578,19 @@ class DeclarativeEvaluationComponent(
                 for k, v in result_dict.items()
                 if not (k.startswith("reasoning") or k.startswith("trajectory"))
             }
+    
+    def filter_status_output(
+        self, result_dict: dict[str, Any], include_status_output: bool
+    ) -> dict[str, Any]:
+        """Filter out status output from the result dictionary."""
+        if include_status_output:
+            return result_dict
+        else:
+            return {
+                k: v
+                for k, v in result_dict.items()
+                if not (k.startswith("_status_output"))
+            }
 
     def filter_reasoning(
         self, result_dict: dict[str, Any], include_reasoning: bool

flock/core/agent/default_agent.py

@@ -44,13 +44,14 @@ class DefaultAgent(FlockAgent):
         use_cache: bool = False,
         temperature: float = 0.7,
         max_tokens: int | None = None,
-        max_tool_calls: int = 0,
+        max_tool_calls: int = 10,
         max_retries: int = 2,
         stream: bool = True,
         stream_callbacks: list[Callable[..., Any] | Any] | None = None,
         stream_vertical_overflow: Literal["crop", "ellipsis", "crop_above", "visible"] = "crop_above",
         include_thought_process: bool = False,
         include_reasoning: bool = False,
+        include_status_output: bool = False,
         # Output utility parameters
         enable_rich_tables: bool = True,
         output_theme: OutputTheme | None = None,
@@ -90,6 +91,7 @@ class DefaultAgent(FlockAgent):
             stream_vertical_overflow: Rich Live overflow handling ('ellipsis', 'crop', 'crop_above', 'visible')
             include_thought_process: Include reasoning in output
             include_reasoning: Include detailed reasoning steps
+            include_status_output: Include status output in output
             enable_rich_tables: Enable rich table formatting for output
             output_theme: Theme for output formatting
             no_output: Disable output printing
@@ -129,6 +131,7 @@ class DefaultAgent(FlockAgent):
             stream_vertical_overflow=stream_vertical_overflow,
             include_thought_process=include_thought_process,
             include_reasoning=include_reasoning,
+            include_status_output=include_status_output,
         )
         if max_tokens is not None:
             _eval_kwargs["max_tokens"] = max_tokens

flock/core/logging/formatters/themed_formatter.py

@@ -256,6 +256,14 @@ def create_rich_renderable(
     if styles is None:
         styles = get_default_styles(theme)
 
+    # Convert Pydantic BaseModel instances to dicts for rendering
+    try:
+        from pydantic import BaseModel
+        if isinstance(value, BaseModel):
+            value = value.model_dump()
+    except ImportError:
+        pass
+
     # If the value is a dictionary, render it as a table.
     if isinstance(value, dict):
         # Convert table_box string into an actual box style.

{flock_core-0.5.0b25.dist-info → flock_core-0.5.0b27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.5.0b25
+Version: 0.5.0b27
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE

{flock_core-0.5.0b25.dist-info → flock_core-0.5.0b27.dist-info}/RECORD

@@ -27,7 +27,7 @@ flock/cli/yaml_editor.py,sha256=K3N0bh61G1TSDAZDnurqW9e_-hO6CtSQKXQqlDhCjVo,1252
 flock/cli/assets/release_notes.md,sha256=bqnk50jxM3w5uY44Dc7MkdT8XmRREFxrVBAG9XCOSSU,4896
 flock/components/__init__.py,sha256=qDcaP0O7_b5RlUEXluqwskpKCkhM73kSMeNXReze63M,963
 flock/components/evaluation/__init__.py,sha256=_M3UlRFeNN90fEny6byt5VdLDE5o5khbd0EPT0o9S9k,303
-flock/components/evaluation/declarative_evaluation_component.py,sha256=SiW6NddBsNNLte3sPiqkLe-sPCH1ACCyximhZoUsvpY,20706
+flock/components/evaluation/declarative_evaluation_component.py,sha256=tEMs5mENuQL84ZXJlQObvSygqajaJcu0LLOEKAdaYoE,23195
 flock/components/routing/__init__.py,sha256=BH_pFm9T6bUuf8HH4byDJ0dO0fzEVHv9m-ghUdDVdm0,542
 flock/components/routing/conditional_routing_component.py,sha256=WqZLMz-0Dhfb97xvttNrJCIVe6FNMLEQ2m4KQTDpIbI,21374
 flock/components/routing/default_routing_component.py,sha256=ZHt2Kjf-GHB5n7evU5NSGeQJ1Wuims5soeMswqaUb1E,3370
@@ -43,7 +43,7 @@ flock/core/flock_factory.py,sha256=Z6GJpYXN9_DXuOqvBH9ir0SMoUw78DkWhrhkm90luAQ,2
 flock/core/flock_scheduler.py,sha256=ng_s7gyijmc-AmYvBn5rtg61CSUZiIkXPRSlA1xO6VQ,8766
 flock/core/flock_server_manager.py,sha256=tM_nOs37vAbEvxmhwy_DL2JPvgFViWroNxrRSu5MfUQ,4523
 flock/core/agent/__init__.py,sha256=l32KFMJnC_gidMXpAXK8-OX228bWOhNc8OY_NzXm59Q,515
-flock/core/agent/default_agent.py,sha256=924SWDx8axJ57JCWREZuLzV8039Wt_-5WIBNTvx479Y,7483
+flock/core/agent/default_agent.py,sha256=faeWCgMbMmU_QyTxeBxxc_nsD3h-wHHVTzUaFXgvcM4,7653
 flock/core/agent/flock_agent_components.py,sha256=LamOgpRC7wDKuU3d6enDG0UFlNxyKPErLpH7SQ_Pi74,4539
 flock/core/agent/flock_agent_execution.py,sha256=pdOddBGv8y1P89Ix8XFWa1eW9i3bWjOYiQQxeY2K0yo,4217
 flock/core/agent/flock_agent_integration.py,sha256=fnxzEA8-gIopHwD1de8QKt2A7Ilb1iH5Koxk1uiASas,10737
@@ -80,7 +80,7 @@ flock/core/logging/telemetry.py,sha256=2T_o5qjvWWGMEP3UmlF9pbiTr4HDUcojHNrAbsad0
 flock/core/logging/trace_and_logged.py,sha256=5vNrK1kxuPMoPJ0-QjQg-EDJL1oiEzvU6UNi6X8FiMs,2117
 flock/core/logging/formatters/enum_builder.py,sha256=LgEYXUv84wK5vwHflZ5h8HBGgvLH3sByvUQe8tZiyY0,981
 flock/core/logging/formatters/theme_builder.py,sha256=Wnaal3HuUDA4HFg9tdql1BxYwK83ACOZBBQy-DXnxcA,17342
-flock/core/logging/formatters/themed_formatter.py,sha256=f9BiIBUk3cLma6eAPbW8BnvUqTzPzcPhjLNQoia7pI4,20656
+flock/core/logging/formatters/themed_formatter.py,sha256=7SjkayQINY7ttxcqMWeZ0mxrqXWq6tgUgeEPKeLgddk,20888
 flock/core/logging/formatters/themes.py,sha256=80BRJJB0LZr11N0yQw2f8vdb_9179qjQO8PoeBaLMN0,10680
 flock/core/logging/span_middleware/baggage_span_processor.py,sha256=gJfRl8FeB6jdtghTaRHCrOaTo4fhPMRKgjqtZj-8T48,1118
 flock/core/logging/telemetry_exporter/base_exporter.py,sha256=rQJJzS6q9n2aojoSqwCnl7ZtHrh5LZZ-gkxUuI5WfrQ,1124
@@ -552,8 +552,8 @@ flock/workflow/agent_execution_activity.py,sha256=0exwmeWKYXXxdUqDf4YaUVpn0zl06S
 flock/workflow/flock_workflow.py,sha256=sKFsRIL_bDGonXSNhK1zwu6UechghC_PihJJMidI-VI,9139
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=KR6MlWOrpMtv8NyhaIPAsfl4tjobt81OBByQvg8Kw-Y,1948
-flock_core-0.5.0b25.dist-info/METADATA,sha256=OK1IlaUsnVvLIeIBbjn3lGPnCRUl6TTnjJQJ1-1Yu9M,9997
-flock_core-0.5.0b25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.5.0b25.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.5.0b25.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.5.0b25.dist-info/RECORD,,
+flock_core-0.5.0b27.dist-info/METADATA,sha256=CZTMnb9cOHSI6w5UQHSR9H9Ps3RKIakJndLB-OX66Vw,9997
+flock_core-0.5.0b27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.5.0b27.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.5.0b27.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.5.0b27.dist-info/RECORD,,