feedback

Author: vgrozdanic

scripts/populate_tox/releases.jsonl

@@ -91,7 +91,6 @@ def iter_default_integrations(with_auto_enabling_integrations):
     "sentry_sdk.integrations.flask.FlaskIntegration",
     "sentry_sdk.integrations.gql.GQLIntegration",
     "sentry_sdk.integrations.graphene.GrapheneIntegration",
-    "sentry_sdk.integrations.google_genai.GoogleGenAIIntegration",
     "sentry_sdk.integrations.httpx.HttpxIntegration",
     "sentry_sdk.integrations.huey.HueyIntegration",
     "sentry_sdk.integrations.huggingface_hub.HuggingfaceHubIntegration",

sentry_sdk/integrations/__init__.py

@@ -24,11 +24,11 @@
     set_span_data_for_request,
     set_span_data_for_response,
     capture_exception,
+    prepare_generate_content_args,
 )
 from .streaming import (
     set_span_data_for_streaming_response,
     accumulate_streaming_response,
-    prepare_generate_content_args,
 )
 
 

sentry_sdk/integrations/google_genai/__init__.py

@@ -24,22 +24,6 @@
     from google.genai.types import GenerateContentResponse
 
 
-def prepare_generate_content_args(args, kwargs):
-    # type: (tuple[Any, ...], dict[str, Any]) -> tuple[Any, Any, str]
-    """Extract and prepare common arguments for generate_content methods."""
-    model = args[0] if args else kwargs.get("model", "unknown")
-    contents = args[1] if len(args) > 1 else kwargs.get("contents")
-    model_name = get_model_name(model)
-
-    # Wrap config with tools
-    config = kwargs.get("config")
-    wrapped_config = wrapped_config_with_tools(config)
-    if wrapped_config is not config:
-        kwargs["config"] = wrapped_config
-
-    return model, contents, model_name
-
-
 def accumulate_streaming_response(chunks):
     # type: (List[GenerateContentResponse]) -> dict[str, Any]
     """Accumulate streaming chunks into a single response-like object."""

sentry_sdk/integrations/google_genai/streaming.py

@@ -561,3 +561,19 @@ def set_span_data_for_response(span, integration, response):
     # Set total token count if available
     if usage_data["total_tokens"]:
         span.set_data(SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS, usage_data["total_tokens"])
+
+
+def prepare_generate_content_args(args, kwargs):
+    # type: (tuple[Any, ...], dict[str, Any]) -> tuple[Any, Any, str]
+    """Extract and prepare common arguments for generate_content methods."""
+    model = args[0] if args else kwargs.get("model", "unknown")
+    contents = args[1] if len(args) > 1 else kwargs.get("contents")
+    model_name = get_model_name(model)
+
+    # Wrap config with tools
+    config = kwargs.get("config")
+    wrapped_config = wrapped_config_with_tools(config)
+    if wrapped_config is not config:
+        kwargs["config"] = wrapped_config
+
+    return model, contents, model_name

sentry_sdk/integrations/google_genai/utils.py

@@ -84,7 +84,7 @@ def get_file_text(file_name):
         "statsig": ["statsig>=0.55.3"],
         "tornado": ["tornado>=6"],
         "unleash": ["UnleashClient>=6.0.1"],
-        "google-genai": ["google-genai"],
+        "google-genai": ["google-genai>=1.0.0"],
     },
     entry_points={
         "opentelemetry_propagator": [

setup.py

@@ -78,6 +78,10 @@ envlist =
     {py3.9,py3.12,py3.13}-langgraph-v0.6.8
     {py3.10,py3.12,py3.13}-langgraph-v1.0.0a4
 
+    {py3.9,py3.11,py3.12}-google-genai-v0.0.1
+    {py3.9,py3.12,py3.13}-google-genai-v0.8.0
+    {py3.9,py3.12,py3.13}-google-genai-v1.41.0
+
     {py3.10,py3.11,py3.12}-openai_agents-v0.0.19
     {py3.10,py3.12,py3.13}-openai_agents-v0.1.0
     {py3.10,py3.12,py3.13}-openai_agents-v0.2.11
@@ -87,14 +91,14 @@ envlist =
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.28.1
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.32.6
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.35.3
-    {py3.9,py3.12,py3.13}-huggingface_hub-v1.0.0rc2
+    {py3.9,py3.12,py3.13}-huggingface_hub-v1.0.0rc4
 
 
     # ~~~ Cloud ~~~
     {py3.6,py3.7}-boto3-v1.12.49
     {py3.6,py3.9,py3.10}-boto3-v1.20.54
     {py3.7,py3.11,py3.12}-boto3-v1.28.85
-    {py3.9,py3.12,py3.13}-boto3-v1.40.46
+    {py3.9,py3.12,py3.13}-boto3-v1.40.47
 
     {py3.6,py3.7,py3.8}-chalice-v1.16.0
     {py3.9,py3.12,py3.13}-chalice-v1.32.0
@@ -110,14 +114,14 @@ envlist =
 
     {py3.6}-pymongo-v3.5.1
     {py3.6,py3.10,py3.11}-pymongo-v3.13.0
-    {py3.9,py3.12,py3.13}-pymongo-v4.15.2
+    {py3.9,py3.12,py3.13}-pymongo-v4.15.3
 
     {py3.6}-redis-v2.10.6
     {py3.6,py3.7,py3.8}-redis-v3.5.3
     {py3.7,py3.10,py3.11}-redis-v4.6.0
     {py3.8,py3.11,py3.12}-redis-v5.3.1
     {py3.9,py3.12,py3.13}-redis-v6.4.0
-    {py3.9,py3.12,py3.13}-redis-v7.0.0b2
+    {py3.9,py3.12,py3.13}-redis-v7.0.0b3
 
     {py3.6}-redis_py_cluster_legacy-v1.3.6
     {py3.6,py3.7,py3.8}-redis_py_cluster_legacy-v2.1.3
@@ -153,7 +157,7 @@ envlist =
     {py3.8,py3.12,py3.13}-graphene-v3.4.3
 
     {py3.8,py3.10,py3.11}-strawberry-v0.209.8
-    {py3.9,py3.12,py3.13}-strawberry-v0.283.1
+    {py3.9,py3.12,py3.13}-strawberry-v0.283.2
 
 
     # ~~~ Network ~~~
@@ -222,7 +226,7 @@ envlist =
     {py3.6,py3.9,py3.10}-fastapi-v0.79.1
     {py3.7,py3.10,py3.11}-fastapi-v0.92.0
     {py3.8,py3.10,py3.11}-fastapi-v0.105.0
-    {py3.8,py3.12,py3.13}-fastapi-v0.118.0
+    {py3.8,py3.12,py3.13}-fastapi-v0.118.1
 
 
     # ~~~ Web 2 ~~~
@@ -381,6 +385,11 @@ deps =
     langgraph-v0.6.8: langgraph==0.6.8
     langgraph-v1.0.0a4: langgraph==1.0.0a4
 
+    google-genai-v0.0.1: google-genai==0.0.1
+    google-genai-v0.8.0: google-genai==0.8.0
+    google-genai-v1.41.0: google-genai==1.41.0
+    google-genai: pytest-asyncio
+
     openai_agents-v0.0.19: openai-agents==0.0.19
     openai_agents-v0.1.0: openai-agents==0.1.0
     openai_agents-v0.2.11: openai-agents==0.2.11
@@ -391,7 +400,7 @@ deps =
     huggingface_hub-v0.28.1: huggingface_hub==0.28.1
     huggingface_hub-v0.32.6: huggingface_hub==0.32.6
     huggingface_hub-v0.35.3: huggingface_hub==0.35.3
-    huggingface_hub-v1.0.0rc2: huggingface_hub==1.0.0rc2
+    huggingface_hub-v1.0.0rc4: huggingface_hub==1.0.0rc4
     huggingface_hub: responses
     huggingface_hub: pytest-httpx
 
@@ -400,7 +409,7 @@ deps =
     boto3-v1.12.49: boto3==1.12.49
     boto3-v1.20.54: boto3==1.20.54
     boto3-v1.28.85: boto3==1.28.85
-    boto3-v1.40.46: boto3==1.40.46
+    boto3-v1.40.47: boto3==1.40.47
     {py3.7,py3.8}-boto3: urllib3<2.0.0
 
     chalice-v1.16.0: chalice==1.16.0
@@ -419,15 +428,15 @@ deps =
 
     pymongo-v3.5.1: pymongo==3.5.1
     pymongo-v3.13.0: pymongo==3.13.0
-    pymongo-v4.15.2: pymongo==4.15.2
+    pymongo-v4.15.3: pymongo==4.15.3
     pymongo: mockupdb
 
     redis-v2.10.6: redis==2.10.6
     redis-v3.5.3: redis==3.5.3
     redis-v4.6.0: redis==4.6.0
     redis-v5.3.1: redis==5.3.1
     redis-v6.4.0: redis==6.4.0
-    redis-v7.0.0b2: redis==7.0.0b2
+    redis-v7.0.0b3: redis==7.0.0b3
     redis: fakeredis!=1.7.4
     redis: pytest<8.0.0
     redis-v4.6.0: fakeredis<2.31.0
@@ -477,7 +486,7 @@ deps =
     {py3.6}-graphene: aiocontextvars
 
     strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
-    strawberry-v0.283.1: strawberry-graphql[fastapi,flask]==0.283.1
+    strawberry-v0.283.2: strawberry-graphql[fastapi,flask]==0.283.2
     strawberry: httpx
     strawberry-v0.209.8: pydantic<2.11
 
@@ -604,7 +613,7 @@ deps =
     fastapi-v0.79.1: fastapi==0.79.1
     fastapi-v0.92.0: fastapi==0.92.0
     fastapi-v0.105.0: fastapi==0.105.0
-    fastapi-v0.118.0: fastapi==0.118.0
+    fastapi-v0.118.1: fastapi==0.118.1
     fastapi: httpx
     fastapi: pytest-asyncio
     fastapi: python-multipart
@@ -747,6 +756,7 @@ setenv =
     falcon: TESTPATH=tests/integrations/falcon
     fastapi: TESTPATH=tests/integrations/fastapi
     flask: TESTPATH=tests/integrations/flask
+    google-genai: TESTPATH=tests/integrations/google-genai
     gql: TESTPATH=tests/integrations/gql
     graphene: TESTPATH=tests/integrations/graphene
     grpc: TESTPATH=tests/integrations/grpc