langtrace-python-sdk 2.3.12__tar.gz → 2.3.14__tar.gz

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: langtrace-python-sdk
-Version: 2.3.12
+Version: 2.3.14
 Summary: Python SDK for LangTrace
 Project-URL: Homepage, https://github.com/Scale3-Labs/langtrace-python-sdk
 Author-email: Scale3 Labs <engineering@scale3labs.com>
@@ -18,6 +18,7 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.25.0
 Requires-Dist: opentelemetry-instrumentation-sqlalchemy>=0.46b0
 Requires-Dist: opentelemetry-instrumentation>=0.47b0
 Requires-Dist: opentelemetry-sdk>=1.25.0
+Requires-Dist: sentry-sdk>=2.14.0
 Requires-Dist: sqlalchemy
 Requires-Dist: tiktoken>=0.1.1
 Requires-Dist: trace-attributes==7.0.4
@@ -196,6 +197,10 @@ langtrace.init(custom_remote_exporter=<your_exporter>, batch=<True or False>)
 | `api_host`                 | `Optional[str]`                     | `https://langtrace.ai/`       | The API host for the remote exporter.                                                                                             |
 | `disable_instrumentations` | `Optional[DisableInstrumentations]` | `None`                        | You can pass an object to disable instrumentation for specific vendors ex: `{'only': ['openai']}` or `{'all_except': ['openai']}` |
 
+### Error Reporting to Langtrace
+
+By default all sdk errors are reported to langtrace via Sentry. This can be disabled by setting the following enviroment variable to `False` like so `LANGTRACE_ERROR_REPORTING=False`
+
 ### Additional Customization
 
 - `@with_langtrace_root_span` - this decorator is designed to organize and relate different spans, in a hierarchical manner. When you're performing multiple operations that you want to monitor together as a unit, this function helps by establishing a "parent" (`LangtraceRootSpan` or whatever is passed to `name`) span. Then, any calls to the LLM APIs made within the given function (fn) will be considered "children" of this parent span. This setup is especially useful for tracking the performance or behavior of a group of operations collectively, rather than individually.
@@ -277,6 +282,7 @@ prompt = get_prompt_from_registry(<Registry ID>, options={"prompt_version": 1, "
 ```
 
 ### Opt out of tracing prompt and completion data
+
 By default, prompt and completion data are captured. If you would like to opt out of it, set the following env var,
 
 `TRACE_PROMPT_COMPLETION_DATA=false`
@@ -285,30 +291,31 @@ By default, prompt and completion data are captured. If you would like to opt ou
 
 Langtrace automatically captures traces from the following vendors:
 
-| Vendor       | Type            | Typescript SDK     | Python SDK                      |
-| ------------ | --------------- | ------------------ | ------------------------------- |
-| OpenAI       | LLM             | :white_check_mark: | :white_check_mark:              |
-| Anthropic    | LLM             | :white_check_mark: | :white_check_mark:              |
-| Azure OpenAI | LLM             | :white_check_mark: | :white_check_mark:              |
-| Cohere       | LLM             | :white_check_mark: | :white_check_mark:              |
-| Groq         | LLM             | :x:                | :white_check_mark:              |
-| Perplexity   | LLM             | :white_check_mark: | :white_check_mark:              |
-| Gemini       | LLM             | :x:                | :white_check_mark:              |
-| Mistral      | LLM             | :x:                | :white_check_mark:              |
-| Langchain    | Framework       | :x:                | :white_check_mark:              |
-| LlamaIndex   | Framework       | :white_check_mark: | :white_check_mark:              |
-| Langgraph    | Framework       | :x:                | :white_check_mark:              |
-| DSPy         | Framework       | :x:                | :white_check_mark:              |
-| CrewAI       | Framework       | :x:                | :white_check_mark:              |
-| Ollama       | Framework       | :x:                | :white_check_mark:              |
-| VertexAI     | Framework       | :x:                | :white_check_mark:              |
-| Vercel AI SDK| Framework       | :white_check_mark: | :x:                             |
-| EmbedChain   | Framework       | :x:                | :white_check_mark:              |
-| Pinecone     | Vector Database | :white_check_mark: | :white_check_mark:              |
-| ChromaDB     | Vector Database | :white_check_mark: | :white_check_mark:              |
-| QDrant       | Vector Database | :white_check_mark: | :white_check_mark:              |
-| Weaviate     | Vector Database | :white_check_mark: | :white_check_mark:              |
-| PGVector     | Vector Database | :white_check_mark: | :white_check_mark: (SQLAlchemy) |
+| Vendor        | Type            | Typescript SDK     | Python SDK                      |
+| ------------- | --------------- | ------------------ | ------------------------------- |
+| OpenAI        | LLM             | :white_check_mark: | :white_check_mark:              |
+| Anthropic     | LLM             | :white_check_mark: | :white_check_mark:              |
+| Azure OpenAI  | LLM             | :white_check_mark: | :white_check_mark:              |
+| Cohere        | LLM             | :white_check_mark: | :white_check_mark:              |
+| Groq          | LLM             | :x:                | :white_check_mark:              |
+| Perplexity    | LLM             | :white_check_mark: | :white_check_mark:              |
+| Gemini        | LLM             | :x:                | :white_check_mark:              |
+| Mistral       | LLM             | :x:                | :white_check_mark:              |
+| Langchain     | Framework       | :x:                | :white_check_mark:              |
+| LlamaIndex    | Framework       | :white_check_mark: | :white_check_mark:              |
+| Langgraph     | Framework       | :x:                | :white_check_mark:              |
+| DSPy          | Framework       | :x:                | :white_check_mark:              |
+| CrewAI        | Framework       | :x:                | :white_check_mark:              |
+| Ollama        | Framework       | :x:                | :white_check_mark:              |
+| VertexAI      | Framework       | :x:                | :white_check_mark:              |
+| Vercel AI SDK | Framework       | :white_check_mark: | :x:                             |
+| EmbedChain    | Framework       | :x:                | :white_check_mark:              |
+| Autogen       | Framework       | :x:                | :white_check_mark:              |
+| Pinecone      | Vector Database | :white_check_mark: | :white_check_mark:              |
+| ChromaDB      | Vector Database | :white_check_mark: | :white_check_mark:              |
+| QDrant        | Vector Database | :white_check_mark: | :white_check_mark:              |
+| Weaviate      | Vector Database | :white_check_mark: | :white_check_mark:              |
+| PGVector      | Vector Database | :white_check_mark: | :white_check_mark: (SQLAlchemy) |
 
 ---
 

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/README.md

@@ -148,6 +148,10 @@ langtrace.init(custom_remote_exporter=<your_exporter>, batch=<True or False>)
 | `api_host`                 | `Optional[str]`                     | `https://langtrace.ai/`       | The API host for the remote exporter.                                                                                             |
 | `disable_instrumentations` | `Optional[DisableInstrumentations]` | `None`                        | You can pass an object to disable instrumentation for specific vendors ex: `{'only': ['openai']}` or `{'all_except': ['openai']}` |
 
+### Error Reporting to Langtrace
+
+By default all sdk errors are reported to langtrace via Sentry. This can be disabled by setting the following enviroment variable to `False` like so `LANGTRACE_ERROR_REPORTING=False`
+
 ### Additional Customization
 
 - `@with_langtrace_root_span` - this decorator is designed to organize and relate different spans, in a hierarchical manner. When you're performing multiple operations that you want to monitor together as a unit, this function helps by establishing a "parent" (`LangtraceRootSpan` or whatever is passed to `name`) span. Then, any calls to the LLM APIs made within the given function (fn) will be considered "children" of this parent span. This setup is especially useful for tracking the performance or behavior of a group of operations collectively, rather than individually.
@@ -229,6 +233,7 @@ prompt = get_prompt_from_registry(<Registry ID>, options={"prompt_version": 1, "
 ```
 
 ### Opt out of tracing prompt and completion data
+
 By default, prompt and completion data are captured. If you would like to opt out of it, set the following env var,
 
 `TRACE_PROMPT_COMPLETION_DATA=false`
@@ -237,30 +242,31 @@ By default, prompt and completion data are captured. If you would like to opt ou
 
 Langtrace automatically captures traces from the following vendors:
 
-| Vendor       | Type            | Typescript SDK     | Python SDK                      |
-| ------------ | --------------- | ------------------ | ------------------------------- |
-| OpenAI       | LLM             | :white_check_mark: | :white_check_mark:              |
-| Anthropic    | LLM             | :white_check_mark: | :white_check_mark:              |
-| Azure OpenAI | LLM             | :white_check_mark: | :white_check_mark:              |
-| Cohere       | LLM             | :white_check_mark: | :white_check_mark:              |
-| Groq         | LLM             | :x:                | :white_check_mark:              |
-| Perplexity   | LLM             | :white_check_mark: | :white_check_mark:              |
-| Gemini       | LLM             | :x:                | :white_check_mark:              |
-| Mistral      | LLM             | :x:                | :white_check_mark:              |
-| Langchain    | Framework       | :x:                | :white_check_mark:              |
-| LlamaIndex   | Framework       | :white_check_mark: | :white_check_mark:              |
-| Langgraph    | Framework       | :x:                | :white_check_mark:              |
-| DSPy         | Framework       | :x:                | :white_check_mark:              |
-| CrewAI       | Framework       | :x:                | :white_check_mark:              |
-| Ollama       | Framework       | :x:                | :white_check_mark:              |
-| VertexAI     | Framework       | :x:                | :white_check_mark:              |
-| Vercel AI SDK| Framework       | :white_check_mark: | :x:                             |
-| EmbedChain   | Framework       | :x:                | :white_check_mark:              |
-| Pinecone     | Vector Database | :white_check_mark: | :white_check_mark:              |
-| ChromaDB     | Vector Database | :white_check_mark: | :white_check_mark:              |
-| QDrant       | Vector Database | :white_check_mark: | :white_check_mark:              |
-| Weaviate     | Vector Database | :white_check_mark: | :white_check_mark:              |
-| PGVector     | Vector Database | :white_check_mark: | :white_check_mark: (SQLAlchemy) |
+| Vendor        | Type            | Typescript SDK     | Python SDK                      |
+| ------------- | --------------- | ------------------ | ------------------------------- |
+| OpenAI        | LLM             | :white_check_mark: | :white_check_mark:              |
+| Anthropic     | LLM             | :white_check_mark: | :white_check_mark:              |
+| Azure OpenAI  | LLM             | :white_check_mark: | :white_check_mark:              |
+| Cohere        | LLM             | :white_check_mark: | :white_check_mark:              |
+| Groq          | LLM             | :x:                | :white_check_mark:              |
+| Perplexity    | LLM             | :white_check_mark: | :white_check_mark:              |
+| Gemini        | LLM             | :x:                | :white_check_mark:              |
+| Mistral       | LLM             | :x:                | :white_check_mark:              |
+| Langchain     | Framework       | :x:                | :white_check_mark:              |
+| LlamaIndex    | Framework       | :white_check_mark: | :white_check_mark:              |
+| Langgraph     | Framework       | :x:                | :white_check_mark:              |
+| DSPy          | Framework       | :x:                | :white_check_mark:              |
+| CrewAI        | Framework       | :x:                | :white_check_mark:              |
+| Ollama        | Framework       | :x:                | :white_check_mark:              |
+| VertexAI      | Framework       | :x:                | :white_check_mark:              |
+| Vercel AI SDK | Framework       | :white_check_mark: | :x:                             |
+| EmbedChain    | Framework       | :x:                | :white_check_mark:              |
+| Autogen       | Framework       | :x:                | :white_check_mark:              |
+| Pinecone      | Vector Database | :white_check_mark: | :white_check_mark:              |
+| ChromaDB      | Vector Database | :white_check_mark: | :white_check_mark:              |
+| QDrant        | Vector Database | :white_check_mark: | :white_check_mark:              |
+| Weaviate      | Vector Database | :white_check_mark: | :white_check_mark:              |
+| PGVector      | Vector Database | :white_check_mark: | :white_check_mark: (SQLAlchemy) |
 
 ---
 

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
   'sqlalchemy',
   'fsspec>=2024.6.0',
   "transformers>=4.11.3",
+  "sentry-sdk>=2.14.0",
 ]
 
 requires-python = ">=3.9"

langtrace_python_sdk-2.3.14/src/examples/autogen_example/__init__.py

@@ -0,0 +1,8 @@
+from .main import main as autogen_main
+from .main import comedy_show
+
+
+class AutoGenRunner:
+    def run(self):
+        # autogen_main()
+        comedy_show()

langtrace_python_sdk-2.3.14/src/examples/autogen_example/main.py

@@ -0,0 +1,72 @@
+from langtrace_python_sdk import langtrace
+from autogen import ConversableAgent
+from dotenv import load_dotenv
+from autogen.coding import LocalCommandLineCodeExecutor
+import tempfile
+
+
+load_dotenv()
+langtrace.init(write_spans_to_console=False)
+# agentops.init(api_key=os.getenv("AGENTOPS_API_KEY"))
+# Create a temporary directory to store the code files.
+temp_dir = tempfile.TemporaryDirectory()
+
+
+# Create a local command line code executor.
+executor = LocalCommandLineCodeExecutor(
+    timeout=10,  # Timeout for each code execution in seconds.
+    work_dir=temp_dir.name,  # Use the temporary directory to store the code files.
+)
+
+
+def main():
+
+    agent = ConversableAgent(
+        "chatbot",
+        llm_config={"config_list": [{"model": "gpt-4"}], "cache_seed": None},
+        code_execution_config=False,  # Turn off code execution, by default it is off.
+        function_map=None,  # No registered functions, by default it is None.
+        human_input_mode="NEVER",  # Never ask for human input.
+    )
+
+    reply = agent.generate_reply(
+        messages=[{"content": "Tell me a joke.", "role": "user"}]
+    )
+    return reply
+
+
+def comedy_show():
+    cathy = ConversableAgent(
+        name="cathy",
+        system_message="Your name is Cathy and you are a part of a duo of comedians.",
+        llm_config={
+            "config_list": [{"model": "gpt-4o-mini", "temperature": 0.9}],
+            "cache_seed": None,
+        },
+        description="Cathy is a comedian",
+        max_consecutive_auto_reply=10,
+        code_execution_config={
+            "executor": executor
+        },  # Use the local command line code executor.
+        function_map=None,
+        chat_messages=None,
+        silent=True,
+        default_auto_reply="Sorry, I don't know what to say.",
+        human_input_mode="NEVER",  # Never ask for human input.
+    )
+
+    joe = ConversableAgent(
+        "joe",
+        system_message="Your name is Joe and you are a part of a duo of comedians.",
+        llm_config={
+            "config_list": [{"model": "gpt-4o-mini", "temperature": 0.7}],
+            "cache_seed": None,
+        },
+        human_input_mode="NEVER",  # Never ask for human input.
+    )
+
+    result = joe.initiate_chat(
+        recipient=cathy, message="Cathy, tell me a joke.", max_turns=2
+    )
+
+    return result

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/src/examples/langchain_example/__init__.py

@@ -1,3 +1,4 @@
+from examples.langchain_example.langchain_google_genai import basic_google_genai
 from .basic import basic_app, rag, load_and_split
 from langtrace_python_sdk import with_langtrace_root_span
 
@@ -12,6 +13,7 @@ class LangChainRunner:
         rag()
         load_and_split()
         basic_graph_tools()
+        basic_google_genai()
 
 
 class GroqRunner:

langtrace_python_sdk-2.3.14/src/examples/langchain_example/langchain_google_example.py

@@ -0,0 +1,29 @@
+from langchain_core.messages import HumanMessage
+from langchain_google_genai import ChatGoogleGenerativeAI
+from langtrace_python_sdk.utils.with_root_span import with_langtrace_root_span
+from dotenv import find_dotenv, load_dotenv
+from langtrace_python_sdk import langtrace
+
+_ = load_dotenv(find_dotenv())
+
+langtrace.init()
+
+@with_langtrace_root_span("basic_google_genai")
+def basic_google_genai():
+    llm = ChatGoogleGenerativeAI(model="gemini-1.5-flash")
+    # example
+    message = HumanMessage(
+        content=[
+            {
+                "type": "text",
+                "text": "What's in this image?",
+            },
+        ]
+    )
+    message_image = HumanMessage(content="https://picsum.photos/seed/picsum/200/300")
+
+    res = llm.invoke([message, message_image])
+    # print(res)
+
+
+basic_google_genai()

langtrace_python_sdk-2.3.14/src/langtrace_python_sdk/constants/__init__.py

@@ -0,0 +1,2 @@
+LANGTRACE_SDK_NAME = "langtrace-python-sdk"
+SENTRY_DSN = "https://7f8eed3a1237fb2efef0f5e96ab407af@o1419498.ingest.us.sentry.io/4507929133056000"

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/src/langtrace_python_sdk/constants/instrumentation/common.py

@@ -31,6 +31,7 @@ SERVICE_PROVIDERS = {
     "GEMINI": "Gemini",
     "MISTRAL": "Mistral",
     "EMBEDCHAIN": "Embedchain",
+    "AUTOGEN": "Autogen",
 }
 
 LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY = "langtrace_additional_attributes"

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/src/langtrace_python_sdk/instrumentation/__init__.py

@@ -14,6 +14,7 @@ from .qdrant import QdrantInstrumentation
 from .weaviate import WeaviateInstrumentation
 from .ollama import OllamaInstrumentor
 from .dspy import DspyInstrumentation
+from .autogen import AutogenInstrumentation
 from .vertexai import VertexAIInstrumentation
 from .gemini import GeminiInstrumentation
 from .mistral import MistralInstrumentation
@@ -37,6 +38,7 @@ __all__ = [
     "WeaviateInstrumentation",
     "OllamaInstrumentor",
     "DspyInstrumentation",
+    "AutogenInstrumentation",
     "VertexAIInstrumentation",
     "GeminiInstrumentation",
     "MistralInstrumentation",

langtrace_python_sdk-2.3.14/src/langtrace_python_sdk/instrumentation/autogen/__init__.py

@@ -0,0 +1,3 @@
+from .instrumentation import AutogenInstrumentation
+
+__all__ = ["AutogenInstrumentation"]

langtrace_python_sdk-2.3.14/src/langtrace_python_sdk/instrumentation/autogen/instrumentation.py

@@ -0,0 +1,42 @@
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.trace import get_tracer
+from wrapt import wrap_function_wrapper as _W
+from importlib_metadata import version as v
+from .patch import patch_generate_reply, patch_initiate_chat
+
+
+class AutogenInstrumentation(BaseInstrumentor):
+    def instrumentation_dependencies(self):
+        return ["autogen >= 0.1.0"]
+
+    def _instrument(self, **kwargs):
+        print("Instrumneting autogen")
+        tracer_provider = kwargs.get("tracer_provider")
+        tracer = get_tracer(__name__, "", tracer_provider)
+        version = v("autogen")
+        # conversable_agent.intiate_chat
+        # conversable_agent.register_function
+        # agent.Agent
+        # AgentCreation
+        # Tools --> Register_for_llm, register_for_execution, register_for_function
+        try:
+            _W(
+                module="autogen.agentchat.conversable_agent",
+                name="ConversableAgent.initiate_chat",
+                wrapper=patch_initiate_chat(
+                    "conversable_agent.initiate_chat", version, tracer
+                ),
+            )
+
+            _W(
+                module="autogen.agentchat.conversable_agent",
+                name="ConversableAgent.generate_reply",
+                wrapper=patch_generate_reply(
+                    "conversable_agent.generate_reply", version, tracer
+                ),
+            )
+        except Exception as e:
+            pass
+
+    def _uninstrument(self, **kwargs):
+        pass

langtrace_python_sdk-2.3.14/src/langtrace_python_sdk/instrumentation/autogen/patch.py

@@ -0,0 +1,132 @@
+from langtrace_python_sdk.utils.llm import (
+    get_langtrace_attributes,
+    get_extra_attributes,
+    get_span_name,
+    set_span_attributes,
+    get_llm_request_attributes,
+    set_event_completion,
+    set_usage_attributes,
+)
+from langtrace_python_sdk.constants.instrumentation.common import SERVICE_PROVIDERS
+from langtrace.trace_attributes import FrameworkSpanAttributes
+from opentelemetry.trace.status import Status, StatusCode
+from langtrace.trace_attributes import SpanAttributes
+from opentelemetry.trace import Tracer, SpanKind
+
+from langtrace_python_sdk.utils import deduce_args_and_kwargs, set_span_attribute
+import json
+
+
+def patch_initiate_chat(name, version, tracer: Tracer):
+    def traced_method(wrapped, instance, args, kwargs):
+        all_params = deduce_args_and_kwargs(wrapped, *args, **kwargs)
+        all_params["recipient"] = json.dumps(parse_agent(all_params.get("recipient")))
+        span_attributes = {
+            **get_langtrace_attributes(
+                service_provider=SERVICE_PROVIDERS["AUTOGEN"],
+                version=version,
+                vendor_type="framework",
+            ),
+            "sender": json.dumps(parse_agent(instance)),
+            **all_params,
+        }
+        attributes = FrameworkSpanAttributes(**span_attributes)
+
+        with tracer.start_as_current_span(
+            name=get_span_name(name), kind=SpanKind.CLIENT
+        ) as span:
+            try:
+                set_span_attributes(span, attributes)
+                result = wrapped(*args, **kwargs)
+                # set_response_attributes(span, result)
+                return result
+            except Exception as err:
+                # Record the exception in the span
+                span.record_exception(err)
+
+                # Set the span status to indicate an error
+                span.set_status(Status(StatusCode.ERROR, str(err)))
+
+                # Reraise the exception to ensure it's not swallowed
+                raise
+
+    return traced_method
+
+
+def patch_generate_reply(name, version, tracer: Tracer):
+
+    def traced_method(wrapped, instance, args, kwargs):
+
+        llm_config = instance.llm_config
+        kwargs = {
+            **kwargs,
+            **llm_config.get("config_list")[0],
+        }
+        service_provider = SERVICE_PROVIDERS["AUTOGEN"]
+
+        span_attributes = {
+            **get_langtrace_attributes(
+                version=version,
+                service_provider=service_provider,
+                vendor_type="framework",
+            ),
+            **get_llm_request_attributes(
+                kwargs,
+                prompts=kwargs.get("messages"),
+            ),
+            **get_extra_attributes(),
+        }
+        attributes = FrameworkSpanAttributes(**span_attributes)
+
+        with tracer.start_as_current_span(
+            name=get_span_name(name), kind=SpanKind.CLIENT
+        ) as span:
+            try:
+
+                result = wrapped(*args, **kwargs)
+                
+                # if caching is disabled, return result as langtrace will instrument the rest.
+                if "cache_seed" in llm_config and llm_config.get("cache_seed") is None:
+                    return result
+
+                set_span_attributes(span, attributes)
+                set_event_completion(span, [{"role": "assistant", "content": result}])
+                total_cost, response_model = list(instance.get_total_usage().keys())
+                set_span_attribute(
+                    span, SpanAttributes.LLM_RESPONSE_MODEL, response_model
+                )
+                set_usage_attributes(
+                    span, instance.get_total_usage().get(response_model)
+                )
+
+                return result
+
+            except Exception as err:
+                # Record the exception in the span
+                span.record_exception(err)
+
+                # Set the span status to indicate an error
+                span.set_status(Status(StatusCode.ERROR, str(err)))
+
+                # Reraise the exception to ensure it's not swallowed
+                raise
+
+    return traced_method
+
+
+def set_response_attributes(span, result):
+    summary = getattr(result, "summary", None)
+    if summary:
+        set_span_attribute(span, "autogen.chat.summary", summary)
+
+
+def parse_agent(agent):
+
+    return {
+        "name": getattr(agent, "name", None),
+        "description": getattr(agent, "description", None),
+        "system_message": str(getattr(agent, "system_message", None)),
+        "silent": getattr(agent, "silent", None),
+        "llm_config": str(getattr(agent, "llm_config", None)),
+        "human_input_mode": getattr(agent, "human_input_mode", None),
+    }

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/src/langtrace_python_sdk/instrumentation/langchain/instrumentation.py

@@ -81,21 +81,16 @@ class LangchainInstrumentation(BaseInstrumentor):
         tracer_provider = kwargs.get("tracer_provider")
         tracer = get_tracer(__name__, "", tracer_provider)
         version = importlib.metadata.version("langchain")
-
         wrap_function_wrapper(
             "langchain.agents.agent",
             "RunnableAgent.plan",
-            generic_patch(
-                "RunnableAgent.plan", "plan", tracer, version, True, True
-            ),
+            generic_patch("RunnableAgent.plan", "plan", tracer, version, True, True),
         )
 
         wrap_function_wrapper(
             "langchain.agents.agent",
             "RunnableAgent.aplan",
-            generic_patch(
-                "RunnableAgent.aplan", "plan", tracer, version, True, True
-            ),
+            generic_patch("RunnableAgent.aplan", "plan", tracer, version, True, True),
         )
 
         # modules_to_patch = []

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/src/langtrace_python_sdk/instrumentation/langchain_core/instrumentation.py

@@ -134,6 +134,20 @@ class LangchainCoreInstrumentation(BaseInstrumentor):
         ]
 
         modules_to_patch = [
+            (
+                "langchain_core.language_models.chat_models",
+                "chatmodel",
+                generic_patch,
+                True,
+                True,
+            ),
+            (
+                "langchain_core.language_models.base",
+                "language_model",
+                generic_patch,
+                True,
+                True,
+            ),
             ("langchain_core.retrievers", "retriever", generic_patch, True, True),
             ("langchain_core.prompts.chat", "prompt", generic_patch, True, True),
             (

{langtrace_python_sdk-2.3.12 → langtrace_python_sdk-2.3.14}/src/langtrace_python_sdk/instrumentation/langchain_core/patch.py

@@ -57,7 +57,24 @@ def generic_patch(
             "langtrace.service.version": version,
             "langtrace.version": v(LANGTRACE_SDK_NAME),
             "langchain.task.name": task,
-            **(extra_attributes if extra_attributes is not None else {}),
+            "gen_ai.request.model": (
+                instance.model if hasattr(instance, "model") else None
+            ),
+            SpanAttributes.LLM_REQUEST_MAX_TOKENS: (
+                instance.max_output_tokens
+                if hasattr(instance, "max_output_tokens")
+                else None
+            ),
+            SpanAttributes.LLM_TOP_K: (
+                instance.top_k if hasattr(instance, "top_k") else None
+            ),
+            SpanAttributes.LLM_REQUEST_TOP_P: (
+                instance.top_p if hasattr(instance, "top_p") else None
+            ),
+            SpanAttributes.LLM_REQUEST_TEMPERATURE: (
+                instance.temperature if hasattr(instance, "temperature") else None
+            ),
+            **(extra_attributes if extra_attributes is not None else {}),  # type: ignore
         }
 
         if trace_input and len(args) > 0:
@@ -79,21 +96,17 @@ def generic_patch(
             try:
                 # Attempt to call the original method
                 result = wrapped(*args, **kwargs)
-
                 if trace_output:
                     span.set_attribute("langchain.outputs", to_json_string(result))
-                    if hasattr(result, 'usage'):
-                        prompt_tokens = result.usage.prompt_tokens
-                        completion_tokens = result.usage.completion_tokens
-                        span.set_attribute(SpanAttributes.LLM_USAGE_PROMPT_TOKENS, prompt_tokens)
-                        span.set_attribute(SpanAttributes.LLM_USAGE_COMPLETION_TOKENS, completion_tokens)
-                    elif hasattr(result, 'generations') and len(result.generations) > 0 and len(result.generations[0]) > 0 and hasattr(result.generations[0][0], 'text') and isinstance(result.generations[0][0].text, str):
-                        span.set_attribute(SpanAttributes.LLM_USAGE_COMPLETION_TOKENS, instance.get_num_tokens(result.generations[0][0].text))
-                    elif len(args) > 0 and len(args[0]) > 0 and not hasattr(args[0][0], 'text') and hasattr(instance, 'get_num_tokens'):
-                        span.set_attribute(SpanAttributes.LLM_USAGE_PROMPT_TOKENS, instance.get_num_tokens(args[0][0]))
-                    elif len(args) > 0 and len(args[0]) > 0 and hasattr(args[0][0], 'text') and isinstance(args[0][0].text, str) and hasattr(instance, 'get_num_tokens'):
-                        span.set_attribute(SpanAttributes.LLM_USAGE_PROMPT_TOKENS, instance.get_num_tokens(args[0][0].text))
-
+                    if hasattr(result, "usage_metadata"):
+                        span.set_attribute(
+                            SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
+                            result.usage_metadata["input_tokens"],
+                        )
+                        span.set_attribute(
+                            SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
+                            result.usage_metadata["output_tokens"],
+                        )
                 span.set_status(StatusCode.OK)
                 return result
             except Exception as err:
@@ -208,9 +221,17 @@ def clean_empty(d):
     if not isinstance(d, (dict, list, tuple)):
         return d
     if isinstance(d, tuple):
-        return tuple(val for val in (clean_empty(val) for val in d) if val != () and val is not None)
+        return tuple(
+            val
+            for val in (clean_empty(val) for val in d)
+            if val != () and val is not None
+        )
     if isinstance(d, list):
-        return [val for val in (clean_empty(val) for val in d) if val != [] and val is not None]
+        return [
+            val
+            for val in (clean_empty(val) for val in d)
+            if val != [] and val is not None
+        ]
     result = {}
     for k, val in d.items():
         if isinstance(val, dict):
@@ -226,7 +247,7 @@ def clean_empty(d):
                 result[k] = val.strip()
         elif isinstance(val, object):
             # some langchain objects have a text attribute
-            val = getattr(val, 'text', None)
+            val = getattr(val, "text", None)
             if val is not None and val.strip() != "":
                 result[k] = val.strip()
     return result