flock-core 0.4.0b21__py3-none-any.whl → 0.4.0b23__py3-none-any.whl

flock/routers/list_generator/list_generator_router.py

@@ -0,0 +1,166 @@
+# src/flock/routers/list_generator/iterative_list_router.py (New File)
+
+from typing import Any
+
+from pydantic import Field
+
+from flock.core.context.context import FlockContext
+from flock.core.flock_agent import FlockAgent
+from flock.core.flock_registry import flock_component
+from flock.core.flock_router import (
+    FlockRouter,
+    FlockRouterConfig,
+    HandOffRequest,
+)
+from flock.core.logging.logging import get_logger
+
+# Need signature utils
+
+logger = get_logger("router.list_generator")
+
+
+class IterativeListGeneratorRouterConfig(FlockRouterConfig):
+    target_list_field: str = Field(
+        ...,
+        description="Name of the final list output field (e.g., 'chapters').",
+    )
+    item_output_field: str = Field(
+        ...,
+        description="Name of the single item output field for each iteration (e.g., 'chapter').",
+    )
+    context_input_field: str = Field(
+        default="previous_items",
+        description="Input field name for passing back generated items (e.g., 'existing_chapters').",
+    )
+    max_iterations: int = Field(
+        default=10, description="Maximum number of items to generate."
+    )
+    # More advanced: termination_condition: Optional[Callable] = None
+    # Store iteration state in context under this prefix
+    context_state_prefix: str = Field(
+        default="flock.iterator_state_",
+        description="Prefix for context keys storing iteration state.",
+    )
+
+    # Field to extract item type from target_list_field signature
+    # This might require parsing the original agent's output signature
+    # item_type_str: Optional[str] = None # e.g., 'dict[str, str]' or 'MyChapterType'
+
+
+@flock_component
+class IterativeListGeneratorRouter(FlockRouter):
+    name: str = "iterative_list_generator"
+    config: IterativeListGeneratorRouterConfig = Field(
+        default_factory=IterativeListGeneratorRouterConfig
+    )
+
+    # Helper to get state keys
+    def _get_state_keys(self, agent_name: str) -> tuple[str, str]:
+        prefix = self.config.context_state_prefix
+        list_key = f"{prefix}{agent_name}_{self.config.target_list_field}"
+        count_key = f"{prefix}{agent_name}_iteration_count"
+        return list_key, count_key
+
+    async def route(
+        self,
+        current_agent: FlockAgent,
+        result: dict[str, Any],
+        context: FlockContext,
+    ) -> HandOffRequest:
+        list_key, count_key = self._get_state_keys(current_agent.name)
+
+        # --- State Initialization (First Run) ---
+        if count_key not in context.state:
+            logger.debug(
+                f"Initializing iterative list generation for '{self.config.target_list_field}' in agent '{current_agent.name}'."
+            )
+            context.set_variable(count_key, 0)
+            context.set_variable(list_key, [])
+            # Modify agent signature for the *first* iteration (remove context_input_field, use item_output_field)
+            # This requires modifying the agent's internal state or creating a temporary one.
+            # Let's try modifying the context passed to the *next* run instead.
+            context.set_variable(
+                f"{current_agent.name}.next_run_output_field",
+                self.config.item_output_field,
+            )
+            context.set_variable(
+                f"{current_agent.name}.next_run_input_fields_to_exclude",
+                {self.config.context_input_field},
+            )
+
+        # --- Process Result of Previous Iteration ---
+        iteration_count = context.get_variable(count_key, 0)
+        generated_items = context.get_variable(list_key, [])
+
+        # Get the single item generated in the *last* run
+        # The result dict should contain the 'item_output_field' if it wasn't the very first run
+        new_item = result.get(self.config.item_output_field)
+
+        if (
+            new_item is not None and iteration_count > 0
+        ):  # Add item from previous run (not the init run)
+            generated_items.append(new_item)
+            context.set_variable(list_key, generated_items)  # Update context
+            logger.info(
+                f"Added item #{iteration_count} to list '{self.config.target_list_field}' for agent '{current_agent.name}'."
+            )
+        elif iteration_count > 0:
+            logger.warning(
+                f"Iteration {iteration_count} for agent '{current_agent.name}' did not produce expected output field '{self.config.item_output_field}'."
+            )
+            # Decide how to handle: stop, retry, continue? Let's continue for now.
+
+        # Increment iteration count *after* processing the result of the previous one
+        current_iteration = iteration_count + 1
+        context.set_variable(count_key, current_iteration)
+
+        # --- Termination Check ---
+        if current_iteration > self.config.max_iterations:
+            logger.info(
+                f"Max iterations ({self.config.max_iterations}) reached for '{self.config.target_list_field}' in agent '{current_agent.name}'. Finalizing."
+            )
+            # Clean up state
+            del context.state[count_key]
+            # Final result should be the list itself under the target_list_field key
+            final_result = {self.config.target_list_field: generated_items}
+            # Handoff with empty next_agent to stop, but potentially override the *result*
+            # This is tricky. Routers usually decide the *next agent*, not the *final output*.
+            # Maybe the router should just signal termination, and the Flock run loop handles assembling the final output?
+            # Let's assume the router signals termination by returning next_agent=""
+            # The final list is already in the context under list_key.
+            # A final "AssemblerAgent" could read this context variable.
+            # OR we modify the HandOffRequest:
+            return HandOffRequest(
+                next_agent="", final_output_override=final_result
+            )  # Needs HandOffRequest modification
+
+        # --- Prepare for Next Iteration ---
+        logger.info(
+            f"Routing back to agent '{current_agent.name}' for item #{current_iteration} of '{self.config.target_list_field}'."
+        )
+
+        # The agent needs the context (previously generated items) and the original inputs again.
+        # We will pass the generated items via the context_input_field.
+        # The original inputs (like story_outline) should still be in the context.
+        next_input_override = {
+            self.config.context_input_field: generated_items  # Pass the list back
+        }
+
+        # Modify agent signature for the *next* iteration (add context_input_field, use item_output_field)
+        # This is the trickiest part - how to modify the agent's perceived signature for the next run?
+        # Option 1: Pass overrides via HandOffRequest (cleanest)
+        next_signature_input = f"{current_agent.input}, {self.config.context_input_field}: list | Previously generated items"  # Needs smarter joining
+        next_signature_output = (
+            self.config.item_output_field
+        )  # Only ask for one item
+
+        # This requires HandOffRequest and Flock execution loop to support signature overrides
+        return HandOffRequest(
+            next_agent=current_agent.name,
+            output_to_input_merge_strategy="add",  # Add the context_input_field to existing context
+            input_override=next_input_override,  # Provide the actual list data
+            # --- Hypothetical Overrides ---
+            next_run_input_signature_override=next_signature_input,
+            next_run_output_signature_override=next_signature_output,
+            # -----------------------------
+        )

flock/routers/llm/llm_router.py

@@ -140,7 +140,7 @@ class LLMRouter(FlockRouter):
         )
         return HandOffRequest(
             next_agent=next_agent_name,
-            hand_off_mode="add",
+            output_to_input_merge_strategy="add",
             override_next_agent=None,
             override_context=None,
         )

flock/workflow/activities.py

@@ -171,8 +171,27 @@ async def run_agent(context: FlockContext) -> dict:
                 # Prepare the next agent.
                 try:
                     agent = registry.get_agent(handoff_data.next_agent)
-                    if handoff_data.hand_off_mode == "add":
+                    if handoff_data.output_to_input_merge_strategy == "add":
                         agent.input = previous_agent_output + ", " + agent.input
+
+                    if handoff_data.add_input_fields:
+                        for field in handoff_data.add_input_fields:
+                            agent.input = field + ", " + agent.input
+
+                    if handoff_data.add_output_fields:
+                        for field in handoff_data.add_output_fields:
+                            agent.output = field + ", " + agent.output
+
+                    if handoff_data.add_description:
+                        if agent.description:
+                            agent.description = (
+                                agent.description
+                                + "\n"
+                                + handoff_data.add_description
+                            )
+                        else:
+                            agent.description = handoff_data.add_description
+
                     agent.resolve_callables(context=context)
                     if not agent:
                         logger.error(

{flock_core-0.4.0b21.dist-info → flock_core-0.4.0b23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.0b21
+Version: 0.4.0b23
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE
@@ -17,6 +17,7 @@ Requires-Dist: dspy==2.6.16
 Requires-Dist: duckduckgo-search>=7.3.2
 Requires-Dist: fastapi>=0.115.8
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: inspect-ai>=0.3.88
 Requires-Dist: litellm==1.63.7
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: matplotlib>=3.10.0

{flock_core-0.4.0b21.dist-info → flock_core-0.4.0b23.dist-info}/RECORD

@@ -20,12 +20,12 @@ flock/cli/yaml_editor.py,sha256=K3N0bh61G1TSDAZDnurqW9e_-hO6CtSQKXQqlDhCjVo,1252
 flock/cli/assets/release_notes.md,sha256=bqnk50jxM3w5uY44Dc7MkdT8XmRREFxrVBAG9XCOSSU,4896
 flock/core/__init__.py,sha256=p7lmQULRu9ejIAELfanZiyMhW0CougIPvyFHW2nqBFQ,847
 flock/core/flock.py,sha256=RcDUc__ukjUy9aSA_n0t8SxXCex4BV_nagTcg22peJ0,25116
-flock/core/flock_agent.py,sha256=ZmkiHd2oLao_263b7nmf26TQfyevX9_HNlhHPIkd3UM,33497
+flock/core/flock_agent.py,sha256=Hqh9jh_m-8hc9n9qE34XvTiOx92s7Xu_yR87M0n7GPU,33187
 flock/core/flock_evaluator.py,sha256=dOXZeDOGZcAmJ9ahqq_2bdGUU1VOXY4skmwTVpAjiVw,1685
-flock/core/flock_factory.py,sha256=vLkCASLh7Vrb5NFjb4ZQT5xN3zsUDud51hAQxb82oTk,2993
+flock/core/flock_factory.py,sha256=38cq0kovBhjulEecdnNk3MWSklX5lcdg0brhx49ixfQ,2993
 flock/core/flock_module.py,sha256=96aFVYAgwpKN53xGbivQDUpikOYGFCxK5mqhclOcxY0,3003
-flock/core/flock_registry.py,sha256=ekYpQgSkZVnbyPbl8gA7nf54brt94rYZZBe2RwEGtUc,20828
-flock/core/flock_router.py,sha256=A5GaxcGvtiFlRLHBTW7okh5RDm3BdKam2uXvRHRaj7k,2187
+flock/core/flock_registry.py,sha256=KjLqJrCpCuvk4Ot5ASbRAWXwy5gHBneS_8IjttRPRnQ,22292
+flock/core/flock_router.py,sha256=1OAXDsdaIIFApEfo6SRfFEDoTuGt3Si7n2MXiySEfis,2644
 flock/core/api/__init__.py,sha256=OKlhzDWZJfA6ddBwxQUmATY0TSzESsH032u00iVGvdA,228
 flock/core/api/endpoints.py,sha256=qQnJmtcYGkjdKtLllVpyJVjc-iZrvu5EEeVIryyt4tc,12987
 flock/core/api/main.py,sha256=glu9ThsYNTt35Ogjx732SGYJ9-aFftpvzLMQEJ7VuvQ,19189
@@ -56,7 +56,7 @@ flock/core/logging/span_middleware/baggage_span_processor.py,sha256=gJfRl8FeB6jd
 flock/core/logging/telemetry_exporter/base_exporter.py,sha256=rQJJzS6q9n2aojoSqwCnl7ZtHrh5LZZ-gkxUuI5WfrQ,1124
 flock/core/logging/telemetry_exporter/file_exporter.py,sha256=nKAjJSZtA7FqHSTuTiFtYYepaxOq7l1rDvs8U8rSBlA,3023
 flock/core/logging/telemetry_exporter/sqlite_exporter.py,sha256=CDsiMb9QcqeXelZ6ZqPSS56ovMPGqOu6whzBZRK__Vg,3498
-flock/core/mixin/dspy_integration.py,sha256=lB3VLBa5dnBJQOgdJCFGWC_0-XMyXmqCHmnCPFyrZuY,17197
+flock/core/mixin/dspy_integration.py,sha256=JlGtakuy_lXXEEXBycd7ygmdUBKS-4qPWNqx3Wqfy78,17187
 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
@@ -64,7 +64,7 @@ flock/core/serialization/flock_serializer.py,sha256=TEePKaJqU-_XWHTMWyMHloDNwmkK
 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
-flock/core/serialization/serialization_utils.py,sha256=63CV41Jba29EEqS85h_6ADgbeYvVmfILmbXv742LiXQ,12702
+flock/core/serialization/serialization_utils.py,sha256=AHRf90trgnj2Q6aaGaq5eja5PRcuJANUsp2wafGUeig,15257
 flock/core/tools/azure_tools.py,sha256=hwLnI2gsEq6QzUoWj5eCGDKTdXY1XUf6K-H5Uwva2MY,17093
 flock/core/tools/basic_tools.py,sha256=Ye7nlI4RRkqWRy8nH9CKuItBmh_ZXxUpouGnCOfx0s0,9050
 flock/core/tools/llm_tools.py,sha256=Bdt4Dpur5dGpxd2KFEQyxjfZazvW1HCDKY6ydMj6UgQ,21811
@@ -74,14 +74,15 @@ flock/core/tools/dev_tools/github.py,sha256=a2OTPXS7kWOVA4zrZHynQDcsmEi4Pac5MfSj
 flock/core/util/cli_helper.py,sha256=EnK4X-FgaO71JsSXLdy0R-cxE3UctlFZtzldursw-Bw,49845
 flock/core/util/file_path_utils.py,sha256=Odf7uU32C-x1KNighbNERSiMtkzW4h8laABIoFK7A5M,6246
 flock/core/util/hydrator.py,sha256=QJvCA8F4nkSP5akp3yg0cT6oaajOr1n7sldW5dCs6Lo,10733
-flock/core/util/input_resolver.py,sha256=g9vDPdY4OH-G7qjas5ksGEHueokHGFPMoLOvC-ngeLo,5984
+flock/core/util/input_resolver.py,sha256=ttFiz5L_uzSvxEhWOPL09WfLF--RlLOikLP5hrgE7Mo,6138
 flock/core/util/loader.py,sha256=j3q2qem5bFMP2SmMuYjb-ISxsNGNZd1baQmpvAnRUUk,2244
-flock/evaluators/declarative/declarative_evaluator.py,sha256=nagYTKqoduQ968Pij4bZh0584RYH4MDPdYnh9dtaYHc,5905
+flock/evaluators/declarative/declarative_evaluator.py,sha256=gdB1w6_stRhU91D21O9sxqkMbF9VRvaiV6-trwjYLpM,6107
 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
 flock/evaluators/test/test_case_evaluator.py,sha256=9vVhYbRrq68TNn8wo9z_yFD4UydhPKlygzy0mDmLLJU,1124
 flock/evaluators/zep/zep_evaluator.py,sha256=9NOELl7JAuUcx_FQrxY6b-_vN3MjwDyW7ZppPIGeCFc,1954
+flock/modules/assertion/assertion_module.py,sha256=f4hUxqB-KsDXJF2FQJ7hIv-0jJZ_g2Sa0scdgozW1Js,12824
 flock/modules/azure-search/azure_search_module.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/modules/callback/callback_module.py,sha256=volGGgHtY19qj1wHR6m5a_hmXSbV3Ca3uY6I76YmcfU,2833
 flock/modules/memory/memory_module.py,sha256=bSkdFBW-Pp5ldHhXi8v4kfRM7zknfLR2fsOtbTosucI,14916
@@ -94,12 +95,15 @@ flock/platform/docker_tools.py,sha256=fpA7-6rJBjPOUBLdQP4ny2QPgJ_042nmqRn5GtKnoY
 flock/platform/jaeger_install.py,sha256=MyOMJQx4TQSMYvdUJxfiGSo3YCtsfkbNXcAcQ9bjETA,2898
 flock/routers/__init__.py,sha256=w9uL34Auuo26-q_EGlE8Z9iHsw6S8qutTAH_ZI7pn7M,39
 flock/routers/agent/__init__.py,sha256=0ZOYpR8BMnR5iCGfcUiv99g7aT_g13xvm2Shl-XzybY,65
-flock/routers/agent/agent_router.py,sha256=9s3AwcBqpyhpPXOTqyMSVtS8Bcme1RDdqSUfWIqEBfc,8139
+flock/routers/agent/agent_router.py,sha256=uSLWlVTGNspp1WZf1rut-58Yxit6ud33aNT3mqbbVJc,8224
 flock/routers/agent/handoff_agent.py,sha256=p-0XEPXIyv1T3DGAhhXg2SYXmrwEaJ5pnuLgRSvbiZg,1903
+flock/routers/conditional/conditional_router.py,sha256=G4zulYBVo4xd6ExJrszmqYa5pyOsE6GXoD5MugNQa78,21223
 flock/routers/default/__init__.py,sha256=DOatGX_aE2DWvf55a0Tv7qDK05QFD-hL3sm7g58hmLU,61
-flock/routers/default/default_router.py,sha256=D9TCAAeNfzt3Se6QduGO2TmZ6038XlQLV6Y1u5IGI-0,2232
+flock/routers/default/default_router.py,sha256=wKbZFBSL9VhHjm5fzEVMwGkyRtmO3_lfmRnZ02BFeQ8,2279
+flock/routers/feedback/feedback_router.py,sha256=fFHUGnmKBAfdzgIh7EzjHOdEntgTN59JWpc_GsHAawo,4907
+flock/routers/list_generator/list_generator_router.py,sha256=OWnZJNfYCL-V78WxyUNlb8S48xj0-VE59d8XOpppvzk,7692
 flock/routers/llm/__init__.py,sha256=OV89ebq8RPWZwCJTS2_P46Q0yKD_03rwq_fBOsETd08,63
-flock/routers/llm/llm_router.py,sha256=3WXUK2TqZENYXSFb7o_WtpONq0SsebaZZpytCRr1daw,12217
+flock/routers/llm/llm_router.py,sha256=k2nxWxkBZaOPByiwUIYjN7N5jcFNAmqhSZm0LcF0tok,12234
 flock/themes/3024-day.toml,sha256=uOVHqEzSyHx0WlUk3D0lne4RBsNBAPCTy3C58yU7kEY,667
 flock/themes/3024-night.toml,sha256=qsXUwd6ZYz6J-R129_Ao2TKlvvK60svhZJJjB5c8Tfo,1667
 flock/themes/aardvark-blue.toml,sha256=5ZgsxP3pWLPN3yJ2Wd9ErCo7fy_VJpIfje4kriDKlqo,1667
@@ -437,12 +441,12 @@ flock/themes/zenburned.toml,sha256=UEmquBbcAO3Zj652XKUwCsNoC2iQSlIh-q5c6DH-7Kc,1
 flock/themes/zenwritten-dark.toml,sha256=To5l6520_3UqAGiEumpzGWsHhXxqu9ThrMildXKgIO0,1669
 flock/themes/zenwritten-light.toml,sha256=G1iEheCPfBNsMTGaVpEVpDzYBHA_T-MV27rolUYolmE,1666
 flock/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flock/workflow/activities.py,sha256=eVZDnxGJl_quNO-UTV3YgvTV8LrRaHN3QDAA1ANKzac,9065
+flock/workflow/activities.py,sha256=Rcgcepa-RzaEjKo2aNuI14O_sX8ij0RrqeyPa0oSw8M,9910
 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.0b21.dist-info/METADATA,sha256=q4rcJrfPWmenOfchiag5UQhLaLmdr68TE-f7G6p7Hd8,12970
-flock_core-0.4.0b21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b21.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b21.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b21.dist-info/RECORD,,
+flock_core-0.4.0b23.dist-info/METADATA,sha256=jiZmPSrAwNEiyugjNKF63f0qloquD8CFWb8SWodU588,13004
+flock_core-0.4.0b23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b23.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b23.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b23.dist-info/RECORD,,