langtrace-python-sdk 2.2.6__tar.gz → 2.2.8__tar.gz

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: langtrace-python-sdk
-Version: 2.2.6
+Version: 2.2.8
 Summary: Python SDK for LangTrace
 Project-URL: Homepage, https://github.com/Scale3-Labs/langtrace-python-sdk
 Author-email: Scale3 Labs <engineering@scale3labs.com>
@@ -20,7 +20,7 @@ Requires-Dist: opentelemetry-instrumentation>=0.46b0
 Requires-Dist: opentelemetry-sdk>=1.25.0
 Requires-Dist: sqlalchemy
 Requires-Dist: tiktoken>=0.1.1
-Requires-Dist: trace-attributes<7.0.0,>=6.0.3
+Requires-Dist: trace-attributes==7.0.0
 Provides-Extra: dev
 Requires-Dist: anthropic; extra == 'dev'
 Requires-Dist: chromadb; extra == 'dev'
@@ -239,7 +239,7 @@ def main():
 from langtrace_python_sdk import with_langtrace_root_span, with_additional_attributes
 
 
-@with_additional_attributes({"user.id": "1234", "user.feedback.rating": 1})
+@with_additional_attributes({"user.id": "1234"})
 def api_call1():
     response = client.chat.completions.create(
         model="gpt-4",
@@ -249,7 +249,7 @@ def api_call1():
     return response
 
 
-@with_additional_attributes({"user.id": "5678", "user.feedback.rating": -1})
+@with_additional_attributes({"user.id": "5678"})
 def api_call2():
     response = client.chat.completions.create(
         model="gpt-4",
@@ -293,6 +293,7 @@ Langtrace automatically captures traces from the following vendors:
 | 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:                             |
 | 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:              |

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/README.md

@@ -194,7 +194,7 @@ def main():
 from langtrace_python_sdk import with_langtrace_root_span, with_additional_attributes
 
 
-@with_additional_attributes({"user.id": "1234", "user.feedback.rating": 1})
+@with_additional_attributes({"user.id": "1234"})
 def api_call1():
     response = client.chat.completions.create(
         model="gpt-4",
@@ -204,7 +204,7 @@ def api_call1():
     return response
 
 
-@with_additional_attributes({"user.id": "5678", "user.feedback.rating": -1})
+@with_additional_attributes({"user.id": "5678"})
 def api_call2():
     response = client.chat.completions.create(
         model="gpt-4",
@@ -248,6 +248,7 @@ Langtrace automatically captures traces from the following vendors:
 | 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:                             |
 | 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:              |

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers=[
     "Operating System :: OS Independent",
 ]
 dependencies = [
-  'trace-attributes>=6.0.3,<7.0.0',
+  'trace-attributes==7.0.0',
   'opentelemetry-api>=1.25.0',
   'opentelemetry-sdk>=1.25.0',
   'opentelemetry-instrumentation>=0.46b0',

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/src/examples/inspect_ai_example/basic_eval.py

@@ -1,10 +1,12 @@
 import fsspec
+from dotenv import find_dotenv, load_dotenv
 from inspect_ai import Task, task
 from inspect_ai.dataset import csv_dataset, Sample
 from inspect_ai.scorer import model_graded_qa
 from inspect_ai.solver import chain_of_thought, self_critique
 from langtrace_python_sdk.extensions.langtrace_filesystem import LangTraceFileSystem
 
+_ = load_dotenv(find_dotenv())
 
 # Manually register the filesystem with fsspec
 # Note: This is only necessary because the filesystem is not registered.
@@ -24,9 +26,9 @@ def hydrate_with_question(record):
 
 
 @task
-def pricing_question():
+def basic_eval():
     return Task(
-        dataset=csv_dataset("langtracefs://clyythmcs0001145cuvi426zi", hydrate_with_question),
+        dataset=csv_dataset("langtracefs://clz0p4i1t000fwv0xjtlvkxyx"),
         plan=[chain_of_thought(), self_critique()],
         scorer=model_graded_qa(),
     )

langtrace_python_sdk-2.2.8/src/examples/openai_example/send_user_feedback.py

@@ -0,0 +1,40 @@
+from dotenv import find_dotenv, load_dotenv
+from openai import OpenAI
+from langtrace_python_sdk import langtrace, with_langtrace_root_span, SendUserFeedback
+
+_ = load_dotenv(find_dotenv())
+
+# Initialize Langtrace SDK
+langtrace.init()
+client = OpenAI()
+
+
+def api(span_id, trace_id):
+    response = client.chat.completions.create(
+        model="gpt-4o-mini",
+        messages=[
+            {"role": "user", "content": "What is the best place to live in the US?"},
+        ],
+        stream=False,
+    )
+
+    # Collect user feedback and send it to Langtrace
+    user_score = 1  # Example user score
+    user_id = 'user_1234'  # Example user ID
+    data = {
+        "userScore": user_score,
+        "userId": user_id,
+        "spanId": span_id,
+        "traceId": trace_id
+    }
+    SendUserFeedback().evaluate(data=data)
+
+    # Return the response
+    return response.choices[0].message.content
+
+
+# wrap the API call with the Langtrace root span
+wrapped_api = with_langtrace_root_span()(api)
+
+# Call the wrapped API
+wrapped_api()

langtrace_python_sdk-2.2.8/src/examples/otlp_example/otlp_with_langtrace.py

@@ -0,0 +1,59 @@
+# Instructions
+# 1. Run the OpenTelemetry Collector with the OTLP receiver enabled
+# Create otel-config.yaml with the following content:
+# receivers:
+#   otlp:
+#     protocols:
+#       grpc:
+#         endpoint: "0.0.0.0:4317"
+#       http:
+#         endpoint: "0.0.0.0:4318"
+
+# exporters:
+#   logging:
+#     loglevel: debug
+
+# service:
+#   pipelines:
+#     traces:
+#       receivers: [otlp]
+#       exporters: [logging]
+# docker pull otel/opentelemetry-collector:latest
+# docker run --rm -p 4317:4317 -p 4318:4318 -v $(pwd)/otel-config.yaml:/otel-config.yaml otel/opentelemetry-collector --config otel-config.yaml
+# 2. Run the following code
+
+from langtrace_python_sdk import langtrace
+from openai import OpenAI
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+
+
+# Configure the OTLP exporter to use the correct endpoint and API key
+otlp_endpoint = "http://localhost:4318/v1/traces"
+otlp_exporter = OTLPSpanExporter(
+    endpoint=otlp_endpoint,
+    headers=(("Content-Type", "application/json"),))
+langtrace.init(custom_remote_exporter=otlp_exporter, batch=False)
+
+
+def chat_with_openai():
+    client = OpenAI()
+    messages = [
+        {
+            "role": "user",
+            "content": "Hello, I'm a human.",
+        },
+    ]
+    chat_completion = client.chat.completions.create(
+        messages=messages,
+        stream=False,
+        model="gpt-3.5-turbo",
+    )
+    print(chat_completion.choices[0].message.content)
+
+
+def main():
+    chat_with_openai()
+
+
+if __name__ == "__main__":
+    main()

langtrace_python_sdk-2.2.8/src/examples/routellm_example/basic.py

@@ -0,0 +1,41 @@
+import sys
+
+sys.path.insert(0, "/Users/karthikkalyanaraman/work/langtrace/langtrace-python-sdk/src")
+
+from langtrace_python_sdk import langtrace
+from langtrace_python_sdk.utils.with_root_span import with_langtrace_root_span
+from routellm.controller import Controller
+from dotenv import load_dotenv
+
+load_dotenv()
+
+langtrace.init()
+
+# litellm.set_verbose=True
+client = Controller(
+    routers=["mf"],
+    strong_model="claude-3-opus-20240229",
+    weak_model="claude-3-opus-20240229",
+)
+
+
+@with_langtrace_root_span("Routellm")
+def Routellm(prompt):
+    try:
+
+        response = client.chat.completions.create(
+            model="router-mf-0.11593", messages=[{"role": "user", "content": prompt}]
+        )
+
+        for chunk in response:
+            if hasattr(chunk, "choices"):
+                print(chunk.choices[0].delta.content or "", end="")
+            else:
+                print(chunk)
+
+    except Exception as e:
+        print(f"An error occurred: {e}")
+
+
+Routellm("what is the square root of 12182382932.99")
+Routellm("Write me a short story")

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/src/langtrace_python_sdk/extensions/langtrace_filesystem.py

@@ -27,13 +27,25 @@ class OpenMode(str):
 
 
 class LangTraceFile(io.BytesIO):
-    _host: str = os.environ.get("LANGTRACE_API_HOST", None) or LANGTRACE_REMOTE_URL
 
     def __init__(self, fs: "LangTraceFileSystem", path: str, mode: OpenMode):
         super().__init__()
         self.fs = fs
         self.path = path
         self.mode = mode
+        self._host: str = os.environ.get("LANGTRACE_API_HOST", LANGTRACE_REMOTE_URL)
+        self._api_key: str = os.environ.get("LANGTRACE_API_KEY", None)
+        if self._host.endswith("/api/trace"):
+            self._host = self._host.replace("/api/trace", "")
+
+        if self._api_key is None:
+            print(Fore.RED)
+            print(
+                f"Missing Langtrace API key, proceed to {self._host} to create one"
+            )
+            print("Set the API key as an environment variable LANGTRACE_API_KEY")
+            print(Fore.RESET)
+            return
 
     def close(self) -> None:
         if not self.closed:
@@ -71,7 +83,7 @@ class LangTraceFile(io.BytesIO):
                 data=json.dumps(data),
                 headers={
                     "Content-Type": "application/json",
-                    "x-api-key": os.environ.get("LANGTRACE_API_KEY"),
+                    "x-api-key": self._api_key,
                 },
                 timeout=20,
             )
@@ -82,7 +94,6 @@ class LangTraceFile(io.BytesIO):
 
 
 class LangTraceFileSystem(AbstractFileSystem):
-    _host: str = os.environ.get("LANGTRACE_API_HOST", None) or LANGTRACE_REMOTE_URL
     protocol = "langtracefs"
     sep = "/"
 
@@ -90,6 +101,19 @@ class LangTraceFileSystem(AbstractFileSystem):
         super().__init__(*args, **kwargs)
         self.files = {}
         self.dirs = set()
+        self._host: str = os.environ.get("LANGTRACE_API_HOST", LANGTRACE_REMOTE_URL)
+        self._api_key: str = os.environ.get("LANGTRACE_API_KEY", None)
+        if self._host.endswith("/api/trace"):
+            self._host = self._host.replace("/api/trace", "")
+
+        if self._api_key is None:
+            print(Fore.RED)
+            print(
+                f"Missing Langtrace API key, proceed to {self._host} to create one"
+            )
+            print("Set the API key as an environment variable LANGTRACE_API_KEY")
+            print(Fore.RESET)
+            return
 
     def open(
         self,
@@ -118,7 +142,7 @@ class LangTraceFileSystem(AbstractFileSystem):
                 url=f"{self._host}/api/dataset/download?id={dataset_id}",
                 headers={
                     "Content-Type": "application/json",
-                    "x-api-key": os.environ.get("LANGTRACE_API_KEY"),
+                    "x-api-key": self._api_key,
                 },
                 timeout=20,
             )

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/src/langtrace_python_sdk/instrumentation/cohere/patch.py

@@ -44,7 +44,7 @@ def rerank(original_method, version, tracer):
 
         span_attributes = {
             **get_langtrace_attributes(version, service_provider),
-            **get_llm_request_attributes(kwargs),
+            **get_llm_request_attributes(kwargs, operation_name="rerank"),
             **get_llm_url(instance),
             SpanAttributes.LLM_REQUEST_MODEL: kwargs.get("model") or "command-r-plus",
             SpanAttributes.LLM_URL: APIS["RERANK"]["URL"],
@@ -121,7 +121,7 @@ def embed(original_method, version, tracer):
 
         span_attributes = {
             **get_langtrace_attributes(version, service_provider),
-            **get_llm_request_attributes(kwargs),
+            **get_llm_request_attributes(kwargs, operation_name="embed"),
             **get_llm_url(instance),
             SpanAttributes.LLM_URL: APIS["EMBED"]["URL"],
             SpanAttributes.LLM_PATH: APIS["EMBED"]["ENDPOINT"],

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/src/langtrace_python_sdk/instrumentation/openai/patch.py

@@ -55,7 +55,7 @@ def images_generate(original_method, version, tracer):
         service_provider = SERVICE_PROVIDERS["OPENAI"]
         span_attributes = {
             **get_langtrace_attributes(version, service_provider, vendor_type="llm"),
-            **get_llm_request_attributes(kwargs),
+            **get_llm_request_attributes(kwargs, operation_name="images_generate"),
             **get_llm_url(instance),
             SpanAttributes.LLM_PATH: APIS["IMAGES_GENERATION"]["ENDPOINT"],
             **get_extra_attributes(),
@@ -118,7 +118,7 @@ def async_images_generate(original_method, version, tracer):
 
         span_attributes = {
             **get_langtrace_attributes(version, service_provider, vendor_type="llm"),
-            **get_llm_request_attributes(kwargs),
+            **get_llm_request_attributes(kwargs, operation_name="images_generate"),
             **get_llm_url(instance),
             SpanAttributes.LLM_PATH: APIS["IMAGES_GENERATION"]["ENDPOINT"],
             **get_extra_attributes(),
@@ -181,7 +181,7 @@ def images_edit(original_method, version, tracer):
 
         span_attributes = {
             **get_langtrace_attributes(version, service_provider, vendor_type="llm"),
-            **get_llm_request_attributes(kwargs),
+            **get_llm_request_attributes(kwargs, operation_name="images_edit"),
             **get_llm_url(instance),
             SpanAttributes.LLM_PATH: APIS["IMAGES_EDIT"]["ENDPOINT"],
             SpanAttributes.LLM_RESPONSE_FORMAT: kwargs.get("response_format"),
@@ -432,7 +432,7 @@ def embeddings_create(original_method, version, tracer):
 
         span_attributes = {
             **get_langtrace_attributes(version, service_provider, vendor_type="llm"),
-            **get_llm_request_attributes(kwargs),
+            **get_llm_request_attributes(kwargs, operation_name="embed"),
             **get_llm_url(instance),
             SpanAttributes.LLM_PATH: APIS["EMBEDDINGS_CREATE"]["ENDPOINT"],
             SpanAttributes.LLM_REQUEST_DIMENSIONS: kwargs.get("dimensions"),
@@ -490,7 +490,7 @@ def async_embeddings_create(original_method, version, tracer):
 
         span_attributes = {
             **get_langtrace_attributes(version, service_provider, vendor_type="llm"),
-            **get_llm_request_attributes(kwargs),
+            **get_llm_request_attributes(kwargs, operation_name="embed"),
             SpanAttributes.LLM_PATH: APIS["EMBEDDINGS_CREATE"]["ENDPOINT"],
             SpanAttributes.LLM_REQUEST_DIMENSIONS: kwargs.get("dimensions"),
             **get_extra_attributes(),

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/src/langtrace_python_sdk/utils/llm.py

@@ -92,7 +92,7 @@ def get_langtrace_attributes(version, service_provider, vendor_type="llm"):
     }
 
 
-def get_llm_request_attributes(kwargs, prompts=None, model=None):
+def get_llm_request_attributes(kwargs, prompts=None, model=None, operation_name="chat"):
 
     user = kwargs.get("user", None)
     if prompts is None:
@@ -111,6 +111,7 @@ def get_llm_request_attributes(kwargs, prompts=None, model=None):
     top_p = kwargs.get("p", None) or kwargs.get("top_p", None)
     tools = kwargs.get("tools", None)
     return {
+        SpanAttributes.LLM_OPERATION_NAME: operation_name,
         SpanAttributes.LLM_REQUEST_MODEL: model or kwargs.get("model"),
         SpanAttributes.LLM_IS_STREAMING: kwargs.get("stream"),
         SpanAttributes.LLM_REQUEST_TEMPERATURE: kwargs.get("temperature"),

{langtrace_python_sdk-2.2.6 → langtrace_python_sdk-2.2.8}/src/langtrace_python_sdk/utils/with_root_span.py

@@ -25,6 +25,9 @@ from opentelemetry import baggage, context, trace
 from opentelemetry.trace import SpanKind
 from opentelemetry.trace.propagation import set_span_in_context
 
+from langtrace_python_sdk.constants.exporter.langtrace_exporter import (
+    LANGTRACE_REMOTE_URL,
+)
 from langtrace_python_sdk.constants.instrumentation.common import (
     LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY,
 )
@@ -142,7 +145,10 @@ class SendUserFeedback:
     _langtrace_api_key: str
 
     def __init__(self):
-        self._langtrace_host = os.environ["LANGTRACE_API_HOST"]
+        self._langtrace_host = os.environ.get("LANGTRACE_API_HOST", LANGTRACE_REMOTE_URL)
+        # When the host is set to /api/trace, remove the /api/trace
+        if self._langtrace_host.endswith("/api/trace"):
+            self._langtrace_host = self._langtrace_host.replace("/api/trace", "")
         self._langtrace_api_key = os.environ.get("LANGTRACE_API_KEY", None)
 
     def evaluate(self, data: EvaluationAPIData) -> None:
@@ -155,6 +161,16 @@ class SendUserFeedback:
                 print("Set the API key as an environment variable LANGTRACE_API_KEY")
                 print(Fore.RESET)
                 return
+
+            # convert spanId and traceId to hexadecimals
+            span_hex_number = hex(int(data["spanId"], 10))[2:]  # Convert to hex and remove the '0x' prefix
+            formatted_span_hex_number = span_hex_number.zfill(16)  # Pad with zeros to 16 characters
+            data["spanId"] = f"0x{formatted_span_hex_number}"
+
+            trace_hex_number = hex(int(data["traceId"], 10))[2:]  # Convert to hex and remove the '0x' prefix
+            formatted_trace_hex_number = trace_hex_number.zfill(32)  # Pad with zeros to 32 characters
+            data["traceId"] = f"0x{formatted_trace_hex_number}"
+
             evaluation = self.get_evaluation(data["spanId"])
             headers = {"x-api-key": self._langtrace_api_key}
             if evaluation is not None:

langtrace_python_sdk-2.2.8/src/langtrace_python_sdk/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.8"

langtrace_python_sdk-2.2.6/src/examples/ollama_example/basic_example_2.py

@@ -1,34 +0,0 @@
-from langtrace_python_sdk import langtrace
-from openai import OpenAI
-from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
-
-service_name = "langtrace-python-ollama"
-otlp_endpoint = "http://localhost:4318/v1/traces"
-otlp_exporter = OTLPSpanExporter(
-    endpoint=otlp_endpoint,
-    headers=(("Content-Type", "application/json"),))
-langtrace.init(custom_remote_exporter=otlp_exporter, batch=False)
-
-
-def chat_with_ollama():
-    # Use the OpenAI endpoint, not the Ollama API.
-    base_url = "http://localhost:11434/v1"
-    client = OpenAI(base_url=base_url, api_key="unused")
-    messages = [
-        {
-            "role": "user",
-            "content": "Hello, I'm a human.",
-        },
-    ]
-    chat_completion = client.chat.completions.create(
-        model="llama3", messages=messages
-    )
-    print(chat_completion.choices[0].message.content)
-
-
-def main():
-    chat_with_ollama()
-
-
-if __name__ == "__main__":
-    main()

langtrace_python_sdk-2.2.6/src/langtrace_python_sdk/version.py

@@ -1 +0,0 @@
-__version__ = "2.2.6"