flock-core 0.2.5__tar.gz → 0.2.7__tar.gz

{flock_core-0.2.5 → flock_core-0.2.7}/.vscode/settings.json

@@ -31,6 +31,7 @@
     "yaml.schemas": {
         "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yml"
     },
+    "AREPL.customCSS": ".print { font-size: var(--vscode-editor-font-size); } .renderjson { font-family: var(--vscode-editor-font-family); font-size: var(--vscode-editor-font-size); line-height: initial; }",
     "yaml.customTags": [
         "!ENV scalar",
         "!ENV sequence",

{flock_core-0.2.5 → flock_core-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.2.5
+Version: 0.2.7
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE
@@ -38,7 +38,9 @@ Description-Content-Type: text/markdown
 
 <p align="center">
 <img src="docs/img/flock.png" width="600"><br>
-<img alt="Dynamic TOML Badge" src="https://img.shields.io/badge/dynamic/toml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fwhiteducksoftware%2Fflock%2Frefs%2Fheads%2Fbadges%2Fpyproject.toml%3Ftoken%3DGHSAT0AAAAAACVFDVNBU3S6HLJSC36P3YNQZ5LNPQQ&query=%24.project.version&style=for-the-badge&logo=pypi&logoSize=large&label=pip%20version&link=https%3A%2F%2Fpypi.org%2Fproject%2Fflock-core%2F">
+<img alt="Dynamic TOML Badge" src="https://img.shields.io/badge/dynamic/toml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fwhiteducksoftware%2Fflock%2Frefs%2Fheads%2Fmaster%2Fpyproject.toml&query=%24.project.version&style=for-the-badge&logo=pypi&label=pip%20version">
+<img alt="X (formerly Twitter) Follow" src="https://img.shields.io/twitter/follow/whiteduck_gmbh?style=for-the-badge&logo=X">
+
 
 
 

{flock_core-0.2.5 → flock_core-0.2.7}/README.md

@@ -1,6 +1,8 @@
 <p align="center">
 <img src="docs/img/flock.png" width="600"><br>
-<img alt="Dynamic TOML Badge" src="https://img.shields.io/badge/dynamic/toml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fwhiteducksoftware%2Fflock%2Frefs%2Fheads%2Fbadges%2Fpyproject.toml%3Ftoken%3DGHSAT0AAAAAACVFDVNBU3S6HLJSC36P3YNQZ5LNPQQ&query=%24.project.version&style=for-the-badge&logo=pypi&logoSize=large&label=pip%20version&link=https%3A%2F%2Fpypi.org%2Fproject%2Fflock-core%2F">
+<img alt="Dynamic TOML Badge" src="https://img.shields.io/badge/dynamic/toml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fwhiteducksoftware%2Fflock%2Frefs%2Fheads%2Fmaster%2Fpyproject.toml&query=%24.project.version&style=for-the-badge&logo=pypi&label=pip%20version">
+<img alt="X (formerly Twitter) Follow" src="https://img.shields.io/twitter/follow/whiteduck_gmbh?style=for-the-badge&logo=X">
+
 
 
 

{flock_core-0.2.5 → flock_core-0.2.7}/examples/01_introduction/03_tool_and_code_agent.py

@@ -52,7 +52,7 @@ async def main():
         name="my_celebrity_age_agent",
         input="a_person",
         output="persons_age_in_days",
-        tools=[basic_tools.web_search_tavily, basic_tools.code_eval],
+        tools=[basic_tools.web_search_duckduckgo, basic_tools.code_eval],
         use_cache=True,
     )
     flock.add_agent(agent)

{flock_core-0.2.5 → flock_core-0.2.7}/examples/01_introduction/05_typed_output2.py

@@ -39,6 +39,8 @@ class RandomPerson:
     favorite_movie: str  
     short_bio: str
 
+RandomUserList = list[RandomPerson]
+
 async def main():
    
     flock = Flock(local_debug=True)
@@ -53,7 +55,7 @@ async def main():
     people_agent = FlockAgent(
         name="people_agent",
         input="amount_of_people",
-        output="random_user_list: list[RandomPerson]",
+        output="random_user_list: RandomUserList",
         use_cache=True,
     )
     flock.add_agent(people_agent)

{flock_core-0.2.5 → flock_core-0.2.7}/pyproject.toml

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

flock_core-0.2.7/src/flock/__init__.py

@@ -0,0 +1 @@
+"""Flock package initialization."""

{flock_core-0.2.5 → flock_core-0.2.7}/src/flock/config.py

@@ -28,9 +28,9 @@ JAEGER_TRANSPORT = config(
 ).lower()  # Options: "grpc" or "http"
 OTEL_SQL_DATABASE_NAME = config("OTEL_SQL_DATABASE", "flock_events.db")
 OTEL_FILE_NAME = config("OTEL_FILE_NAME", "flock_events.jsonl")
-OTEL_ENABLE_SQL = config("OTEL_ENABLE_SQL", True)
-OTEL_ENABLE_FILE = config("OTEL_ENABLE_FILE", True)
-OTEL_ENABLE_JAEGER = config("OTEL_ENABLE_JAEGER", True)
+OTEL_ENABLE_SQL: bool = config("OTEL_ENABLE_SQL", True) == "True"
+OTEL_ENABLE_FILE: bool = config("OTEL_ENABLE_FILE", True) == "True"
+OTEL_ENABLE_JAEGER: bool = config("OTEL_ENABLE_JAEGER", True) == "True"
 
 
 TELEMETRY = TelemetryConfig(

{flock_core-0.2.5 → flock_core-0.2.7}/src/flock/core/flock.py

@@ -40,6 +40,7 @@ class Flock:
         output_formatter: FormatterOptions = FormatterOptions(
             PrettyPrintFormatter
         ),
+        show_cli_banner: bool = True,
     ):
         """Initialize the Flock orchestrator.
 
@@ -66,10 +67,10 @@ class Flock:
             session_id = get_baggage("session_id")
             if not session_id:
                 session_id = str(uuid.uuid4())
-            set_baggage("session_id", session_id)
-            span.set_attribute("session_id", get_baggage("session_id"))
+                set_baggage("session_id", session_id)
 
-            display_banner()
+            if show_cli_banner:
+                display_banner()
 
             self.agents: dict[str, FlockAgent] = {}
             self.registry = Registry()

{flock_core-0.2.5 → flock_core-0.2.7}/src/flock/core/flock_agent.py

@@ -151,7 +151,7 @@ class FlockAgent(BaseModel, ABC, PromptParserMixin, DSPyIntegrationMixin):
         ),
     )
 
-    tools: list[Callable[..., Any]] | None = Field(
+    tools: list[Callable[..., Any] | Any] | None = Field(
         default=None,
         description="An optional list of callable tools that the agent can leverage during execution.",
     )

{flock_core-0.2.5 → flock_core-0.2.7}/src/flock/core/logging/formatters/pprint_formatter.py

@@ -1,4 +1,3 @@
-import json
 from typing import Any
 
 from flock.core.logging.formatters.base_formatter import BaseFormatter
@@ -9,16 +8,18 @@ class PrettyPrintFormatter(BaseFormatter):
         self, result: dict[str, Any], agent_name: str, **kwargs
     ) -> None:
         """Print an agent's result using Rich formatting."""
+        from devtools import pformat
         from rich.console import Console
-        from rich.json import JSON
+        from rich.panel import Panel
 
         console = Console()
 
-        console.print(agent_name)
-        console.print(JSON(json.dumps(result)))
+        s = pformat(result, highlight=False)
+
+        console.print(Panel(s, title=agent_name, highlight=True))
 
     def display_data(self, data: dict[str, Any], **kwargs) -> None:
         """Print an agent's result using Rich formatting."""
-        from devtools import pprint
+        from devtools import sprint
 
-        pprint(data)
+        sprint(data, sprint.green)

{flock_core-0.2.5 → flock_core-0.2.7}/src/flock/core/mixin/dspy_integration.py

@@ -1,10 +1,11 @@
 """Mixin class for integrating with the dspy library."""
 
+import inspect
 import sys
 from typing import Any, Literal
 
 from flock.core.logging.logging import get_logger
-from flock.core.util.input_resolver import split_top_level
+from flock.core.util.input_resolver import get_callable_members, split_top_level
 
 logger = get_logger("flock")
 
@@ -68,15 +69,19 @@ class DSPyIntegrationMixin:
                 # TODO: We have to find a way to avoid using eval here.
                 # This is a security risk, as it allows arbitrary code execution.
 
-                try:
-                    field_type = eval(type_str, sys.modules[__name__].__dict__)
-                except Exception:
-                    field_type = eval(
-                        type_str, sys.modules["__main__"].__dict__
-                    )
+                field_type = dspy.PythonInterpreter(
+                    sys.modules[__name__].__dict__
+                    | sys.modules["__main__"].__dict__
+                ).execute(type_str)
+
+                # try:
+                #     field_type = eval(type_str, sys.modules[__name__].__dict__)
+                # except Exception:
+                #     field_type = eval(
+                #         type_str, sys.modules["__main__"].__dict__
+                #     )
 
             except Exception:
-                # If evaluation fails, default to str.
                 field_type = str
 
             return name, field_type, desc
@@ -143,6 +148,14 @@ class DSPyIntegrationMixin:
         """
         import dspy
 
+        processed_tools = []
+        if self.tools:
+            for tool in self.tools:
+                if inspect.ismodule(tool) or inspect.isclass(tool):
+                    processed_tools.extend(get_callable_members(tool))
+                else:
+                    processed_tools.append(tool)
+
         dspy_solver = None
 
         if agent_type_override:
@@ -153,7 +166,7 @@ class DSPyIntegrationMixin:
             if agent_type_override == "ReAct":
                 dspy.ReAct(
                     signature,
-                    tools=self.tools,
+                    tools=processed_tools,
                     max_iters=10,
                 )
             if agent_type_override == "Completion":
@@ -164,7 +177,7 @@ class DSPyIntegrationMixin:
             if self.tools:
                 dspy_solver = dspy.ReAct(
                     signature,
-                    tools=self.tools,
+                    tools=processed_tools,
                     max_iters=10,
                 )
             else:

flock_core-0.2.7/src/flock/core/tools/basic_tools.py

@@ -0,0 +1,197 @@
+"""This module contains basic agentic tools for performing various tasks."""
+
+import importlib
+import os
+from typing import Literal
+
+from flock.core.logging.trace_and_logged import traced_and_logged
+from flock.interpreter.python_interpreter import PythonInterpreter
+
+
+@traced_and_logged
+def web_search_tavily(query: str):
+    if importlib.util.find_spec("tavily") is not None:
+        from tavily import TavilyClient
+
+        client = TavilyClient(api_key=os.getenv("TAVILY_API_KEY"))
+        try:
+            response = client.search(query, include_answer=True)  # type: ignore
+            return response
+        except Exception:
+            raise
+    else:
+        raise ImportError(
+            "Optional tool dependencies not installed. Install with 'pip install flock-core[tools]'."
+        )
+
+
+@traced_and_logged
+def web_search_duckduckgo(
+    keywords: str, search_type: Literal["news", "web"] = "web"
+):
+    try:
+        from duckduckgo_search import DDGS
+
+        if search_type == "news":
+            response = DDGS().news(keywords)
+        else:
+            response = DDGS().text(keywords)
+
+        return response
+    except Exception:
+        raise
+
+
+@traced_and_logged
+def get_web_content_as_markdown(url: str):
+    if (
+        importlib.util.find_spec("httpx") is not None
+        and importlib.util.find_spec("markdownify") is not None
+    ):
+        import httpx
+        from markdownify import markdownify as md
+
+        try:
+            response = httpx.get(url)
+            response.raise_for_status()
+            markdown = md(response.text)
+            return markdown
+        except Exception:
+            raise
+    else:
+        raise ImportError(
+            "Optional tool dependencies not installed. Install with 'pip install flock-core[tools]'."
+        )
+
+
+@traced_and_logged
+def get_anything_as_markdown(url_or_file_path: str):
+    if importlib.util.find_spec("docling") is not None:
+        from docling.document_converter import DocumentConverter
+
+        try:
+            converter = DocumentConverter()
+            result = converter.convert(url_or_file_path)
+            markdown = result.document.export_to_markdown()
+            return markdown
+        except Exception:
+            raise
+    else:
+        raise ImportError(
+            "Optional tool dependencies not installed. Install with 'pip install flock-core[all-tools]'."
+        )
+
+
+@traced_and_logged
+def evaluate_math(expression: str) -> float:
+    try:
+        result = PythonInterpreter(
+            {},
+            [
+                "os",
+                "math",
+                "random",
+                "datetime",
+                "time",
+                "string",
+                "collections",
+                "itertools",
+                "functools",
+                "typing",
+                "enum",
+                "json",
+                "ast",
+            ],
+            verbose=True,
+        ).execute(expression)
+        return result
+    except Exception:
+        raise
+
+
+@traced_and_logged
+def code_eval(python_code: str) -> str:
+    try:
+        result = PythonInterpreter(
+            {},
+            [
+                "os",
+                "math",
+                "random",
+                "datetime",
+                "time",
+                "string",
+                "collections",
+                "itertools",
+                "functools",
+                "typing",
+                "enum",
+                "json",
+                "ast",
+            ],
+            verbose=True,
+        ).execute(python_code)
+        return result
+    except Exception:
+        raise
+
+
+@traced_and_logged
+def get_current_time() -> str:
+    import datetime
+
+    time = datetime.datetime.now().isoformat()
+    return time
+
+
+@traced_and_logged
+def count_words(text: str) -> int:
+    count = len(text.split())
+    return count
+
+
+@traced_and_logged
+def extract_urls(text: str) -> list[str]:
+    import re
+
+    url_pattern = r"https?://(?:[-\w.]|(?:%[\da-fA-F]{2}))+"
+    urls = re.findall(url_pattern, text)
+    return urls
+
+
+@traced_and_logged
+def extract_numbers(text: str) -> list[float]:
+    import re
+
+    numbers = [float(x) for x in re.findall(r"-?\d*\.?\d+", text)]
+    return numbers
+
+
+@traced_and_logged
+def json_parse_safe(text: str) -> dict:
+    import json
+
+    try:
+        result = json.loads(text)
+        return result
+    except Exception:
+        return {}
+
+
+@traced_and_logged
+def save_to_file(content: str, filename: str):
+    try:
+        with open(filename, "w") as f:
+            f.write(content)
+    except Exception:
+        raise
+
+
+@traced_and_logged
+def read_from_file(filename: str) -> str:
+    try:
+        with open(filename) as f:
+            content = f.read()
+        return content
+    except Exception:
+        raise

{flock_core-0.2.5 → flock_core-0.2.7}/src/flock/core/tools/dev_tools/github.py

@@ -10,23 +10,6 @@ from flock.core.logging.trace_and_logged import traced_and_logged
 
 @traced_and_logged
 def create_user_stories_as_github_issue(title: str, body: str) -> str:
-    """Create a new GitHub issue representing a user story.
-
-    This function creates an issue in a GitHub repository using the specified title and body.
-    The title is used as the issue title, and the body should contain the full user story
-    description along with a formatted list of acceptance criteria. The following
-    environment variables must be set for this function to work correctly:
-
-      - GITHUB_PAT: Personal Access Token for GitHub API authentication.
-      - GITHUB_REPO: Repository identifier in the format "owner/repo".
-
-    Parameters:
-        title (str): The title for the GitHub issue (user story).
-        body (str): The detailed description including acceptance criteria.
-
-    Returns:
-        str: A message indicating whether the issue was created successfully or not.
-    """
     github_pat = os.getenv("GITHUB_PAT")
     github_repo = os.getenv("GITHUB_REPO")
 
@@ -49,22 +32,6 @@ def create_user_stories_as_github_issue(title: str, body: str) -> str:
 
 @traced_and_logged
 def upload_readme(content: str):
-    """Upload or update the README.md file in a GitHub repository.
-
-    This function uses the GitHub API to either create a new README.md file or update an
-    existing one in the specified repository. It encodes the provided content to base64 before
-    sending it via the API. The function requires the following environment variables to be set:
-
-      - GITHUB_USERNAME: Your GitHub username.
-      - GITHUB_REPO: The name of the repository.
-      - GITHUB_PAT: Your GitHub Personal Access Token for authentication.
-
-    Parameters:
-        content (str): The text content to be written into the README.md file.
-
-    Raises:
-        ValueError: If any of the required environment variables are missing.
-    """
     GITHUB_USERNAME = os.getenv("GITHUB_USERNAME")
     REPO_NAME = os.getenv("GITHUB_REPO")
     GITHUB_TOKEN = os.getenv("GITHUB_PAT")

{flock_core-0.2.5 → flock_core-0.2.7}/src/flock/core/util/input_resolver.py

@@ -3,6 +3,25 @@
 from flock.core.context.context import FlockContext
 
 
+def get_callable_members(obj):
+    """Extract all callable (methods/functions) members from a module or class.
+    Returns a list of callable objects.
+    """
+    import inspect
+
+    # Get all members of the object
+    members = inspect.getmembers(obj)
+
+    # Filter for callable members that don't start with underscore (to exclude private/special methods)
+    callables = [
+        member[1]
+        for member in members
+        if inspect.isroutine(member[1]) and not member[0].startswith("_")
+    ]
+
+    return callables
+
+
 def split_top_level(s: str) -> list[str]:
     """Split a string on commas that are not enclosed within brackets, parentheses, or quotes.