Merge branch 'main' into ollama-tool-calling

.cz.toml

@@ -4,7 +4,7 @@ tag_format = "v$version"
 version_scheme = "pep440"
 major_version_zero = true
 update_changelog_on_bump = true
-version = "0.32.0"
+version = "0.32.2"
 version_files = [
     "packages/opentelemetry-instrumentation-groq/pyproject.toml:^version",
     "packages/opentelemetry-instrumentation-groq/opentelemetry/instrumentation/groq/version.py",
@@ -42,6 +42,8 @@ version_files = [
     "packages/opentelemetry-instrumentation-qdrant/opentelemetry/instrumentation/qdrant/version.py",
     "packages/opentelemetry-instrumentation-replicate/pyproject.toml:^version",
     "packages/opentelemetry-instrumentation-replicate/opentelemetry/instrumentation/replicate/version.py",
+    "packages/opentelemetry-instrumentation-sagemaker/pyproject.toml:^version",
+    "packages/opentelemetry-instrumentation-sagemaker/opentelemetry/instrumentation/sagemaker/version.py",
     "packages/opentelemetry-instrumentation-together/pyproject.toml:^version",
     "packages/opentelemetry-instrumentation-together/opentelemetry/instrumentation/together/version.py",
     "packages/opentelemetry-instrumentation-transformers/pyproject.toml:^version",

CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.32.2 (2024-10-04)
+
+### Fix
+
+- **traceloop-sdk**: add aiohttp as dependency (#2094)
+
+## v0.32.1 (2024-10-03)
+
+### Fix
+
+- **anthropic**: Replace count_tokens with usage for newer models (#2086)
+
 ## v0.32.0 (2024-10-03)
 
 ### Feat

packages/opentelemetry-instrumentation-alephalpha/opentelemetry/instrumentation/alephalpha/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-alephalpha/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-alephalpha"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Aleph Alpha instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-anthropic/opentelemetry/instrumentation/anthropic/__init__.py

@@ -182,23 +182,26 @@ async def _aset_token_usage(
     if not isinstance(response, dict):
         response = response.__dict__
 
-    prompt_tokens = 0
-    if hasattr(anthropic, "count_tokens"):
-        if request.get("prompt"):
-            prompt_tokens = await anthropic.count_tokens(request.get("prompt"))
-        elif request.get("messages"):
-            prompt_tokens = 0
-            for m in request.get("messages"):
-                content = m.get("content")
-                if isinstance(content, str):
-                    prompt_tokens += await anthropic.count_tokens(content)
-                elif isinstance(content, list):
-                    for item in content:
-                        # TODO: handle image tokens
-                        if isinstance(item, dict) and item.get("type") == "text":
-                            prompt_tokens += await anthropic.count_tokens(
-                                item.get("text", "")
-                            )
+    if usage := response.get("usage"):
+        prompt_tokens = usage.input_tokens
+    else:
+        prompt_tokens = 0
+        if hasattr(anthropic, "count_tokens"):
+            if request.get("prompt"):
+                prompt_tokens = await anthropic.count_tokens(request.get("prompt"))
+            elif request.get("messages"):
+                prompt_tokens = 0
+                for m in request.get("messages"):
+                    content = m.get("content")
+                    if isinstance(content, str):
+                        prompt_tokens += await anthropic.count_tokens(content)
+                    elif isinstance(content, list):
+                        for item in content:
+                            # TODO: handle image tokens
+                            if isinstance(item, dict) and item.get("type") == "text":
+                                prompt_tokens += await anthropic.count_tokens(
+                                    item.get("text", "")
+                                )
 
     if token_histogram and type(prompt_tokens) is int and prompt_tokens >= 0:
         token_histogram.record(
@@ -209,14 +212,17 @@ async def _aset_token_usage(
             },
         )
 
-    completion_tokens = 0
-    if hasattr(anthropic, "count_tokens"):
-        if response.get("completion"):
-            completion_tokens = await anthropic.count_tokens(response.get("completion"))
-        elif response.get("content"):
-            completion_tokens = await anthropic.count_tokens(
-                response.get("content")[0].text
-            )
+    if usage := response.get("usage"):
+        completion_tokens = usage.output_tokens
+    else:
+        completion_tokens = 0
+        if hasattr(anthropic, "count_tokens"):
+            if response.get("completion"):
+                completion_tokens = await anthropic.count_tokens(response.get("completion"))
+            elif response.get("content"):
+                completion_tokens = await anthropic.count_tokens(
+                    response.get("content")[0].text
+                )
 
     if token_histogram and type(completion_tokens) is int and completion_tokens >= 0:
         token_histogram.record(
@@ -264,23 +270,26 @@ def _set_token_usage(
     if not isinstance(response, dict):
         response = response.__dict__
 
-    prompt_tokens = 0
-    if hasattr(anthropic, "count_tokens"):
-        if request.get("prompt"):
-            prompt_tokens = anthropic.count_tokens(request.get("prompt"))
-        elif request.get("messages"):
-            prompt_tokens = 0
-            for m in request.get("messages"):
-                content = m.get("content")
-                if isinstance(content, str):
-                    prompt_tokens += anthropic.count_tokens(content)
-                elif isinstance(content, list):
-                    for item in content:
-                        # TODO: handle image tokens
-                        if isinstance(item, dict) and item.get("type") == "text":
-                            prompt_tokens += anthropic.count_tokens(
-                                item.get("text", "")
-                            )
+    if usage := response.get("usage"):
+        prompt_tokens = usage.input_tokens
+    else:
+        prompt_tokens = 0
+        if hasattr(anthropic, "count_tokens"):
+            if request.get("prompt"):
+                prompt_tokens = anthropic.count_tokens(request.get("prompt"))
+            elif request.get("messages"):
+                prompt_tokens = 0
+                for m in request.get("messages"):
+                    content = m.get("content")
+                    if isinstance(content, str):
+                        prompt_tokens += anthropic.count_tokens(content)
+                    elif isinstance(content, list):
+                        for item in content:
+                            # TODO: handle image tokens
+                            if isinstance(item, dict) and item.get("type") == "text":
+                                prompt_tokens += anthropic.count_tokens(
+                                    item.get("text", "")
+                                )
 
     if token_histogram and type(prompt_tokens) is int and prompt_tokens >= 0:
         token_histogram.record(
@@ -291,12 +300,15 @@ def _set_token_usage(
             },
         )
 
-    completion_tokens = 0
-    if hasattr(anthropic, "count_tokens"):
-        if response.get("completion"):
-            completion_tokens = anthropic.count_tokens(response.get("completion"))
-        elif response.get("content"):
-            completion_tokens = anthropic.count_tokens(response.get("content")[0].text)
+    if usage := response.get("usage"):
+        completion_tokens = usage.output_tokens
+    else:
+        completion_tokens = 0
+        if hasattr(anthropic, "count_tokens"):
+            if response.get("completion"):
+                completion_tokens = anthropic.count_tokens(response.get("completion"))
+            elif response.get("content"):
+                completion_tokens = anthropic.count_tokens(response.get("content")[0].text)
 
     if token_histogram and type(completion_tokens) is int and completion_tokens >= 0:
         token_histogram.record(

packages/opentelemetry-instrumentation-anthropic/opentelemetry/instrumentation/anthropic/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-anthropic/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-anthropic"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Anthropic instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-anthropic/tests/test_completion.py

@@ -132,7 +132,7 @@ def test_anthropic_message_create(exporter, reader):
         anthropic_span.attributes.get(f"{SpanAttributes.LLM_COMPLETIONS}.0.content")
         == response.content[0].text
     )
-    assert anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS] == 8
+    assert anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS] == 17
     assert (
         anthropic_span.attributes[SpanAttributes.LLM_USAGE_COMPLETION_TOKENS]
         + anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS]
@@ -255,7 +255,7 @@ def test_anthropic_multi_modal(exporter):
         anthropic_span.attributes.get(f"{SpanAttributes.LLM_COMPLETIONS}.0.content")
         == response.content[0].text
     )
-    assert anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS] == 5
+    assert anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS] == 1381
     assert (
         anthropic_span.attributes[SpanAttributes.LLM_USAGE_COMPLETION_TOKENS]
         + anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS]
@@ -314,7 +314,7 @@ async def test_anthropic_async_multi_modal(exporter):
         anthropic_span.attributes.get(f"{SpanAttributes.LLM_COMPLETIONS}.0.content")
         == response.content[0].text
     )
-    assert anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS] == 5
+    assert anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS] == 1311
     assert (
         anthropic_span.attributes[SpanAttributes.LLM_USAGE_COMPLETION_TOKENS]
         + anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS]
@@ -457,7 +457,7 @@ async def test_async_anthropic_message_create(exporter, reader):
         anthropic_span.attributes.get(f"{SpanAttributes.LLM_COMPLETIONS}.0.content")
         == response.content[0].text
     )
-    assert anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS] == 8
+    assert anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS] == 17
     assert (
         anthropic_span.attributes[SpanAttributes.LLM_USAGE_COMPLETION_TOKENS]
         + anthropic_span.attributes[SpanAttributes.LLM_USAGE_PROMPT_TOKENS]

packages/opentelemetry-instrumentation-bedrock/opentelemetry/instrumentation/bedrock/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-bedrock/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-bedrock"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Bedrock instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-chromadb/opentelemetry/instrumentation/chromadb/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-chromadb/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-chromadb"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Chroma DB instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-cohere/opentelemetry/instrumentation/cohere/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-cohere/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-cohere"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Cohere instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-google-generativeai/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-google-generativeai"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Google Generative AI instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-groq/opentelemetry/instrumentation/groq/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-groq/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-groq"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Groq instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-haystack/opentelemetry/instrumentation/haystack/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-haystack/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-haystack"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Haystack instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-lancedb/opentelemetry/instrumentation/lancedb/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-lancedb/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-lancedb"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Lancedb instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-langchain/opentelemetry/instrumentation/langchain/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-langchain/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-langchain"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Langchain instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-llamaindex/opentelemetry/instrumentation/llamaindex/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-llamaindex/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-llamaindex"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry LlamaIndex instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-marqo/opentelemetry/instrumentation/marqo/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-marqo/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-marqo"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Marqo instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-milvus/opentelemetry/instrumentation/milvus/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-milvus/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-milvus"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Milvus instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-mistralai/opentelemetry/instrumentation/mistralai/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-mistralai/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-mistralai"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Mistral AI instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-ollama/opentelemetry/instrumentation/ollama/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-ollama/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-ollama"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry Ollama instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-openai/opentelemetry/instrumentation/openai/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"

packages/opentelemetry-instrumentation-openai/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-openai"
-version = "0.32.0"
+version = "0.32.2"
 description = "OpenTelemetry OpenAI instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-pinecone/opentelemetry/instrumentation/pinecone/version.py

@@ -1 +1 @@
-__version__ = "0.32.0"
+__version__ = "0.32.2"