Address cursor[bot] review feedback for OCI client

- Remove unused response_mapping and stream_response_mapping dicts
- Remove unused transform_oci_stream_response function
- Remove unused imports (EmbedResponse, Generation, etc.)
- Fix crash when thinking parameter is explicitly None
- Fix V2 chat response role not lowercased (ASSISTANT -> assistant)
- Fix V2 finish_reason incorrectly lowercased (should stay uppercase)
- Add unit tests for thinking=None, role lowercase, and finish_reason

Author: fede-kamel

src/cohere/oci_client.py

@@ -8,14 +8,6 @@
 
 import httpx
 import requests
-from . import (
-    EmbedResponse,
-    GenerateStreamedResponse,
-    Generation,
-    NonStreamedChatResponse,
-    RerankResponse,
-    StreamedChatResponse,
-)
 from .client import Client, ClientEnvironment
 from .client_v2 import ClientV2
 from .manually_maintained.lazy_oci_deps import lazy_oci
@@ -239,18 +231,6 @@ def __init__(
 EventHook = typing.Callable[..., typing.Any]
 
 
-# Response type mappings
-response_mapping: typing.Dict[str, typing.Any] = {
-    "chat": NonStreamedChatResponse,
-    "embed": EmbedResponse,
-    "generate": Generation,
-    "rerank": RerankResponse,
-}
-
-stream_response_mapping: typing.Dict[str, typing.Any] = {
-    "chat": StreamedChatResponse,
-    "generate": GenerateStreamedResponse,
-}
 
 
 class Streamer(SyncByteStream):
@@ -685,7 +665,7 @@ def transform_request_to_oci(
             if "safety_mode" in cohere_body:
                 chat_request["safetyMode"] = cohere_body["safety_mode"]
             # Thinking parameter for Command A Reasoning models
-            if "thinking" in cohere_body:
+            if "thinking" in cohere_body and cohere_body["thinking"] is not None:
                 thinking = cohere_body["thinking"]
                 oci_thinking: typing.Dict[str, typing.Any] = {}
                 if "type" in thinking:
@@ -840,8 +820,14 @@ def transform_oci_response_to_cohere(
                     "output_tokens": usage_data.get("completionTokens", 0),
                 }
 
-            # Transform message content types from OCI (uppercase) to Cohere (lowercase)
+            # Transform message from OCI format to Cohere format
             message = chat_response.get("message", {})
+
+            # Lowercase the role (OCI returns "ASSISTANT", Cohere expects "assistant")
+            if "role" in message:
+                message = {**message, "role": message["role"].lower()}
+
+            # Transform content types from OCI (uppercase) to Cohere (lowercase)
             if "content" in message and isinstance(message["content"], list):
                 transformed_content = []
                 for item in message["content"]:
@@ -857,7 +843,7 @@ def transform_oci_response_to_cohere(
             return {
                 "id": chat_response.get("id", str(uuid.uuid4())),
                 "message": message,
-                "finish_reason": chat_response.get("finishReason", "COMPLETE").lower(),
+                "finish_reason": chat_response.get("finishReason", "COMPLETE"),  # V2 keeps uppercase
                 "usage": usage,
             }
         else:
@@ -965,35 +951,6 @@ def transform_oci_stream_wrapper(
                     continue
 
 
-def transform_oci_stream_response(
-    response: httpx.Response, endpoint: str
-) -> typing.Iterator[bytes]:
-    """
-    Transform OCI streaming responses to Cohere streaming format.
-
-    OCI uses Server-Sent Events (SSE) format.
-
-    Args:
-        response: httpx Response object
-        endpoint: Cohere endpoint name
-
-    Yields:
-        Bytes of transformed streaming events
-    """
-    for line in response.iter_lines():
-        if line.startswith("data: "):
-            data_str = line[6:]  # Remove "data: " prefix
-            if data_str.strip() == "[DONE]":
-                break
-
-            try:
-                oci_event = json.loads(data_str)
-                cohere_event = transform_stream_event(endpoint, oci_event)
-                yield json.dumps(cohere_event).encode("utf-8") + b"\n"
-            except json.JSONDecodeError:
-                continue
-
-
 def transform_stream_event(
     endpoint: str, oci_event: typing.Dict[str, typing.Any], is_v2: bool = False
 ) -> typing.Dict[str, typing.Any]:

tests/test_oci_client.py

@@ -597,6 +597,65 @@ def test_stream_event_text_transformation(self):
         self.assertIn("text", result["delta"]["message"]["content"])
         self.assertEqual(result["delta"]["message"]["content"]["text"], "The answer is...")
 
+    def test_thinking_parameter_none(self):
+        """Test that thinking=None does not crash (issue: null guard)."""
+        from cohere.oci_client import transform_request_to_oci
+
+        cohere_body = {
+            "model": "command-a-03-2025",
+            "messages": [{"role": "user", "content": "Hello"}],
+            "thinking": None,  # Explicitly set to None
+        }
+
+        # Should not crash with TypeError
+        result = transform_request_to_oci("chat", cohere_body, "compartment-123")
+
+        chat_request = result["chatRequest"]
+        # thinking should not be in request when None
+        self.assertNotIn("thinking", chat_request)
+
+    def test_v2_response_role_lowercased(self):
+        """Test that V2 response message role is lowercased."""
+        from cohere.oci_client import transform_oci_response_to_cohere
+
+        oci_response = {
+            "chatResponse": {
+                "id": "test-id",
+                "message": {
+                    "role": "ASSISTANT",
+                    "content": [{"type": "TEXT", "text": "Hello"}],
+                },
+                "finishReason": "COMPLETE",
+                "usage": {"inputTokens": 10, "completionTokens": 20},
+            }
+        }
+
+        result = transform_oci_response_to_cohere("chat", oci_response, is_v2=True)
+
+        # Role should be lowercased
+        self.assertEqual(result["message"]["role"], "assistant")
+
+    def test_v2_response_finish_reason_uppercase(self):
+        """Test that V2 response finish_reason stays uppercase."""
+        from cohere.oci_client import transform_oci_response_to_cohere
+
+        oci_response = {
+            "chatResponse": {
+                "id": "test-id",
+                "message": {
+                    "role": "ASSISTANT",
+                    "content": [{"type": "TEXT", "text": "Hello"}],
+                },
+                "finishReason": "MAX_TOKENS",
+                "usage": {"inputTokens": 10, "completionTokens": 20},
+            }
+        }
+
+        result = transform_oci_response_to_cohere("chat", oci_response, is_v2=True)
+
+        # V2 finish_reason should stay uppercase
+        self.assertEqual(result["finish_reason"], "MAX_TOKENS")
+
 
 if __name__ == "__main__":
     unittest.main()