flock-core 0.4.520__py3-none-any.whl → 0.4.522__py3-none-any.whl

flock/core/flock_factory.py

@@ -413,6 +413,7 @@ class FlockFactory:
         write_to_file: bool = False,
         stream: bool = False,
         include_thought_process: bool = False,
+        include_reasoning: bool = False,
         temporal_activity_config: TemporalActivityConfig | None = None,
     ) -> FlockAgent:
         """Creates a default FlockAgent.
@@ -433,6 +434,7 @@ class FlockFactory:
             max_retries=max_retries,
             stream=stream,
             include_thought_process=include_thought_process,
+            include_reasoning=include_reasoning,
         )
 
         evaluator = DeclarativeEvaluator(name="default", config=eval_config)

flock/evaluators/declarative/declarative_evaluator.py

@@ -36,6 +36,10 @@ class DeclarativeEvaluatorConfig(FlockEvaluatorConfig):
         default=False,
         description="Include the thought process in the output.",
     )
+    include_reasoning: bool = Field(
+        default=False,
+        description="Include the reasoning in the output.",
+    )
     kwargs: dict[str, Any] = Field(default_factory=dict)
 
 
@@ -154,6 +158,9 @@ class DeclarativeEvaluator(
                     self._lm_history = lm_history
 
                 console.print("\n")
+                result_dict = self.filter_reasoning(
+                    result_dict, self.config.include_reasoning
+                )
                 return self.filter_thought_process(
                     result_dict, self.config.include_thought_process
                 )
@@ -170,6 +177,9 @@ class DeclarativeEvaluator(
                     )
                     self._cost = cost
                     self._lm_history = lm_history
+                    result_dict = self.filter_reasoning(
+                        result_dict, self.config.include_reasoning
+                    )
                     return self.filter_thought_process(
                         result_dict, self.config.include_thought_process
                     )
@@ -190,5 +200,18 @@ class DeclarativeEvaluator(
             return {
                 k: v
                 for k, v in result_dict.items()
-                if not (k.startswith("reasoning") or k.startswith("trajectory"))
+                if not (k.startswith("trajectory"))
+            }
+
+    def filter_reasoning(
+        self, result_dict: dict[str, Any], include_reasoning: bool
+    ) -> dict[str, Any]:
+        """Filter out reasoning from the result dictionary."""
+        if include_reasoning:
+            return result_dict
+        else:
+            return {
+                k: v
+                for k, v in result_dict.items()
+                if not (k.startswith("reasoning"))
             }

flock/webapp/app/api/execution.py

@@ -12,6 +12,7 @@ from fastapi import (  # Ensure Form and HTTPException are imported
 )
 from fastapi.responses import HTMLResponse
 from fastapi.templating import Jinja2Templates
+from pydantic import BaseModel
 
 if TYPE_CHECKING:
     from flock.core.flock import Flock
@@ -151,7 +152,10 @@ async def htmx_run_flock(
             return HTMLResponse(f"<p class='error'>Error processing inputs for {start_agent_name}: {e_parse}</p>")
 
     result_data = await run_current_flock_service(start_agent_name, inputs, request.app.state)
-    raw_json_for_template = json.dumps(result_data, indent=2)
+    if isinstance(result_data, BaseModel):
+        raw_json_for_template = result_data.model_dump_json(indent=2, ensure_ascii=False)
+    else:
+        raw_json_for_template = json.dumps(result_data, indent=2, ensure_ascii=False)
     # Unescape newlines for proper display in HTML <pre> tag
     result_data_raw_json_str = raw_json_for_template.replace('\\n', '\n')
     root_path = request.scope.get("root_path", "")
@@ -215,7 +219,10 @@ async def htmx_run_shared_flock(
 
         shared_logger.info(f"HTMX Run Shared: Executing agent '{start_agent_name}' in pre-loaded Flock '{temp_flock.name}'. Inputs: {list(inputs.keys())}")
         result_data = await temp_flock.run_async(start_agent=start_agent_name, input=inputs, box_result=False)
-        raw_json_for_template = json.dumps(result_data, indent=2)
+        if isinstance(result_data, BaseModel):
+            raw_json_for_template = result_data.model_dump_json(indent=2, ensure_ascii=False)
+        else:
+            raw_json_for_template = json.dumps(result_data, indent=2, ensure_ascii=False)
         # Unescape newlines for proper display in HTML <pre> tag
         result_data_raw_json_str = raw_json_for_template.replace('\\n', '\n')
         shared_logger.info(f"HTMX Run Shared: Agent '{start_agent_name}' executed. Result keys: {list(result_data.keys()) if isinstance(result_data, dict) else 'N/A'}")

{flock_core-0.4.520.dist-info → flock_core-0.4.522.dist-info}/METADATA

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

{flock_core-0.4.520.dist-info → flock_core-0.4.522.dist-info}/RECORD

@@ -29,7 +29,7 @@ flock/core/__init__.py,sha256=juwyNr3QqKXUS5-E3hlMYRhgqHgQBqgtP12OF3tUCAI,1249
 flock/core/flock.py,sha256=iR4i0_z0w2ns_iHbP7FqN--7wlsPIWch1H-BVecPs_I,38205
 flock/core/flock_agent.py,sha256=Hl6TONSiJi2I-N_49-1hkW2q_hyPXMebMr-5oZLI-PY,48842
 flock/core/flock_evaluator.py,sha256=TPy6u6XX3cqkY1r9NW1w2lTwCMNW7pxhFYKLefnEbXg,1820
-flock/core/flock_factory.py,sha256=siCShld0mHPzjsw2_TUhg_nesMYhocJympt1M8ch6p8,18724
+flock/core/flock_factory.py,sha256=QI5qzxSyg3z3T3wRHoTOyegeaquyfUO5cJjpT_QgRl8,18814
 flock/core/flock_module.py,sha256=ObILimpVaPnaaqYvcBYJJ20lQzfrjgTdADplaNRjHU0,7448
 flock/core/flock_registry.py,sha256=KzdFfc3QC-Dk42G24hdf6Prp3HvGj9ymXR3TTBe-T-A,27161
 flock/core/flock_router.py,sha256=1OAXDsdaIIFApEfo6SRfFEDoTuGt3Si7n2MXiySEfis,2644
@@ -97,7 +97,7 @@ flock/core/util/loader.py,sha256=j3q2qem5bFMP2SmMuYjb-ISxsNGNZd1baQmpvAnRUUk,224
 flock/core/util/splitter.py,sha256=rDLnZX158PWkmW8vi2UfMLAMRXcHQFUIydAABd-lDGw,7154
 flock/evaluators/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
 flock/evaluators/declarative/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/evaluators/declarative/declarative_evaluator.py,sha256=tulTpUOXhF-wMe5a9ULpsCiS1o2Z-DOXOUTqOSzVYqI,7397
+flock/evaluators/declarative/declarative_evaluator.py,sha256=vEdScni2uzOKFliFgSZEE1mgcDWM0s9MdOEga6a_nUM,8186
 flock/evaluators/memory/memory_evaluator.py,sha256=ySwz7kcc8suXMJ7gKNSWThW8iOMlE8lUcUzEAHvv8rw,3559
 flock/evaluators/test/test_case_evaluator.py,sha256=3Emcoty0LOLLBIuPGxSpKphuZC9Fu1DTr1vbGg-hd0Q,1233
 flock/evaluators/zep/zep_evaluator.py,sha256=6_5vTdU0yJAH8I8w3-MPXiAZx6iUPhAVCsHjrHzkPLM,2058
@@ -502,7 +502,7 @@ flock/webapp/app/theme_mapper.py,sha256=QzWwLWpED78oYp3FjZ9zxv1KxCyj43m8MZ0fhfzz
 flock/webapp/app/utils.py,sha256=RF8DMKKAj1XPmm4txUdo2OdswI1ATQ7cqUm6G9JFDzA,2942
 flock/webapp/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/webapp/app/api/agent_management.py,sha256=5xqO94QjjAYvxImyjKV9EGUQOvo4n3eqs7pGwGPSQJ4,10394
-flock/webapp/app/api/execution.py,sha256=tmExz11EPYmltYsQ-xB58ueXZbmlpW1fJFi0s6LjWnU,13120
+flock/webapp/app/api/execution.py,sha256=COPHVpyzjhGACZuQsrrudweGE4bHgtrxR4hoAopI2BA,13497
 flock/webapp/app/api/flock_management.py,sha256=1o-6-36kTnUjI3am_BqLpdrcz0aqFXrxE-hQHIFcCsg,4869
 flock/webapp/app/api/registry_viewer.py,sha256=IoInxJiRR0yFlecG_l2_eRc6l35RQQyEDMG9BcBkipY,1020
 flock/webapp/app/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -562,8 +562,8 @@ flock/workflow/agent_execution_activity.py,sha256=Gy6FtuVAjf0NiUXmC3syS2eJpNQF4R
 flock/workflow/flock_workflow.py,sha256=iSUF_soFvWar0ffpkzE4irkDZRx0p4HnwmEBi_Ne2sY,9666
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=YIHnSBntzOchHfMSh8hoLeNXrz3B1UbR14YrR6soM7A,1606
-flock_core-0.4.520.dist-info/METADATA,sha256=0dDV8IbiheDnn0O-Tm6c0poo7h7kAq7U4vMzcrRk8dc,22786
-flock_core-0.4.520.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.520.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.520.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.520.dist-info/RECORD,,
+flock_core-0.4.522.dist-info/METADATA,sha256=ihZdtIEwkGF3FUhglU0fQo9EYJEZSTpqB3m10FlgtSk,22786
+flock_core-0.4.522.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.522.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.522.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.522.dist-info/RECORD,,