flock-core 0.4.0b4__py3-none-any.whl → 0.4.0b6__py3-none-any.whl

flock/core/tools/azure_tools.py

@@ -231,7 +231,8 @@ def azure_search_query(
     )
 
     # Convert results to list of dictionaries
-    result_list = [dict(result) for result in results]
+    # filter out the text_vector field
+    result_list = [{**dict(result), "text_vector": ""} for result in results]
 
     return result_list
 

flock/core/tools/basic_tools.py

@@ -76,7 +76,7 @@ def extract_links_from_markdown(markdown: str, url: str) -> list:
 
 
 @traced_and_logged
-def get_web_content_as_markdown(url: str):
+def get_web_content_as_markdown(url: str) -> str:
     if (
         importlib.util.find_spec("httpx") is not None
         and importlib.util.find_spec("markdownify") is not None

flock/core/util/loader.py

@@ -0,0 +1,59 @@
+# src/flock/core/loader.py
+"""Provides functionality to load Flock instances from files."""
+
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+# Use TYPE_CHECKING to avoid runtime circular import if Flock imports this module indirectly
+if TYPE_CHECKING:
+    from flock.core.flock import Flock
+
+# Import locally within the function to ensure Serializable methods are available
+# from .serialization.serializable import Serializable # Serializable defines the file methods
+
+# Cloudpickle check needs to be top-level
+try:
+    import cloudpickle
+
+    PICKLE_AVAILABLE = True
+except ImportError:
+    PICKLE_AVAILABLE = False
+
+
+def load_flock_from_file(file_path: str) -> "Flock":
+    """Load a Flock instance from various file formats (detects type)."""
+    # Import Flock locally within the function to avoid circular dependency at module level
+    from flock.core.flock import Flock
+
+    p = Path(file_path)
+    if not p.exists():
+        raise FileNotFoundError(f"Flock file not found: {file_path}")
+
+    try:
+        if p.suffix.lower() in [".yaml", ".yml"]:
+            return Flock.from_yaml_file(p)
+        elif p.suffix.lower() == ".json":
+            # Assuming from_json is available via Serializable or directly on Flock
+            return Flock.from_json(p.read_text())
+        elif p.suffix.lower() == ".msgpack":
+            # Assuming from_msgpack_file is available via Serializable or directly on Flock
+            return Flock.from_msgpack_file(p)
+        elif p.suffix.lower() == ".pkl":
+            if PICKLE_AVAILABLE:
+                # Assuming from_pickle_file is available via Serializable or directly on Flock
+                return Flock.from_pickle_file(p)
+            else:
+                raise RuntimeError(
+                    "Cannot load Pickle file: cloudpickle not installed."
+                )
+        else:
+            raise ValueError(f"Unsupported file extension: {p.suffix}")
+    except Exception as e:
+        # Add specific error logging if helpful
+        from flock.core.logging.logging import get_logger
+
+        logger = get_logger("loader")
+        logger.error(
+            f"Error loading Flock from {file_path}: {e}", exc_info=True
+        )
+        raise  # Re-raise the original exception

flock/modules/output/output_module.py

@@ -7,6 +7,8 @@ from typing import TYPE_CHECKING, Any
 
 from pydantic import Field
 
+from flock.core.context.context_vars import FLOCK_BATCH_SILENT_MODE
+
 if TYPE_CHECKING:
     from flock.core import FlockAgent
 
@@ -181,17 +183,50 @@ class OutputModule(FlockModule):
     ) -> dict[str, Any]:
         """Format and display the output."""
         logger.debug("Formatting and displaying output")
-        if self.config.no_output:
-            return result
-        if self.config.print_context:
-            result["context"] = context
-        # Display the result using the formatter
-        self._formatter.display_result(result, agent.name)
+
+        # Determine if output should be suppressed
+        is_silent = self.config.no_output or (
+            context and context.get_variable(FLOCK_BATCH_SILENT_MODE, False)
+        )
+
+        if is_silent:
+            logger.debug("Output suppressed (config or batch silent mode).")
+            # Still save to file if configured, even in silent mode
+            self._save_output(agent.name, result)
+            return result  # Skip console output
+
+        logger.debug("Formatting and displaying output to console.")
+
+        if self.config.print_context and context:
+            # Add context snapshot if requested (be careful with large contexts)
+            try:
+                # Create a copy or select relevant parts to avoid modifying original result dict directly
+                display_result = result.copy()
+                display_result["context_snapshot"] = (
+                    context.to_dict()
+                )  # Potential performance hit
+            except Exception:
+                display_result = result.copy()
+                display_result["context_snapshot"] = (
+                    "[Error serializing context]"
+                )
+            result_to_display = display_result
+        else:
+            result_to_display = result
+
+        if not hasattr(self, "_formatter") or self._formatter is None:
+            self._formatter = ThemedAgentResultFormatter(
+                theme=self.config.theme,
+                max_length=self.config.max_length,
+                render_table=self.config.render_table,
+                wait_for_input=self.config.wait_for_input,
+            )
+        self._formatter.display_result(result_to_display, agent.name)
 
         # Save to file if configured
-        self._save_output(agent.name, result)
+        self._save_output(agent.name, result)  # Save the original result
 
-        return result
+        return result  # Return the original, unmodified result
 
     def update_theme(self, new_theme: OutputTheme) -> None:
         """Update the output theme."""

{flock_core-0.4.0b4.dist-info → flock_core-0.4.0b6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.0b4
+Version: 0.4.0b6
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE
@@ -11,6 +11,7 @@ Requires-Python: >=3.10
 Requires-Dist: azure-search-documents>=11.5.2
 Requires-Dist: chromadb>=0.6.3
 Requires-Dist: cloudpickle>=3.1.1
+Requires-Dist: datasets>=3.2.0
 Requires-Dist: devtools>=0.12.2
 Requires-Dist: dspy==2.6.16
 Requires-Dist: duckduckgo-search>=7.3.2
@@ -28,9 +29,11 @@ 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: pandas>=2.2.3
 Requires-Dist: pillow>=10.4.0
 Requires-Dist: prometheus-client>=0.21.1
 Requires-Dist: psutil>=6.1.1
+Requires-Dist: pydantic-settings>=2.7.1
 Requires-Dist: pydantic>=2.10.5
 Requires-Dist: python-box>=7.3.2
 Requires-Dist: python-decouple>=3.8
@@ -61,6 +64,11 @@ Description-Content-Type: text/markdown
 <a href="https://www.linkedin.com/company/whiteduck" target="_blank"><img alt="LinkedIn" src="https://img.shields.io/badge/linkedin-%230077B5.svg?style=for-the-badge&logo=linkedin&logoColor=white&label=whiteduck"></a>
 <a href="https://bsky.app/profile/whiteduck-gmbh.bsky.social" target="_blank"><img alt="Bluesky" src="https://img.shields.io/badge/bluesky-Follow-blue?style=for-the-badge&logo=bluesky&logoColor=%23fff&color=%23333&labelColor=%230285FF&label=whiteduck-gmbh"></a>
 
+🐤 Flock 0.4.0 currently in beta - use `pip install flock-core==0.4.0b5` 🐤
+🐤 `pip install flock-core` will install the latest non-beta version 🐤
+🐤  Expected Release for 0.4.0 `Magpie`: End of April 2025 🐤
+
+
 ## Overview
 
 Flock is a framework for orchestrating LLM-powered agents. It leverages a **declarative approach** where you simply specify what each agent needs as input and what it produces as output, without having to write lengthy, brittle prompts. Under the hood, Flock transforms these declarations into robust workflows, using cutting-edge components such as Temporal and DSPy to handle fault tolerance, state management, and error recovery.

{flock_core-0.4.0b4.dist-info → flock_core-0.4.0b6.dist-info}/RECORD

@@ -1,22 +1,24 @@
-flock/__init__.py,sha256=LhuAmkwwNuNbEvo2N4r1myDgGqQwDRe_HYU3sTZQgDc,4139
-flock/config.py,sha256=O5QJGlStf4DWSK4ovZsKw01ud4YK3_ij6Ay8sWU8ih0,1522
-flock/cli/constants.py,sha256=EgGwFYl6TD7GVm9gASPJTjSl-aYROiFGltwFYp7u1AQ,668
+flock/__init__.py,sha256=vnL2AVN9perQ4WRwNKQgeruFw4WIZkZLqMKzxrTF2h4,4530
+flock/config.py,sha256=Nrip1Nn03KGVmRq2NYkuI-hJtnIVI1lHkurIrsPt7YI,1588
+flock/cli/config.py,sha256=5DvFLObOx3ObisHnc9JfnUBnK83y0CBsUQzXfxPZve0,138
+flock/cli/constants.py,sha256=ZyXtTW91P1hUMkbMwmOwp_JEL5e9-YkcuM3vHM5glP4,978
 flock/cli/create_agent.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
-flock/cli/create_flock.py,sha256=XjTZEMQcEuAhniDJFrZoV103c-iTS1j-8AnagWZYxGE,8229
-flock/cli/execute_flock.py,sha256=rAP-5nFfyOivi5uWG8mloZwXF9Tj9iD8MYSbllPllQ4,5726
+flock/cli/create_flock.py,sha256=wGS3azisS0QWYIDKQswoKDDJ7B0udU2o5b2IwacMN84,8634
+flock/cli/execute_flock.py,sha256=-rujYj_gLvmtf8Xiax2Ih631ibPw_-nyZIyraKzPvUc,18300
 flock/cli/load_agent.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 flock/cli/load_examples.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 flock/cli/load_flock.py,sha256=sfZ9B9aiyC5TCEbn1xR5Yd5SoaVji6MBNYzXlWOpoZ4,7111
 flock/cli/load_release_notes.py,sha256=qFcgUrMddAE_TP6x1P-6ZywTUjTknfhTDW5LTxtg1yk,599
-flock/cli/loaded_flock_cli.py,sha256=LpPBBSMOw0780EQ4KHz7QMpwz29KZZW7AuTerHvramw,6351
+flock/cli/loaded_flock_cli.py,sha256=IkeYvw52Bh3uFIm2O5xgppJ9KaY7jfh0VSFkiI46tTg,6855
 flock/cli/manage_agents.py,sha256=wkNF0IqNFfePrFueR57SILPW885IPqs3U8Cp-fcPPmo,12710
 flock/cli/registry_management.py,sha256=mAHy3wT97YgODR0gVOkTXDqR5NIPzM-E-z9dEtw9-tw,29790
+flock/cli/runner.py,sha256=TebsqwAfc_bTGzr-id6frgZXPCDJ5Xu1pBd9bZnqIDg,1120
 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/flock.py,sha256=ZB4NlBfAX3PUAm757eeVANHcbjp6UDbeixI-7yUrMEA,62592
+flock/core/flock.py,sha256=zQUpITLx_CMhJRnft4AWQDfYj85FhUlT-Ank5c-fSko,25146
 flock/core/flock_agent.py,sha256=L5sZ6weY4pNFbk8CEUrRD1506ojq_tx1jjQy02qEdC8,29126
 flock/core/flock_evaluator.py,sha256=dOXZeDOGZcAmJ9ahqq_2bdGUU1VOXY4skmwTVpAjiVw,1685
 flock/core/flock_factory.py,sha256=MGTkJCP1WGpV614f87r1vwe0tqAvBCoH9PlqtqDyJDk,2828
@@ -24,16 +26,20 @@ flock/core/flock_module.py,sha256=96aFVYAgwpKN53xGbivQDUpikOYGFCxK5mqhclOcxY0,30
 flock/core/flock_registry.py,sha256=ax2pIxv6hVqRw3eJCPQ9jAul_ocYWfl9BZttmu054d0,20830
 flock/core/flock_router.py,sha256=A5GaxcGvtiFlRLHBTW7okh5RDm3BdKam2uXvRHRaj7k,2187
 flock/core/api/__init__.py,sha256=OKlhzDWZJfA6ddBwxQUmATY0TSzESsH032u00iVGvdA,228
-flock/core/api/endpoints.py,sha256=m-QAyizCHGh3sd5IXaDEhquSxNgTZLpUVTXLdVjiDVw,9086
-flock/core/api/main.py,sha256=-MJClTcmkyUnaP9fmVu2CcHagFy_9lKk6CAbF05kraY,8928
-flock/core/api/models.py,sha256=mMPCMCD52Txc56_yscwZQG0RRPCJTnIrVKQ8WbI7gts,1111
-flock/core/api/run_store.py,sha256=kmrb0bq2Et5JiSxFWskAAf5a4jTeEFVZShTDlX5jfAk,2773
+flock/core/api/endpoints.py,sha256=qQnJmtcYGkjdKtLllVpyJVjc-iZrvu5EEeVIryyt4tc,12987
+flock/core/api/main.py,sha256=glu9ThsYNTt35Ogjx732SGYJ9-aFftpvzLMQEJ7VuvQ,19189
+flock/core/api/models.py,sha256=seqKuzhbN37nCNO7KrcJjI2mWuwiOKCLFcJcTPvTtag,3422
+flock/core/api/run_store.py,sha256=bFodJvVyWogzoezVy0cOoWWU3MdEBXf_6_5sBqCRWps,9227
+flock/core/api/runner.py,sha256=PjKQyMNawHm_N-X2uTUWBKAKBe7AEzNmRIGwQI6tUWw,1156
 flock/core/api/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/core/api/ui/routes.py,sha256=nS-wWO94mshE5ozWfOQZ-HOvtes_1qxDVcqpMZtU5JQ,8885
 flock/core/api/ui/utils.py,sha256=V7PqYHNK519hFJ8jvvwf7bGpbBXCRz_HQG3BDCCqlNA,4802
 flock/core/context/context.py,sha256=8bjRLZ74oacRNBaHmDNXdQKfB-95poF7Pp03n2k0zcQ,6437
 flock/core/context/context_manager.py,sha256=FANSWa6DEhdhtZ7t_9Gza0v80UdpoDOhHbfVOccmjkA,1181
-flock/core/context/context_vars.py,sha256=zYTMi9b6mNSSEHowEQUOTpEDurmAjaUcyBCgfKY6-cU,300
+flock/core/context/context_vars.py,sha256=ASPA29hpENWub4mgRoG62FtTVakCHQZfn6IhJQKe3C8,347
+flock/core/evaluation/utils.py,sha256=ZJkIMC9YT-HA2SPCZ4_bQ98isW1i6nbltVEYbjze-b0,12827
+flock/core/execution/batch_executor.py,sha256=JbOf-VInYA2CoQ7q2aHVA1w5ofEYQ9INFRYLRQdwEDs,13312
+flock/core/execution/evaluation_executor.py,sha256=D9EO0sU-2qWj3vomjmUUi-DOtHNJNFRf30kGDHuzREE,17702
 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
@@ -53,12 +59,13 @@ 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/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=ONv7KUhc66e4sKYu9uFc3qU1jOg4DvIXRJ5QXaTIQj0,10298
-flock/core/tools/azure_tools.py,sha256=9Bi6IrB5pzBTBhBSxpCVMgx8HBud8nl4gDp8aN0NT6c,17031
-flock/core/tools/basic_tools.py,sha256=hEG14jNZ2itVvubCHTfsWkuJK6yuNwBtuFj2Js0VHZs,9043
+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
 flock/core/tools/markdown_tools.py,sha256=W6fGM48yGHbifVlaOk1jOtVcybfRbRmf20VbDOZv8S4,6031
 flock/core/tools/dev_tools/github.py,sha256=a2OTPXS7kWOVA4zrZHynQDcsmEi4Pac5MfSjQOLePzA,5308
@@ -66,6 +73,7 @@ flock/core/util/cli_helper.py,sha256=mbxFhAGDES1AySbz5D672Az-EWk88FIvtFIGJMEp6fc
 flock/core/util/file_path_utils.py,sha256=Odf7uU32C-x1KNighbNERSiMtkzW4h8laABIoFK7A5M,6246
 flock/core/util/hydrator.py,sha256=6qNwOwCZB7r6y25BZ--0PGofrAlfMaXbDKFQeP5NLts,11196
 flock/core/util/input_resolver.py,sha256=g9vDPdY4OH-G7qjas5ksGEHueokHGFPMoLOvC-ngeLo,5984
+flock/core/util/loader.py,sha256=j3q2qem5bFMP2SmMuYjb-ISxsNGNZd1baQmpvAnRUUk,2244
 flock/evaluators/declarative/declarative_evaluator.py,sha256=WZ74LG81JcuApG2KcTk8plh0fFqDhJjtl6ubW1K-fqc,1750
 flock/evaluators/memory/azure_search_evaluator.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/evaluators/memory/memory_evaluator.py,sha256=SmerXyNaqm8DTV0yw-WqWkn9DXIf6x-nPG1eyTV6NY8,3452
@@ -76,7 +84,7 @@ flock/modules/callback/callback_module.py,sha256=volGGgHtY19qj1wHR6m5a_hmXSbV3Ca
 flock/modules/memory/memory_module.py,sha256=bSkdFBW-Pp5ldHhXi8v4kfRM7zknfLR2fsOtbTosucI,14916
 flock/modules/memory/memory_parser.py,sha256=FLH7GL8XThvHiCMfX3eQH7Sz-f62fzhAUmO6_gaDI7U,4372
 flock/modules/memory/memory_storage.py,sha256=CNcLDMmvv0x7Z3YMKr6VveS_VCa7rKPw8l2d-XgqokA,27246
-flock/modules/output/output_module.py,sha256=wOXMCyldFslj2iCMn2W5VZrSHCauMXwsW7YoFEHEcLY,7846
+flock/modules/output/output_module.py,sha256=lcQGQgwRl8luJs2gQ7SoPcXVMkrdFOJRxN33dShYS24,9424
 flock/modules/performance/metrics_module.py,sha256=UD9OjY4-zAvauMD7YyDYqE1gyIhzpdr3JkBT8j9knxY,16790
 flock/modules/zep/zep_module.py,sha256=x7JG6O6xnwwum0RETIqKYbA3xzdcvX2aUuns0Cl0c2Q,6014
 flock/platform/docker_tools.py,sha256=fpA7-6rJBjPOUBLdQP4ny2QPgJ_042nmqRn5GtKnoYw,1445
@@ -430,8 +438,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.0b4.dist-info/METADATA,sha256=0DojQCrrxsHSVfi051pnB7B8X5ONXtFHLt4iEEB9KbM,20773
-flock_core-0.4.0b4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b4.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b4.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b4.dist-info/RECORD,,
+flock_core-0.4.0b6.dist-info/METADATA,sha256=abVhPX58YsOnir9jBSpDfv5TGDvKXGwHYdc312jQDRU,21097
+flock_core-0.4.0b6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b6.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b6.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b6.dist-info/RECORD,,