crewplus 0.2.68__py3-none-any.whl → 0.2.70__py3-none-any.whl

crewplus/services/tracing_manager.py

@@ -9,16 +9,11 @@ import logging
 try:
     from langfuse.langchain import CallbackHandler as LangfuseCallbackHandler
     from ..callbacks.async_langfuse_handler import AsyncLangfuseCallbackHandler
-    # Import the new custom handlers
-    from ..callbacks.run_id_handler import RunIdCallbackHandler, AsyncRunIdCallbackHandler
     LANGFUSE_AVAILABLE = True
 except ImportError:
     LANGFUSE_AVAILABLE = False
     LangfuseCallbackHandler = None
     AsyncLangfuseCallbackHandler = None
-    # Define dummy classes for the custom handlers to prevent errors if langfuse is not installed
-    class RunIdCallbackHandler: pass
-    class AsyncRunIdCallbackHandler: pass
 
 class TracingContext(Protocol):
     """
@@ -101,24 +96,20 @@ class TracingManager:
         # by detecting its environment variables.
         enable_langfuse = self.context.enable_tracing
         if enable_langfuse is None: # Auto-detect if not explicitly set
-            self.context.logger.debug("enable_tracing is None, auto-detecting via environment variables.")
             langfuse_env_vars = ["LANGFUSE_PUBLIC_KEY", "LANGFUSE_SECRET_KEY"]
             enable_langfuse = any(os.getenv(var) for var in langfuse_env_vars)
-            self.context.logger.debug(f"Auto-detection result for enable_langfuse: {enable_langfuse}")
         
         if enable_langfuse:
             try:
-                self.context.logger.debug("Langfuse is enabled, creating handlers.")
-                # Create and add both the standard and the run_id-capturing handlers.
-                # The standard handler creates the trace, and the custom one updates it.
-                self._sync_handlers.append(LangfuseCallbackHandler())
-                self._sync_handlers.append(RunIdCallbackHandler())
+                # Create both sync and async handlers. We'll pick one at runtime.
+                sync_handler = LangfuseCallbackHandler()
+                self._sync_handlers.append(sync_handler)
 
                 if AsyncLangfuseCallbackHandler:
-                    self._async_handlers.append(AsyncLangfuseCallbackHandler())
-                    self._async_handlers.append(AsyncRunIdCallbackHandler())
+                    async_handler = AsyncLangfuseCallbackHandler()
+                    self._async_handlers.append(async_handler)
                 
-                self.context.logger.info(f"Langfuse tracing enabled for {self.context.get_model_identifier()}. Sync handlers loaded: {len(self._sync_handlers)}")
+                self.context.logger.info(f"Langfuse tracing enabled for {self.context.get_model_identifier()}")
             except Exception as e:
                 self.context.logger.warning(f"Failed to initialize Langfuse: {e}", exc_info=True)
         else:

{crewplus-0.2.68.dist-info → crewplus-0.2.70.dist-info}/METADATA

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

{crewplus-0.2.68.dist-info → crewplus-0.2.70.dist-info}/RECORD

@@ -1,17 +1,16 @@
-crewplus-0.2.68.dist-info/METADATA,sha256=sqbjQMZRzh7U0AajzZZ1lvgXuZzRsYDI3_pC9AKYLYg,5424
-crewplus-0.2.68.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-crewplus-0.2.68.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crewplus-0.2.68.dist-info/licenses/LICENSE,sha256=2_NHSHRTKB_cTcT_GXgcenOCtIZku8j343mOgAguTfc,1087
+crewplus-0.2.70.dist-info/METADATA,sha256=M2xMdWJbR5BsBLfIGxner83D2vLfE5ui-hmEmhcVMUQ,5424
+crewplus-0.2.70.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+crewplus-0.2.70.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crewplus-0.2.70.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/run_id_handler.py,sha256=T_YqmGmUp2_DIc01dlVY-aC43NKcevfRejAWN-lft6M,5266
 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=oyKoPAfirAvb9M6Kca6HMNQYo3mBtXCLM3jFkPYU55s,8368
+crewplus/services/tracing_manager.py,sha256=_C4zYj6o_k5mDWY7vM8UeaVaXp8SqrkvYOb0Jj-y3sY,7566
 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
@@ -23,4 +22,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.68.dist-info/RECORD,,
+crewplus-0.2.70.dist-info/RECORD,,

crewplus/callbacks/run_id_handler.py

@@ -1,131 +0,0 @@
-# File: crewplus/callbacks/run_id_handler.py
-
-from typing import Any, Dict, List
-from uuid import UUID
-import logging
-
-# Langfuse imports with graceful fallback
-from langfuse.langchain import CallbackHandler as LangfuseCallbackHandler
-from .async_langfuse_handler import AsyncLangfuseCallbackHandler
-from langfuse import get_client
-from langchain_core.messages import BaseMessage
-#from langchain_core.outputs import LLMResult
-LANGFUSE_AVAILABLE = True
-
-# --- Custom Callback Handlers to capture the run_id ---
-
-class RunIdCallbackHandler(LangfuseCallbackHandler):
-    """
-    A custom handler that injects the LangChain run_id into the metadata
-    before the Langfuse observation is created.
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.run_trace_map = {}
-        # Use a named logger for better context
-        self.logger = logging.getLogger(__name__)
-        self.logger.info("RunIdCallbackHandler initialized.")
-
-    def _inject_run_id_to_metadata(self, run_id: UUID, kwargs: Dict[str, Any]) -> Dict[str, Any]:
-        """Helper to safely add the run_id to the metadata in kwargs."""
-        metadata = kwargs.get("metadata") or {}
-        metadata["langchain_run_id"] = str(run_id)
-        kwargs["metadata"] = metadata
-        return kwargs
-
-    def on_chain_start(
-        self,
-        serialized: Dict[str, Any],
-        inputs: Dict[str, Any],
-        *,
-        run_id: UUID,
-        **kwargs: Any,
-    ) -> Any:
-        self.logger.debug(f"[on_chain_start] Intercepted run_id: {run_id}")
-        kwargs = self._inject_run_id_to_metadata(run_id, kwargs)
-        
-        # Call the base handler with the modified kwargs
-        result = super().on_chain_start(serialized, inputs, run_id=run_id, **kwargs)
-        
-        # We still map the trace_id for easy retrieval in tests
-        if self.last_trace_id:
-            self.run_trace_map[str(run_id)] = self.last_trace_id
-            self.logger.info(f"[on_chain_start] Mapped run_id '{run_id}' to trace_id '{self.last_trace_id}'.")
-            
-        return result
-
-    def on_chat_model_start(
-        self,
-        serialized: Dict[str, Any],
-        messages: List[List[BaseMessage]],
-        *,
-        run_id: UUID,
-        parent_run_id: UUID | None = None,
-        **kwargs: Any,
-    ) -> Any:
-        self.logger.debug(f"[on_chat_model_start] Intercepted run_id: {run_id}")
-        
-        # Only inject the run_id if this is the root of the trace
-        if parent_run_id is None:
-            kwargs = self._inject_run_id_to_metadata(run_id, kwargs)
-
-        # Call the base handler with potentially modified kwargs
-        result = super().on_chat_model_start(serialized, messages, run_id=run_id, parent_run_id=parent_run_id, **kwargs)
-
-        if parent_run_id is None and self.last_trace_id:
-            self.run_trace_map[str(run_id)] = self.last_trace_id
-            self.logger.info(f"[on_chat_model_start] Mapped root run_id '{run_id}' to trace_id '{self.last_trace_id}'.")
-
-        return result
-
-# You would similarly update the AsyncRunIdCallbackHandler if you use it
-class AsyncRunIdCallbackHandler(AsyncLangfuseCallbackHandler):
-    """
-    An async custom handler that injects the LangChain run_id into the metadata
-    before the Langfuse observation is created.
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.run_trace_map = {}
-        self.logger = logging.getLogger(__name__)
-        self.logger.info("AsyncRunIdCallbackHandler initialized.")
-
-    def _inject_run_id_to_metadata(self, run_id: UUID, kwargs: Dict[str, Any]) -> Dict[str, Any]:
-        """Helper to safely add the run_id to the metadata in kwargs."""
-        metadata = kwargs.get("metadata") or {}
-        metadata["langchain_run_id"] = str(run_id)
-        kwargs["metadata"] = metadata
-        return kwargs
-
-    async def on_chain_start(
-        self,
-        serialized: Dict[str, Any],
-        inputs: Dict[str, Any],
-        *,
-        run_id: UUID,
-        **kwargs: Any,
-    ) -> Any:
-        self.logger.debug(f"Async [on_chain_start] Intercepted run_id: {run_id}")
-        kwargs = self._inject_run_id_to_metadata(run_id, kwargs)
-        result = await super().on_chain_start(serialized, inputs, run_id=run_id, **kwargs)
-        if self.last_trace_id:
-            self.run_trace_map[str(run_id)] = self.last_trace_id
-        return result
-
-    async def on_chat_model_start(
-        self,
-        serialized: Dict[str, Any],
-        messages: List[List[BaseMessage]],
-        *,
-        run_id: UUID,
-        parent_run_id: UUID | None = None,
-        **kwargs: Any,
-    ) -> Any:
-        self.logger.debug(f"Async [on_chat_model_start] Intercepted run_id: {run_id}")
-        if parent_run_id is None:
-            kwargs = self._inject_run_id_to_metadata(run_id, kwargs)
-        result = await super().on_chat_model_start(serialized, messages, run_id=run_id, parent_run_id=parent_run_id, **kwargs)
-        
-        if parent_run_id is None and self.last_trace_id:
-            self.run_trace_map[str(run_id)] = self.last_trace_id
-        return result