flock-core 0.4.0b9__tar.gz → 0.4.0b11__tar.gz

{flock_core-0.4.0b9 → flock_core-0.4.0b11}/PKG-INFO

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

{flock_core-0.4.0b9 → flock_core-0.4.0b11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flock-core"
-version = "0.4.0b-9"
+version = "0.4.0b-11"
 description = "Declarative LLM Orchestration at Scale"
 readme = "README.md"
 authors = [

{flock_core-0.4.0b9 → flock_core-0.4.0b11}/src/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-0.4.0b9 → flock_core-0.4.0b11}/src/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-0.4.0b9 → flock_core-0.4.0b11}/src/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-0.4.0b9 → flock_core-0.4.0b11}/src/flock/core/tools/zendesk_tools.py

@@ -65,3 +65,35 @@ def get_article_by_id(article_id: str) -> dict:
         response = client.get(url)
         response.raise_for_status()
         return response.json()["article"]
+
+
+def get_articles() -> list[dict]:
+    """Get all articles."""
+    ZENDESK_LOCALE = os.getenv("ZENDESK_ARTICLE_LOCALE")
+    ZENDESK_SUBDOMAIN = os.getenv("ZENDESK_SUBDOMAIN_ARTICLE")
+    BASE_URL = f"https://{ZENDESK_SUBDOMAIN}.zendesk.com"
+    url = f"{BASE_URL}/api/v2/help_center/{ZENDESK_LOCALE}/articles.json"
+    with httpx.Client(headers=HEADERS, timeout=30.0) as client:
+        response = client.get(url)
+        response.raise_for_status()
+        return response.json()["articles"]
+
+
+def search_articles(query: str) -> list[dict]:
+    """Search Zendesk Help Center articles using a query string."""
+    ZENDESK_LOCALE = os.getenv("ZENDESK_ARTICLE_LOCALE")  # e.g., "en-us"
+    ZENDESK_SUBDOMAIN = os.getenv("ZENDESK_SUBDOMAIN_ARTICLE")
+    BASE_URL = f"https://{ZENDESK_SUBDOMAIN}.zendesk.com"
+    url = f"{BASE_URL}/api/v2/help_center/articles/search.json"
+
+    params = {
+        "query": query,
+        "locale": ZENDESK_LOCALE,
+        "sort_by": "updated_at",
+        "sort_order": "desc",
+    }
+
+    with httpx.Client(headers=HEADERS, timeout=30.0) as client:
+        response = client.get(url, params=params)
+        response.raise_for_status()
+        return response.json().get("results", [])

{flock_core-0.4.0b9 → flock_core-0.4.0b11}/src/flock/core/util/cli_helper.py

@@ -52,7 +52,7 @@ def init_console(clear_screen: bool = True):
 │ ▒█▀▀▀ █░░ █▀▀█ █▀▀ █░█ │
 │ ▒█▀▀▀ █░░ █░░█ █░░ █▀▄ │
 │ ▒█░░░ ▀▀▀ ▀▀▀▀ ▀▀▀ ▀░▀ │
-╰━━━━━━━━v{__version__}━━━━━━━━╯
+╰━━━━━━━━v{__version__}━━━━━━━╯
 🦆     🐤    🐧     🐓
 """,
         justify="center",

{flock_core-0.4.0b9 → flock_core-0.4.0b11}/uv.lock

@@ -1245,7 +1245,7 @@ wheels = [
 
 [[package]]
 name = "flock-core"
-version = "0.4.0b9"
+version = "0.4.0b11"
 source = { editable = "." }
 dependencies = [
     { name = "azure-search-documents" },