langtrace-python-sdk 2.1.11__tar.gz → 2.1.13__tar.gz

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: langtrace-python-sdk
-Version: 2.1.11
+Version: 2.1.13
 Summary: Python SDK for LangTrace
 Project-URL: Homepage, https://github.com/Scale3-Labs/langtrace-python-sdk
 Author-email: Scale3 Labs <engineering@scale3labs.com>
@@ -19,7 +19,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>=4.0.4
+Requires-Dist: trace-attributes==4.0.5
 Provides-Extra: dev
 Requires-Dist: anthropic; extra == 'dev'
 Requires-Dist: chromadb; extra == 'dev'

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/pyproject.toml

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

langtrace_python_sdk-2.1.13/src/examples/openai_example/images_edit.py

@@ -0,0 +1,40 @@
+from dotenv import find_dotenv, load_dotenv
+from openai import OpenAI
+
+from langtrace_python_sdk import langtrace
+
+# from PIL import Image
+
+
+_ = load_dotenv(find_dotenv())
+
+langtrace.init(write_spans_to_console=True)
+
+
+client = OpenAI()
+
+
+# use this to convert the image to RGBA
+# def convert_to_rgba():
+#     Image.open("./resources/image.png").convert("RGBA").save("./resources/image_with_alpha.png")
+
+
+def image_edit():
+
+    response = client.images.edit(
+        model="dall-e-2",
+        image=open("./resources/lounge_flamingo.png", "rb"),
+        mask=open("./resources/mask.png", "rb"),
+        prompt="A sunlit indoor lounge area with a pool and duck standing in side with flamingo.",
+        n=1,
+        size="1024x1024",
+        response_format="url",
+    )
+
+    image_url = response.data[0].url
+    print(image_url)
+    print(response)
+
+
+image_edit()
+# convert_to_rgba()

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/src/langtrace_python_sdk/constants/instrumentation/openai.py

@@ -40,6 +40,10 @@ APIS = {
         "METHOD": OpenAIMethods.IMAGES_GENERATION.value,
         "ENDPOINT": "/images/generations",
     },
+    "IMAGES_EDIT": {
+        "METHOD": OpenAIMethods.IMAGES_EDIT.value,
+        "ENDPOINT": "/images/edits",
+    },
     "EMBEDDINGS_CREATE": {
         "METHOD": OpenAIMethods.EMBEDDINGS_CREATE.value,
         "ENDPOINT": "/embeddings",

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/src/langtrace_python_sdk/extensions/langtrace_exporter.py

@@ -48,14 +48,19 @@ class LangTraceExporter(SpanExporter):
     """
 
     api_key: str
+    api_host: str
 
     def __init__(
         self,
+        api_host,
         api_key: str = None,
-        api_host: typing.Optional[str] = None,
     ) -> None:
         self.api_key = api_key or os.environ.get("LANGTRACE_API_KEY")
-        self.api_host: str = api_host or LANGTRACE_REMOTE_URL
+        self.api_host = (
+            f"{LANGTRACE_REMOTE_URL}/api/trace"
+            if api_host == LANGTRACE_REMOTE_URL
+            else api_host
+        )
 
     def export(self, spans: typing.Sequence[ReadableSpan]) -> SpanExportResult:
         """
@@ -90,7 +95,7 @@ class LangTraceExporter(SpanExporter):
         # Send data to remote URL
         try:
             response = requests.post(
-                url=f"{self.api_host}/api/trace",
+                url=f"{self.api_host}",
                 data=json.dumps(data),
                 headers={"Content-Type": "application/json", "x-api-key": self.api_key},
                 timeout=20,

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/src/langtrace_python_sdk/instrumentation/openai/instrumentation.py

@@ -28,6 +28,7 @@ from langtrace_python_sdk.instrumentation.openai.patch import (
     async_images_generate,
     chat_completions_create,
     embeddings_create,
+    images_edit,
     images_generate,
 )
 
@@ -37,7 +38,7 @@ logging.basicConfig(level=logging.FATAL)
 class OpenAIInstrumentation(BaseInstrumentor):
 
     def instrumentation_dependencies(self) -> Collection[str]:
-        return ["openai >= 0.27.0"]
+        return ["openai >= 0.27.0", "trace-attributes >= 4.0.5"]
 
     def _instrument(self, **kwargs):
         tracer_provider = kwargs.get("tracer_provider")
@@ -69,6 +70,13 @@ class OpenAIInstrumentation(BaseInstrumentor):
             "AsyncImages.generate",
             async_images_generate("openai.images.generate", version, tracer),
         )
+
+        wrap_function_wrapper(
+            "openai.resources.images",
+            "Images.edit",
+            images_edit("openai.images.edit", version, tracer),
+        )
+
         wrap_function_wrapper(
             "openai.resources.embeddings",
             "Embeddings.create",

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/src/langtrace_python_sdk/instrumentation/openai/patch.py

@@ -16,20 +16,19 @@ limitations under the License.
 
 import json
 
+from importlib_metadata import version as v
 from langtrace.trace_attributes import Event, LLMSpanAttributes
 from opentelemetry import baggage
 from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
 
+from langtrace_python_sdk.constants import LANGTRACE_SDK_NAME
 from langtrace_python_sdk.constants.instrumentation.common import (
     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 importlib_metadata import version as v
-
-from langtrace_python_sdk.constants import LANGTRACE_SDK_NAME
 
 
 def images_generate(original_method, version, tracer):
@@ -187,6 +186,89 @@ def async_images_generate(original_method, version, tracer):
     return traced_method
 
 
+def images_edit(original_method, version, tracer):
+    """
+    Wrap the `edit` method of the `Images` class to trace it.
+    """
+
+    def traced_method(wrapped, instance, args, kwargs):
+        base_url = (
+            str(instance._client._base_url)
+            if hasattr(instance, "_client") and hasattr(instance._client, "_base_url")
+            else ""
+        )
+        service_provider = SERVICE_PROVIDERS["OPENAI"]
+        extra_attributes = baggage.get_baggage(LANGTRACE_ADDITIONAL_SPAN_ATTRIBUTES_KEY)
+
+        span_attributes = {
+            "langtrace.sdk.name": "langtrace-python-sdk",
+            "langtrace.service.name": service_provider,
+            "langtrace.service.type": "llm",
+            "langtrace.service.version": version,
+            "langtrace.version": v(LANGTRACE_SDK_NAME),
+            "url.full": base_url,
+            "llm.api": APIS["IMAGES_EDIT"]["ENDPOINT"],
+            "llm.model": kwargs.get("model"),
+            "llm.response_format": kwargs.get("response_format"),
+            "llm.image.size": kwargs.get("size"),
+            "llm.prompts": json.dumps(
+                [
+                    {
+                        "role": kwargs.get("user", "user"),
+                        "content": kwargs.get("prompt", []),
+                    }
+                ]
+            ),
+            "llm.top_k": kwargs.get("n"),
+            **(extra_attributes if extra_attributes is not None else {}),
+        }
+
+        attributes = LLMSpanAttributes(**span_attributes)
+
+        with tracer.start_as_current_span(
+            APIS["IMAGES_EDIT"]["METHOD"], kind=SpanKind.CLIENT
+        ) as span:
+            for field, value in attributes.model_dump(by_alias=True).items():
+                if value is not None:
+                    span.set_attribute(field, value)
+            try:
+                # Attempt to call the original method
+                result = wrapped(*args, **kwargs)
+
+                response = []
+                # Parse each image object
+                for each_data in result.data:
+                    response.append(
+                        {
+                            "role": "assistant",
+                            "content": {
+                                "url": each_data.url,
+                                "revised_prompt": each_data.revised_prompt,
+                                "base64": each_data.b64_json,
+                            },
+                        }
+                    )
+
+                span.add_event(
+                    name="response",
+                    attributes={"llm.responses": json.dumps(response)},
+                )
+
+                span.set_status(StatusCode.OK)
+                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 chat_completions_create(original_method, version, tracer):
     """Wrap the `create` method of the `ChatCompletion` class to trace it."""
 

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/src/langtrace_python_sdk/langtrace.py

@@ -16,6 +16,9 @@ limitations under the License.
 
 from typing import Optional
 
+from langtrace_python_sdk.constants.exporter.langtrace_exporter import (
+    LANGTRACE_REMOTE_URL,
+)
 from langtrace_python_sdk.types import DisableInstrumentations, InstrumentationType
 from opentelemetry import trace
 from opentelemetry.sdk.trace import TracerProvider
@@ -46,6 +49,7 @@ from langtrace_python_sdk.instrumentation import (
 from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
 from colorama import Fore
 from langtrace_python_sdk.utils import check_if_sdk_is_outdated
+import os
 
 
 def init(
@@ -53,15 +57,19 @@ def init(
     batch: bool = True,
     write_spans_to_console: bool = False,
     custom_remote_exporter=None,
-    api_host: Optional[str] = None,
+    api_host: Optional[str] = LANGTRACE_REMOTE_URL,
     disable_instrumentations: Optional[DisableInstrumentations] = None,
 ):
+
+    host = (
+        os.environ.get("LANGTRACE_API_HOST", None) or api_host or LANGTRACE_REMOTE_URL
+    )
     check_if_sdk_is_outdated()
     print(Fore.GREEN + "Initializing Langtrace SDK.." + Fore.RESET)
     provider = TracerProvider(resource=Resource.create({"service.name": sys.argv[0]}))
 
     remote_write_exporter = (
-        LangTraceExporter(api_key=api_key, api_host=api_host)
+        LangTraceExporter(api_key=api_key, api_host=host)
         if custom_remote_exporter is None
         else custom_remote_exporter
     )
@@ -70,6 +78,7 @@ def init(
     simple_processor_remote = SimpleSpanProcessor(remote_write_exporter)
     simple_processor_console = SimpleSpanProcessor(console_exporter)
 
+    os.environ["LANGTRACE_API_HOST"] = host.replace("/api/trace", "")
     # Initialize tracer
     trace.set_tracer_provider(provider)
     all_instrumentations = {
@@ -101,8 +110,8 @@ def init(
         else:
             provider.add_span_processor(simple_processor_remote)
 
-    elif api_host is not None:
-        print(Fore.BLUE + f"Exporting spans to custom host: {api_host}.." + Fore.RESET)
+    elif host != LANGTRACE_REMOTE_URL:
+        print(Fore.BLUE + f"Exporting spans to custom host: {host}.." + Fore.RESET)
         if batch:
             provider.add_span_processor(batch_processor_remote)
         else:

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/src/langtrace_python_sdk/utils/prompt_registry.py

@@ -1,7 +1,4 @@
 import os
-from langtrace_python_sdk.constants.exporter.langtrace_exporter import (
-    LANGTRACE_REMOTE_URL,
-)
 import requests
 from urllib.parse import urlencode
 from typing import Optional, TypedDict, Dict, List
@@ -59,7 +56,7 @@ def get_prompt_from_registry(
         print(query_params)
         # Make the GET request to the API
         response = requests.get(
-            f"{LANGTRACE_REMOTE_URL}/api/promptset?{query_string}",
+            f"{os.environ['LANGTRACE_API_HOST']}/api/promptset?{query_string}",
             headers=headers,
             timeout=None,
         )

{langtrace_python_sdk-2.1.11 → langtrace_python_sdk-2.1.13}/src/langtrace_python_sdk/utils/with_root_span.py

@@ -118,9 +118,7 @@ class SendUserFeedback:
     _langtrace_api_key: str
 
     def __init__(self):
-        self._langtrace_host = os.environ.get(
-            "LANGTRACE_API_HOST", LANGTRACE_REMOTE_URL
-        )
+        self._langtrace_host = os.environ["LANGTRACE_API_HOST"]
         self._langtrace_api_key = os.environ.get("LANGTRACE_API_KEY", None)
 
     def evaluate(self, data: EvaluationAPIData) -> None:
@@ -137,6 +135,7 @@ class SendUserFeedback:
             headers = {"x-api-key": self._langtrace_api_key}
             if evaluation is not None:
                 # Make a PUT request to update the evaluation
+                print(Fore.BLUE + "Updating Feedback.." + Fore.RESET)
                 response = requests.put(
                     f"{self._langtrace_host}/api/evaluation",
                     json=data,
@@ -147,6 +146,7 @@ class SendUserFeedback:
                 response.raise_for_status()
 
             else:
+                print(Fore.BLUE + "Sending User Feedback.." + Fore.RESET)
                 # Make a POST request to create a new evaluation
                 response = requests.post(
                     f"{self._langtrace_host}/api/evaluation",

langtrace_python_sdk-2.1.13/src/langtrace_python_sdk/version.py

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

langtrace_python_sdk-2.1.11/src/langtrace_python_sdk/version.py

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