flock-core 0.4.0b25__py3-none-any.whl → 0.4.0b26__py3-none-any.whl

flock/__init__.py

@@ -1,35 +1,31 @@
 """Flock package initialization."""
 
-from rich.panel import Panel
-
-from flock.cli.config import init_config_file, load_config_file
-from flock.cli.constants import (
-    CLI_CFG_FILE,
-    CLI_EXIT,
-    CLI_NOTES,
-    CLI_REGISTRY_MANAGEMENT,
-    CLI_THEME_BUILDER,
-)
-from flock.cli.load_release_notes import load_release_notes
-from flock.cli.settings import settings_editor
-from flock.core.logging.formatters.theme_builder import theme_builder
-
 
 def main():
     """Main function."""
     import questionary
     from rich.console import Console
+    from rich.panel import Panel
 
+    from flock.cli.config import init_config_file, load_config_file
     from flock.cli.constants import (
+        CLI_CFG_FILE,
         CLI_CREATE_AGENT,
         CLI_CREATE_FLOCK,
+        CLI_EXIT,
         CLI_LOAD_AGENT,
         CLI_LOAD_EXAMPLE,
         CLI_LOAD_FLOCK,
+        CLI_NOTES,
+        CLI_REGISTRY_MANAGEMENT,
         CLI_SETTINGS,
         CLI_START_WEB_SERVER,
+        CLI_THEME_BUILDER,
     )
     from flock.cli.load_flock import load_flock
+    from flock.cli.load_release_notes import load_release_notes
+    from flock.cli.settings import settings_editor
+    from flock.core.logging.formatters.theme_builder import theme_builder
     from flock.core.util.cli_helper import init_console
 
     console = Console()

flock/cli/load_release_notes.py

@@ -1,14 +1,12 @@
 from pathlib import Path
 
-from flock.core.util.cli_helper import display_hummingbird
-
 
 def load_release_notes():
     """Load release notes."""
     from rich.console import Console
     from rich.markdown import Markdown
 
-    from flock.core.util.cli_helper import init_console
+    from flock.core.util.cli_helper import display_hummingbird, init_console
 
     console = Console()
     file_path = Path(__file__).parent / "assets" / "release_notes.md"
@@ -19,5 +17,4 @@ def load_release_notes():
     with open(file_path) as file:
         release_notes = file.read()
 
-    
     console.print(Markdown(release_notes))

flock/core/execution/temporal_executor.py

@@ -7,7 +7,6 @@ from flock.workflow.activities import (
     run_agent,  # Activity function used in Temporal
 )
 from flock.workflow.temporal_setup import create_temporal_client, setup_worker
-from flock.workflow.workflow import FlockWorkflow  # Your workflow class
 
 logger = get_logger("flock")
 
@@ -25,25 +24,34 @@ async def run_temporal_workflow(
     Returns:
         A dictionary containing the workflow result.
     """
-    logger.info("Setting up Temporal workflow")
-    await setup_worker(workflow=FlockWorkflow, activity=run_agent)
-    logger.debug("Creating Temporal client")
-    flock_client = await create_temporal_client()
-    workflow_id = context.get_variable(FLOCK_RUN_ID)
-    logger.info("Executing Temporal workflow", workflow_id=workflow_id)
-    result = await flock_client.execute_workflow(
-        FlockWorkflow.run,
-        context.to_dict(),
-        id=workflow_id,
-        task_queue="flock-queue",
-    )
-
-    agent_name = context.get_variable("FLOCK_CURRENT_AGENT")
-    logger.debug("Formatting Temporal result", agent=agent_name)
-
-    if box_result:
-        from box import Box
-
-        logger.debug("Boxing Temporal result")
-        return Box(result)
-    return result
+    try:
+        from flock.workflow.flock_workflow import (
+            FlockWorkflow,  # Your workflow class
+        )
+
+        logger.info("Setting up Temporal workflow")
+        await setup_worker(workflow=FlockWorkflow, activity=run_agent)
+        logger.debug("Creating Temporal client")
+        flock_client = await create_temporal_client()
+        workflow_id = context.get_variable(FLOCK_RUN_ID)
+        logger.info("Executing Temporal workflow", workflow_id=workflow_id)
+        context_dict = context.model_dump()
+        result = await flock_client.execute_workflow(
+            FlockWorkflow.run,
+            context_dict,
+            id=workflow_id,
+            task_queue="flock-queue",
+        )
+
+        agent_name = context.get_variable("FLOCK_CURRENT_AGENT")
+        logger.debug("Formatting Temporal result", agent=agent_name)
+
+        if box_result:
+            from box import Box
+
+            logger.debug("Boxing Temporal result")
+            return Box(result)
+        return result
+    except Exception as e:
+        logger.error("Error executing Temporal workflow", error=e)
+        raise e

flock/core/flock.py

@@ -17,7 +17,14 @@ from typing import (
 
 # Third-party imports
 from box import Box
-from datasets import Dataset
+from temporalio import workflow
+
+with workflow.unsafe.imports_passed_through():
+    from datasets import Dataset
+
+    from flock.core.execution.local_executor import (
+        run_local_workflow,
+    )
 from opentelemetry import trace
 from opentelemetry.baggage import get_baggage, set_baggage
 from pandas import DataFrame
@@ -27,7 +34,6 @@ from pydantic import BaseModel, Field
 from flock.config import DEFAULT_MODEL, TELEMETRY
 from flock.core.context.context import FlockContext
 from flock.core.context.context_manager import initialize_context
-from flock.core.execution.local_executor import run_local_workflow
 from flock.core.execution.temporal_executor import run_temporal_workflow
 from flock.core.flock_evaluator import FlockEvaluator
 from flock.core.logging.logging import LOGGERS, get_logger, get_module_loggers
@@ -59,9 +65,9 @@ FlockRegistry = get_registry()  # Get the registry instance
 # Define TypeVar for generic class methods like from_dict
 T = TypeVar("T", bound="Flock")
 
-from rich.traceback import install
+# from rich.traceback import install
 
-install(show_locals=True)
+# install(show_locals=True)
 
 
 class Flock(BaseModel, Serializable):

flock/core/flock_agent.py

@@ -19,7 +19,6 @@ if TYPE_CHECKING:
 
 from opentelemetry import trace
 from pydantic import BaseModel, Field
-from rich.console import Console
 
 # Core Flock components (ensure these are importable)
 from flock.core.context.context import FlockContext
@@ -38,8 +37,6 @@ from flock.core.serialization.serialization_utils import (
     serialize_item,
 )
 
-console = Console()
-
 logger = get_logger("agent")
 tracer = trace.get_tracer(__name__)
 T = TypeVar("T", bound="FlockAgent")
@@ -230,8 +227,7 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
 
                 if self.write_to_file:
                     self._save_output(self.name, result)
-                if self.wait_for_input:
-                    console.input(prompt="Press Enter to continue...")
+
             except Exception as module_error:
                 logger.error(
                     "Error during terminate",

flock/core/util/cli_helper.py

@@ -1,15 +1,10 @@
 from importlib.metadata import PackageNotFoundError, version
 
-from rich.console import Console
-from rich.syntax import Text
-
 try:
     __version__ = version("flock-core")
 except PackageNotFoundError:
     __version__ = "0.2.0"
 
-console = Console()
-
 
 def display_hummingbird():
     """Display the hummingbird."""
@@ -45,6 +40,10 @@ def display_hummingbird():
 
 def init_console(clear_screen: bool = True, show_banner: bool = True):
     """Display the Flock banner."""
+    from rich.console import Console
+    from rich.syntax import Text
+
+    console = Console()
     banner_text = Text(
         f"""
 🦆    🐓     🐤     🐧
@@ -70,6 +69,10 @@ def init_console(clear_screen: bool = True, show_banner: bool = True):
 
 def display_banner_no_version():
     """Display the Flock banner."""
+    from rich.console import Console
+    from rich.syntax import Text
+
+    console = Console()
     banner_text = Text(
         """
 🦆    🐓     🐤     🐧

flock/evaluators/declarative/declarative_evaluator.py

@@ -1,9 +1,12 @@
 from collections.abc import Generator
 from typing import Any
 
-import dspy
+from temporalio import workflow
+
+with workflow.unsafe.imports_passed_through():
+    import dspy
+
 from pydantic import Field, PrivateAttr
-from rich.console import Console
 
 from flock.core.flock_agent import FlockAgent
 from flock.core.flock_evaluator import FlockEvaluator, FlockEvaluatorConfig
@@ -12,8 +15,6 @@ from flock.core.logging.logging import get_logger
 from flock.core.mixin.dspy_integration import DSPyIntegrationMixin
 from flock.core.mixin.prompt_parser import PromptParserMixin
 
-console = Console()
-
 logger = get_logger("evaluators.declarative")
 
 
@@ -56,6 +57,9 @@ class DeclarativeEvaluator(
         """Evaluate using DSPy, with optional asynchronous streaming."""
         # --- Setup Signature and LM ---
         try:
+            from rich.console import Console
+
+            console = Console()
             _dspy_signature = self.create_dspy_signature_class(
                 agent.name,
                 agent.description,

flock/modules/performance/metrics_module.py

@@ -24,6 +24,9 @@ class MetricPoint(BaseModel):
     value: int | float | str
     tags: dict[str, str] = {}
 
+    class Config:
+        arbitrary_types_allowed = True
+
 
 class MetricsModuleConfig(FlockModuleConfig):
     """Configuration for performance metrics collection."""

flock/workflow/temporal_setup.py

@@ -1,4 +1,5 @@
 import asyncio
+import traceback
 import uuid
 
 from temporalio.client import Client
@@ -11,14 +12,38 @@ async def create_temporal_client() -> Client:
 
 
 async def setup_worker(workflow, activity) -> Client:
-    worker_client = await create_temporal_client()
-    worker = Worker(worker_client, task_queue="flock-queue", workflows=[workflow], activities=[activity])
-    asyncio.create_task(worker.run())
-    await asyncio.sleep(1)
+    """Setup the worker and return the result of the worker.run() call."""
+    try:
+        # debug
+        # print("workflow =", workflow)
+        # print("isclass     :", inspect.isclass(workflow))
+        # print(
+        #     "has _defn   :",
+        #     hasattr(workflow, "_temporalio_workflow_definition"),
+        # )
+        worker_client = await create_temporal_client()
+        worker = Worker(
+            worker_client,
+            task_queue="flock-queue",
+            workflows=[workflow],
+            activities=[activity],
+        )
+        result = asyncio.create_task(worker.run())
+        await asyncio.sleep(1)
+        return result
+    except Exception:
+        print("\n=== Worker construction failed ===")
+        traceback.print_exc()
+        raise
 
 
 async def run_worker(client: Client, task_queue: str, workflows, activities):
-    worker = Worker(client, task_queue=task_queue, workflows=workflows, activities=activities)
+    worker = Worker(
+        client,
+        task_queue=task_queue,
+        workflows=workflows,
+        activities=activities,
+    )
     await worker.run()
 
 

{flock_core-0.4.0b25.dist-info → flock_core-0.4.0b26.dist-info}/METADATA

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

{flock_core-0.4.0b25.dist-info → flock_core-0.4.0b26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-flock/__init__.py,sha256=vnL2AVN9perQ4WRwNKQgeruFw4WIZkZLqMKzxrTF2h4,4530
+flock/__init__.py,sha256=O_8dFcANbbrAMHVUUYXKVj6vzYTOKh4cDO5pEaEXFEs,4532
 flock/config.py,sha256=Nrip1Nn03KGVmRq2NYkuI-hJtnIVI1lHkurIrsPt7YI,1588
 flock/cli/config.py,sha256=5DvFLObOx3ObisHnc9JfnUBnK83y0CBsUQzXfxPZve0,138
 flock/cli/constants.py,sha256=ZyXtTW91P1hUMkbMwmOwp_JEL5e9-YkcuM3vHM5glP4,978
@@ -8,7 +8,7 @@ flock/cli/execute_flock.py,sha256=yFn5D_qrNclNW8JofoBfr8UrUzWgs4wUHBeoU1pNigk,18
 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/load_release_notes.py,sha256=bkMIjjQFfOngXkDCh2kB404lQYIToeR91LodzI2IUWM,555
 flock/cli/loaded_flock_cli.py,sha256=IkeYvw52Bh3uFIm2O5xgppJ9KaY7jfh0VSFkiI46tTg,6855
 flock/cli/manage_agents.py,sha256=Psl014LCrJmBgwrjsp7O3WNlWvQmVd_IDud3rd0lnLI,12786
 flock/cli/registry_management.py,sha256=mAHy3wT97YgODR0gVOkTXDqR5NIPzM-E-z9dEtw9-tw,29790
@@ -19,8 +19,8 @@ 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=p7lmQULRu9ejIAELfanZiyMhW0CougIPvyFHW2nqBFQ,847
-flock/core/flock.py,sha256=0hKRlG8CRwjq5uicaxxKQCtlD2PP84c1IaO_RxZ-tG0,25666
-flock/core/flock_agent.py,sha256=k2HDMG8yd8It9eZglLA4RDhTHrqq48bE7YEzIayqjq8,39054
+flock/core/flock.py,sha256=eymHQ4BT-mVT-ml4Eod13iuS5-sAskDgOa83qwAyFos,25776
+flock/core/flock_agent.py,sha256=9hAkWUpxxz2nFamTENFhLBzAFOdIfLZTQuVcn68G1l0,38890
 flock/core/flock_evaluator.py,sha256=dOXZeDOGZcAmJ9ahqq_2bdGUU1VOXY4skmwTVpAjiVw,1685
 flock/core/flock_factory.py,sha256=uRqcpu1fFbsDKp5YhGk47c6NjC36vAowQ3wzaQqmkBo,2972
 flock/core/flock_module.py,sha256=96aFVYAgwpKN53xGbivQDUpikOYGFCxK5mqhclOcxY0,3003
@@ -42,7 +42,7 @@ flock/core/evaluation/utils.py,sha256=ZJkIMC9YT-HA2SPCZ4_bQ98isW1i6nbltVEYbjze-b
 flock/core/execution/batch_executor.py,sha256=nvsFOVaH4c4uPw_gwZ5jCIULpK59EL1kmcoPTja5kko,13745
 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/execution/temporal_executor.py,sha256=ZDTdTI13UKIAFQmBGA9fISDmDfHNsKJIjcKLOXEvhro,1949
 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=JcgABQ8QJU1hhzhfF93eqnE0jhyXGZ2oObZst68sKR8,15409
@@ -71,12 +71,12 @@ flock/core/tools/llm_tools.py,sha256=Bdt4Dpur5dGpxd2KFEQyxjfZazvW1HCDKY6ydMj6UgQ
 flock/core/tools/markdown_tools.py,sha256=W6fGM48yGHbifVlaOk1jOtVcybfRbRmf20VbDOZv8S4,6031
 flock/core/tools/zendesk_tools.py,sha256=deZAyUi9j-_yZaTayLQVJaFXIqIct-P6C8IGN5UU_tM,3528
 flock/core/tools/dev_tools/github.py,sha256=a2OTPXS7kWOVA4zrZHynQDcsmEi4Pac5MfSjQOLePzA,5308
-flock/core/util/cli_helper.py,sha256=EnK4X-FgaO71JsSXLdy0R-cxE3UctlFZtzldursw-Bw,49845
+flock/core/util/cli_helper.py,sha256=Q8GFizNKiMW3wMJwIOobR6ldP40wYCdcNqTgD5z4sPo,49951
 flock/core/util/file_path_utils.py,sha256=Odf7uU32C-x1KNighbNERSiMtkzW4h8laABIoFK7A5M,6246
 flock/core/util/hydrator.py,sha256=QJvCA8F4nkSP5akp3yg0cT6oaajOr1n7sldW5dCs6Lo,10733
 flock/core/util/input_resolver.py,sha256=ttFiz5L_uzSvxEhWOPL09WfLF--RlLOikLP5hrgE7Mo,6138
 flock/core/util/loader.py,sha256=j3q2qem5bFMP2SmMuYjb-ISxsNGNZd1baQmpvAnRUUk,2244
-flock/evaluators/declarative/declarative_evaluator.py,sha256=mzg6Ch1JFGZb09goLC3dXxpuojIMR3AcFuoQaIUjEAk,6219
+flock/evaluators/declarative/declarative_evaluator.py,sha256=q3qKHuKrj17mhaoOZuKh2HyVfiDBEEUk1Y1ZrejvggA,6328
 flock/evaluators/memory/memory_evaluator.py,sha256=ySwz7kcc8suXMJ7gKNSWThW8iOMlE8lUcUzEAHvv8rw,3559
 flock/evaluators/test/test_case_evaluator.py,sha256=3Emcoty0LOLLBIuPGxSpKphuZC9Fu1DTr1vbGg-hd0Q,1233
 flock/evaluators/zep/zep_evaluator.py,sha256=6_5vTdU0yJAH8I8w3-MPXiAZx6iUPhAVCsHjrHzkPLM,2058
@@ -86,7 +86,7 @@ flock/modules/memory/memory_module.py,sha256=MBsUCpnMWY184PlZUKw91b8Yf0jCg9ixsxi
 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=V2g7UF538dwCe4J2QsemADMOnorGfK5Z995Q2ZIV7K4,7385
-flock/modules/performance/metrics_module.py,sha256=D7MHnkHcGe7BfKFV85LqGujZcXM7Mh95BkSmO7UbJEk,16895
+flock/modules/performance/metrics_module.py,sha256=SptJzBmtVyVloi8-QtJ1jF0pBak1kelsMiZQfoeHr-4,16953
 flock/modules/zep/zep_module.py,sha256=uWhSXma4EIMt70L1_588FLnoLNmU8l7Vhhy1viRK1dk,6115
 flock/platform/docker_tools.py,sha256=fpA7-6rJBjPOUBLdQP4ny2QPgJ_042nmqRn5GtKnoYw,1445
 flock/platform/jaeger_install.py,sha256=MyOMJQx4TQSMYvdUJxfiGSo3YCtsfkbNXcAcQ9bjETA,2898
@@ -440,10 +440,10 @@ flock/themes/zenwritten-light.toml,sha256=G1iEheCPfBNsMTGaVpEVpDzYBHA_T-MV27rolU
 flock/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/workflow/activities.py,sha256=Rcgcepa-RzaEjKo2aNuI14O_sX8ij0RrqeyPa0oSw8M,9910
 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.0b25.dist-info/METADATA,sha256=Ph3rXzRZxPyXT03fVs_uebGvo9scAX-Fa_FqN5tAG_U,13004
-flock_core-0.4.0b25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b25.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b25.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b25.dist-info/RECORD,,
+flock/workflow/flock_workflow.py,sha256=I9MryXW_bqYVTHx-nl2epbTqeRy27CAWHHA7ZZA0nAk,1696
+flock/workflow/temporal_setup.py,sha256=epYMHdmTFC6njn3eaJOcs7E5yB0sxqHoMBvFeKSbKE8,1701
+flock_core-0.4.0b26.dist-info/METADATA,sha256=hX9OrCZRs6Neu4seUKingm6YggEYeTL9_aVcONqHreo,13004
+flock_core-0.4.0b26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b26.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b26.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b26.dist-info/RECORD,,