crewplus 0.2.71__py3-none-any.whl → 0.2.73__py3-none-any.whl

crewplus/callbacks/async_langfuse_handler.py

@@ -42,10 +42,14 @@ class AsyncLangfuseCallbackHandler(AsyncCallbackHandler):
     Wraps the synchronous LangfuseCallbackHandler to make it fully compatible with
     LangChain's async methods by handling all relevant events.
     """
-    def __init__(self, *args: Any, **kwargs: Any):
+    def __init__(self, sync_handler: Optional[LangfuseCallbackHandler] = None, *args: Any, **kwargs: Any):
         if not LANGFUSE_AVAILABLE:
             raise ImportError("Langfuse is not available. Please install it with 'pip install langfuse'")
-        self.sync_handler = LangfuseCallbackHandler(*args, **kwargs)
+        
+        if sync_handler:
+            self.sync_handler = sync_handler
+        else:
+            self.sync_handler = LangfuseCallbackHandler(*args, **kwargs)
 
     def __getattr__(self, name: str) -> Any:
         return getattr(self.sync_handler, name)

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/utils/tracing_util.py

@@ -0,0 +1,55 @@
+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, ensuring it
+    shares the same underlying synchronous Langfuse handler singleton.
+    """
+    global _ASYNC_LANGFUSE_HANDLER
+    if _ASYNC_LANGFUSE_HANDLER is None:
+        sync_handler = get_langfuse_handler()
+        _ASYNC_LANGFUSE_HANDLER = AsyncLangfuseCallbackHandler(sync_handler=sync_handler)
+    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.dist-info → crewplus-0.2.73.dist-info}/METADATA

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

{crewplus-0.2.71.dist-info → crewplus-0.2.73.dist-info}/RECORD

@@ -1,19 +1,20 @@
-crewplus-0.2.71.dist-info/METADATA,sha256=x45o-KC-K6zW8OIsL3eEwcS-mQ2wupMQYHVo5JANcLs,5424
-crewplus-0.2.71.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-crewplus-0.2.71.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crewplus-0.2.71.dist-info/licenses/LICENSE,sha256=2_NHSHRTKB_cTcT_GXgcenOCtIZku8j343mOgAguTfc,1087
+crewplus-0.2.73.dist-info/METADATA,sha256=TK-9vndgc42n3Ovj05JoC5ZkeVVrffOcwC4HloEEyXc,5424
+crewplus-0.2.73.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+crewplus-0.2.73.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crewplus-0.2.73.dist-info/licenses/LICENSE,sha256=2_NHSHRTKB_cTcT_GXgcenOCtIZku8j343mOgAguTfc,1087
 crewplus/__init__.py,sha256=m46HkZL1Y4toD619NL47Sn2Qe084WFFSFD7e6VoYKZc,284
 crewplus/callbacks/__init__.py,sha256=YG7ieeb91qEjp1zF0-inEN7mjZ7yT_D2yzdWFT8Z1Ws,63
-crewplus/callbacks/async_langfuse_handler.py,sha256=A4uFeLpvOUdc58M7sZoE65_C1V98u0QCvx5jUquM0pM,7006
+crewplus/callbacks/async_langfuse_handler.py,sha256=8_p7ctgcmDNQgF5vOqA47I0x-3GWsm7zioZcZHgedZk,7163
 crewplus/services/__init__.py,sha256=V1CG8b2NOmRzNgQH7BPl4KVxWSYJH5vfEsW1wVErKNE,375
 crewplus/services/azure_chat_model.py,sha256=iWzJ2GQFSNmwJx-2O5_xKPSB6VVc-7T6bcfFI8_WezA,5521
 crewplus/services/gemini_chat_model.py,sha256=DYqz01H2TIHiCDQesSozVfOsMigno6QGwOtIweg7UHk,40103
 crewplus/services/init_services.py,sha256=tc1ti8Yufo2ixlJpwg8uH0KmoyQ4EqxCOe4uTEWnlRM,2413
 crewplus/services/model_load_balancer.py,sha256=Q9Gx3GrbKworU-Ytxeqp0ggHSgZ1Q6brtTk-nCl4sak,12095
-crewplus/services/tracing_manager.py,sha256=_C4zYj6o_k5mDWY7vM8UeaVaXp8SqrkvYOb0Jj-y3sY,7566
+crewplus/services/tracing_manager.py,sha256=pwNFeA77vnoZMh_AUOnK5TvAaPOOLg5oDnVOe1yUa9A,8502
 crewplus/utils/__init__.py,sha256=2Gk1n5srFJQnFfBuYTxktdtKOVZyNrFcNaZKhXk35Pw,142
 crewplus/utils/schema_action.py,sha256=GDaBoVFQD1rXqrLVSMTfXYW1xcUu7eDcHsn57XBSnIg,422
 crewplus/utils/schema_document_updater.py,sha256=frvffxn2vbi71fHFPoGb9hq7gH2azmmdq17p-Fumnvg,7322
+crewplus/utils/tracing_util.py,sha256=ew5VwjTKcY88P2sveIlGqmsNFR5OJ-DjKAHKQzBoTyE,2449
 crewplus/vectorstores/milvus/__init__.py,sha256=OeYv2rdyG7tcREIjBJPyt2TbE54NvyeRoWMe7LwopRE,245
 crewplus/vectorstores/milvus/milvus_schema_manager.py,sha256=-QRav-hzu-XWeJ_yKUMolal_EyMUspSg-nvh5sqlrlQ,11442
 crewplus/vectorstores/milvus/schema_milvus.py,sha256=wwNpfqsKS0xeozZES40IvB0iNwUtpCall_7Hkg0dL1g,27223
@@ -22,4 +23,4 @@ docs/GeminiChatModel.md,sha256=zZYyl6RmjZTUsKxxMiC9O4yV70MC4TD-IGUmWhIDBKA,8677
 docs/ModelLoadBalancer.md,sha256=aGHES1dcXPz4c7Y8kB5-vsCNJjriH2SWmjBkSGoYKiI,4398
 docs/VDBService.md,sha256=Dw286Rrf_fsi13jyD3Bo4Sy7nZ_G7tYm7d8MZ2j9hxk,9375
 docs/index.md,sha256=3tlc15uR8lzFNM5WjdoZLw0Y9o1P1gwgbEnOdIBspqc,1643
-crewplus-0.2.71.dist-info/RECORD,,
+crewplus-0.2.73.dist-info/RECORD,,