crewplus 0.2.65__tar.gz → 0.2.67__tar.gz

{crewplus-0.2.65 → crewplus-0.2.67}/PKG-INFO

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

crewplus-0.2.67/crewplus/callbacks/run_id_handler.py

@@ -0,0 +1,99 @@
+# File: crewplus/callbacks/run_id_handler.py
+
+from typing import Any, Dict
+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
+LANGFUSE_AVAILABLE = True
+
+# --- Custom Callback Handlers to capture the run_id ---
+
+class RunIdCallbackHandler(LangfuseCallbackHandler):
+    """
+    A custom synchronous callback handler that captures the Langchain run_id
+    and adds it to the Langfuse trace metadata. It also stores the mapping
+    between the run_id and the generated trace_id.
+    """
+    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 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 triggered for run_id: {run_id}")
+        # First, let the base handler do its work, which includes creating the trace
+        run = super().on_chain_start(serialized, inputs, run_id, **kwargs)
+        self.logger.debug(f"Base handler's on_chain_start completed. Current trace_id: {self.last_trace_id}")
+
+        try:
+            # The base handler sets `self.last_trace_id` when a trace is created
+            if self.last_trace_id:
+                self.run_trace_map[str(run_id)] = self.last_trace_id
+                self.logger.info(f"Mapping run_id '{run_id}' to trace_id '{self.last_trace_id}'.")
+
+                # Then, update the created trace with the run_id as metadata
+                langfuse_client = get_client()
+                langfuse_client.update_current_trace(
+                    metadata={"langchain_run_id": str(run_id)}
+                )
+                self.logger.info(f"Successfully updated trace '{self.last_trace_id}' with metadata for run_id '{run_id}'.")
+            else:
+                self.logger.warning(f"Could not find 'last_trace_id' for run_id '{run_id}'. Metadata will not be updated.")
+
+        except Exception as e:
+            self.logger.error(f"Failed to process run_id '{run_id}' in RunIdCallbackHandler: {e}", exc_info=True)
+
+        return run
+
+class AsyncRunIdCallbackHandler(AsyncLangfuseCallbackHandler):
+    """
+    A custom asynchronous callback handler that captures the Langchain run_id
+    and adds it to the Langfuse trace metadata.
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.run_trace_map = {}
+        self.logger = logging.getLogger(__name__)
+        self.logger.info("AsyncRunIdCallbackHandler initialized.")
+
+    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 triggered for run_id: {run_id}")
+        # First, let the base handler do its work
+        run = await super().on_chain_start(serialized, inputs, run_id, **kwargs)
+        self.logger.debug(f"Async base handler's on_chain_start completed. Current trace_id: {self.last_trace_id}")
+        
+        try:
+            if self.last_trace_id:
+                self.run_trace_map[str(run_id)] = self.last_trace_id
+                self.logger.info(f"Async: Mapping run_id '{run_id}' to trace_id '{self.last_trace_id}'.")
+
+                langfuse_client = get_client()
+                langfuse_client.update_current_trace(
+                    metadata={"langchain_run_id": str(run_id)}
+                )
+                self.logger.info(f"Async: Successfully updated trace '{self.last_trace_id}' with metadata for run_id '{run_id}'.")
+            else:
+                self.logger.warning(f"Async: Could not find 'last_trace_id' for run_id '{run_id}'. Metadata will not be updated.")
+
+        except Exception as e:
+            self.logger.error(f"Async: Failed to process run_id '{run_id}' in AsyncRunIdCallbackHandler: {e}", exc_info=True)
+
+        return run

{crewplus-0.2.65 → crewplus-0.2.67}/pyproject.toml

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

crewplus-0.2.65/crewplus/callbacks/run_id_handler.py

@@ -1,73 +0,0 @@
-# File: crewplus/callbacks/run_id_handler.py
-
-from typing import Any, Dict
-from uuid import UUID
-import logging
-
-# Langfuse imports with graceful fallback
-try:
-    from langfuse.langchain import CallbackHandler as LangfuseCallbackHandler
-    from .async_langfuse_handler import AsyncLangfuseCallbackHandler
-    from langfuse import get_client
-    LANGFUSE_AVAILABLE = True
-except ImportError:
-    LANGFUSE_AVAILABLE = False
-    # Define dummy base classes if langfuse is not available to avoid runtime errors
-    class LangfuseCallbackHandler: pass
-    class AsyncLangfuseCallbackHandler: pass
-    get_client = None
-
-# --- Custom Callback Handlers to capture the run_id ---
-if LANGFUSE_AVAILABLE:
-    class RunIdCallbackHandler(LangfuseCallbackHandler):
-        """
-        A custom synchronous callback handler that captures the Langchain run_id
-        and adds it to the Langfuse trace metadata.
-        """
-        def on_chain_start(
-            self,
-            serialized: Dict[str, Any],
-            inputs: Dict[str, Any],
-            run_id: UUID,
-            **kwargs: Any,
-        ) -> Any:
-            # First, let the base handler do its work, which includes creating the trace
-            run = super().on_chain_start(serialized, inputs, run_id, **kwargs)
-
-            try:
-                # Then, update the created trace with the run_id as metadata
-                langfuse_client = get_client()
-                langfuse_client.update_current_trace(
-                    metadata={"langchain_run_id": str(run_id)}
-                )
-            except Exception as e:
-                logging.getLogger(__name__).warning(f"Failed to add run_id to Langfuse trace: {e}")
-
-            return run
-
-    class AsyncRunIdCallbackHandler(AsyncLangfuseCallbackHandler):
-        """
-        A custom asynchronous callback handler that captures the Langchain run_id
-        and adds it to the Langfuse trace metadata.
-        """
-        async def on_chain_start(
-            self,
-            serialized: Dict[str, Any],
-            inputs: Dict[str, Any],
-            run_id: UUID,
-            **kwargs: Any,
-        ) -> Any:
-            # First, let the base handler do its work, which includes creating the trace
-            run = await super().on_chain_start(serialized, inputs, run_id, **kwargs)
-
-            try:
-                # The get_client() is thread-safe and can be used in async contexts
-                # for this type of single, atomic update.
-                langfuse_client = get_client()
-                langfuse_client.update_current_trace(
-                    metadata={"langchain_run_id": str(run_id)}
-                )
-            except Exception as e:
-                logging.getLogger(__name__).warning(f"Failed to add run_id to async Langfuse trace: {e}")
-
-            return run