ragaai-catalyst 2.1.5b40__tar.gz → 2.1.5b41__tar.gz

{ragaai_catalyst-2.1.5b40/ragaai_catalyst.egg-info → ragaai_catalyst-2.1.5b41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.5b40
+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.9

{ragaai_catalyst-2.1.5b40 → ragaai_catalyst-2.1.5b41}/examples/langgraph_examples/customer_support.py

@@ -1,3 +1,6 @@
+import sys 
+sys.path.append('.')
+
 import os
 import random
 from dotenv import load_dotenv
@@ -11,14 +14,14 @@ from dotenv import load_dotenv
 load_dotenv()
 
 catalyst = RagaAICatalyst(
-    access_key=os.getenv("RAGAAI_CATALYST_ACCESS_KEY"),
-    secret_key=os.getenv("RAGAAI_CATALYST_SECRET_KEY"),
-    base_url=os.getenv("RAGAAI_CATALYST_BASE_URL"),
+    access_key=os.getenv("RAGAAI_CATALYST_PROD_ACCESS_KEY"),
+    secret_key=os.getenv("RAGAAI_CATALYST_PROD_SECRET_KEY"),
+    base_url=os.getenv("RAGAAI_CATALYST_PROD_BASE_URL"),
 )
 
 # Initialize tracer
 tracer = Tracer(
-    project_name="Langgraph_testing",
+    project_name="langgraph_testing_100525",
     dataset_name="customer_support",
     tracer_type="Agentic",
 )
@@ -401,7 +404,7 @@ class State(TypedDict):
 
 
 
-from langchain_anthropic import ChatAnthropic
+# from langchain_anthropic import ChatAnthropic
 from langchain_community.tools.tavily_search import TavilySearchResults
 from langchain_core.prompts import ChatPromptTemplate
 from langchain_core.runnables import Runnable, RunnableConfig
@@ -431,14 +434,9 @@ class Assistant:
         return {"messages": result}
 
 
-# Haiku is faster and cheaper, but less accurate
-# llm = ChatAnthropic(model="claude-3-haiku-20240307")
-llm = ChatAnthropic(model="claude-3-5-sonnet-20240620", temperature=1)
-# You could swap LLMs, though you will likely want to update the prompts when
-# doing so!
-# from langchain_openai import ChatOpenAI
+from langchain_openai import ChatOpenAI
 
-# llm = ChatOpenAI(model="gpt-4-turbo-preview")
+llm = ChatOpenAI(model="gpt-4o-mini")
 
 primary_assistant_prompt = ChatPromptTemplate.from_messages(
     [

{ragaai_catalyst-2.1.5b40 → ragaai_catalyst-2.1.5b41}/pyproject.toml

@@ -8,7 +8,7 @@ description = "RAGA AI CATALYST"
 readme = "README.md"
 requires-python = ">=3.9,<3.13"
 # license = {file = "LICENSE"}
-version = "2.1.5.b40"
+version = "2.1.5.b41"
 authors = [
     {name = "Kiran Scaria", email = "kiran.scaria@raga.ai"},
     {name = "Kedar Gaikwad", email = "kedar.gaikwad@raga.ai"},

{ragaai_catalyst-2.1.5b40 → ragaai_catalyst-2.1.5b41}/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-2.1.5b40 → ragaai_catalyst-2.1.5b41/ragaai_catalyst.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ragaai_catalyst
-Version: 2.1.5b40
+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.9