langtrace-python-sdk 2.1.29__py3-none-any.whl → 2.2.1__py3-none-any.whl

tests/groq/conftest.py

@@ -0,0 +1,33 @@
+import os
+import pytest
+
+from groq import Groq, AsyncGroq
+from langtrace_python_sdk.instrumentation import GroqInstrumentation
+from dotenv import load_dotenv
+
+load_dotenv()
+
+
+@pytest.fixture(autouse=True)
+def environment():
+    os.environ["GROQ_API_KEY"] = "test_api_key"
+
+
+@pytest.fixture
+def groq_client():
+    return Groq()
+
+
+@pytest.fixture
+def async_groq_client():
+    return AsyncGroq()
+
+
+@pytest.fixture(scope="module")
+def vcr_config():
+    return {"filter_headers": ["authorization", "api-key"]}
+
+
+@pytest.fixture(scope="session", autouse=True)
+def instrument():
+    GroqInstrumentation().instrument()

tests/groq/test_groq.py

@@ -0,0 +1,142 @@
+from langtrace_python_sdk.constants import LANGTRACE_SDK_NAME
+from langtrace_python_sdk.constants.instrumentation.groq import APIS
+import pytest
+from langtrace.trace_attributes import SpanAttributes
+from importlib_metadata import version as v
+from tests.utils import (
+    assert_completion_in_events,
+    assert_prompt_in_events,
+    assert_response_format,
+    assert_token_count,
+)
+
+
+@pytest.mark.vcr
+def test_chat_completion(exporter, groq_client):
+    chat_completion = groq_client.chat.completions.create(
+        messages=[
+            {
+                "role": "user",
+                "content": "Explain the importance of low latency LLMs",
+            }
+        ],
+        model="llama3-8b-8192",
+    )
+
+    spans = exporter.get_finished_spans()
+    groq_span = spans[-1]
+
+    assert groq_span.name == "groq.chat.completions.create"
+    attributes = groq_span.attributes
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == LANGTRACE_SDK_NAME
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "Groq"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("groq")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v(LANGTRACE_SDK_NAME)
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.groq.com"
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["CHAT_COMPLETION"]["ENDPOINT"]
+    )
+    assert_token_count(attributes)
+    assert_prompt_in_events(groq_span.events)
+    assert_completion_in_events(groq_span.events)
+
+
+@pytest.mark.vcr()
+@pytest.mark.asyncio()
+async def test_async_chat_completion(exporter, async_groq_client):
+    chat_completion = await async_groq_client.chat.completions.create(
+        messages=[
+            {
+                "role": "user",
+                "content": "Explain the importance of low latency LLMs",
+            }
+        ],
+        model="llama3-8b-8192",
+    )
+    spans = exporter.get_finished_spans()
+    groq_span = spans[-1]
+
+    assert groq_span.name == "groq.chat.completions.create"
+    attributes = groq_span.attributes
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == LANGTRACE_SDK_NAME
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "Groq"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("groq")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v(LANGTRACE_SDK_NAME)
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.groq.com"
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["CHAT_COMPLETION"]["ENDPOINT"]
+    )
+    assert_token_count(attributes)
+    assert_prompt_in_events(groq_span.events)
+    assert_completion_in_events(groq_span.events)
+
+
+@pytest.mark.vcr()
+def test_chat_completion_streaming(exporter, groq_client):
+    chat_completion = groq_client.chat.completions.create(
+        messages=[
+            {
+                "role": "user",
+                "content": "Explain the importance of low latency LLMs",
+            }
+        ],
+        stream=True,
+        model="llama3-8b-8192",
+    )
+
+    for _ in chat_completion:
+        pass
+
+    spans = exporter.get_finished_spans()
+    groq_span = spans[-1]
+    assert groq_span.name == "groq.chat.completions.create"
+    attributes = groq_span.attributes
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == LANGTRACE_SDK_NAME
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "Groq"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("groq")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v(LANGTRACE_SDK_NAME)
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.groq.com"
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["CHAT_COMPLETION"]["ENDPOINT"]
+    )
+
+    assert_token_count(attributes)
+    assert_completion_in_events(groq_span.events)
+
+
+@pytest.mark.vcr()
+@pytest.mark.asyncio()
+async def test_async_chat_completion_streaming(async_groq_client, exporter):
+    chat_completion = await async_groq_client.chat.completions.create(
+        messages=[
+            {
+                "role": "user",
+                "content": "Explain the importance of low latency LLMs",
+            }
+        ],
+        stream=True,
+        model="llama3-8b-8192",
+    )
+
+    async for _ in chat_completion:
+        pass
+
+    spans = exporter.get_finished_spans()
+    groq_span = spans[-1]
+    assert groq_span.name == "groq.chat.completions.create"
+    attributes = groq_span.attributes
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == LANGTRACE_SDK_NAME
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "Groq"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("groq")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v(LANGTRACE_SDK_NAME)
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.groq.com"
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["CHAT_COMPLETION"]["ENDPOINT"]
+    )
+
+    assert_token_count(attributes)
+    assert_completion_in_events(groq_span.events)

tests/openai/cassettes/test_async_chat_completion_streaming.yaml

@@ -6,7 +6,7 @@ interactions:
       accept:
       - application/json
       accept-encoding:
-      - gzip, deflate
+      - gzip, deflate, br
       connection:
       - keep-alive
       content-length:
@@ -35,66 +35,66 @@ interactions:
     uri: https://api.openai.com/v1/chat/completions
   response:
     body:
-      string: 'data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"role":"assistant","content":""},"logprobs":null,"finish_reason":null}]}
+      string: 'data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"role":"assistant","content":""},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"This"},"logprobs":null,"finish_reason":null}]}
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"This"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         is"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         a"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         test"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"."},"logprobs":null,"finish_reason":null}]}
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"."},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         This"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         is"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         a"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         test"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"."},"logprobs":null,"finish_reason":null}]}
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"."},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         This"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         is"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         a"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"
         test"},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"."},"logprobs":null,"finish_reason":null}]}
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{"content":"."},"logprobs":null,"finish_reason":null}]}
 
 
-        data: {"id":"chatcmpl-9deeLdQVwFn9pGfxPrHrnGhzMINed","object":"chat.completion.chunk","created":1719238077,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{},"logprobs":null,"finish_reason":"stop"}]}
+        data: {"id":"chatcmpl-9eMqF91g3NE1pyxZvquq7cplPnrXE","object":"chat.completion.chunk","created":1719407951,"model":"gpt-4-0613","system_fingerprint":null,"choices":[{"index":0,"delta":{},"logprobs":null,"finish_reason":"stop"}]}
 
 
         data: [DONE]
@@ -105,20 +105,20 @@ interactions:
       CF-Cache-Status:
       - DYNAMIC
       CF-RAY:
-      - 898d497cff180da3-MRS
+      - 899d7cd0ed680db9-MRS
       Connection:
       - keep-alive
       Content-Type:
       - text/event-stream; charset=utf-8
       Date:
-      - Mon, 24 Jun 2024 14:07:57 GMT
+      - Wed, 26 Jun 2024 13:19:12 GMT
       Server:
       - cloudflare
       Set-Cookie:
-      - __cf_bm=9.DjXDRH6yqveelPQR44ZtyVUYJzgnA0G.nzqFBokzU-1719238077-1.0.1.1-aMCvEWGLFuE6ItsOru0NDaEtwnP4gVQChxLODAqfb5jmClZJa8lKqg.tNgoeMSGnxhnih1YJRhw2gq02fThn1g;
-        path=/; expires=Mon, 24-Jun-24 14:37:57 GMT; domain=.api.openai.com; HttpOnly;
+      - __cf_bm=Koulk3jjfKTtiwmlpNUH5Uye51Zphg2V.pD_ZnQF2ZE-1719407952-1.0.1.1-1_bGj0x07cc6IT0NHiXCIjjTnk5qDAJ.123pg_4.g85iZakVAGtWPnz7bbLr8y8IBPOXwA7X5KnPl67mbAHuFQ;
+        path=/; expires=Wed, 26-Jun-24 13:49:12 GMT; domain=.api.openai.com; HttpOnly;
         Secure; SameSite=None
-      - _cfuvid=O9yzYcvRGvChbCerFoeKPvIqX_jwhxHPRVMMxoF4wLY-1719238077679-0.0.1.1-604800000;
+      - _cfuvid=Di5O_shad8PpLIGwUHtQVySW5EcyGPn98xWvMpFs.fc-1719407952314-0.0.1.1-604800000;
         path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
       Transfer-Encoding:
       - chunked
@@ -127,7 +127,7 @@ interactions:
       openai-organization:
       - scale3-1
       openai-processing-ms:
-      - '193'
+      - '206'
       openai-version:
       - '2020-10-01'
       strict-transport-security:
@@ -135,17 +135,17 @@ interactions:
       x-ratelimit-limit-requests:
       - '10000'
       x-ratelimit-limit-tokens:
-      - '300000'
+      - '1000000'
       x-ratelimit-remaining-requests:
       - '9999'
       x-ratelimit-remaining-tokens:
-      - '299975'
+      - '999975'
       x-ratelimit-reset-requests:
       - 6ms
       x-ratelimit-reset-tokens:
-      - 5ms
+      - 1ms
       x-request-id:
-      - ae303b10004d584d9da9cb432917ef64
+      - 98bad879df65b3adda303922fbc539cf
     status:
       code: 200
       message: OK

tests/openai/test_chat_completion.py

@@ -1,8 +1,14 @@
 import pytest
 import json
 from langtrace_python_sdk.constants.instrumentation.openai import APIS
-from tests.utils import assert_response_format, assert_token_count
+from tests.utils import (
+    assert_completion_in_events,
+    assert_prompt_in_events,
+    assert_response_format,
+    assert_token_count,
+)
 from importlib_metadata import version as v
+from langtrace.trace_attributes import SpanAttributes
 
 
 @pytest.mark.vcr()
@@ -22,33 +28,22 @@ def test_chat_completion(exporter, openai_client):
     assert completion_span.name == "openai.chat.completions.create"
 
     attributes = completion_span.attributes
-    assert attributes.get("langtrace.sdk.name") == "langtrace-python-sdk"
-    assert attributes.get("langtrace.service.name") == "OpenAI"
-    assert attributes.get("langtrace.service.type") == "llm"
-    assert attributes.get("langtrace.service.version") == v("openai")
-    assert attributes.get("langtrace.version") == v("langtrace-python-sdk")
-    assert attributes.get("url.full") == "https://api.openai.com/v1/"
-    assert attributes.get("llm.api") == APIS["CHAT_COMPLETION"]["ENDPOINT"]
-    assert attributes.get("llm.model") == "gpt-4-0613"
-    assert attributes.get("llm.prompts") == json.dumps(messages_value)
-    assert attributes.get("llm.stream") is False
 
-    assert_token_count(attributes)
-    assert_response_format(attributes)
-
-    langtrace_responses = json.loads(attributes.get("llm.responses"))
-    assert isinstance(langtrace_responses, list)
-    for langtrace_response in langtrace_responses:
-        assert isinstance(langtrace_response, dict)
-        assert "role" in langtrace_response
-        assert "content" in langtrace_response
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == "langtrace-python-sdk"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "OpenAI"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("openai")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v("langtrace-python-sdk")
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.openai.com/v1/"
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["CHAT_COMPLETION"]["ENDPOINT"]
+    )
+    assert attributes.get(SpanAttributes.LLM_RESPONSE_MODEL) == "gpt-4-0613"
+    assert_prompt_in_events(completion_span.events)
+    assert_completion_in_events(completion_span.events)
+    assert attributes.get(SpanAttributes.LLM_IS_STREAMING) is False
 
-    langtrace_responses = json.loads(attributes.get("llm.responses"))
-    assert isinstance(langtrace_responses, list)
-    for langtrace_response in langtrace_responses:
-        assert isinstance(langtrace_response, dict)
-        assert "role" in langtrace_response
-        assert "content" in langtrace_response
+    assert_token_count(attributes)
 
 
 @pytest.mark.vcr()
@@ -64,6 +59,7 @@ def test_chat_completion_streaming(exporter, openai_client):
 
     chunk_count = 0
     response = openai_client.chat.completions.create(**kwargs)
+
     for _ in response:
         chunk_count += 1
 
@@ -73,36 +69,24 @@ def test_chat_completion_streaming(exporter, openai_client):
     assert streaming_span.name == "openai.chat.completions.create"
     attributes = streaming_span.attributes
 
-    assert attributes.get("langtrace.sdk.name") == "langtrace-python-sdk"
-    assert attributes.get("langtrace.service.name") == "OpenAI"
-    assert attributes.get("langtrace.service.type") == "llm"
-    assert attributes.get("langtrace.service.version") == v("openai")
-    assert attributes.get("langtrace.version") == v("langtrace-python-sdk")
-    assert attributes.get("url.full") == "https://api.openai.com/v1/"
-    assert attributes.get("llm.api") == APIS["CHAT_COMPLETION"]["ENDPOINT"]
-    assert attributes.get("llm.model") == "gpt-4-0613"
-    assert attributes.get("llm.prompts") == json.dumps(messages_value)
-    assert attributes.get("llm.stream") is True
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == "langtrace-python-sdk"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "OpenAI"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("openai")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v("langtrace-python-sdk")
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.openai.com/v1/"
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["CHAT_COMPLETION"]["ENDPOINT"]
+    )
+    assert attributes.get(SpanAttributes.LLM_RESPONSE_MODEL) == "gpt-4-0613"
+    assert_prompt_in_events(streaming_span.events)
+    assert_completion_in_events(streaming_span.events)
+    assert attributes.get(SpanAttributes.LLM_IS_STREAMING) is True
 
     events = streaming_span.events
-    assert len(events) - 2 == chunk_count  # -2 for start and end events
+    assert len(events) - 4 == chunk_count  # -2 for start and end events
 
     assert_token_count(attributes)
-    assert_response_format(attributes)
-
-    langtrace_responses = json.loads(attributes.get("llm.responses"))
-    assert isinstance(langtrace_responses, list)
-    for langtrace_response in langtrace_responses:
-        assert isinstance(langtrace_response, dict)
-        assert "role" in langtrace_response
-        assert "content" in langtrace_response
-
-    langtrace_responses = json.loads(attributes.get("llm.responses"))
-    assert isinstance(langtrace_responses, list)
-    for langtrace_response in langtrace_responses:
-        assert isinstance(langtrace_response, dict)
-        assert "role" in langtrace_response
-        assert "content" in langtrace_response
 
 
 @pytest.mark.vcr()
@@ -118,9 +102,9 @@ async def test_async_chat_completion_streaming(exporter, async_openai_client):
     }
 
     chunk_count = 0
-    with await async_openai_client.chat.completions.create(**kwargs) as response:
-        async for _ in response:
-            chunk_count += 1
+    response = await async_openai_client.chat.completions.create(**kwargs)
+    async for chunk in response:
+        chunk_count += 1
 
     spans = exporter.get_finished_spans()
     streaming_span = spans[-1]
@@ -128,19 +112,21 @@ async def test_async_chat_completion_streaming(exporter, async_openai_client):
     assert streaming_span.name == "openai.chat.completions.create"
     attributes = streaming_span.attributes
 
-    assert attributes.get("langtrace.sdk.name") == "langtrace-python-sdk"
-    assert attributes.get("langtrace.service.name") == "OpenAI"
-    assert attributes.get("langtrace.service.type") == "llm"
-    assert attributes.get("langtrace.service.version") == v("openai")
-    assert attributes.get("langtrace.version") == v("langtrace-python-sdk")
-    assert attributes.get("url.full") == "https://api.openai.com/v1/"
-    assert attributes.get("llm.api") == APIS["CHAT_COMPLETION"]["ENDPOINT"]
-    assert attributes.get("llm.model") == "gpt-4-0613"
-    assert attributes.get("llm.prompts") == json.dumps(messages_value)
-    assert attributes.get("llm.stream") is True
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == "langtrace-python-sdk"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "OpenAI"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("openai")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v("langtrace-python-sdk")
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.openai.com/v1/"
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["CHAT_COMPLETION"]["ENDPOINT"]
+    )
+    assert attributes.get(SpanAttributes.LLM_RESPONSE_MODEL) == "gpt-4-0613"
+    assert_prompt_in_events(streaming_span.events)
+    assert_completion_in_events(streaming_span.events)
+    assert attributes.get(SpanAttributes.LLM_IS_STREAMING) is True
 
     events = streaming_span.events
-    assert len(events) - 2 == chunk_count  # -2 for start and end events
+    assert len(events) - 4 == chunk_count  # -2 for start and end events
 
     assert_token_count(attributes)
-    assert_response_format(attributes)

tests/openai/test_image_generation.py

@@ -2,6 +2,7 @@ import pytest
 import json
 from langtrace_python_sdk.constants.instrumentation.openai import APIS
 from importlib_metadata import version as v
+from langtrace.trace_attributes import SpanAttributes
 
 
 @pytest.mark.vcr()
@@ -20,23 +21,34 @@ def test_image_generation(openai_client, exporter):
     assert image_generation_span.name == "openai.images.generate"
 
     attributes = image_generation_span.attributes
-    assert attributes.get("langtrace.sdk.name") == "langtrace-python-sdk"
-    assert attributes.get("langtrace.service.name") == "OpenAI"
-    assert attributes.get("langtrace.service.type") == "llm"
-    assert attributes.get("langtrace.service.version") == v("openai")
-    assert attributes.get("langtrace.version") == v("langtrace-python-sdk")
-    assert attributes.get("url.full") == "https://api.openai.com/v1/"
-    assert attributes.get("llm.api") == APIS["IMAGES_GENERATION"]["ENDPOINT"]
-    assert attributes.get("llm.model") == llm_model_value
-    prompts = json.loads(attributes.get("llm.prompts"))
-    assert prompts[0]["content"] == prompt
-
-    langtrace_responses = json.loads(attributes.get("llm.responses"))
+    events = image_generation_span.events
+
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == "langtrace-python-sdk"
+
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "OpenAI"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("openai")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v("langtrace-python-sdk")
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.openai.com/v1/"
+
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["IMAGES_GENERATION"]["ENDPOINT"]
+    )
+
+    assert attributes.get(SpanAttributes.LLM_REQUEST_MODEL) == llm_model_value
+
+    # prompts = json.loads(attributes.get(SpanAttributes.LLM_PROMPTS))
+    # assert prompts[0]["content"] == prompt
+
+    langtrace_responses = json.loads(
+        events[-1].attributes.get(SpanAttributes.LLM_COMPLETIONS)
+    )
     assert isinstance(langtrace_responses, list)
     for langtrace_response in langtrace_responses:
         assert isinstance(langtrace_response, dict)
         assert "role" in langtrace_response
         assert "content" in langtrace_response
+
         assert response.data[0].url == langtrace_response["content"]["url"]
         assert (
             response.data[0].revised_prompt
@@ -61,23 +73,34 @@ async def test_async_image_generation(async_openai_client, exporter):
     assert image_generation_span.name == "openai.images.generate"
 
     attributes = image_generation_span.attributes
-    assert attributes.get("langtrace.sdk.name") == "langtrace-python-sdk"
-    assert attributes.get("langtrace.service.name") == "OpenAI"
-    assert attributes.get("langtrace.service.type") == "llm"
-    assert attributes.get("langtrace.service.version") == v("openai")
-    assert attributes.get("langtrace.version") == v("langtrace-python-sdk")
-    assert attributes.get("url.full") == "https://api.openai.com/v1/"
-    assert attributes.get("llm.api") == APIS["IMAGES_GENERATION"]["ENDPOINT"]
-    assert attributes.get("llm.model") == llm_model_value
-    prompts = json.loads(attributes.get("llm.prompts"))
-    assert prompts[0]["content"] == prompt
-
-    langtrace_responses = json.loads(attributes.get("llm.responses"))
+    events = image_generation_span.events
+
+    assert attributes.get(SpanAttributes.LANGTRACE_SDK_NAME) == "langtrace-python-sdk"
+
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_NAME) == "OpenAI"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_TYPE) == "llm"
+    assert attributes.get(SpanAttributes.LANGTRACE_SERVICE_VERSION) == v("openai")
+    assert attributes.get(SpanAttributes.LANGTRACE_VERSION) == v("langtrace-python-sdk")
+    assert attributes.get(SpanAttributes.LLM_URL) == "https://api.openai.com/v1/"
+
+    assert (
+        attributes.get(SpanAttributes.LLM_PATH) == APIS["IMAGES_GENERATION"]["ENDPOINT"]
+    )
+
+    assert attributes.get(SpanAttributes.LLM_REQUEST_MODEL) == llm_model_value
+
+    # prompts = json.loads(attributes.get(SpanAttributes.LLM_PROMPTS))
+    # assert prompts[0]["content"] == prompt
+
+    langtrace_responses = json.loads(
+        events[-1].attributes.get(SpanAttributes.LLM_COMPLETIONS)
+    )
     assert isinstance(langtrace_responses, list)
     for langtrace_response in langtrace_responses:
         assert isinstance(langtrace_response, dict)
         assert "role" in langtrace_response
         assert "content" in langtrace_response
+
         assert response.data[0].url == langtrace_response["content"]["url"]
         assert (
             response.data[0].revised_prompt