langtrace-python-sdk 3.8.1__py3-none-any.whl → 3.8.2__py3-none-any.whl

langtrace_python_sdk/instrumentation/agno/patch.py

@@ -15,26 +15,46 @@ from langtrace_python_sdk.utils import set_span_attribute
 from langtrace_python_sdk.utils.llm import get_span_name, set_span_attributes
 from langtrace_python_sdk.utils.misc import serialize_args, serialize_kwargs
 
+def _safe_serialize(obj):
+    """Safely serialize objects that might not be JSON serializable"""
+    if hasattr(obj, 'to_dict'):
+        return obj.to_dict()
+    elif hasattr(obj, '__dict__'):
+        return {k: _safe_serialize(v) for k, v in obj.__dict__.items() if not k.startswith('_')}
+    elif isinstance(obj, dict):
+        return {k: _safe_serialize(v) for k, v in obj.items()}
+    elif isinstance(obj, (list, tuple)):
+        return [_safe_serialize(i) for i in obj]
+    return str(obj)
+
+def _safe_json_dumps(obj):
+    """Safely dump an object to JSON, handling non-serializable types"""
+    try:
+        return json.dumps(obj)
+    except (TypeError, ValueError):
+        return json.dumps(_safe_serialize(obj))
+
 def _extract_metrics(metrics: Dict[str, Any]) -> Dict[str, Any]:
     """Helper function to extract and format metrics"""
-    formatted_metrics = {}
+    if not metrics:
+        return {}
+        
+    if hasattr(metrics, 'to_dict'):
+        metrics = metrics.to_dict()
+    elif hasattr(metrics, '__dict__'):
+        metrics = {k: v for k, v in metrics.__dict__.items() if not k.startswith('_')}
     
-    # Extract basic metrics
+    formatted_metrics = {}
+
     for key in ['time', 'time_to_first_token', 'input_tokens', 'output_tokens', 
-                'prompt_tokens', 'completion_tokens', 'total_tokens']:
+                'prompt_tokens', 'completion_tokens', 'total_tokens',
+                'prompt_tokens_details', 'completion_tokens_details', 'tool_call_times']:
         if key in metrics:
             formatted_metrics[key] = metrics[key]
-    
-    # Extract nested metric details if present
-    if 'prompt_tokens_details' in metrics:
-        formatted_metrics['prompt_tokens_details'] = metrics['prompt_tokens_details']
-    if 'completion_tokens_details' in metrics:
-        formatted_metrics['completion_tokens_details'] = metrics['completion_tokens_details']
-    if 'tool_call_times' in metrics:
-        formatted_metrics['tool_call_times'] = metrics['tool_call_times']
-        
+
     return formatted_metrics
 
+
 def patch_memory(operation_name, version, tracer: Tracer):
     def traced_method(wrapped, instance, args, kwargs):
         service_provider = SERVICE_PROVIDERS["AGNO"]
@@ -110,86 +130,120 @@ def patch_agent(operation_name, version, tracer: Tracer):
             try:
                 set_span_attributes(span, attributes)
                 AgnoSpanAttributes(span=span, instance=instance)
-                result_generator = wrapped(*args, **kwargs)
-
-                accumulated_content = ""
-                current_tool_call = None
-                response_metadata = None
-                seen_tool_calls = set()
-
-                try:
-                    for response in result_generator:
-                        if not hasattr(response, 'to_dict'):
-                            yield response
-                            continue
-
-                        if not response_metadata:
-                            response_metadata = {
-                                "run_id": response.run_id,
-                                "agent_id": response.agent_id,
-                                "session_id": response.session_id,
-                                "model": response.model,
-                                "content_type": response.content_type,
-                            }
-                            for key, value in response_metadata.items():
-                                if value is not None:
-                                    set_span_attribute(span, f"agno.agent.{key}", str(value))
-
-                        if response.content:
-                            accumulated_content += response.content
-                            set_span_attribute(span, "agno.agent.response", accumulated_content)
-
-                        if response.messages:
-                            for msg in response.messages:
-                                if msg.tool_calls:
-                                    for tool_call in msg.tool_calls:
-                                        tool_id = tool_call.get('id')
-                                        if tool_id and tool_id not in seen_tool_calls:
-                                            seen_tool_calls.add(tool_id)
-                                            tool_info = {
-                                                'id': tool_id,
-                                                'name': tool_call.get('function', {}).get('name'),
-                                                'arguments': tool_call.get('function', {}).get('arguments'),
-                                                'start_time': msg.created_at,
-                                            }
-                                            current_tool_call = tool_info
-                                            set_span_attribute(span, f"agno.agent.tool_call.{tool_id}", json.dumps(tool_info))
-
-                                if msg.metrics:
-                                    metrics = _extract_metrics(msg.metrics)
-                                    role_prefix = f"agno.agent.metrics.{msg.role}"
-                                    for key, value in metrics.items():
-                                        set_span_attribute(span, f"{role_prefix}.{key}", str(value))
-
-                        if response.tools:
-                            for tool in response.tools:
-                                tool_id = tool.get('tool_call_id')
-                                if tool_id and current_tool_call and current_tool_call['id'] == tool_id:
-                                    tool_result = {
-                                        **current_tool_call,
-                                        'result': tool.get('content'),
-                                        'error': tool.get('tool_call_error'),
-                                        'end_time': tool.get('created_at'),
-                                        'metrics': tool.get('metrics'),
-                                    }
-                                    set_span_attribute(span, f"agno.agent.tool_call.{tool_id}", json.dumps(tool_result))
-                                    current_tool_call = None
-
-                        yield response
-
-                except Exception as err:
-                    span.record_exception(err)
-                    span.set_status(Status(StatusCode.ERROR, str(err)))
-                    raise
-                finally:
-                    span.set_status(Status(StatusCode.OK))
-                    if len(seen_tool_calls) > 0:
-                        span.set_attribute("agno.agent.total_tool_calls", len(seen_tool_calls))
+                is_streaming = kwargs.get('stream', False)
+                result = wrapped(*args, **kwargs)
+
+                if not is_streaming and not operation_name.startswith('Agent._'):
+                    if hasattr(result, 'to_dict'):
+                        _process_response(span, result)
+                    return result
+
+                # Handle streaming (generator) case
+                return _process_generator(span, result)
+                
             except Exception as err:
                 span.record_exception(err)
                 span.set_status(Status(StatusCode.ERROR, str(err)))
                 raise
 
+    # Helper function to process a generator
+    def _process_generator(span, result_generator):
+        accumulated_content = ""
+        current_tool_call = None
+        response_metadata = None
+        seen_tool_calls = set()
+        
+        try:
+            for response in result_generator:
+                if not hasattr(response, 'to_dict'):
+                    yield response
+                    continue
+
+                _process_response(span, response, 
+                                 accumulated_content=accumulated_content,
+                                 current_tool_call=current_tool_call,
+                                 response_metadata=response_metadata,
+                                 seen_tool_calls=seen_tool_calls)
+
+                if response.content:
+                    accumulated_content += response.content
+                
+                yield response
+                
+        except Exception as err:
+            span.record_exception(err)
+            span.set_status(Status(StatusCode.ERROR, str(err)))
+            raise
+        finally:
+            span.set_status(Status(StatusCode.OK))
+            if len(seen_tool_calls) > 0:
+                span.set_attribute("agno.agent.total_tool_calls", len(seen_tool_calls))
+    
+    def _process_response(span, response, accumulated_content="", current_tool_call=None, 
+                         response_metadata=None, seen_tool_calls=set()):
+        if not response_metadata:
+            response_metadata = {
+                "run_id": response.run_id,
+                "agent_id": response.agent_id,
+                "session_id": response.session_id,
+                "model": response.model,
+                "content_type": response.content_type,
+            }
+            for key, value in response_metadata.items():
+                if value is not None:
+                    set_span_attribute(span, f"agno.agent.{key}", str(value))
+
+        if response.content:
+            if accumulated_content:
+                accumulated_content += response.content
+            else:
+                accumulated_content = response.content
+            set_span_attribute(span, "agno.agent.response", accumulated_content)
+
+        if response.messages:
+            for msg in response.messages:
+                if msg.tool_calls:
+                    for tool_call in msg.tool_calls:
+                        tool_id = tool_call.get('id')
+                        if tool_id and tool_id not in seen_tool_calls:
+                            seen_tool_calls.add(tool_id)
+                            tool_info = {
+                                'id': tool_id,
+                                'name': tool_call.get('function', {}).get('name'),
+                                'arguments': tool_call.get('function', {}).get('arguments'),
+                                'start_time': msg.created_at,
+                            }
+                            current_tool_call = tool_info
+                            set_span_attribute(span, f"agno.agent.tool_call.{tool_id}", _safe_json_dumps(tool_info))
+
+                if msg.metrics:
+                    metrics = _extract_metrics(msg.metrics)
+                    role_prefix = f"agno.agent.metrics.{msg.role}"
+                    for key, value in metrics.items():
+                        set_span_attribute(span, f"{role_prefix}.{key}", str(value))
+
+        if response.tools:
+            for tool in response.tools:
+                tool_id = tool.get('tool_call_id')
+                if tool_id and current_tool_call and current_tool_call['id'] == tool_id:
+                    tool_result = {
+                        **current_tool_call,
+                        'result': tool.get('content'),
+                        'error': tool.get('tool_call_error'),
+                        'end_time': tool.get('created_at'),
+                        'metrics': tool.get('metrics'),
+                    }
+                    set_span_attribute(span, f"agno.agent.tool_call.{tool_id}", _safe_json_dumps(tool_result))
+                    current_tool_call = None
+                    
+        if response.metrics:
+            metrics = _extract_metrics(response.metrics)
+            for key, value in metrics.items():
+                set_span_attribute(span, f"agno.agent.metrics.{key}", str(value))
+        
+        if len(seen_tool_calls) > 0:
+            span.set_attribute("agno.agent.total_tool_calls", len(seen_tool_calls))
+                
     return traced_method
 
 class AgnoSpanAttributes:
@@ -238,7 +292,7 @@ class AgnoSpanAttributes:
 
             if hasattr(self.instance.model, 'metrics') and self.instance.model.metrics:
                 metrics = _extract_metrics(self.instance.model.metrics)
-                set_span_attribute(self.span, "agno.agent.model.metrics", json.dumps(metrics))
+                set_span_attribute(self.span, "agno.agent.model.metrics", _safe_json_dumps(metrics))
 
         if self.instance.tools:
             tool_list = []

langtrace_python_sdk/version.py

@@ -1 +1 @@
-__version__ = "3.8.1"
+__version__ = "3.8.2"

{langtrace_python_sdk-3.8.1.dist-info → langtrace_python_sdk-3.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langtrace-python-sdk
-Version: 3.8.1
+Version: 3.8.2
 Summary: Python SDK for LangTrace
 Project-URL: Homepage, https://github.com/Scale3-Labs/langtrace-python-sdk
 Author-email: Scale3 Labs <engineering@scale3labs.com>

{langtrace_python_sdk-3.8.1.dist-info → langtrace_python_sdk-3.8.2.dist-info}/RECORD

@@ -116,7 +116,7 @@ examples/weaviate_example/__init__.py,sha256=8JMDBsRSEV10HfTd-YC7xb4txBjD3la56sn
 examples/weaviate_example/query_text.py,sha256=wPHQTc_58kPoKTZMygVjTj-2ZcdrIuaausJfMxNQnQc,127162
 langtrace_python_sdk/__init__.py,sha256=VZM6i71NR7pBQK6XvJWRelknuTYUhqwqE7PlicKa5Wg,1166
 langtrace_python_sdk/langtrace.py,sha256=L0ktJXsGjvKS0dc6kWGCOUoNsGTERLEmd-1QfzDppq8,13706
-langtrace_python_sdk/version.py,sha256=kZzGpxWKY4rWDQrrrlM7bN7YKRAjy17Wv4w__djvVYU,22
+langtrace_python_sdk/version.py,sha256=RbOxThvu1HcxD17bsEp4gU_z66QQb8i2Fh75JKkh0is,22
 langtrace_python_sdk/constants/__init__.py,sha256=3CNYkWMdd1DrkGqzLUgNZXjdAlM6UFMlf_F-odAToyc,146
 langtrace_python_sdk/constants/exporter/langtrace_exporter.py,sha256=EVCrouYCpY98f0KSaKr4PzNxPULTZZO6dSA_crEOyJU,106
 langtrace_python_sdk/constants/instrumentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -144,7 +144,7 @@ langtrace_python_sdk/extensions/langtrace_filesystem.py,sha256=34fZutG28EJ66l67O
 langtrace_python_sdk/instrumentation/__init__.py,sha256=UOtU6nT-ZT-ZvHzOgPNhG_IooMe5jU8lzgdoDCHpeBc,2469
 langtrace_python_sdk/instrumentation/agno/__init__.py,sha256=95fn4oA-CHB0mxc6KnVB20KSbXGl_ZZr9n99EEaXzrY,91
 langtrace_python_sdk/instrumentation/agno/instrumentation.py,sha256=CrwHzkzLpdo2m2nBHE69d8MIFMxZuvTsT1LTxqlTWV0,2664
-langtrace_python_sdk/instrumentation/agno/patch.py,sha256=EOaz3n_FYx7qXtd_liSjvBqjvD5E1ze6FL1K51v8NBc,12060
+langtrace_python_sdk/instrumentation/agno/patch.py,sha256=tbMscAxsZuo4MAEUQ9tUPiluyj8RRcksF7sYU-v2knM,13399
 langtrace_python_sdk/instrumentation/anthropic/__init__.py,sha256=donrurJAGYlxrSRA3BIf76jGeUcAx9Tq8CVpah68S0Y,101
 langtrace_python_sdk/instrumentation/anthropic/instrumentation.py,sha256=ndXdruI0BG7n75rsuEpKjfzePxrZxg40gZ39ONmD_v4,1845
 langtrace_python_sdk/instrumentation/anthropic/patch.py,sha256=ztPN4VZujoxYOKhTbFnup7Ibms9NAzYCPAJY43NUgKw,4935
@@ -297,8 +297,8 @@ tests/pinecone/cassettes/test_query.yaml,sha256=b5v9G3ssUy00oG63PlFUR3JErF2Js-5A
 tests/pinecone/cassettes/test_upsert.yaml,sha256=neWmQ1v3d03V8WoLl8FoFeeCYImb8pxlJBWnFd_lITU,38607
 tests/qdrant/conftest.py,sha256=9n0uHxxIjWk9fbYc4bx-uP8lSAgLBVx-cV9UjnsyCHM,381
 tests/qdrant/test_qdrant.py,sha256=pzjAjVY2kmsmGfrI2Gs2xrolfuaNHz7l1fqGQCjp5_o,3353
-langtrace_python_sdk-3.8.1.dist-info/METADATA,sha256=ktcD9oBxDhCg6GZuUXQYLAwcvGdo9NvD-QYwlQSaQ2c,15792
-langtrace_python_sdk-3.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langtrace_python_sdk-3.8.1.dist-info/entry_points.txt,sha256=1_b9-qvf2fE7uQNZcbUei9vLpFZBbbh9LrtGw95ssAo,70
-langtrace_python_sdk-3.8.1.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-langtrace_python_sdk-3.8.1.dist-info/RECORD,,
+langtrace_python_sdk-3.8.2.dist-info/METADATA,sha256=HCBbeEC66vg50PnJIkzbCXkSf_J3LyB0AjxP3nydWH4,15792
+langtrace_python_sdk-3.8.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langtrace_python_sdk-3.8.2.dist-info/entry_points.txt,sha256=1_b9-qvf2fE7uQNZcbUei9vLpFZBbbh9LrtGw95ssAo,70
+langtrace_python_sdk-3.8.2.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+langtrace_python_sdk-3.8.2.dist-info/RECORD,,