flock-core 0.4.0b11__py3-none-any.whl → 0.4.0b13__py3-none-any.whl

flock/core/flock_factory.py

@@ -37,6 +37,7 @@ class FlockFactory:
         no_output: bool = False,
         print_context: bool = False,
         write_to_file: bool = False,
+        stream: bool = False,
     ) -> FlockAgent:
         """Creates a default FlockAgent.
 
@@ -50,6 +51,7 @@ class FlockFactory:
             use_cache=use_cache,
             max_tokens=max_tokens,
             temperature=temperature,
+            stream=stream,
         )
 
         evaluator = DeclarativeEvaluator(name="default", config=eval_config)

flock/core/serialization/flock_serializer.py

@@ -145,6 +145,66 @@ class FlockSerializer:
                             )
                         )
 
+                # Description (Callables)
+                if agent_data.get("description_callable"):
+                    logger.debug(
+                        f"Adding description callable '{agent_data['description_callable']}' from agent '{name}'"
+                    )
+                    description_callable_name = agent_data[
+                        "description_callable"
+                    ]
+                    description_callable = agent_instance.description
+                    path_str = FlockRegistry.get_callable_path_string(
+                        description_callable
+                    )
+                    if path_str:
+                        logger.debug(
+                            f"Adding description callable '{description_callable_name}' (from path '{path_str}') to components"
+                        )
+                        components[description_callable_name] = (
+                            FlockSerializer._get_callable_definition(
+                                path_str, description_callable_name, path_type
+                            )
+                        )
+
+                if agent_data.get("input_callable"):
+                    logger.debug(
+                        f"Adding input callable '{agent_data['input_callable']}' from agent '{name}'"
+                    )
+                    input_callable_name = agent_data["input_callable"]
+                    input_callable = agent_instance.input
+                    path_str = FlockRegistry.get_callable_path_string(
+                        input_callable
+                    )
+                    if path_str:
+                        logger.debug(
+                            f"Adding input callable '{input_callable_name}' (from path '{path_str}') to components"
+                        )
+                        components[input_callable_name] = (
+                            FlockSerializer._get_callable_definition(
+                                path_str, input_callable_name, path_type
+                            )
+                        )
+
+                if agent_data.get("output_callable"):
+                    logger.debug(
+                        f"Adding output callable '{agent_data['output_callable']}' from agent '{name}'"
+                    )
+                    output_callable_name = agent_data["output_callable"]
+                    output_callable = agent_instance.output
+                    path_str = FlockRegistry.get_callable_path_string(
+                        output_callable
+                    )
+                    if path_str:
+                        logger.debug(
+                            f"Adding output callable '{output_callable_name}' (from path '{path_str}') to components"
+                        )
+                        components[output_callable_name] = (
+                            FlockSerializer._get_callable_definition(
+                                path_str, output_callable_name, path_type
+                            )
+                        )
+
                 # Tools (Callables)
                 if agent_data.get("tools"):
                     logger.debug(

flock/evaluators/declarative/declarative_evaluator.py

@@ -1,12 +1,20 @@
+from collections.abc import Generator
 from typing import Any
 
+import dspy
 from pydantic import Field
+from rich.console import Console
 
 from flock.core.flock_agent import FlockAgent
 from flock.core.flock_evaluator import FlockEvaluator, FlockEvaluatorConfig
+from flock.core.logging.logging import get_logger
 from flock.core.mixin.dspy_integration import DSPyIntegrationMixin
 from flock.core.mixin.prompt_parser import PromptParserMixin
 
+console = Console()
+
+logger = get_logger("evaluators.declarative")
+
 
 class DeclarativeEvaluatorConfig(FlockEvaluatorConfig):
     """Configuration for the DeclarativeEvaluator."""
@@ -16,6 +24,10 @@ class DeclarativeEvaluatorConfig(FlockEvaluatorConfig):
     use_cache: bool = True
     temperature: float = 0.0
     max_tokens: int = 4096
+    stream: bool = Field(
+        default=False,
+        description="Enable streaming output from the underlying DSPy program.",
+    )
 
 
 class DeclarativeEvaluator(
@@ -31,24 +43,86 @@ class DeclarativeEvaluator(
     async def evaluate(
         self, agent: FlockAgent, inputs: dict[str, Any], tools: list[Any]
     ) -> dict[str, Any]:
-        """Evaluate using DSPy."""
-        _dspy_signature = self.create_dspy_signature_class(
-            agent.name,
-            agent.description,
-            f"{agent.input} -> {agent.output}",
-        )
-        self._configure_language_model(
-            model=self.config.model,
-            use_cache=self.config.use_cache,
-            temperature=self.config.temperature,
-            max_tokens=self.config.max_tokens,
-        )
-        agent_task = self._select_task(
-            _dspy_signature,
-            agent_type_override=self.config.agent_type_override,
-            tools=tools,
-        )
-        # Execute the task.
-        result = agent_task(**inputs)
-        result = self._process_result(result, inputs)
-        return result
+        """Evaluate using DSPy, with optional asynchronous streaming."""
+        # --- Setup Signature and LM ---
+        try:
+            _dspy_signature = self.create_dspy_signature_class(
+                agent.name,
+                agent.description,
+                f"{agent.input} -> {agent.output}",
+            )
+            # --- Get output field names ---
+            # dspy.Signature holds fields in .output_fields attribute
+            output_field_names = list(_dspy_signature.output_fields.keys())
+            if not output_field_names:
+                logger.warning(
+                    f"DSPy signature for agent '{agent.name}' has no defined output fields. Streaming might not produce text."
+                )
+            # -----------------------------
+
+            self._configure_language_model(
+                model=self.config.model or agent.model,
+                use_cache=self.config.use_cache,
+                temperature=self.config.temperature,
+                max_tokens=self.config.max_tokens,
+            )
+            agent_task = self._select_task(
+                _dspy_signature,
+                agent_type_override=self.config.agent_type_override,
+                tools=tools,
+            )
+        except Exception as setup_error:
+            logger.error(
+                f"Error setting up DSPy task for agent '{agent.name}': {setup_error}",
+                exc_info=True,
+            )
+            raise RuntimeError(
+                f"DSPy task setup failed: {setup_error}"
+            ) from setup_error
+
+        # --- Conditional Evaluation (Stream vs No Stream) ---
+        if self.config.stream:
+            logger.info(
+                f"Evaluating agent '{agent.name}' with async streaming."
+            )
+            if not callable(agent_task):
+                logger.error("agent_task is not callable, cannot stream.")
+                raise TypeError(
+                    "DSPy task could not be created or is not callable."
+                )
+
+            streaming_task = dspy.streamify(agent_task)
+            stream_generator: Generator = streaming_task(**inputs)
+
+            console.print("\n")
+            async for chunk in stream_generator:
+                if (
+                    hasattr(chunk, "choices")
+                    and chunk.choices
+                    and hasattr(chunk.choices[0], "delta")
+                    and chunk.choices[0].delta
+                    and hasattr(chunk.choices[0].delta, "content")
+                ):
+                    delta_content = chunk.choices[0].delta.content
+
+                if delta_content:
+                    console.print(delta_content, end="")
+
+                result_dict = self._process_result(chunk, inputs)
+
+            console.print("\n")
+            return result_dict
+
+        else:  # Non-streaming path
+            logger.info(f"Evaluating agent '{agent.name}' without streaming.")
+            try:
+                # Ensure the call is awaited if the underlying task is async
+                result_obj = await agent_task(**inputs)
+                result_dict = self._process_result(result_obj, inputs)
+                return result_dict
+            except Exception as e:
+                logger.error(
+                    f"Error during non-streaming evaluation for agent '{agent.name}': {e}",
+                    exc_info=True,
+                )
+                raise RuntimeError(f"Evaluation failed: {e}") from e

{flock_core-0.4.0b11.dist-info → flock_core-0.4.0b13.dist-info}/METADATA

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

{flock_core-0.4.0b11.dist-info → flock_core-0.4.0b13.dist-info}/RECORD

@@ -21,7 +21,7 @@ flock/core/__init__.py,sha256=p7lmQULRu9ejIAELfanZiyMhW0CougIPvyFHW2nqBFQ,847
 flock/core/flock.py,sha256=zQUpITLx_CMhJRnft4AWQDfYj85FhUlT-Ank5c-fSko,25146
 flock/core/flock_agent.py,sha256=uFVr8eVWZ4uowH659fdOvVuBD4fx695Zm9UB9pOQKDU,32223
 flock/core/flock_evaluator.py,sha256=dOXZeDOGZcAmJ9ahqq_2bdGUU1VOXY4skmwTVpAjiVw,1685
-flock/core/flock_factory.py,sha256=MGTkJCP1WGpV614f87r1vwe0tqAvBCoH9PlqtqDyJDk,2828
+flock/core/flock_factory.py,sha256=ym2ZIdDXzV_Ym5JdRUvFJRIkLIVCj017M6-AXQ7VkW8,2885
 flock/core/flock_module.py,sha256=96aFVYAgwpKN53xGbivQDUpikOYGFCxK5mqhclOcxY0,3003
 flock/core/flock_registry.py,sha256=ekYpQgSkZVnbyPbl8gA7nf54brt94rYZZBe2RwEGtUc,20828
 flock/core/flock_router.py,sha256=A5GaxcGvtiFlRLHBTW7okh5RDm3BdKam2uXvRHRaj7k,2187
@@ -59,7 +59,7 @@ flock/core/mixin/dspy_integration.py,sha256=vlf6rJnR9EsfZi5KyFLEXIbUvhpBhodctn-m
 flock/core/mixin/prompt_parser.py,sha256=eOqI-FK3y17gVqpc_y5GF-WmK1Jv8mFlkZxTcgweoxI,5121
 flock/core/serialization/__init__.py,sha256=CML7fPgG6p4c0CDBlJ_uwV1aZZhJKK9uy3IoIHfO87w,431
 flock/core/serialization/callable_registry.py,sha256=sUZECTZWsM3fJ8FDRQ-FgLNW9hF26nY17AD6fJKADMc,1419
-flock/core/serialization/flock_serializer.py,sha256=EcDpw-OdkDied80UMXnWYOU0A8PrTQlZ7JRNK2YQ9Tg,30041
+flock/core/serialization/flock_serializer.py,sha256=TEePKaJqU-_XWHTMWyMHloDNwmkKyOUSfXoJ7ZVki8k,33048
 flock/core/serialization/json_encoder.py,sha256=gAKj2zU_8wQiNvdkby2hksSA4fbPNwTjup_yz1Le1Vw,1229
 flock/core/serialization/secure_serializer.py,sha256=n5-zRvvXddgJv1FFHsaQ2wuYdL3WUSGPvG_LGaffEJo,6144
 flock/core/serialization/serializable.py,sha256=qlv8TsTqRuklXiNuCMrvro5VKz764xC2i3FlgLJSkdk,12129
@@ -75,7 +75,7 @@ flock/core/util/file_path_utils.py,sha256=Odf7uU32C-x1KNighbNERSiMtkzW4h8laABIoF
 flock/core/util/hydrator.py,sha256=6qNwOwCZB7r6y25BZ--0PGofrAlfMaXbDKFQeP5NLts,11196
 flock/core/util/input_resolver.py,sha256=g9vDPdY4OH-G7qjas5ksGEHueokHGFPMoLOvC-ngeLo,5984
 flock/core/util/loader.py,sha256=j3q2qem5bFMP2SmMuYjb-ISxsNGNZd1baQmpvAnRUUk,2244
-flock/evaluators/declarative/declarative_evaluator.py,sha256=WZ74LG81JcuApG2KcTk8plh0fFqDhJjtl6ubW1K-fqc,1750
+flock/evaluators/declarative/declarative_evaluator.py,sha256=kGhxkFJx8T0JXsr27rdqmB4nwq28yMDCOwPRJ-C2DOA,4778
 flock/evaluators/memory/azure_search_evaluator.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/evaluators/memory/memory_evaluator.py,sha256=SmerXyNaqm8DTV0yw-WqWkn9DXIf6x-nPG1eyTV6NY8,3452
 flock/evaluators/natural_language/natural_language_evaluator.py,sha256=6nVEeh8_uwv_h-d3FWlA0GbzDzRtdhvxCGKirHtyvOU,2012
@@ -439,8 +439,8 @@ flock/workflow/activities.py,sha256=eVZDnxGJl_quNO-UTV3YgvTV8LrRaHN3QDAA1ANKzac,
 flock/workflow/agent_activities.py,sha256=NhBZscflEf2IMfSRa_pBM_TRP7uVEF_O0ROvWZ33eDc,963
 flock/workflow/temporal_setup.py,sha256=VWBgmBgfTBjwM5ruS_dVpA5AVxx6EZ7oFPGw4j3m0l0,1091
 flock/workflow/workflow.py,sha256=I9MryXW_bqYVTHx-nl2epbTqeRy27CAWHHA7ZZA0nAk,1696
-flock_core-0.4.0b11.dist-info/METADATA,sha256=SBfnjjaedd-MZ5XRQCxC0Mgmm0k1uhVRWjZGGE-UDnY,21101
-flock_core-0.4.0b11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b11.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b11.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b11.dist-info/RECORD,,
+flock_core-0.4.0b13.dist-info/METADATA,sha256=-oZxxLDqjStFoVTtT5Ss9sk-EFpgsyINBBBJYYq7i6I,21101
+flock_core-0.4.0b13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b13.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b13.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b13.dist-info/RECORD,,