ragaai-catalyst 2.1.5b39__py3-none-any.whl → 2.1.5b41__py3-none-any.whl

ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py

@@ -378,7 +378,7 @@ class AgenticTracing(
             super().add_component(component)
 
         # Handle error case
-        if is_error:
+        if is_error and not self.current_agent_id.get():
             self.stop()
 
     def __enter__(self):

ragaai_catalyst/tracers/agentic_tracing/utils/llm_utils.py

@@ -74,6 +74,10 @@ def extract_model_name(args, kwargs, result):
             return "gemini-1.5-pro"
         if "gemini-pro" in model:
             return "gemini-pro"
+
+    if 'response_metadata' in dir(result):
+        if 'model_name' in result.response_metadata:
+            model = result.response_metadata['model_name']
     
     return model or "default"
 
@@ -116,8 +120,8 @@ def extract_token_usage(result):
         # Run the coroutine in the current event loop
         result = loop.run_until_complete(result)
 
-    # Handle text attribute responses (JSON string or Vertex AI)
-    if hasattr(result, "text"):
+    # Handle text attribute responses (JSON string for Vertex AI)
+    if hasattr(result, "text") and isinstance(result.text, (str, bytes, bytearray)):
         # First try parsing as JSON for OpenAI responses
         try:
             import json
@@ -162,11 +166,26 @@ def extract_token_usage(result):
     # Handle Google GenerativeAI format with usage_metadata
     if hasattr(result, "usage_metadata"):
         metadata = result.usage_metadata
-        return {
-            "prompt_tokens": getattr(metadata, "prompt_token_count", 0),
-            "completion_tokens": getattr(metadata, "candidates_token_count", 0),
-            "total_tokens": getattr(metadata, "total_token_count", 0)
-        }
+        if hasattr(metadata, "prompt_token_count"):
+            return {
+                "prompt_tokens": getattr(metadata, "prompt_token_count", 0),
+                "completion_tokens": getattr(metadata, "candidates_token_count", 0),
+                "total_tokens": getattr(metadata, "total_token_count", 0)
+            }
+        elif hasattr(metadata, "input_tokens"):
+            return {
+                "prompt_tokens": getattr(metadata, "input_tokens", 0),
+                "completion_tokens": getattr(metadata, "output_tokens", 0),
+                "total_tokens": getattr(metadata, "total_tokens", 0)
+            }
+        elif "input_tokens" in metadata:
+            return {
+                "prompt_tokens": metadata["input_tokens"],
+                "completion_tokens": metadata["output_tokens"],
+                "total_tokens": metadata["total_tokens"]
+            }
+
+
     
     # Handle ChatResponse format with raw usuage
     if hasattr(result, "raw") and hasattr(result.raw, "usage"):

ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py

@@ -42,7 +42,7 @@ class DynamicTraceExporter(SpanExporter):
         self._project_id = project_id
         self._dataset_name = dataset_name
         self._user_details = user_details
-        self._base_url = base_url,
+        self._base_url = base_url
         self._custom_model_cost = custom_model_cost
 
     
@@ -57,22 +57,37 @@ class DynamicTraceExporter(SpanExporter):
         Returns:
             SpanExportResult: Result of the export operation
         """
-        # Update the exporter's properties
-        self._update_exporter_properties()
-        
-        # Forward the call to the underlying exporter
-        return self._exporter.export(spans)
-    
+        try:
+            # Update the exporter's properties
+            self._update_exporter_properties()
+        except Exception as e:
+            raise Exception(f"Error updating exporter properties: {e}")
+
+        try:
+            # Forward the call to the underlying exporter
+            result = self._exporter.export(spans)
+            return result
+        except Exception as e:
+            raise Exception(f"Error exporting trace: {e}")
+            
+
+
     def shutdown(self):
         """
         Shutdown the exporter by forwarding to the underlying exporter.
         Before shutting down, update the exporter's properties with the current values.
         """
-        # Update the exporter's properties
-        self._update_exporter_properties()
-        
-        # Forward the call to the underlying exporter
-        return self._exporter.shutdown()
+        try:
+            # Update the exporter's properties
+            self._update_exporter_properties()
+        except Exception as e:
+            raise Exception(f"Error updating exporter properties: {e}")
+
+        try:
+            # Forward the call to the underlying exporter
+            return self._exporter.shutdown()
+        except Exception as e:
+            raise Exception(f"Error shutting down exporter: {e}")
     
     def _update_exporter_properties(self):
         """

ragaai_catalyst/tracers/exporters/ragaai_trace_exporter.py

@@ -35,6 +35,8 @@ class RAGATraceExporter(SpanExporter):
         for span in spans:
             span_json = json.loads(span.to_json())
             trace_id = span_json.get("context").get("trace_id")
+            if trace_id is None:
+                raise Exception("Trace ID is None")
 
             if trace_id not in self.trace_spans:
                 self.trace_spans[trace_id] = list()
@@ -43,8 +45,14 @@ class RAGATraceExporter(SpanExporter):
 
             if span_json["parent_id"] is None:
                 trace = self.trace_spans[trace_id]
-                self.process_complete_trace(trace, trace_id)
-                del self.trace_spans[trace_id]
+                try:
+                    self.process_complete_trace(trace, trace_id)
+                except Exception as e:
+                    raise Exception(f"Error processing complete trace: {e}")
+                try:
+                    del self.trace_spans[trace_id]
+                except Exception as e:
+                    raise Exception(f"Error deleting trace: {e}")
 
         return SpanExportResult.SUCCESS
 

ragaai_catalyst/tracers/utils/trace_json_converter.py

@@ -223,7 +223,10 @@ def convert_json_format(input_trace, custom_model_cost):
     }
     final_trace["replays"]={"source":None}
     final_trace["data"]=[{}]
-    final_trace["data"][0]["spans"] = get_spans(input_trace, custom_model_cost)
+    try:
+        final_trace["data"][0]["spans"] = get_spans(input_trace, custom_model_cost)
+    except Exception as e:
+        raise Exception(f"Error in get_spans function: {e}")
     final_trace["network_calls"] =[]
     final_trace["interactions"] = []
 
@@ -231,15 +234,15 @@ def convert_json_format(input_trace, custom_model_cost):
         if itr["type"]=="llm":
             if "tokens" in itr["info"]:
                 if "prompt_tokens" in itr["info"]["tokens"]:
-                    final_trace["metadata"]["tokens"]["prompt_tokens"] += itr["info"]["tokens"]['prompt_tokens']
-                    final_trace["metadata"]["cost"]["input_cost"] += itr["info"]["cost"]['input_cost'] 
+                    final_trace["metadata"]["tokens"]["prompt_tokens"] += itr["info"]["tokens"].get('prompt_tokens', 0.0)
+                    final_trace["metadata"]["cost"]["input_cost"] += itr["info"]["cost"].get('input_cost', 0.0) 
                 if "completion_tokens" in itr["info"]["tokens"]:
-                    final_trace["metadata"]["tokens"]["completion_tokens"] += itr["info"]["tokens"]['completion_tokens']
-                    final_trace["metadata"]["cost"]["output_cost"] += itr["info"]["cost"]['output_cost'] 
+                    final_trace["metadata"]["tokens"]["completion_tokens"] += itr["info"]["tokens"].get('completion_tokens', 0.0)
+                    final_trace["metadata"]["cost"]["output_cost"] += itr["info"]["cost"].get('output_cost', 0.0) 
             if "tokens" in itr["info"]:
                 if "total_tokens" in itr["info"]["tokens"]:
-                    final_trace["metadata"]["tokens"]["total_tokens"] += itr["info"]["tokens"]['total_tokens']
-                    final_trace["metadata"]["cost"]["total_cost"] += itr["info"]["cost"]['total_cost'] 
+                    final_trace["metadata"]["tokens"]["total_tokens"] += itr["info"]["tokens"].get('total_tokens', 0.0)
+                    final_trace["metadata"]["cost"]["total_cost"] += itr["info"]["cost"].get('total_cost', 0.0) 
 
     # get the total tokens, cost
     final_trace["metadata"]["total_cost"] = final_trace["metadata"]["cost"]["total_cost"] 

{ragaai_catalyst-2.1.5b39.dist-info → ragaai_catalyst-2.1.5b41.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.5b39
+Version: 2.1.5b41
 Summary: RAGA AI CATALYST
 Author-email: Kiran Scaria <kiran.scaria@raga.ai>, Kedar Gaikwad <kedar.gaikwad@raga.ai>, Dushyant Mahajan <dushyant.mahajan@raga.ai>, Siddhartha Kosti <siddhartha.kosti@raga.ai>, Ritika Goel <ritika.goel@raga.ai>, Vijay Chaurasia <vijay.chaurasia@raga.ai>, Tushar Kumar <tushar.kumar@raga.ai>
-Requires-Python: <3.13,>=3.10
+Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.10.2

{ragaai_catalyst-2.1.5b39.dist-info → ragaai_catalyst-2.1.5b41.dist-info}/RECORD

@@ -49,7 +49,7 @@ ragaai_catalyst/tracers/agentic_tracing/tracers/base.py,sha256=Kmy1kgwy19e7MuMMq
 ragaai_catalyst/tracers/agentic_tracing/tracers/custom_tracer.py,sha256=OBJJjFSvwRjCGNJyqX3yIfC1W05ZN2QUXasCJ4gmCjQ,13930
 ragaai_catalyst/tracers/agentic_tracing/tracers/langgraph_tracer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ragaai_catalyst/tracers/agentic_tracing/tracers/llm_tracer.py,sha256=z-qzmCQCkhyW0aLDUR_rNq4pmxhAaVhNY-kZQsox-Ws,50221
-ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=PYYNNeFfsQpw5D4A0jzwNYhAvC1bMT5vtAGaTsgk2xY,16112
+ragaai_catalyst/tracers/agentic_tracing/tracers/main_tracer.py,sha256=aiFobQb5ePPhyRADXJTZgI8_PrSGhjXnOu9W_o3ngEA,16148
 ragaai_catalyst/tracers/agentic_tracing/tracers/network_tracer.py,sha256=m8CxYkl7iMiFya_lNwN1ykBc3Pmo-2pR_2HmpptwHWQ,10352
 ragaai_catalyst/tracers/agentic_tracing/tracers/tool_tracer.py,sha256=xxrliKPfdfbIZRZqMnUewsaTD8_Hv0dbuoBivNZGD4U,21674
 ragaai_catalyst/tracers/agentic_tracing/tracers/user_interaction_tracer.py,sha256=bhSUhNQCuJXKjgJAXhjKEYjnHMpYN90FSZdR84fNIKU,4614
@@ -65,7 +65,7 @@ ragaai_catalyst/tracers/agentic_tracing/utils/create_dataset_schema.py,sha256=xH
 ragaai_catalyst/tracers/agentic_tracing/utils/file_name_tracker.py,sha256=YG601l1a29ov9VPu9Vl4RXxgL7l16k54_WWnoTNoG58,2064
 ragaai_catalyst/tracers/agentic_tracing/utils/generic.py,sha256=WwXT01xmp8MSr7KinuDCSK9a1ifpLcT7ajFkvYviG_A,1190
 ragaai_catalyst/tracers/agentic_tracing/utils/get_user_trace_metrics.py,sha256=vPZ4dn4EHFW0kqd1GyRpsYXbfrRrd0DXCmh-pzsDBNE,1109
-ragaai_catalyst/tracers/agentic_tracing/utils/llm_utils.py,sha256=Z01wEEGVlWx-45rHPCKDmeusfpjdS2-LXKYNhsAgjJE,21548
+ragaai_catalyst/tracers/agentic_tracing/utils/llm_utils.py,sha256=McKB7TQchmFcgg2h0zg-inuxxKaRjcwbqV_OnRzzYEw,22387
 ragaai_catalyst/tracers/agentic_tracing/utils/model_costs.json,sha256=2tzGw_cKCTPcfjEm7iGvFE6pTw7gMTPzeBov_MTaXNY,321336
 ragaai_catalyst/tracers/agentic_tracing/utils/span_attributes.py,sha256=qmODERcFZhc8MX24boFCXkkh6sJ-vZngRHPvxhyWFeE,4347
 ragaai_catalyst/tracers/agentic_tracing/utils/supported_llm_provider.toml,sha256=LvFDivDIE96Zasp-fgDEqUJ5GEQZUawQucR3aOcSUTY,926
@@ -74,10 +74,10 @@ ragaai_catalyst/tracers/agentic_tracing/utils/trace_utils.py,sha256=go7FVnofviAT
 ragaai_catalyst/tracers/agentic_tracing/utils/unique_decorator.py,sha256=G027toV-Km20JjKrc-Y_PilQ8ABEKrBvvzgLTnqVg7I,5819
 ragaai_catalyst/tracers/agentic_tracing/utils/zip_list_of_unique_files.py,sha256=4TeCGsFF26249fV6dJHLTZDrRa93SG9oer4rudoF8Y4,19443
 ragaai_catalyst/tracers/exporters/__init__.py,sha256=wQbaqyeIjVZxYprHCKZ9BeiqxeXYBKjzEgP79LWNxCU,293
-ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py,sha256=dAT2WIvkQLl8RrXdhDwm0NxhxytV6PP4ZViYJ6jlOQg,4553
+ragaai_catalyst/tracers/exporters/dynamic_trace_exporter.py,sha256=w9U8UTxvTbGTDUoMtsgy2BsdpYp-APTKFdGV4o5JPaM,5051
 ragaai_catalyst/tracers/exporters/file_span_exporter.py,sha256=RgGteu-NVGprXKkynvyIO5yOjpbtA41R3W_NzCjnkwE,6445
 ragaai_catalyst/tracers/exporters/raga_exporter.py,sha256=6xvjWXyh8XPkHKSLLmAZUQSvwuyY17ov8pv2VdfI0qA,17875
-ragaai_catalyst/tracers/exporters/ragaai_trace_exporter.py,sha256=OhPnquuOOxoCtx7cGYdnsQJZ8lNnl0alm3A2Wc4Bl2g,4814
+ragaai_catalyst/tracers/exporters/ragaai_trace_exporter.py,sha256=s8zIUMrUKhtGrg-32XZnlJPKXWSyHo_WiJ1DoTcHVRg,5170
 ragaai_catalyst/tracers/instrumentators/__init__.py,sha256=FgnMQupoRTzmVsG9YKsLQera2Pfs-AluZv8CxwavoyQ,253
 ragaai_catalyst/tracers/instrumentators/langchain.py,sha256=yMN0qVF0pUVk6R5M1vJoUXezDo1ejs4klCFRlE8x4vE,574
 ragaai_catalyst/tracers/instrumentators/llamaindex.py,sha256=SMrRlR4xM7k9HK43hakE8rkrWHxMlmtmWD-AX6TeByc,416
@@ -88,10 +88,10 @@ ragaai_catalyst/tracers/utils/convert_llama_instru_callback.py,sha256=8qLo7x4Zsn
 ragaai_catalyst/tracers/utils/extraction_logic_llama_index.py,sha256=ZhPs0YhVtB82-Pq9o1BvCinKE_WPvVxPTEcZjlJbFYM,2371
 ragaai_catalyst/tracers/utils/langchain_tracer_extraction_logic.py,sha256=XS2_x2qneqEx9oAighLg-LRiueWcESLwIC2r7eJT-Ww,3117
 ragaai_catalyst/tracers/utils/model_prices_and_context_window_backup.json,sha256=C3uwkibJ08C9sOX-54kulZYmJlIpZ-SQpfE6HNGrjbM,343502
-ragaai_catalyst/tracers/utils/trace_json_converter.py,sha256=9I3cidegQuedauvUF2NoZiNCPSjCaaskkaXxCcUJ9Po,12285
+ragaai_catalyst/tracers/utils/trace_json_converter.py,sha256=qXSYKr4JMUpGQsB3mnr9_2qH6FqzUhCynNqlDp1IWTs,12440
 ragaai_catalyst/tracers/utils/utils.py,sha256=ViygfJ7vZ7U0CTSA1lbxVloHp4NSlmfDzBRNCJuMhis,2374
-ragaai_catalyst-2.1.5b39.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ragaai_catalyst-2.1.5b39.dist-info/METADATA,sha256=bIq4JlzWIo7te22u94rhmkGGxCtBNsFoGeiJv5IVMDo,22061
-ragaai_catalyst-2.1.5b39.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-ragaai_catalyst-2.1.5b39.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
-ragaai_catalyst-2.1.5b39.dist-info/RECORD,,
+ragaai_catalyst-2.1.5b41.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ragaai_catalyst-2.1.5b41.dist-info/METADATA,sha256=CrlkR9TD7BsrlN3EbTlxlCqOKuk2GFWLMGJV3hqkHJQ,22060
+ragaai_catalyst-2.1.5b41.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+ragaai_catalyst-2.1.5b41.dist-info/top_level.txt,sha256=HpgsdRgEJMk8nqrU6qdCYk3di7MJkDL0B19lkc7dLfM,16
+ragaai_catalyst-2.1.5b41.dist-info/RECORD,,

{ragaai_catalyst-2.1.5b39.dist-info → ragaai_catalyst-2.1.5b41.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any