flock-core 0.2.9__py3-none-any.whl → 0.2.11__py3-none-any.whl

flock/config.py

@@ -30,7 +30,7 @@ OTEL_SQL_DATABASE_NAME = config("OTEL_SQL_DATABASE", "flock_events.db")
 OTEL_FILE_NAME = config("OTEL_FILE_NAME", "flock_events.jsonl")
 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"
+OTEL_ENABLE_JAEGER: bool = config("OTEL_ENABLE_JAEGER", False) == "True"
 
 
 TELEMETRY = TelemetryConfig(

flock/core/flock.py

@@ -99,31 +99,34 @@ class Flock:
         Returns:
             FlockAgent: The registered agent instance.
         """
-        if not agent.model:
-            agent.model = self.model
-            logger.debug(
-                f"Using default model for agent {agent.name}", model=self.model
-            )
+        with tracer.start_as_current_span("add_agent") as span:
+            span.set_attribute("agent_name", agent.name)
+            if not agent.model:
+                agent.model = self.model
+                logger.debug(
+                    f"Using default model for agent {agent.name}",
+                    model=self.model,
+                )
 
-        if agent.name in self.agents:
-            logger.warning(
-                f"Agent {agent.name} already exists, returning existing instance"
+            if agent.name in self.agents:
+                logger.warning(
+                    f"Agent {agent.name} already exists, returning existing instance"
+                )
+                return self.agents[agent.name]
+            logger.info("Adding new agent")
+
+            self.agents[agent.name] = agent
+            self.registry.register_agent(agent)
+            self.context.add_agent_definition(
+                type(agent), agent.name, agent.to_dict()
             )
-            return self.agents[agent.name]
-        logger.info("Adding new agent")
-
-        self.agents[agent.name] = agent
-        self.registry.register_agent(agent)
-        self.context.add_agent_definition(
-            type(agent), agent.name, agent.to_dict()
-        )
-
-        if hasattr(agent, "tools") and agent.tools:
-            for tool in agent.tools:
-                self.registry.register_tool(tool.__name__, tool)
-                logger.debug("Registered tool", tool_name=tool.__name__)
-        logger.success("Agent added successfully")
-        return agent
+
+            if hasattr(agent, "tools") and agent.tools:
+                for tool in agent.tools:
+                    self.registry.register_tool(tool.__name__, tool)
+                    logger.debug("Registered tool", tool_name=tool.__name__)
+            logger.success("Agent added successfully")
+            return agent
 
     def add_tool(self, tool_name: str, tool: callable):
         """Register a tool with the Flock system.
@@ -132,9 +135,12 @@ class Flock:
             tool_name (str): The name under which the tool will be registered.
             tool (callable): The tool function to register.
         """
-        logger.info("Registering tool", tool_name=tool_name)
-        self.registry.register_tool(tool_name, tool)
-        logger.debug("Tool registered successfully")
+        with tracer.start_as_current_span("add_tool") as span:
+            span.set_attribute("tool_name", tool_name)
+            span.set_attribute("tool", tool.__name__)
+            logger.info("Registering tool", tool_name=tool_name)
+            self.registry.register_tool(tool_name, tool)
+            logger.debug("Tool registered successfully")
 
     async def run_async(
         self,

flock/core/flock_agent.py

@@ -14,6 +14,8 @@ from flock.core.mixin.dspy_integration import AgentType, DSPyIntegrationMixin
 from flock.core.mixin.prompt_parser import PromptParserMixin
 
 logger = get_logger("flock")
+
+
 from opentelemetry import trace
 
 tracer = trace.get_tracer(__name__)

flock/core/logging/telemetry.py

@@ -61,6 +61,7 @@ class TelemetryConfig:
         self.enable_jaeger = enable_jaeger
         self.enable_file = enable_file
         self.enable_sql = enable_sql
+        self.global_tracer = None
 
     def setup_tracing(self):
         """Set up OpenTelemetry tracing with the specified exporters."""
@@ -117,7 +118,7 @@ class TelemetryConfig:
         provider.add_span_processor(
             BaggageAttributeSpanProcessor(baggage_keys=["session_id", "run_id"])
         )
-
+        self.global_tracer = trace.get_tracer("flock")
         sys.excepthook = self.log_exception_to_otel
 
     def log_exception_to_otel(self, exc_type, exc_value, exc_traceback):

flock/core/mixin/dspy_integration.py

@@ -69,20 +69,39 @@ 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.
                 # Figure out why the following code doesn't work as well as the eval.
+
+                # import dspy
+
                 # field_type = dspy.PythonInterpreter(
-                #     sys.modules[__name__].__dict__
-                #     | sys.modules["__main__"].__dict__
+                #     sys.modules[__name__].__dict__ | sys.modules["__main__"].__dict__
                 # ).execute(type_str)
 
                 try:
                     field_type = eval(type_str, sys.modules[__name__].__dict__)
-                except Exception:
+                except Exception as e:
+                    logger.warning(
+                        "Failed to evaluate type_str in __name__" + str(e)
+                    )
                     field_type = eval(
                         type_str, sys.modules["__main__"].__dict__
                     )
 
-            except Exception:
-                field_type = str
+            except Exception as ex:
+                # AREPL fix - var
+                logger.warning(
+                    "Failed to evaluate type_str in __main__" + str(ex)
+                )
+                try:
+                    field_type = eval(
+                        f"exec_locals.get('{type_str}')",
+                        sys.modules["__main__"].__dict__,
+                    )
+                except Exception as ex_arepl:
+                    logger.warning(
+                        "Failed to evaluate type_str in exec_locals"
+                        + str(ex_arepl)
+                    )
+                    field_type = str
 
             return name, field_type, desc
 

flock/core/registry/agent_registry.py

@@ -2,12 +2,12 @@
 
 from collections.abc import Callable
 
-from opentelemetry import trace
-
 from flock.core.flock_agent import FlockAgent
 from flock.core.logging.logging import get_logger
 
 logger = get_logger("registry")
+from opentelemetry import trace
+
 tracer = trace.get_tracer(__name__)
 
 

flock/core/util/cli_helper.py

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

{flock_core-0.2.9.dist-info → flock_core-0.2.11.dist-info}/METADATA

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

{flock_core-0.2.9.dist-info → flock_core-0.2.11.dist-info}/RECORD

@@ -1,8 +1,8 @@
 flock/__init__.py,sha256=JeRpPR29wyqXe8El-Ug4v_Ibhf5GQm_i8yWMi0cUYz0,36
-flock/config.py,sha256=jmW1PQ2oiCUpERLhNFzvrcHlYS3KM_jJyMXrnoeA0gs,1547
+flock/config.py,sha256=5WvDubaeM6eVyPrawybxvv3SwORArGeWi9rBZpCrAME,1548
 flock/core/__init__.py,sha256=0Xq_txurlxxjKGXjRn6GNJusGTiBcd7zw2eF0L7JyuU,183
-flock/core/flock.py,sha256=dyyLeCIUQ_tp-lUfbNphxwsIq8oWgEo8R2B6BhjeqTg,9826
-flock/core/flock_agent.py,sha256=prA2jslYuAABzIG6uw55f0XCNR-V4Ptaaju93ZuCc6E,27767
+flock/core/flock.py,sha256=USuECIlmQBZUzBgaHkUwD53ltiuP7aqyK1rlNBfGPt0,10240
+flock/core/flock_agent.py,sha256=cUKY0o4zbxEdjMNDx9NPMKZEIazS_ssvn0TFB6aK66w,27769
 flock/core/context/context.py,sha256=jH06w4C_O5CEL-YxjX_x_dmgLe9Rcllnn1Ebs0dvwaE,6171
 flock/core/context/context_manager.py,sha256=qMySVny_dbTNLh21RHK_YT0mNKIOrqJDZpi9ZVdBsxU,1103
 flock/core/context/context_vars.py,sha256=0Hn6fM2iNc0_jIIU0B7KX-K2o8qXqtZ5EYtwujETQ7U,272
@@ -10,7 +10,7 @@ flock/core/execution/local_executor.py,sha256=O_dgQ_HJPCp97ghdEoDSNDIiaYkogrUS0G
 flock/core/execution/temporal_executor.py,sha256=ai6ikr9rEiN2Kc-208OalxtfqL_FTt_UaH6a--oEkJM,2010
 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/telemetry.py,sha256=yEOfEZ3HBFeLCaHZA6QmsRdwZKtmUC6bQtEOTVeRR4o,5314
+flock/core/logging/telemetry.py,sha256=On-ywmCUks7FNq7xwdhksfJhH-TlDwErGsNmE0LFTT0,5402
 flock/core/logging/trace_and_logged.py,sha256=5vNrK1kxuPMoPJ0-QjQg-EDJL1oiEzvU6UNi6X8FiMs,2117
 flock/core/logging/formatters/base_formatter.py,sha256=CyG-X2NWq8sqEhFEO2aG7Mey5tVkIzoWiihW301_VIo,1023
 flock/core/logging/formatters/formatter_factory.py,sha256=hmH-NpCESHkioX0GBQ5CuQR4axyIXnSRWwAZCHylx6Q,1283
@@ -22,12 +22,12 @@ flock/core/logging/span_middleware/baggage_span_processor.py,sha256=gJfRl8FeB6jd
 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=WHCCIxpb0Pk0NVV5tPEcpTWcwPMTVATY4O5yflgKrMA,7460
+flock/core/mixin/dspy_integration.py,sha256=eeY18D2ZFp_XhVFnhHISbjhkz386MEnSBzfiHRIU850,8185
 flock/core/mixin/prompt_parser.py,sha256=eOqI-FK3y17gVqpc_y5GF-WmK1Jv8mFlkZxTcgweoxI,5121
-flock/core/registry/agent_registry.py,sha256=QHdr3Cb-32PEdz8jFCIZSH9OlfpRwAJMtSRpHCWJDq4,4889
+flock/core/registry/agent_registry.py,sha256=YkYIyvFNjm7gYKRAiQQdOvVYMtsYH5cijfrv_GP4ZHc,4889
 flock/core/tools/basic_tools.py,sha256=OwWaFu4NoVrc3Uijj56RY9XDDaP_mOnEa5B3wSWwwLE,4756
 flock/core/tools/dev_tools/github.py,sha256=a2OTPXS7kWOVA4zrZHynQDcsmEi4Pac5MfSjQOLePzA,5308
-flock/core/util/cli_helper.py,sha256=qBB5C4MU-JqohHVjdI8E7od5ZAnzM_0IteZndCc5RBQ,939
+flock/core/util/cli_helper.py,sha256=nlSnPrc1pnYEFQXcL_wCqPI6g1Jr7AzNtmGoOPs0zKw,936
 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
@@ -374,8 +374,8 @@ flock/workflow/activities.py,sha256=YEg-Gr8kzVsxWsmsZguIVhX2XwMRvhZ2OlnsJoG5g_A,
 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.9.dist-info/METADATA,sha256=dLxdYNdWIn4ZlvhIT3HZJwd_C8ZB3eOvmbK9_KJw_nA,11569
-flock_core-0.2.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.2.9.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.2.9.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.2.9.dist-info/RECORD,,
+flock_core-0.2.11.dist-info/METADATA,sha256=5jKsTBzO8s5UlMNkZYdl_bagI68y8n6LkMjmRbW1DkY,11570
+flock_core-0.2.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.2.11.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.2.11.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.2.11.dist-info/RECORD,,