flock-core 0.4.0b10__py3-none-any.whl → 0.4.0b12__py3-none-any.whl

flock/core/__init__.py

@@ -8,6 +8,7 @@ from flock.core.flock_factory import FlockFactory
 from flock.core.flock_module import FlockModule, FlockModuleConfig
 from flock.core.flock_registry import (
     FlockRegistry,
+    flock_callable,
     flock_component,
     flock_tool,
     flock_type,
@@ -24,6 +25,7 @@ __all__ = [
     "FlockModule",
     "FlockModuleConfig",
     "FlockRegistry",
+    "flock_callable",
     "flock_component",
     "flock_tool",
     "flock_type",

flock/core/flock_agent.py

@@ -361,16 +361,30 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
         from flock.core.flock_registry import get_registry
 
         FlockRegistry = get_registry()
+
+        exclude = ["context", "evaluator", "modules", "handoff_router", "tools"]
+
+        is_descrition_callable = False
+        is_input_callable = False
+        is_output_callable = False
+
+        # if self.description is a callable, exclude it
+        if callable(self.description):
+            is_descrition_callable = True
+            exclude.append("description")
+        # if self.input is a callable, exclude it
+        if callable(self.input):
+            is_input_callable = True
+            exclude.append("input")
+        # if self.output is a callable, exclude it
+        if callable(self.output):
+            is_output_callable = True
+            exclude.append("output")
+
         logger.debug(f"Serializing agent '{self.name}' to dict.")
         # Use Pydantic's dump, exclude manually handled fields and runtime context
         data = self.model_dump(
-            exclude={
-                "context",
-                "evaluator",
-                "modules",
-                "handoff_router",
-                "tools",
-            },
+            exclude=exclude,
             mode="json",  # Use json mode for better handling of standard types by Pydantic
             exclude_none=True,  # Exclude None values for cleaner output
         )
@@ -483,6 +497,45 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
                     f"Added {len(serialized_tools)} tools to agent '{self.name}'"
                 )
 
+        if is_descrition_callable:
+            path_str = FlockRegistry.get_callable_path_string(self.description)
+            if path_str:
+                func_name = path_str.split(".")[-1]
+                data["description_callable"] = func_name
+                logger.debug(
+                    f"Added description '{func_name}' (from path '{path_str}') to agent '{self.name}'"
+                )
+            else:
+                logger.warning(
+                    f"Could not get path string for description {self.description} in agent '{self.name}'. Skipping."
+                )
+
+        if is_input_callable:
+            path_str = FlockRegistry.get_callable_path_string(self.input)
+            if path_str:
+                func_name = path_str.split(".")[-1]
+                data["input_callable"] = func_name
+                logger.debug(
+                    f"Added input '{func_name}' (from path '{path_str}') to agent '{self.name}'"
+                )
+            else:
+                logger.warning(
+                    f"Could not get path string for input {self.input} in agent '{self.name}'. Skipping."
+                )
+
+        if is_output_callable:
+            path_str = FlockRegistry.get_callable_path_string(self.output)
+            if path_str:
+                func_name = path_str.split(".")[-1]
+                data["output_callable"] = func_name
+                logger.debug(
+                    f"Added output '{func_name}' (from path '{path_str}') to agent '{self.name}'"
+                )
+            else:
+                logger.warning(
+                    f"Could not get path string for output {self.output} in agent '{self.name}'. Skipping."
+                )
+
         # No need to call _filter_none_values here as model_dump(exclude_none=True) handles it
         logger.info(
             f"Serialization of agent '{self.name}' complete with {len(data)} fields"
@@ -508,6 +561,9 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
         router_data = data.pop("handoff_router", None)
         modules_data = data.pop("modules", {})
         tools_data = data.pop("tools", [])
+        description_callable = data.pop("description_callable", None)
+        input_callable = data.pop("input_callable", None)
+        output_callable = data.pop("output_callable", None)
 
         logger.debug(
             f"Agent '{agent_name}' has {len(modules_data)} modules and {len(tools_data)} tools"
@@ -663,6 +719,24 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
                         exc_info=True,
                     )
 
+        if description_callable:
+            logger.debug(
+                f"Deserializing description callable '{description_callable}' for agent '{agent_name}'"
+            )
+            agent.description = components[description_callable]
+
+        if input_callable:
+            logger.debug(
+                f"Deserializing input callable '{input_callable}' for agent '{agent_name}'"
+            )
+            agent.input = components[input_callable]
+
+        if output_callable:
+            logger.debug(
+                f"Deserializing output callable '{output_callable}' for agent '{agent_name}'"
+            )
+            agent.output = components[output_callable]
+
         logger.info(
             f"Successfully deserialized agent '{agent_name}' with {len(agent.modules)} modules and {len(agent.tools)} tools"
         )

flock/core/flock_registry.py

@@ -480,7 +480,7 @@ def flock_tool(func: FuncType | None = None, *, name: str | None = None) -> Any:
 
 
 # Alias for clarity if desired
-# flock_callable = flock_tool
+flock_callable = flock_tool
 
 
 @overload

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_core-0.4.0b10.dist-info → flock_core-0.4.0b12.dist-info}/METADATA

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

{flock_core-0.4.0b10.dist-info → flock_core-0.4.0b12.dist-info}/RECORD

@@ -17,13 +17,13 @@ flock/cli/settings.py,sha256=Z_TXBzCYlCmSaKrJ_CQCdYy-Cj29gpI4kbC_2KzoKqg,27025
 flock/cli/view_results.py,sha256=dOzK0O1FHSIDERnx48y-2Xke9BkOHS7pcOhs64AyIg0,781
 flock/cli/yaml_editor.py,sha256=K3N0bh61G1TSDAZDnurqW9e_-hO6CtSQKXQqlDhCjVo,12527
 flock/cli/assets/release_notes.md,sha256=bqnk50jxM3w5uY44Dc7MkdT8XmRREFxrVBAG9XCOSSU,4896
-flock/core/__init__.py,sha256=R64A7zi51Uz6jzzCFWGol9SZQnMFz3ynEse5ivhSkEA,805
+flock/core/__init__.py,sha256=p7lmQULRu9ejIAELfanZiyMhW0CougIPvyFHW2nqBFQ,847
 flock/core/flock.py,sha256=zQUpITLx_CMhJRnft4AWQDfYj85FhUlT-Ank5c-fSko,25146
-flock/core/flock_agent.py,sha256=L5sZ6weY4pNFbk8CEUrRD1506ojq_tx1jjQy02qEdC8,29126
+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_module.py,sha256=96aFVYAgwpKN53xGbivQDUpikOYGFCxK5mqhclOcxY0,3003
-flock/core/flock_registry.py,sha256=ax2pIxv6hVqRw3eJCPQ9jAul_ocYWfl9BZttmu054d0,20830
+flock/core/flock_registry.py,sha256=ekYpQgSkZVnbyPbl8gA7nf54brt94rYZZBe2RwEGtUc,20828
 flock/core/flock_router.py,sha256=A5GaxcGvtiFlRLHBTW7okh5RDm3BdKam2uXvRHRaj7k,2187
 flock/core/api/__init__.py,sha256=OKlhzDWZJfA6ddBwxQUmATY0TSzESsH032u00iVGvdA,228
 flock/core/api/endpoints.py,sha256=qQnJmtcYGkjdKtLllVpyJVjc-iZrvu5EEeVIryyt4tc,12987
@@ -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
@@ -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.0b10.dist-info/METADATA,sha256=ahnhPkvyNeFFs6vE37iTywwPJ3ak9kMEEgk7NpjHLjQ,21101
-flock_core-0.4.0b10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b10.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b10.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b10.dist-info/RECORD,,
+flock_core-0.4.0b12.dist-info/METADATA,sha256=obK1R3a6NGzJAof5joz30ccvBDQl1HDA4Sqrgl3EcWc,21101
+flock_core-0.4.0b12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b12.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b12.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b12.dist-info/RECORD,,