langtrace-python-sdk 1.3.6__py3-none-any.whl → 2.0.0__py3-none-any.whl

langtrace_python_sdk/instrumentation/langchain_core/instrumentation.py

@@ -1,5 +1,17 @@
 """
-Instrumentation for langchain-core.
+Copyright (c) 2024 Scale3 Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 """
 
 import importlib.metadata
@@ -11,9 +23,7 @@ from opentelemetry.trace import get_tracer
 from wrapt import wrap_function_wrapper
 
 from langtrace_python_sdk.instrumentation.langchain_core.patch import (
-    generic_patch,
-    runnable_patch,
-)
+    generic_patch, runnable_patch)
 
 
 # pylint: disable=dangerous-default-value

langtrace_python_sdk/instrumentation/langchain_core/patch.py

@@ -1,5 +1,17 @@
 """
-This module contains the patching functions for the langchain_core package.
+Copyright (c) 2024 Scale3 Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 """
 
 import json
@@ -68,12 +80,12 @@ def generic_patch(
 
                 span.set_status(StatusCode.OK)
                 return result
-            except Exception as e:
+            except Exception as err:
                 # Record the exception in the span
-                span.record_exception(e)
+                span.record_exception(err)
 
                 # Set the span status to indicate an error
-                span.set_status(Status(StatusCode.ERROR, str(e)))
+                span.set_status(Status(StatusCode.ERROR, str(err)))
 
                 # Reraise the exception to ensure it's not swallowed
                 raise
@@ -157,12 +169,12 @@ def runnable_patch(
 
                 span.set_status(StatusCode.OK)
                 return result
-            except Exception as e:
+            except Exception as err:
                 # Record the exception in the span
-                span.record_exception(e)
+                span.record_exception(err)
 
                 # Set the span status to indicate an error
-                span.set_status(Status(StatusCode.ERROR, str(e)))
+                span.set_status(Status(StatusCode.ERROR, str(err)))
 
                 # Reraise the exception to ensure it's not swallowed
                 raise

langtrace_python_sdk/instrumentation/llamaindex/instrumentation.py

@@ -1,25 +1,29 @@
 """
-The LlamaindexInstrumentation class represents the LlamaIndex instrumentation
+Copyright (c) 2024 Scale3 Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 """
 
 import importlib.metadata
 import inspect
+import logging
 from typing import Collection
 
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.trace import get_tracer
 from wrapt import wrap_function_wrapper
 
-from langtrace_python_sdk.instrumentation.llamaindex.patch import (
-    generic_patch,
-    async_generic_patch,
-)
-
-import logging
-
-logging.basicConfig(level=logging.FATAL)
-
-import logging
+from langtrace_python_sdk.instrumentation.llamaindex.patch import generic_patch
 
 logging.basicConfig(level=logging.FATAL)
 

langtrace_python_sdk/instrumentation/llamaindex/patch.py

@@ -1,5 +1,17 @@
 """
-This module contains a generic patch method that wraps a function with a span.
+Copyright (c) 2024 Scale3 Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 """
 
 from langtrace.trace_attributes import FrameworkSpanAttributes
@@ -8,9 +20,7 @@ from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
 
 from langtrace_python_sdk.constants.instrumentation.common import (
-    LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY,
-    SERVICE_PROVIDERS,
-)
+    LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY, SERVICE_PROVIDERS)
 
 
 def generic_patch(method, task, tracer, version):
@@ -42,12 +52,12 @@ def generic_patch(method, task, tracer, version):
                 result = wrapped(*args, **kwargs)
                 span.set_status(StatusCode.OK)
                 return result
-            except Exception as e:
+            except Exception as err:
                 # Record the exception in the span
-                span.record_exception(e)
+                span.record_exception(err)
 
                 # Set the span status to indicate an error
-                span.set_status(Status(StatusCode.ERROR, str(e)))
+                span.set_status(Status(StatusCode.ERROR, str(err)))
 
                 # Reraise the exception to ensure it's not swallowed
                 raise
@@ -84,12 +94,12 @@ def async_generic_patch(method, task, tracer, version):
                 result = await wrapped(*args, **kwargs)
                 span.set_status(StatusCode.OK)
                 return result
-            except Exception as e:
+            except Exception as err:
                 # Record the exception in the span
-                span.record_exception(e)
+                span.record_exception(err)
 
                 # Set the span status to indicate an error
-                span.set_status(Status(StatusCode.ERROR, str(e)))
+                span.set_status(Status(StatusCode.ERROR, str(err)))
 
                 # Reraise the exception to ensure it's not swallowed
                 raise

langtrace_python_sdk/instrumentation/openai/instrumentation.py

@@ -1,4 +1,21 @@
+"""
+Copyright (c) 2024 Scale3 Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
 import importlib.metadata
+import logging
 from typing import Collection
 
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
@@ -6,15 +23,9 @@ from opentelemetry.trace import get_tracer
 from wrapt import wrap_function_wrapper
 
 from langtrace_python_sdk.instrumentation.openai.patch import (
-    async_embeddings_create,
-    async_images_generate,
-    chat_completions_create,
-    embeddings_create,
-    images_generate,
-    async_chat_completions_create,
-)
-
-import logging
+    async_chat_completions_create, async_embeddings_create,
+    async_images_generate, chat_completions_create, embeddings_create,
+    images_generate)
 
 logging.basicConfig(level=logging.FATAL)
 

langtrace_python_sdk/instrumentation/openai/patch.py

@@ -1,19 +1,31 @@
 """
-This module contains the patching logic for the OpenAI library."""
+Copyright (c) 2024 Scale3 Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
 
 import json
 
 from langtrace.trace_attributes import Event, LLMSpanAttributes
-from opentelemetry import baggage, trace
+from opentelemetry import baggage
 from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
 
 from langtrace_python_sdk.constants.instrumentation.common import (
-    LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY,
-    SERVICE_PROVIDERS,
-)
+    LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY, SERVICE_PROVIDERS)
 from langtrace_python_sdk.constants.instrumentation.openai import APIS
-from langtrace_python_sdk.utils.llm import calculate_prompt_tokens, estimate_tokens
+from langtrace_python_sdk.utils.llm import (calculate_prompt_tokens,
+                                            estimate_tokens)
 
 
 def images_generate(original_method, version, tracer):
@@ -40,7 +52,7 @@ def images_generate(original_method, version, tracer):
             "llm.api": APIS["IMAGES_GENERATION"]["ENDPOINT"],
             "llm.model": kwargs.get("model"),
             "llm.stream": kwargs.get("stream"),
-            "llm.prompts": json.dumps([kwargs.get("prompt", [])]),
+            "llm.prompts": json.dumps([{"role": "user", "content": kwargs.get("prompt", [])}]),
             **(extra_attributes if extra_attributes is not None else {}),
         }
 
@@ -63,12 +75,15 @@ def images_generate(original_method, version, tracer):
                     )
                     response = [
                         {
-                            "url": data.url if hasattr(data, "url") else "",
-                            "revised_prompt": (
-                                data.revised_prompt
-                                if hasattr(data, "revised_prompt")
-                                else ""
-                            ),
+                            "role": "assistant",
+                            "content": {
+                                "url": data.url if hasattr(data, "url") else "",
+                                "revised_prompt": (
+                                    data.revised_prompt
+                                    if hasattr(data, "revised_prompt")
+                                    else ""
+                                ),
+                            }
                         }
                     ]
                     span.set_attribute("llm.responses", json.dumps(response))
@@ -112,7 +127,7 @@ def async_images_generate(original_method, version, tracer):
             "llm.api": APIS["IMAGES_GENERATION"]["ENDPOINT"],
             "llm.model": kwargs.get("model"),
             "llm.stream": kwargs.get("stream"),
-            "llm.prompts": json.dumps([kwargs.get("prompt", [])]),
+            "llm.prompts": json.dumps([{"role": "user", "content": kwargs.get("prompt", [])}]),
             **(extra_attributes if extra_attributes is not None else {}),
         }
 
@@ -136,12 +151,15 @@ def async_images_generate(original_method, version, tracer):
                     )
                     response = [
                         {
-                            "url": data.url if hasattr(data, "url") else "",
-                            "revised_prompt": (
-                                data.revised_prompt
-                                if hasattr(data, "revised_prompt")
-                                else ""
-                            ),
+                            "role": "assistant",
+                            "content": {
+                                "url": data.url if hasattr(data, "url") else "",
+                                "revised_prompt": (
+                                    data.revised_prompt
+                                    if hasattr(data, "revised_prompt")
+                                    else ""
+                                ),
+                            }
                         }
                     ]
                     span.set_attribute("llm.responses", json.dumps(response))
@@ -230,7 +248,8 @@ def chat_completions_create(original_method, version, tracer):
         if kwargs.get("user") is not None:
             attributes.llm_user = kwargs.get("user")
         if kwargs.get("functions") is not None:
-            tools.append(json.dumps(kwargs.get("functions")))
+            for function in kwargs.get("functions"):
+                tools.append(json.dumps({"type": "function", "function": function}))
         if kwargs.get("tools") is not None:
             tools.append(json.dumps(kwargs.get("tools")))
         if len(tools) > 0:
@@ -253,25 +272,22 @@ def chat_completions_create(original_method, version, tracer):
                 if hasattr(result, "choices") and result.choices is not None:
                     responses = [
                         {
-                            "message": {
-                                "role": (
-                                    choice.message.role
-                                    if choice.message and choice.message.role
-                                    else "assistant"
-                                ),
-                                "content": extract_content(choice),
-                                **(
-                                    {
-                                        "content_filter_results": choice[
-                                            "content_filter_results"
-                                        ]
-                                    }
-                                    if "content_filter_results" in choice
-                                    else {}
-                                ),
-                            }
-                        }
-                        for choice in result.choices
+                            "role": (
+                                choice.message.role
+                                if choice.message and choice.message.role
+                                else "assistant"
+                            ),
+                            "content": extract_content(choice),
+                            **(
+                                {
+                                    "content_filter_results": choice[
+                                        "content_filter_results"
+                                    ]
+                                }
+                                if "content_filter_results" in choice
+                                else {}
+                            ),
+                        } for choice in result.choices
                     ]
                     span.set_attribute("llm.responses", json.dumps(responses))
                 else:
@@ -348,7 +364,7 @@ def chat_completions_create(original_method, version, tracer):
                         for choice in chunk.choices:
                             if (
                                 choice.delta
-                                and choice.delta.function_call
+                                and choice.delta.function_call is not None
                                 and choice.delta.function_call.arguments is not None
                             ):
                                 token_counts = estimate_tokens(
@@ -357,10 +373,20 @@ def chat_completions_create(original_method, version, tracer):
                                 completion_tokens += token_counts
                                 content = [choice.delta.function_call.arguments]
                     elif tool_calls:
-                        # TODO(Karthik): Tool calls streaming is tricky. The chunks after the
-                        # first one are missing the function name and id though the arguments
-                        # are spread across the chunks.
-                        content = []
+                        for choice in chunk.choices:
+                            tool_call = ""
+                            if (choice.delta and choice.delta.tool_calls is not None):
+                                toolcalls = choice.delta.tool_calls
+                                content = []
+                                for tool_call in toolcalls:
+                                    if tool_call and tool_call.function is not None and tool_call.function.arguments is not None:
+                                        token_counts = estimate_tokens(
+                                            tool_call.function.arguments
+                                        )
+                                        completion_tokens += token_counts
+                                        content = content + [tool_call.function.arguments]
+                                    else:
+                                        content = content + []
                 else:
                     content = []
                 span.add_event(
@@ -393,10 +419,8 @@ def chat_completions_create(original_method, version, tracer):
                 json.dumps(
                     [
                         {
-                            "message": {
-                                "role": "assistant",
-                                "content": "".join(result_content),
-                            }
+                            "role": "assistant",
+                            "content": "".join(result_content),
                         }
                     ]
                 ),
@@ -477,7 +501,8 @@ def async_chat_completions_create(original_method, version, tracer):
         if kwargs.get("user") is not None:
             attributes.llm_user = kwargs.get("user")
         if kwargs.get("functions") is not None:
-            tools.append(json.dumps(kwargs.get("functions")))
+            for function in kwargs.get("functions"):
+                tools.append(json.dumps({"type": "function", "function": function}))
         if kwargs.get("tools") is not None:
             tools.append(json.dumps(kwargs.get("tools")))
         if len(tools) > 0:
@@ -500,25 +525,22 @@ def async_chat_completions_create(original_method, version, tracer):
                 if hasattr(result, "choices") and result.choices is not None:
                     responses = [
                         {
-                            "message": {
-                                "role": (
-                                    choice.message.role
-                                    if choice.message and choice.message.role
-                                    else "assistant"
-                                ),
-                                "content": extract_content(choice),
-                                **(
-                                    {
-                                        "content_filter_results": choice[
-                                            "content_filter_results"
-                                        ]
-                                    }
-                                    if "content_filter_results" in choice
-                                    else {}
-                                ),
-                            }
-                        }
-                        for choice in result.choices
+                            "role": (
+                                choice.message.role
+                                if choice.message and choice.message.role
+                                else "assistant"
+                            ),
+                            "content": extract_content(choice),
+                            **(
+                                {
+                                    "content_filter_results": choice[
+                                        "content_filter_results"
+                                    ]
+                                }
+                                if "content_filter_results" in choice
+                                else {}
+                            ),
+                        } for choice in result.choices
                     ]
                     span.set_attribute("llm.responses", json.dumps(responses))
                 else:
@@ -604,10 +626,20 @@ def async_chat_completions_create(original_method, version, tracer):
                                 completion_tokens += token_counts
                                 content = [choice.delta.function_call.arguments]
                     elif tool_calls:
-                        # TODO(Karthik): Tool calls streaming is tricky. The chunks after the
-                        # first one are missing the function name and id though the arguments
-                        # are spread across the chunks.
-                        content = []
+                        for choice in chunk.choices:
+                            tool_call = ""
+                            if (choice.delta and choice.delta.tool_calls is not None):
+                                toolcalls = choice.delta.tool_calls
+                                content = []
+                                for tool_call in toolcalls:
+                                    if tool_call and tool_call.function is not None and tool_call.function.arguments is not None:
+                                        token_counts = estimate_tokens(
+                                            tool_call.function.arguments
+                                        )
+                                        completion_tokens += token_counts
+                                        content = content + [tool_call.function.arguments]
+                                    else:
+                                        content = content + []
                 else:
                     content = []
                 span.add_event(
@@ -640,10 +672,8 @@ def async_chat_completions_create(original_method, version, tracer):
                 json.dumps(
                     [
                         {
-                            "message": {
-                                "role": "assistant",
-                                "content": "".join(result_content),
-                            }
+                            "role": "assistant",
+                            "content": "".join(result_content),
                         }
                     ]
                 ),
@@ -680,9 +710,13 @@ def embeddings_create(original_method, version, tracer):
             "llm.api": APIS["EMBEDDINGS_CREATE"]["ENDPOINT"],
             "llm.model": kwargs.get("model"),
             "llm.prompts": "",
+            "llm.embedding_inputs": json.dumps([kwargs.get("input", "")]),
             **(extra_attributes if extra_attributes is not None else {}),
         }
 
+        if kwargs.get("encoding_format") is not None:
+            span_attributes["llm.encoding_format"] = json.dumps([kwargs.get("encoding_format")])
+
         attributes = LLMSpanAttributes(**span_attributes)
         kwargs.get("encoding_format")
 
@@ -742,7 +776,7 @@ def async_embeddings_create(original_method, version, tracer):
             "url.full": base_url,
             "llm.api": APIS["EMBEDDINGS_CREATE"]["ENDPOINT"],
             "llm.model": kwargs.get("model"),
-            "llm.prompts": "",
+            "llm.prompts": json.dumps([{"role": "user", "content": kwargs.get("input", "")}]),
             **(extra_attributes if extra_attributes is not None else {}),
         }
 

langtrace_python_sdk/instrumentation/pinecone/instrumentation.py

@@ -1,8 +1,21 @@
 """
-Pinecone instrumentation
+Copyright (c) 2024 Scale3 Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 """
 
 import importlib.metadata
+import logging
 from typing import Collection
 
 import pinecone
@@ -14,8 +27,6 @@ from wrapt import wrap_function_wrapper
 from langtrace_python_sdk.constants.instrumentation.pinecone import APIS
 from langtrace_python_sdk.instrumentation.pinecone.patch import generic_patch
 
-import logging
-
 logging.basicConfig(level=logging.FATAL)
 
 

langtrace_python_sdk/instrumentation/pinecone/patch.py

@@ -1,5 +1,18 @@
 """
-This module contains the patching logic for the Pinecone client."""
+Copyright (c) 2024 Scale3 Labs
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
 
 from langtrace.trace_attributes import DatabaseSpanAttributes
 from opentelemetry import baggage
@@ -42,12 +55,12 @@ def generic_patch(original_method, method, version, tracer):
                 result = original_method(instance, *args, **kwargs)
                 span.set_status(StatusCode.OK)
                 return result
-            except Exception as e:
+            except Exception as err:
                 # Record the exception in the span
-                span.record_exception(e)
+                span.record_exception(err)
 
                 # Set the span status to indicate an error
-                span.set_status(Status(StatusCode.ERROR, str(e)))
+                span.set_status(Status(StatusCode.ERROR, str(err)))
 
                 # Reraise the exception to ensure it's not swallowed
                 raise