fix(cohere): Set gen_ai attributes before try block and handle chatbot role locally

cursoragent · claude · cursoragent · commit 5089f11b7ffe · 2026-03-09T13:16:13.000Z
- Move GEN_AI_SYSTEM and GEN_AI_OPERATION_NAME set_data calls before the try block
  so they are always present on spans, even when exceptions occur
- Remove Cohere-specific 'chatbot' role from global GEN_AI_MESSAGE_ROLE_REVERSE_MAPPING
  and handle the chatbot-&gt;assistant conversion locally in the Cohere integration

Co-Authored-By: Claude Opus 4 &lt;noreply@anthropic.com&gt;
diff --git a/sentry_sdk/ai/utils.py b/sentry_sdk/ai/utils.py
@@ -30,7 +30,7 @@ class GEN_AI_ALLOWED_MESSAGE_ROLES:
 GEN_AI_MESSAGE_ROLE_REVERSE_MAPPING = {
     GEN_AI_ALLOWED_MESSAGE_ROLES.SYSTEM: ["system"],
     GEN_AI_ALLOWED_MESSAGE_ROLES.USER: ["user", "human"],
-    GEN_AI_ALLOWED_MESSAGE_ROLES.ASSISTANT: ["assistant", "ai", "chatbot"],
+    GEN_AI_ALLOWED_MESSAGE_ROLES.ASSISTANT: ["assistant", "ai"],
     GEN_AI_ALLOWED_MESSAGE_ROLES.TOOL: ["tool", "tool_call"],
 }
 
diff --git a/sentry_sdk/integrations/cohere.py b/sentry_sdk/integrations/cohere.py
@@ -141,6 +141,8 @@ def new_chat(*args: "Any", **kwargs: "Any") -> "Any":
             origin=CohereIntegration.origin,
         )
         span.__enter__()
+        span.set_data(SPANDATA.GEN_AI_SYSTEM, "cohere")
+        span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "chat")
         try:
             res = f(*args, **kwargs)
         except Exception as e:
@@ -151,15 +153,16 @@ def new_chat(*args: "Any", **kwargs: "Any") -> "Any":
             reraise(*exc_info)
 
         with capture_internal_exceptions():
-            span.set_data(SPANDATA.GEN_AI_SYSTEM, "cohere")
-            span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "chat")
 
             if should_send_default_pii() and integration.include_prompts:
                 messages = []
                 for x in kwargs.get("chat_history", []):
+                    role = getattr(x, "role", "")
+                    if role == "chatbot":
+                        role = "assistant"
                     messages.append(
                         {
-                            "role": getattr(x, "role", ""),
+                            "role": role,
                             "content": getattr(x, "message", ""),
                         }
                     )

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class GEN_AI_ALLOWED_MESSAGE_ROLES:`
`30`	`30`	`GEN_AI_MESSAGE_ROLE_REVERSE_MAPPING = {`
`31`	`31`	`GEN_AI_ALLOWED_MESSAGE_ROLES.SYSTEM: ["system"],`
`32`	`32`	`GEN_AI_ALLOWED_MESSAGE_ROLES.USER: ["user", "human"],`
`33`		`- GEN_AI_ALLOWED_MESSAGE_ROLES.ASSISTANT: ["assistant", "ai", "chatbot"],`
	`33`	`+ GEN_AI_ALLOWED_MESSAGE_ROLES.ASSISTANT: ["assistant", "ai"],`
`34`	`34`	`GEN_AI_ALLOWED_MESSAGE_ROLES.TOOL: ["tool", "tool_call"],`
`35`	`35`	`}`
`36`	`36`