flock-core 0.2.18__py3-none-any.whl → 0.3.2__py3-none-any.whl

flock/modules/zep/zep_module.py

@@ -0,0 +1,177 @@
+import uuid
+from typing import Any
+
+from pydantic import Field
+from zep_python.client import Zep
+from zep_python.types import Message as ZepMessage, SessionSearchResult
+
+from flock.core.flock_agent import FlockAgent
+from flock.core.flock_module import FlockModule, FlockModuleConfig
+from flock.core.logging.logging import get_logger
+
+logger = get_logger("module.zep")
+
+
+class ZepModuleConfig(FlockModuleConfig):
+    """Configuration for the Zep module."""
+
+    zep_url: str = "http://localhost:8000"
+    zep_api_key: str = "apikey"
+    min_fact_rating: float = Field(
+        default=0.7, description="Minimum rating for facts to be considered"
+    )
+    enable_read: bool = True
+    enable_write: bool = False
+
+
+class ZepModule(FlockModule):
+    """Module that adds Zep capabilities to a Flock agent."""
+
+    name: str = "zep"
+    config: ZepModuleConfig = ZepModuleConfig()
+    session_id: str | None = None
+    user_id: str | None = None
+
+    def __init__(self, name, config: ZepModuleConfig) -> None:
+        """Initialize Zep module."""
+        super().__init__(name=name, config=config)
+        logger.debug("Initializing Zep module")
+        zep_client = Zep(
+            base_url=self.config.zep_url, api_key=self.config.zep_api_key
+        )
+        self.user_id = self.name
+        self._setup_user(zep_client)
+        self.session_id = str(uuid.uuid4())
+        self._setup_session(zep_client)
+
+    def _setup_user(self, zep_client: Zep) -> None:
+        """Set up user in Zep."""
+        if not zep_client or not self.user_id:
+            raise ValueError("Zep service or user_id not initialized")
+
+        try:
+            user = zep_client.user.get(user_id=self.user_id)
+            if not user:
+                zep_client.user.add(user_id=self.user_id)
+        except Exception:
+            zep_client.user.add(user_id=self.user_id)
+
+    def _setup_session(self, zep_client: Zep) -> None:
+        """Set up new session."""
+        if not zep_client or not self.user_id or not self.session_id:
+            raise ValueError(
+                "Zep service, user_id, or session_id not initialized"
+            )
+
+        zep_client.memory.add_session(
+            user_id=self.user_id,
+            session_id=self.session_id,
+        )
+
+    def get_client(self) -> Zep:
+        """Get Zep client."""
+        return Zep(
+            base_url=self.config.zep_url, api_key=self.config.zep_api_key
+        )
+
+    def get_memory(self, zep_client: Zep) -> str | None:
+        """Get memory for the current session."""
+        if not zep_client or not self.session_id:
+            logger.error("Zep service or session_id not initialized")
+            return None
+
+        try:
+            memory = zep_client.memory.get(
+                self.session_id, min_rating=self.config.min_fact_rating
+            )
+            if memory:
+                return f"{memory.relevant_facts}"
+        except Exception as e:
+            logger.error(f"Error fetching memory: {e}")
+            return None
+
+        return None
+
+    def split_text(
+        self, text: str | None, max_length: int = 1000
+    ) -> list[ZepMessage]:
+        """Split text into smaller chunks."""
+        result: list[ZepMessage] = []
+        if not text:
+            return result
+        if len(text) <= max_length:
+            return [ZepMessage(role="user", content=text, role_type="user")]
+        for i in range(0, len(text), max_length):
+            result.append(
+                ZepMessage(
+                    role="user",
+                    content=text[i : i + max_length],
+                    role_type="user",
+                )
+            )
+        return result
+
+    def add_to_memory(self, text: str, zep_client: Zep) -> None:
+        """Add text to memory."""
+        if not zep_client or not self.session_id:
+            logger.error("Zep service or session_id not initialized")
+            return
+
+        messages = self.split_text(text)
+        zep_client.memory.add(session_id=self.session_id, messages=messages)
+
+    def search_memory(
+        self, query: str, zep_client: Zep
+    ) -> list[SessionSearchResult]:
+        """Search memory for a query."""
+        if not zep_client or not self.user_id:
+            logger.error("Zep service or user_id not initialized")
+            return []
+
+        response = zep_client.memory.search_sessions(
+            text=query,
+            user_id=self.user_id,
+            search_scope="facts",
+            min_fact_rating=self.config.min_fact_rating,
+        )
+        if not response.results:
+            return []
+        return response.results
+
+    async def post_evaluate(
+        self, agent: FlockAgent, inputs: dict[str, Any], result: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Format and display the output."""
+        if not self.config.enable_write:
+            return result
+        logger.debug("Saving data to memory")
+        zep_client = Zep(
+            base_url=self.config.zep_url, api_key=self.config.zep_api_key
+        )
+        self.add_to_memory(str(result), zep_client)
+        return result
+
+    async def pre_evaluate(
+        self, agent: FlockAgent, inputs: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Format and display the output."""
+        if not self.config.enable_read:
+            return inputs
+
+        zep_client = Zep(
+            base_url=self.config.zep_url, api_key=self.config.zep_api_key
+        )
+
+        logger.debug("Searching memory")
+        facts = self.search_memory(str(inputs), zep_client)
+
+        # Add memory to inputs
+        facts_str = ""
+        if facts:
+            for fact in facts:
+                facts_str += fact.fact.fact + "\n"
+            logger.debug("Found facts in memory: {}", facts_str)
+            agent.input = agent.input + ", memory"
+            inputs["memory"] = facts_str
+
+        return inputs

flock/themes/aardvark-blue.toml

@@ -28,7 +28,7 @@ table_show_lines = true
 table_box = "ROUNDED"
 panel_padding = [ 1, 2,]
 panel_title_align = "center"
-table_row_styles = [ "", "underline",]
+table_row_styles = [ "", "bold",]
 table_safe_box = true
 table_padding = [ 0, 1,]
 table_collapse_padding = false

{flock_core-0.2.18.dist-info → flock_core-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.2.18
+Version: 0.3.2
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE
@@ -14,6 +14,7 @@ Requires-Dist: dspy==2.5.42
 Requires-Dist: duckduckgo-search>=7.3.2
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: loguru>=0.7.3
+Requires-Dist: matplotlib>=3.10.0
 Requires-Dist: msgpack>=1.1.0
 Requires-Dist: opentelemetry-api>=1.30.0
 Requires-Dist: opentelemetry-exporter-jaeger-proto-grpc>=1.21.0
@@ -21,13 +22,19 @@ Requires-Dist: opentelemetry-exporter-jaeger>=1.21.0
 Requires-Dist: opentelemetry-exporter-otlp>=1.30.0
 Requires-Dist: opentelemetry-instrumentation-logging>=0.51b0
 Requires-Dist: opentelemetry-sdk>=1.30.0
+Requires-Dist: pillow>=10.4.0
+Requires-Dist: prometheus-client>=0.21.1
 Requires-Dist: pydantic>=2.10.5
 Requires-Dist: python-box>=7.3.2
 Requires-Dist: python-decouple>=3.8
 Requires-Dist: questionary>=2.1.0
 Requires-Dist: rich>=13.9.4
+Requires-Dist: sentence-transformers>=3.4.1
 Requires-Dist: temporalio>=1.9.0
+Requires-Dist: tiktoken>=0.8.0
 Requires-Dist: toml>=0.10.2
+Requires-Dist: tqdm>=4.67.1
+Requires-Dist: zep-python>=2.0.2
 Provides-Extra: all-tools
 Requires-Dist: docling>=2.18.0; extra == 'all-tools'
 Requires-Dist: markdownify>=0.14.1; extra == 'all-tools'
@@ -350,9 +357,49 @@ Super simple rules to remember:
 1. Point the first agent to the next one using `hand_off`
 2. Make sure their inputs and outputs match up
 
+### Tools of the trade
+
+Of couse no agent framework is complete without using tools.
+Flock enables agents to use any python function you pass as tool or to use one of the plenty default tools
+
+```python
+bloggy = FlockAgent(
+    name="bloggy",
+    input="blog_idea: str|The topic to blog about",
+    output=(
+        "funny_blog_title: str|A catchy title for the blog, "
+        "blog_headers: list[str]|List of section headers for the blog"
+        "analysis_results: dict[str,Any] | Result of calculated analysis if necessary"
+    )
+    tools=[basic_tools.web_search_duckduckgo, basic_tools.code_eval],
+)
+
+result = flock.run(
+    input={"blog_idea": "A blog about cats, with an analysis how old the oldest cat became in days"},
+    start_agent=bloggy
+)
+```
+
+These tools are available out of the box (needs `flock-core[tools]`):
+
+- web_search_tavily
+- web_search_duckduckgo
+- get_web_content_as_markdown
+- get_anything_as_markdown (uses docling and needs `flock-core[all-tools]`)
+- evaluate_math
+- code_eval
+- get_current_time
+- count_words
+- extract_urls
+- extract_numbers
+- json_parse_safe
+- save_to_file
+- read_from_file
+
+
 That's all there is to it! `bloggy` comes up with amazing headers, and `content_writer` turns them into full blog sections. No more writer's block! 🎉
 
-And this is just the beginning - you can chain as many agents as you want. Maybe add a proofreader? Or an SEO optimizer? But let's not get ahead of ourselves! 😉
+And this is just the beginning - you can chain as many agents as you want. Maybe add a proofreader? Or add memory? Or an SEO optimizer? But let's not get ahead of ourselves! 😉
 
 So far we've barely scratched the surface of what flock has to offer, and we're currently hard at work building up the documentation for all the other super cool features Flock has up its sleeve! Stay tuned! 🚀
 

{flock_core-0.2.18.dist-info → flock_core-0.3.2.dist-info}/RECORD

@@ -1,47 +1,62 @@
-flock/__init__.py,sha256=Aw2FBlpdyOMFlV87CgBQkyHZx-FChzzGcBbZaE5EW0A,1420
+flock/__init__.py,sha256=9BfhaVhkV3ZadIXp6xpZYlt8_N_OBmQSxxJHwpXYPic,1867
 flock/config.py,sha256=O5QJGlStf4DWSK4ovZsKw01ud4YK3_ij6Ay8sWU8ih0,1522
-flock/cli/constants.py,sha256=nKdpNBPTjpoq7bfX8GP3fouRG_rYREsIgS-NffCWmaA,627
+flock/cli/constants.py,sha256=UWshD25IGos5Ks4P9paGPalY8BXy9YynzHk6HB4xfOo,669
 flock/cli/create_agent.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 flock/cli/create_flock.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 flock/cli/load_agent.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 flock/cli/load_examples.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 flock/cli/load_flock.py,sha256=3JdECvt5X7uyOG2vZS3-Zk5C5SI_84_QZjcsB3oJmfA,932
+flock/cli/load_release_notes.py,sha256=qFcgUrMddAE_TP6x1P-6ZywTUjTknfhTDW5LTxtg1yk,599
 flock/cli/settings.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
-flock/core/__init__.py,sha256=0Xq_txurlxxjKGXjRn6GNJusGTiBcd7zw2eF0L7JyuU,183
-flock/core/flock.py,sha256=RoLatRW91dSJjFhq6T5t03y_zsIYPxcatn6IHpRUcVc,17435
-flock/core/flock_agent.py,sha256=WWhYMnLGvaeJ47gVX5s3v6sJx1VsGkcU6NDrA3ELbVY,30723
-flock/core/context/context.py,sha256=jH06w4C_O5CEL-YxjX_x_dmgLe9Rcllnn1Ebs0dvwaE,6171
+flock/cli/assets/release_notes.md,sha256=K-upUm5vuUuRSSU2FkMdgDfai_YlDk_vTCp0s4s2WO0,3419
+flock/core/__init__.py,sha256=ZTp6qNY-kNH_Xn0xFfCAYceYqWFdahXYMm5wWPb30Go,501
+flock/core/flock.py,sha256=4Kcnw39YiPRND6U8TWLZ0LyjNTykIk56VPruUEGwBrk,19116
+flock/core/flock_agent.py,sha256=RzKX0GRrRJz16YbQFheMo8TqJPXOZSHWNloTbp35zwI,12229
+flock/core/flock_evaluator.py,sha256=j7riJj_KsWoBnKmLiGp-U0CRhxDyJbgEdLGN26tfKm8,1588
+flock/core/flock_factory.py,sha256=vyDq0eyFT4MyE_n2JyNU7YaFx2ljmjSDmZ07OIsmIOE,2694
+flock/core/flock_module.py,sha256=VWFlBiY2RHZLTlGYfcchuT41M3m_JrZcmzw07u7KayM,2581
+flock/core/context/context.py,sha256=fb7SsGAXmhQ1CvHV3_GihGiJG-4oLJ_DcexJ8vsrbHM,6371
 flock/core/context/context_manager.py,sha256=qMySVny_dbTNLh21RHK_YT0mNKIOrqJDZpi9ZVdBsxU,1103
 flock/core/context/context_vars.py,sha256=0Hn6fM2iNc0_jIIU0B7KX-K2o8qXqtZ5EYtwujETQ7U,272
 flock/core/execution/local_executor.py,sha256=rnIQvaJOs6zZORUcR3vvyS6LPREDJTjaygl_Db0M8ao,952
 flock/core/execution/temporal_executor.py,sha256=OF_uXgQsoUGp6U1ZkcuaidAEKyH7XDtbfrtdF10XQ_4,1675
+flock/core/interpreter/python_interpreter.py,sha256=RaUMZuufsKBNQ4FAeSaOgUuxzs8VYu5TgUUs-xwaxxM,26376
 flock/core/logging/__init__.py,sha256=Q8hp9-1ilPIUIV0jLgJ3_cP7COrea32cVwL7dicPnlM,82
-flock/core/logging/logging.py,sha256=dOo_McbAt9_dST9Hr8RTpAGU-MHR_QvskIdmXrSvZRc,4789
+flock/core/logging/logging.py,sha256=RigZwiu5gsLMqHwhplGkGrmw74xe8M-5KLGIBSsjouY,7620
 flock/core/logging/telemetry.py,sha256=3E9Tyj6AUR6A5RlIufcdCdWm5BAA7tbOsCa7lHoUQaU,5404
 flock/core/logging/trace_and_logged.py,sha256=5vNrK1kxuPMoPJ0-QjQg-EDJL1oiEzvU6UNi6X8FiMs,2117
 flock/core/logging/formatters/enum_builder.py,sha256=LgEYXUv84wK5vwHflZ5h8HBGgvLH3sByvUQe8tZiyY0,981
 flock/core/logging/formatters/theme_builder.py,sha256=Wnaal3HuUDA4HFg9tdql1BxYwK83ACOZBBQy-DXnxcA,17342
 flock/core/logging/formatters/themed_formatter.py,sha256=6WO9RPr6Su05rJEX9bRXd8peE-QzGCQeO5veIjQH-Vc,21086
-flock/core/logging/formatters/themes.py,sha256=vZqDyPlxZ1RGwzp8QCm0-Y0aXBZ62gTllulK6nbi_L4,10675
+flock/core/logging/formatters/themes.py,sha256=80BRJJB0LZr11N0yQw2f8vdb_9179qjQO8PoeBaLMN0,10680
 flock/core/logging/span_middleware/baggage_span_processor.py,sha256=gJfRl8FeB6jdtghTaRHCrOaTo4fhPMRKgjqtZj-8T48,1118
 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=d4O3UdF6QTNWM29YtBNVb_iLWUrTUj6ovfy_iJs7DUc,8316
+flock/core/mixin/dspy_integration.py,sha256=P5G4Y04nl5hFwFbJXCkQ-0TMR1L4skLL2IM_FlUjH_c,8364
 flock/core/mixin/prompt_parser.py,sha256=eOqI-FK3y17gVqpc_y5GF-WmK1Jv8mFlkZxTcgweoxI,5121
-flock/core/registry/agent_registry.py,sha256=YkYIyvFNjm7gYKRAiQQdOvVYMtsYH5cijfrv_GP4ZHc,4889
-flock/core/tools/basic_tools.py,sha256=OwWaFu4NoVrc3Uijj56RY9XDDaP_mOnEa5B3wSWwwLE,4756
+flock/core/registry/agent_registry.py,sha256=TUClh9e3eA6YzZC1CMTlsTPvQeqb9jYHewi-zPpcWM8,4987
+flock/core/tools/basic_tools.py,sha256=fI9r81_ktRiRhNLwT-jSJ9rkjl28LC1ZfL-njnno2iw,4761
 flock/core/tools/dev_tools/github.py,sha256=a2OTPXS7kWOVA4zrZHynQDcsmEi4Pac5MfSjQOLePzA,5308
-flock/core/util/cli_helper.py,sha256=oJGbVaOolMKpXWqWKuT4VJUjyFnlUgHxtGyeK0IDJFg,1644
+flock/core/util/cli_helper.py,sha256=IOl9r4cz_MJv_Bp5R8dhHX8f-unAqA9vDS6-0E90Vzk,49813
 flock/core/util/hydrator.py,sha256=6qNwOwCZB7r6y25BZ--0PGofrAlfMaXbDKFQeP5NLts,11196
 flock/core/util/input_resolver.py,sha256=g9vDPdY4OH-G7qjas5ksGEHueokHGFPMoLOvC-ngeLo,5984
 flock/core/util/serializable.py,sha256=SymJ0YrjBx48mOBItYSqoRpKuzIc4vKWRS6ScTzre7s,2573
-flock/interpreter/python_interpreter.py,sha256=pq2e7KJfAYtBCP2hhbtFNeg18QdMFF66esoYn3MHfA4,26177
+flock/evaluators/declarative/declarative_evaluator.py,sha256=f8ldgZZp94zC4CoGzBufKvbvtckCGBe9EHTOoAZfZK0,1695
+flock/evaluators/natural_language/natural_language_evaluator.py,sha256=6nVEeh8_uwv_h-d3FWlA0GbzDzRtdhvxCGKirHtyvOU,2012
+flock/evaluators/zep/zep_evaluator.py,sha256=hEHQdgIwGsbC4ci9RvtdA2k7f4M0yznIok4v4XltNwg,1885
+flock/modules/callback/callback_module.py,sha256=hCCw-HNYjK4aHnUQfvw26ZP1Q_jdlKb9kDh3BHzbCQA,2916
+flock/modules/memory/memory_module.py,sha256=2grdmvw7FJWZvz0IjgASbDPCfyS1w4gWkRzOWtK7BFM,8214
+flock/modules/memory/memory_parser.py,sha256=2S7CmVEsm22gD7-MiFj4318FTg8wd_jB-RKMwXI14WM,4369
+flock/modules/memory/memory_storage.py,sha256=CNcLDMmvv0x7Z3YMKr6VveS_VCa7rKPw8l2d-XgqokA,27246
+flock/modules/output/output_module.py,sha256=_Hid4ycGEl14m7GEsVGE9wp88SYkQ3eq_x4avUQcTWI,6985
+flock/modules/performance/metrics_module.py,sha256=K5z5bizIjA4ZEUjBk5ShwTR9ZElR-Vmqa7H38dJ3z_0,16735
+flock/modules/zep/zep_module.py,sha256=BIJ5K-hg2bLeJmGKoDcVY1rVN7_0yYETiSaVrO-gtMI,5830
 flock/platform/docker_tools.py,sha256=fpA7-6rJBjPOUBLdQP4ny2QPgJ_042nmqRn5GtKnoYw,1445
 flock/platform/jaeger_install.py,sha256=MyOMJQx4TQSMYvdUJxfiGSo3YCtsfkbNXcAcQ9bjETA,2898
 flock/themes/3024-day.toml,sha256=uOVHqEzSyHx0WlUk3D0lne4RBsNBAPCTy3C58yU7kEY,667
 flock/themes/3024-night.toml,sha256=qsXUwd6ZYz6J-R129_Ao2TKlvvK60svhZJJjB5c8Tfo,1667
-flock/themes/aardvark-blue.toml,sha256=Px1qevE6J1ZAc_jAqF_FX674KdIv_3pAYNKmmvDxIbE,1672
+flock/themes/aardvark-blue.toml,sha256=5ZgsxP3pWLPN3yJ2Wd9ErCo7fy_VJpIfje4kriDKlqo,1667
 flock/themes/abernathy.toml,sha256=T-FeYc_Nkz4dXxj-1SwKhr1BpBPg0bmqAt2Wve9cqUo,1667
 flock/themes/adventure.toml,sha256=sgT63QdUaoq9yatWTnm9H5jp7G6DTsECvfnVon_4LK4,1658
 flock/themes/adventuretime.toml,sha256=ZIrnONaakvI4uqVWfMF4U7OhxtpA-uwzxzlpBgFSQu8,1664
@@ -380,8 +395,8 @@ flock/workflow/activities.py,sha256=2zcYyDoCuYs9oQbnhLjCzBUdEi7d5IEIemKJ7TV_B8w,
 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.2.18.dist-info/METADATA,sha256=GG1FxcQ-Bh96SEo-dQvASbumhdiaAoBh7zNpYYKtgrM,19050
-flock_core-0.2.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.2.18.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.2.18.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.2.18.dist-info/RECORD,,
+flock_core-0.3.2.dist-info/METADATA,sha256=QOuH26c81HAZMQhKeUf869saWNfRHeOW2BMzdI7tC5o,20431
+flock_core-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.3.2.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.3.2.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.3.2.dist-info/RECORD,,