crewplus 0.2.71__tar.gz → 0.2.72__tar.gz

{crewplus-0.2.71 → crewplus-0.2.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crewplus
-Version: 0.2.71
+Version: 0.2.72
 Summary: Base services for CrewPlus AI applications
 Author-Email: Tim Liu <tim@opsmateai.com>
 License: MIT

{crewplus-0.2.71 → crewplus-0.2.72}/crewplus/services/tracing_manager.py

@@ -1,6 +1,6 @@
 # File: crewplus/services/tracing_manager.py
 
-from typing import Any, Optional, List, Protocol
+from typing import Any, Optional, List, Protocol, Dict
 import os
 import logging
 
@@ -9,11 +9,14 @@ import logging
 try:
     from langfuse.langchain import CallbackHandler as LangfuseCallbackHandler
     from ..callbacks.async_langfuse_handler import AsyncLangfuseCallbackHandler
+    from ..utils.tracing_util import get_langfuse_handler, get_async_langfuse_handler
     LANGFUSE_AVAILABLE = True
 except ImportError:
     LANGFUSE_AVAILABLE = False
     LangfuseCallbackHandler = None
     AsyncLangfuseCallbackHandler = None
+    get_langfuse_handler = None
+    get_async_langfuse_handler = None
 
 class TracingContext(Protocol):
     """
@@ -102,11 +105,11 @@ class TracingManager:
         if enable_langfuse:
             try:
                 # Create both sync and async handlers. We'll pick one at runtime.
-                sync_handler = LangfuseCallbackHandler()
+                sync_handler = get_langfuse_handler()
                 self._sync_handlers.append(sync_handler)
 
                 if AsyncLangfuseCallbackHandler:
-                    async_handler = AsyncLangfuseCallbackHandler()
+                    async_handler = get_async_langfuse_handler()
                     self._async_handlers.append(async_handler)
                 
                 self.context.logger.info(f"Langfuse tracing enabled for {self.context.get_model_identifier()}")
@@ -115,7 +118,7 @@ class TracingManager:
         else:
             self.context.logger.info("Langfuse is not enabled, skipping handler initialization.")
     
-    def _add_callbacks_to_config(self, config: Optional[dict], handlers: List[Any]) -> dict:
+    def add_callbacks_to_config(self, config: Optional[dict], handlers: List[Any]) -> dict:
         """A generic helper to add a list of handlers to a config object."""
         if config is None:
             config = {}
@@ -154,10 +157,26 @@ class TracingManager:
         
         return config
 
-    def add_sync_callbacks_to_config(self, config: Optional[dict]) -> dict:
-        """Adds synchronous tracing handlers to the request configuration."""
-        return self._add_callbacks_to_config(config, self._sync_handlers)
+    def add_sync_callbacks_to_config(self, config: Optional[dict], handlers: Optional[List[Any]] = None) -> dict:
+        """
+        Adds synchronous tracing handlers to the request configuration.
+
+        Args:
+            config: The configuration dictionary to which callbacks will be added.
+            handlers: An optional list of handlers to add. If not provided,
+                      the manager's default synchronous handlers are used.
+        """
+        handlers_to_add = self._sync_handlers if handlers is None else handlers
+        return self.add_callbacks_to_config(config, handlers_to_add)
 
-    def add_async_callbacks_to_config(self, config: Optional[dict]) -> dict:
-        """Adds asynchronous tracing handlers to the request configuration."""
-        return self._add_callbacks_to_config(config, self._async_handlers)
+    def add_async_callbacks_to_config(self, config: Optional[dict], handlers: Optional[List[Any]] = None) -> dict:
+        """
+        Adds asynchronous tracing handlers to the request configuration.
+
+        Args:
+            config: The configuration dictionary to which callbacks will be added.
+            handlers: An optional list of handlers to add. If not provided,
+                      the manager's default asynchronous handlers are used.
+        """
+        handlers_to_add = self._async_handlers if handlers is None else handlers
+        return self.add_callbacks_to_config(config, handlers_to_add)

crewplus-0.2.72/crewplus/utils/tracing_util.py

@@ -0,0 +1,51 @@
+from typing import Dict, Any, Optional
+from langchain_core.runnables import RunnableConfig
+from langfuse.langchain import CallbackHandler as LangfuseCallbackHandler
+from ..callbacks.async_langfuse_handler import AsyncLangfuseCallbackHandler
+
+# Singleton holder for the Langfuse handler to avoid multiple instances per run
+_LANGFUSE_HANDLER: Optional[LangfuseCallbackHandler] = None
+_ASYNC_LANGFUSE_HANDLER: Optional[AsyncLangfuseCallbackHandler] = None
+
+def _get_langfuse_handler() -> LangfuseCallbackHandler:
+    global _LANGFUSE_HANDLER
+    if _LANGFUSE_HANDLER is None:
+        _LANGFUSE_HANDLER = LangfuseCallbackHandler()
+    return _LANGFUSE_HANDLER
+
+def get_langfuse_handler() -> LangfuseCallbackHandler:
+    return _get_langfuse_handler()
+
+def get_async_langfuse_handler() -> "AsyncLangfuseCallbackHandler":
+    """Returns a singleton instance of the async Langfuse handler."""
+    global _ASYNC_LANGFUSE_HANDLER
+    if _ASYNC_LANGFUSE_HANDLER is None:
+        _ASYNC_LANGFUSE_HANDLER = AsyncLangfuseCallbackHandler()
+    return _ASYNC_LANGFUSE_HANDLER
+
+def prepare_trace_config(context: Dict[str, Any]) -> RunnableConfig:
+    """
+    Prepares a minimal RunnableConfig for tracing, primarily for Langfuse.
+
+    - Creates a new config containing only tracing-related information.
+    - Extracts 'trace_metadata' from the context's 'configurable' dict
+      and uses it as the 'metadata' for the new trace config.
+    - Adds a singleton Langfuse callback handler.
+    """
+    # The full config is passed in the 'config' key of the context
+    # Start with a copy of the existing config from the graph to preserve its state
+    run_config = context.get("config", {}).copy()
+
+    # Extract trace_metadata from the 'configurable' part of the full config
+    trace_metadata = run_config.get("trace_metadata", {})
+    if not trace_metadata:
+        trace_metadata = run_config.get("configurable", {}).get("trace_metadata", {})
+
+    # If trace_metadata exists, merge all its fields into the main metadata key
+    if trace_metadata and isinstance(trace_metadata, dict):
+        if "metadata" not in run_config:
+            run_config["metadata"] = {}
+        run_config["metadata"].update(trace_metadata)
+
+    return run_config
+    

{crewplus-0.2.71 → crewplus-0.2.72}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "crewplus"
-version = "0.2.71"
+version = "0.2.72"
 description = "Base services for CrewPlus AI applications"
 authors = [
     { name = "Tim Liu", email = "tim@opsmateai.com" },