langtrace-python-sdk 1.0.9__tar.gz → 1.0.11__tar.gz

{langtrace-python-sdk-1.0.9/src/langtrace_python_sdk.egg-info → langtrace-python-sdk-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langtrace-python-sdk
-Version: 1.0.9
+Version: 1.0.11
 Summary: LangTrace - Python SDK
 Home-page: https://github.com/Scale3-Labs/langtrace-python-sdk
 Author: Ali Waleed

langtrace-python-sdk-1.0.11/README.md

@@ -0,0 +1,22 @@
+# langtrace-python-sdk
+
+export PYTHONPATH="/Users/karthikkalyanaraman/work/langtrace/python-sdk:$PYTHONPATH"
+
+## Steps to run
+
+1. From your root directory, create a virtualenv for installing your dependencies
+    ```
+    python -m venv pysdk
+    ```
+2. Activate the virtualenv
+    ```
+    source pysdk/bin/activate
+    ```
+3. Install the dependencies
+   ```
+    pip install -r requirements.txt
+    ```
+4. Run the example and see the traces on the terminal
+   ```
+   python src/entrypoint.py
+   ```

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/setup.py

@@ -4,7 +4,7 @@ with open('requirements.txt') as f:
 
 setup(
     name='langtrace-python-sdk',  # Choose a unique name for PyPI
-    version='1.0.9',
+    version='1.0.11',
     author='Ali Waleed',
     author_email='ali@scale3labs.com',
     description='LangTrace - Python SDK',
@@ -12,7 +12,7 @@ setup(
     long_description_content_type='text/markdown',
     url='https://github.com/Scale3-Labs/langtrace-python-sdk',  # Project home page
     package_dir={'': 'src'},
-    packages=find_packages(where='src', exclude=['examples*']),
+    packages=find_packages(where='src'),
     install_requires=required,
     python_requires='>=3.6',
     classifiers=[

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/examples/chroma_example/basic.py

@@ -2,7 +2,7 @@ import chromadb
 from chromadb.utils import embedding_functions
 from dotenv import find_dotenv, load_dotenv
 
-from instrumentation.setup import setup_instrumentation
+from examples.setup import setup_instrumentation
 from instrumentation.with_root_span import with_langtrace_root_span
 
 _ = load_dotenv(find_dotenv())

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/examples/langchain_example/basic.py

@@ -7,7 +7,7 @@ from langchain_core.prompts.chat import ChatPromptTemplate
 from langchain_core.runnables import RunnablePassthrough
 from langchain_openai import ChatOpenAI, OpenAIEmbeddings
 
-from instrumentation.setup import setup_instrumentation
+from examples.setup import setup_instrumentation
 from instrumentation.with_root_span import with_langtrace_root_span
 
 _ = load_dotenv(find_dotenv())

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/examples/langchain_example/tool.py

@@ -6,7 +6,7 @@ from langchain_core.pydantic_v1 import BaseModel, Field
 from langchain_core.tools import Tool
 from langchain_openai import ChatOpenAI
 
-from instrumentation.setup import setup_instrumentation
+from examples.setup import setup_instrumentation
 from instrumentation.with_root_span import with_langtrace_root_span
 
 _ = load_dotenv(find_dotenv())
@@ -45,7 +45,7 @@ async def aget_prime(n: int, primes: dict = primes) -> str:
     return str(primes.get(int(n)))
 
 
-# @with_langtrace_root_span()
+@with_langtrace_root_span()
 def tool_example():
 
     tools = [

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/examples/llamaindex_example/basic.py

@@ -1,7 +1,7 @@
 from dotenv import find_dotenv, load_dotenv
 from llama_index.core import SimpleDirectoryReader, VectorStoreIndex
 
-from instrumentation.setup import setup_instrumentation
+from examples.setup import setup_instrumentation
 from instrumentation.with_root_span import with_langtrace_root_span
 
 _ = load_dotenv(find_dotenv())

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/examples/openai/chat_completion.py

@@ -1,7 +1,7 @@
 from dotenv import find_dotenv, load_dotenv
 from openai import OpenAI
 
-from instrumentation.setup import setup_instrumentation
+from examples.setup import setup_instrumentation
 from instrumentation.with_root_span import with_langtrace_root_span
 
 _ = load_dotenv(find_dotenv())
@@ -13,14 +13,27 @@ client = OpenAI()
 
 @with_langtrace_root_span()
 def chat_completion():
-    stream = client.chat.completions.create(
+    response = client.chat.completions.create(
         model="gpt-4",
         messages=[{"role": "user", "content": "Say this is a test three times"}],
-        stream=False,
+        stream=True,
     )
+    # print(stream)
     # stream = client.chat.completions.create(
     #     model="gpt-4",
     #     messages=[{"role": "user", "content": "Say this is a test three times"}, {"role": "assistant", "content": "This is a test. This is a test. This is a test"},
     #               {"role": "user", "content": "Say this is a mock 4 times"}],
     #     stream=False,
     # )
+
+    result = []
+    for chunk in response:
+        if chunk.choices[0].delta.function_call is not None:
+            content = [
+                choice.delta.function_call.arguments if choice.delta.function_call and
+                choice.delta.function_call.arguments else ""
+                for choice in chunk.choices]
+            result.append(
+                content[0] if len(content) > 0 else "")
+
+    print("".join(result))

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/examples/openai/embeddings_create.py

@@ -1,7 +1,7 @@
 from dotenv import find_dotenv, load_dotenv
 from openai import OpenAI
 
-from instrumentation.setup import setup_instrumentation
+from examples.setup import setup_instrumentation
 from instrumentation.with_root_span import with_langtrace_root_span
 
 _ = load_dotenv(find_dotenv())

langtrace-python-sdk-1.0.11/src/examples/openai/function_calling.py

@@ -0,0 +1,75 @@
+import json
+
+from dotenv import find_dotenv, load_dotenv
+from openai import OpenAI
+
+from examples.setup import setup_instrumentation
+from instrumentation.with_root_span import with_langtrace_root_span
+
+_ = load_dotenv(find_dotenv())
+
+setup_instrumentation()
+
+client = OpenAI()
+
+
+student_custom_functions = [
+    {
+        'name': 'extract_student_info',
+        'description': 'Get the student information from the body of the input text',
+        'parameters': {
+            'type': 'object',
+            'properties': {
+                'name': {
+                    'type': 'string',
+                    'description': 'Name of the person'
+                },
+                'major': {
+                    'type': 'string',
+                    'description': 'Major subject.'
+                },
+                'school': {
+                    'type': 'string',
+                    'description': 'The university name.'
+                },
+                'grades': {
+                    'type': 'integer',
+                    'description': 'GPA of the student.'
+                },
+                'club': {
+                    'type': 'string',
+                    'description': 'School club for extracurricular activities. '
+                }
+
+            }
+        }
+    }
+]
+
+
+@with_langtrace_root_span()
+def function_calling():
+    response = client.chat.completions.create(
+        model='gpt-3.5-turbo',
+        messages=[{'role': 'user', 'content': "David Nguyen is a sophomore majoring in computer science at Stanford University. He is Asian American and has a 3.8 GPA. David is known for his programming skills and is an active member of the university's Robotics Club. He hopes to pursue a career in artificial intelligence after graduating."}],
+        functions=student_custom_functions,
+        function_call='auto',
+        stream=False
+    )
+
+    # result = []
+    # for chunk in response:
+    #     if chunk.choices[0].delta.function_call is not None:
+    #         content = [
+    #             choice.delta.function_call.arguments if choice.delta.function_call and
+    #             choice.delta.function_call.arguments else ""
+    #             for choice in chunk.choices]
+    #         result.append(
+    #             content[0] if len(content) > 0 else "")
+
+    # print("".join(result))
+
+    # Loading the response as a JSON object
+    json_response = json.loads(
+        response.choices[0].message.function_call.arguments)
+    print(json_response)

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/examples/openai/images_generate.py

@@ -1,7 +1,7 @@
 from dotenv import find_dotenv, load_dotenv
 from openai import OpenAI
 
-from instrumentation.setup import setup_instrumentation
+from examples.setup import setup_instrumentation
 from instrumentation.with_root_span import with_langtrace_root_span
 
 _ = load_dotenv(find_dotenv())

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/examples/pinecone_example/basic.py

@@ -2,7 +2,7 @@ from dotenv import find_dotenv, load_dotenv
 from openai import OpenAI
 from pinecone import Pinecone
 
-from instrumentation.setup import setup_instrumentation
+from examples.setup import setup_instrumentation
 from instrumentation.with_root_span import with_langtrace_root_span
 
 _ = load_dotenv(find_dotenv())

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/instrumentation/chroma/instrumentation.py

@@ -1,3 +1,6 @@
+"""
+Instrumentation for ChromaDB
+"""
 import importlib.metadata
 from typing import Collection
 
@@ -5,11 +8,14 @@ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.trace import get_tracer
 from wrapt import wrap_function_wrapper
 
-from instrumentation.chroma.lib.apis import APIS
+from instrumentation.chroma.apis import APIS
 from instrumentation.chroma.patch import collection_patch
 
 
 class ChromaInstrumentation(BaseInstrumentor):
+    """
+    The ChromaInstrumentation class represents the ChromaDB instrumentation
+    """
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return ["chromadb >= 0.4.23"]
@@ -19,7 +25,7 @@ class ChromaInstrumentation(BaseInstrumentor):
         tracer = get_tracer(__name__, "", tracer_provider)
         version = importlib.metadata.version('chromadb')
 
-        for operation, details in APIS.items():
+        for operation, _ in APIS.items():
             wrap_function_wrapper(
                 'chromadb.api.models.Collection',
                 f'Collection.{operation.lower()}',
@@ -27,7 +33,7 @@ class ChromaInstrumentation(BaseInstrumentor):
             )
 
     def _instrument_module(self, module_name):
-        print(module_name)
+        pass
 
     def _uninstrument(self, **kwargs):
-        print(kwargs)
+        pass

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/instrumentation/chroma/patch.py

@@ -1,12 +1,18 @@
+"""
+This module contains the patching logic for the Chroma client.
+"""
 from langtrace.trace_attributes import DatabaseSpanAttributes
-from opentelemetry.trace import SpanKind, StatusCode
+from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
 
+from instrumentation.chroma.apis import APIS
 from instrumentation.constants import SERVICE_PROVIDERS
-from instrumentation.chroma.lib.apis import APIS
 
 
 def collection_patch(method, version, tracer):
+    """
+    A generic patch method that wraps a function with a span
+    """
     def traced_method(wrapped, instance, args, kwargs):
         api = APIS[method]
         service_provider = SERVICE_PROVIDERS['CHROMA']

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/instrumentation/constants.py

@@ -1,16 +1,11 @@
-
-TRACE_NAMESPACES = {
-    "OPENAI": "Langtrace OpenAI SDK",
-    "LANGCHAIN": "Langtrace Langchain SDK",
-    "PINECONE": "Langtrace Pinecone SDK",
-    "LLAMAINDEX": "Langtrace LlamaIndex SDK",
-    "CHROMA": "Langtrace Chroma SDK",
-}
-
+"""
+This file contains the constants used in the project.
+"""
 SERVICE_PROVIDERS = {
     "OPENAI": "OpenAI",
     "AZURE": "Azure",
     "LANGCHAIN": "Langchain",
+    "LANGCHAIN_CORE": "Langchain Core",
     "LANGCHAIN_COMMUNITY": "Langchain Community",
     "PINECONE": "Pinecone",
     "LLAMAINDEX": "LlamaIndex",

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/instrumentation/langchain_core/instrumentation.py

@@ -71,15 +71,21 @@ class LangchainCoreInstrumentation(BaseInstrumentor):
         version = importlib.metadata.version('langchain-core')
 
         exclude_methods = ['get_name', 'get_output_schema',
-                           'get_input_schema', 'get_graph', 'to_json']
-        exclude_classes = ['BaseChatPromptTemplate']
+                           'get_input_schema', 'get_graph', 'to_json',
+                           'to_json_not_implemented', 'bind',  'dict',
+                           'format', 'format_messages', 'format_prompt']
+        exclude_classes = ['BaseChatPromptTemplate', 'Runnable', 'RunnableBinding',
+                           'RunnableBindingBase', 'RunnableEach', 'RunnableEachBase',
+                           'RunnableGenerator', 'RunnablePick', 'RunnableMap',
+                           'RunnableSerializable']
+
         modules_to_patch = [
             ('langchain_core.retrievers', 'retriever',
              generic_patch, True, True),
-            ('langchain_core.prompts.chat', 'chatprompt',
-             generic_patch, True, False),
+            ('langchain_core.prompts.chat', 'prompt',
+             generic_patch, True, True),
             ('langchain_core.runnables.base',
-             'runnableparallel', runnable_patch, True, True),
+             'runnable', runnable_patch, True, True),
             ('langchain_core.runnables.passthrough',
              'runnablepassthrough', runnable_patch, True, True),
             ('langchain_core.output_parsers.string',

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/instrumentation/langchain_core/patch.py

@@ -22,7 +22,7 @@ def generic_patch(method_name, task, tracer, version, trace_output=True, trace_i
     """
 
     def traced_method(wrapped, instance, args, kwargs):
-        service_provider = SERVICE_PROVIDERS['LANGCHAIN']
+        service_provider = SERVICE_PROVIDERS['LANGCHAIN_CORE']
         span_attributes = {
             'langtrace.service.name': service_provider,
             'langtrace.service.type': 'framework',
@@ -32,7 +32,18 @@ def generic_patch(method_name, task, tracer, version, trace_output=True, trace_i
         }
 
         if len(args) > 0 and trace_input:
-            span_attributes['langchain.inputs'] = to_json_string(args)
+            inputs = {}
+            for arg in args:
+                if isinstance(arg, dict):
+                    for key, value in arg.items():
+                        if isinstance(value, list):
+                            for item in value:
+                                inputs[key] = item.__class__.__name__
+                        elif isinstance(value, str):
+                            inputs[key] = value
+                elif isinstance(arg, str):
+                    inputs['input'] = arg
+            span_attributes['langchain.inputs'] = to_json_string(inputs)
 
         attributes = FrameworkSpanAttributes(**span_attributes)
 
@@ -73,7 +84,7 @@ def runnable_patch(method_name, task, tracer, version, trace_output=True, trace_
     trace_input: Whether to trace the input of the patched methods.
     """
     def traced_method(wrapped, instance, args, kwargs):
-        service_provider = SERVICE_PROVIDERS['LANGCHAIN']
+        service_provider = SERVICE_PROVIDERS['LANGCHAIN_CORE']
         span_attributes = {
             'langtrace.service.name': service_provider,
             'langtrace.service.type': 'framework',
@@ -84,12 +95,17 @@ def runnable_patch(method_name, task, tracer, version, trace_output=True, trace_
 
         if trace_input:
             inputs = {}
-            args_list = []
             if len(args) > 0:
-                for value in args:
-                    if isinstance(value, str):
-                        args_list.append(value)
-            inputs['args'] = args_list
+                for arg in args:
+                    if isinstance(arg, dict):
+                        for key, value in arg.items():
+                            if isinstance(value, list):
+                                for item in value:
+                                    inputs[key] = item.__class__.__name__
+                            elif isinstance(value, str):
+                                inputs[key] = value
+                    elif isinstance(arg, str):
+                        inputs['input'] = arg
 
             for field, value in instance.steps.items() if hasattr(instance, "steps") and \
                     isinstance(instance.steps, dict) else {}:

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/instrumentation/llamaindex/instrumentation.py

@@ -1,3 +1,6 @@
+"""
+The LlamaindexInstrumentation class represents the LlamaIndex instrumentation
+"""
 import importlib.metadata
 from typing import Collection
 
@@ -8,12 +11,11 @@ from wrapt import wrap_function_wrapper
 
 from instrumentation.llamaindex.patch import generic_patch
 
-MODULES = [
-    "llama_index.core.query_pipeline.query",
-]
-
 
 class LlamaindexInstrumentation(BaseInstrumentor):
+    """
+    The LlamaindexInstrumentation class represents the LlamaIndex instrumentation
+    """
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return ["llama-index >= 0.10.0"]

{langtrace-python-sdk-1.0.9 → langtrace-python-sdk-1.0.11}/src/instrumentation/llamaindex/patch.py

@@ -1,11 +1,16 @@
+"""
+This module contains a generic patch method that wraps a function with a span.
+"""
 from langtrace.trace_attributes import FrameworkSpanAttributes
-from opentelemetry.trace import SpanKind, StatusCode
+from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
 
 from instrumentation.constants import SERVICE_PROVIDERS
 
 
 def generic_patch(method, task, tracer, version):
+    """
+    A generic patch method that wraps a function with a span"""
     def traced_method(wrapped, instance, args, kwargs):
         service_provider = SERVICE_PROVIDERS['LLAMAINDEX']
         span_attributes = {

{langtrace-python-sdk-1.0.9/src/instrumentation/openai/lib → langtrace-python-sdk-1.0.11/src/instrumentation/openai}/apis.py

@@ -1,3 +1,6 @@
+"""
+APIs to instrument OpenAI.
+"""
 from langtrace.trace_attributes import OpenAIMethods
 
 APIS = {

{langtrace-python-sdk-1.0.9/src/instrumentation/openai/lib → langtrace-python-sdk-1.0.11/src/instrumentation/openai}/constants.py

@@ -1,3 +1,6 @@
+"""
+Constants for OpenAI API"""
+
 OPENAI_COST_TABLE = {
     "gpt-4-0125-preview": {
         "input": 0.01,
@@ -28,3 +31,13 @@ OPENAI_COST_TABLE = {
         "output": 0.002,
     },
 }
+
+# TODO: Add more models
+# https://github.com/dqbd/tiktoken/blob/74c147e19584a3a1acea0c8e0da4d39415cd33e0/wasm/src/lib.rs#L328
+TIKTOKEN_MODEL_MAPPING = {
+    "gpt-4": "cl100k_base",
+    "gpt-4-32k": "cl100k_base",
+    "gpt-4-0125-preview": "cl100k_base",
+    "gpt-4-1106-preview": "cl100k_base",
+    "gpt-4-1106-vision-preview": "cl100k_base",
+}