local-openai2anthropic 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

local_openai2anthropic/converter.py

@@ -92,7 +92,9 @@ def convert_anthropic_to_openai(
             converted_messages = _convert_anthropic_message_to_openai(msg)
             openai_messages.extend(converted_messages)
             msg_count += 1
-    logger.debug(f"Converted {msg_count} messages, total OpenAI messages: {len(openai_messages)}")
+    logger.debug(
+        f"Converted {msg_count} messages, total OpenAI messages: {len(openai_messages)}"
+    )
 
     # Build OpenAI params
     params: dict[str, Any] = {
@@ -139,17 +141,21 @@ def convert_anthropic_to_openai(
             openai_tools.append(openai_tool)
 
         # Add server tools as OpenAI function tools
-        for tool_class in (enabled_server_tools or []):
+        for tool_class in enabled_server_tools or []:
             if tool_class.tool_type in server_tools_config:
                 config = server_tools_config[tool_class.tool_type]
                 openai_tools.append(tool_class.to_openai_tool(config))
 
         if openai_tools:
             params["tools"] = openai_tools
-        
+
         # Convert tool_choice
         if tool_choice:
-            tc = tool_choice if isinstance(tool_choice, dict) else tool_choice.model_dump()
+            tc = (
+                tool_choice
+                if isinstance(tool_choice, dict)
+                else tool_choice.model_dump()
+            )
             tc_type = tc.get("type")
             if tc_type == "auto":
                 params["tool_choice"] = "auto"
@@ -162,7 +168,7 @@ def convert_anthropic_to_openai(
                 }
         else:
             params["tool_choice"] = "auto"
-    
+
     # Handle thinking parameter
     # vLLM/SGLang use chat_template_kwargs.thinking to toggle thinking mode
     # Some models use "thinking", others use "enable_thinking", so we include both
@@ -181,7 +187,7 @@ def convert_anthropic_to_openai(
                 logger.debug(
                     "thinking.budget_tokens (%s) is accepted but not supported by "
                     "vLLM/SGLang. Using default thinking configuration.",
-                    budget_tokens
+                    budget_tokens,
                 )
         else:
             # Default to disabled thinking mode if not explicitly enabled
@@ -208,32 +214,32 @@ def _convert_anthropic_message_to_openai(
 ) -> list[dict[str, Any]]:
     """
     Convert a single Anthropic message to OpenAI format.
-    
-    Returns a list of messages because tool_results need to be 
+
+    Returns a list of messages because tool_results need to be
     separate tool messages in OpenAI format.
     """
     role = msg.get("role", "user")
     content = msg.get("content", "")
-    
+
     if isinstance(content, str):
         return [{"role": role, "content": content}]
-    
+
     # Handle list of content blocks
     openai_content: list[dict[str, Any]] = []
     tool_calls: list[dict[str, Any]] = []
     tool_call_results: list[dict[str, Any]] = []
-    
+
     for block in content:
         if isinstance(block, str):
             openai_content.append({"type": "text", "text": block})
             continue
-            
+
         block_type = block.get("type") if isinstance(block, dict) else block.type
-        
+
         if block_type == "text":
             text = block.get("text") if isinstance(block, dict) else block.text
             openai_content.append({"type": "text", "text": text})
-            
+
         elif block_type == "image":
             # Convert image to image_url format
             source = block.get("source") if isinstance(block, dict) else block.source
@@ -246,11 +252,13 @@ def _convert_anthropic_message_to_openai(
                     data = source.data
                 # Build data URL
                 url = f"data:{media_type};base64,{data}"
-                openai_content.append({
-                    "type": "image_url",
-                    "image_url": {"url": url},
-                })
-                
+                openai_content.append(
+                    {
+                        "type": "image_url",
+                        "image_url": {"url": url},
+                    }
+                )
+
         elif block_type == "tool_use":
             # Convert to function call
             if isinstance(block, dict):
@@ -261,16 +269,20 @@ def _convert_anthropic_message_to_openai(
                 tool_id = block.id
                 name = block.name
                 input_data = block.input
-                
-            tool_calls.append({
-                "id": tool_id,
-                "type": "function",
-                "function": {
-                    "name": name,
-                    "arguments": json.dumps(input_data) if isinstance(input_data, dict) else str(input_data),
-                },
-            })
-            
+
+            tool_calls.append(
+                {
+                    "id": tool_id,
+                    "type": "function",
+                    "function": {
+                        "name": name,
+                        "arguments": json.dumps(input_data)
+                        if isinstance(input_data, dict)
+                        else str(input_data),
+                    },
+                }
+            )
+
         elif block_type == "tool_result":
             # Tool results need to be separate tool messages
             if isinstance(block, dict):
@@ -281,7 +293,7 @@ def _convert_anthropic_message_to_openai(
                 tool_use_id = block.tool_use_id
                 result_content = block.content
                 is_error = getattr(block, "is_error", False)
-                
+
             # Handle content that might be a list or string
             if isinstance(result_content, list):
                 # Extract text from content blocks
@@ -298,7 +310,7 @@ def _convert_anthropic_message_to_openai(
                 result_text = "\n".join(text_parts)
             else:
                 result_text = str(result_content)
-                
+
             tool_msg: dict[str, Any] = {
                 "role": "tool",
                 "tool_call_id": tool_use_id,
@@ -306,28 +318,28 @@ def _convert_anthropic_message_to_openai(
             }
             # Note: is_error is not directly supported in OpenAI API
             # but we could add it to content if needed
-            
+
             tool_call_results.append(tool_msg)
-    
+
     # Build primary message
     messages: list[dict[str, Any]] = []
     # SGLang requires content field to be present, default to empty string
     primary_msg: dict[str, Any] = {"role": role, "content": ""}
-    
+
     if openai_content:
         if len(openai_content) == 1 and openai_content[0]["type"] == "text":
             primary_msg["content"] = openai_content[0]["text"]
         else:
             primary_msg["content"] = openai_content
-    
+
     if tool_calls:
         primary_msg["tool_calls"] = tool_calls
-    
+
     messages.append(primary_msg)
-    
+
     # Add tool result messages separately
     messages.extend(tool_call_results)
-        
+
     return messages
 
 
@@ -353,24 +365,24 @@ def convert_openai_to_anthropic(
 ) -> Message:
     """
     Convert OpenAI ChatCompletion to Anthropic Message.
-    
+
     Args:
         completion: OpenAI chat completion response
         model: Model name
-        
+
     Returns:
         Anthropic Message response
     """
     from anthropic.types.beta import BetaThinkingBlock
-    
+
     choice = completion.choices[0]
     message = choice.message
-    
+
     # Convert content blocks
     content: list[ContentBlock] = []
-    
+
     # Add reasoning content (thinking) first if present
-    reasoning_content = getattr(message, 'reasoning_content', None)
+    reasoning_content = getattr(message, "reasoning_content", None)
     if reasoning_content:
         content.append(
             BetaThinkingBlock(
@@ -379,7 +391,7 @@ def convert_openai_to_anthropic(
                 signature="",  # Signature not available from OpenAI format
             )
         )
-    
+
     # Add text content if present
     if message.content:
         if isinstance(message.content, str):
@@ -388,16 +400,20 @@ def convert_openai_to_anthropic(
             for part in message.content:
                 if part.type == "text":
                     content.append(TextBlock(type="text", text=part.text))
-    
+
     # Convert tool calls
     if message.tool_calls:
         for tc in message.tool_calls:
+            # Handle case where function might be None
+            if not tc.function:
+                continue
+
             tool_input: dict[str, Any] = {}
             try:
                 tool_input = json.loads(tc.function.arguments)
             except json.JSONDecodeError:
                 tool_input = {"raw": tc.function.arguments}
-                
+
             content.append(
                 ToolUseBlock(
                     type="tool_use",
@@ -406,7 +422,7 @@ def convert_openai_to_anthropic(
                     input=tool_input,
                 )
             )
-    
+
     # Determine stop reason
     stop_reason_map = {
         "stop": "end_turn",
@@ -414,18 +430,24 @@ def convert_openai_to_anthropic(
         "tool_calls": "tool_use",
         "content_filter": "end_turn",
     }
-    anthropic_stop_reason = stop_reason_map.get(choice.finish_reason or "stop", "end_turn")
-    
+    anthropic_stop_reason = stop_reason_map.get(
+        choice.finish_reason or "stop", "end_turn"
+    )
+
     # Build usage dict with cache support (if available from upstream)
     usage_dict = None
     if completion.usage:
         usage_dict = {
             "input_tokens": completion.usage.prompt_tokens,
             "output_tokens": completion.usage.completion_tokens,
-            "cache_creation_input_tokens": getattr(completion.usage, "cache_creation_input_tokens", None),
-            "cache_read_input_tokens": getattr(completion.usage, "cache_read_input_tokens", None),
+            "cache_creation_input_tokens": getattr(
+                completion.usage, "cache_creation_input_tokens", None
+            ),
+            "cache_read_input_tokens": getattr(
+                completion.usage, "cache_read_input_tokens", None
+            ),
         }
-    
+
     # Build message dict to avoid Pydantic validation issues
     message_dict = {
         "id": completion.id,
@@ -437,5 +459,5 @@ def convert_openai_to_anthropic(
         "stop_sequence": None,
         "usage": usage_dict,
     }
-    
+
     return Message.model_validate(message_dict)

local_openai2anthropic/router.py

@@ -47,7 +47,7 @@ def _generate_server_tool_id() -> str:
     """Generate Anthropic-style server tool use ID (srvtoolu_...)."""
     # Generate 24 random alphanumeric characters
     chars = string.ascii_lowercase + string.digits
-    random_part = ''.join(secrets.choice(chars) for _ in range(24))
+    random_part = "".join(secrets.choice(chars) for _ in range(24))
     return f"srvtoolu_{random_part}"
 
 
@@ -62,12 +62,16 @@ async def _stream_response(
     Stream response from OpenAI and convert to Anthropic format.
     """
     try:
-        async with client.stream("POST", url, headers=headers, json=json_data) as response:
+        async with client.stream(
+            "POST", url, headers=headers, json=json_data
+        ) as response:
             if response.status_code != 200:
                 error_body = await response.aread()
                 try:
                     error_json = json.loads(error_body.decode())
-                    error_msg = error_json.get("error", {}).get("message", error_body.decode())
+                    error_msg = error_json.get("error", {}).get(
+                        "message", error_body.decode()
+                    )
                 except json.JSONDecodeError:
                     error_msg = error_body.decode()
 
@@ -98,7 +102,9 @@ async def _stream_response(
 
                 try:
                     chunk = json.loads(data)
-                    logger.debug(f"[OpenAI Stream Chunk] {json.dumps(chunk, ensure_ascii=False)}")
+                    logger.debug(
+                        f"[OpenAI Stream Chunk] {json.dumps(chunk, ensure_ascii=False)}"
+                    )
                 except json.JSONDecodeError:
                     continue
 
@@ -126,7 +132,9 @@ async def _stream_response(
                             },
                         },
                     }
-                    logger.debug(f"[Anthropic Stream Event] message_start: {json.dumps(start_event, ensure_ascii=False)}")
+                    logger.debug(
+                        f"[Anthropic Stream Event] message_start: {json.dumps(start_event, ensure_ascii=False)}"
+                    )
                     yield f"event: message_start\ndata: {json.dumps(start_event)}\n\n"
                     first_chunk = False
                     continue
@@ -139,9 +147,28 @@ async def _stream_response(
                             yield f"event: content_block_stop\ndata: {json.dumps({'type': 'content_block_stop', 'index': content_block_index})}\n\n"
                             content_block_started = False
 
-                        stop_reason_map = {"stop": "end_turn", "length": "max_tokens", "tool_calls": "tool_use"}
-                        delta_event = {'type': 'message_delta', 'delta': {'stop_reason': stop_reason_map.get(finish_reason or 'stop', 'end_turn')}, 'usage': {'input_tokens': usage.get('prompt_tokens', 0), 'output_tokens': usage.get('completion_tokens', 0), 'cache_creation_input_tokens': None, 'cache_read_input_tokens': None}}
-                        logger.debug(f"[Anthropic Stream Event] message_delta: {json.dumps(delta_event, ensure_ascii=False)}")
+                        stop_reason_map = {
+                            "stop": "end_turn",
+                            "length": "max_tokens",
+                            "tool_calls": "tool_use",
+                        }
+                        delta_event = {
+                            "type": "message_delta",
+                            "delta": {
+                                "stop_reason": stop_reason_map.get(
+                                    finish_reason or "stop", "end_turn"
+                                )
+                            },
+                            "usage": {
+                                "input_tokens": usage.get("prompt_tokens", 0),
+                                "output_tokens": usage.get("completion_tokens", 0),
+                                "cache_creation_input_tokens": None,
+                                "cache_read_input_tokens": None,
+                            },
+                        }
+                        logger.debug(
+                            f"[Anthropic Stream Event] message_delta: {json.dumps(delta_event, ensure_ascii=False)}"
+                        )
                         yield f"event: message_delta\ndata: {json.dumps(delta_event)}\n\n"
                     continue
 
@@ -152,77 +179,133 @@ async def _stream_response(
                 if choice.get("finish_reason"):
                     finish_reason = choice["finish_reason"]
 
+                    # When finish_reason is tool_calls, we need to close the current block
+                    # and prepare to send message_delta
+                    if finish_reason == "tool_calls" and content_block_started:
+                        stop_block = {
+                            "type": "content_block_stop",
+                            "index": content_block_index,
+                        }
+                        logger.debug(
+                            f"[Anthropic Stream Event] content_block_stop (tool_calls): {json.dumps(stop_block, ensure_ascii=False)}"
+                        )
+                        yield f"event: content_block_stop\ndata: {json.dumps(stop_block)}\n\n"
+                        content_block_started = False
+
                 # Handle reasoning content (thinking)
                 if delta.get("reasoning_content"):
                     reasoning = delta["reasoning_content"]
                     # Start thinking content block if not already started
-                    if not content_block_started or current_block_type != 'thinking':
+                    if not content_block_started or current_block_type != "thinking":
                         # Close previous block if exists
                         if content_block_started:
-                            stop_block = {'type': 'content_block_stop', 'index': content_block_index}
-                            logger.debug(f"[Anthropic Stream Event] content_block_stop ({current_block_type}): {json.dumps(stop_block, ensure_ascii=False)}")
+                            stop_block = {
+                                "type": "content_block_stop",
+                                "index": content_block_index,
+                            }
+                            logger.debug(
+                                f"[Anthropic Stream Event] content_block_stop ({current_block_type}): {json.dumps(stop_block, ensure_ascii=False)}"
+                            )
                             yield f"event: content_block_stop\ndata: {json.dumps(stop_block)}\n\n"
                             content_block_index += 1
-                        start_block = {'type': 'content_block_start', 'index': content_block_index, 'content_block': {'type': 'thinking', 'thinking': ''}}
-                        logger.debug(f"[Anthropic Stream Event] content_block_start (thinking): {json.dumps(start_block, ensure_ascii=False)}")
+                        start_block = {
+                            "type": "content_block_start",
+                            "index": content_block_index,
+                            "content_block": {"type": "thinking", "thinking": ""},
+                        }
+                        logger.debug(
+                            f"[Anthropic Stream Event] content_block_start (thinking): {json.dumps(start_block, ensure_ascii=False)}"
+                        )
                         yield f"event: content_block_start\ndata: {json.dumps(start_block)}\n\n"
                         content_block_started = True
-                        current_block_type = 'thinking'
+                        current_block_type = "thinking"
 
-                    delta_block = {'type': 'content_block_delta', 'index': content_block_index, 'delta': {'type': 'thinking_delta', 'thinking': reasoning}}
+                    delta_block = {
+                        "type": "content_block_delta",
+                        "index": content_block_index,
+                        "delta": {"type": "thinking_delta", "thinking": reasoning},
+                    }
                     yield f"event: content_block_delta\ndata: {json.dumps(delta_block)}\n\n"
                     continue
 
                 # Handle content
                 if delta.get("content"):
-                    if not content_block_started or current_block_type != 'text':
+                    if not content_block_started or current_block_type != "text":
                         # Close previous block if exists
                         if content_block_started:
-                            stop_block = {'type': 'content_block_stop', 'index': content_block_index}
-                            logger.debug(f"[Anthropic Stream Event] content_block_stop ({current_block_type}): {json.dumps(stop_block, ensure_ascii=False)}")
+                            stop_block = {
+                                "type": "content_block_stop",
+                                "index": content_block_index,
+                            }
+                            logger.debug(
+                                f"[Anthropic Stream Event] content_block_stop ({current_block_type}): {json.dumps(stop_block, ensure_ascii=False)}"
+                            )
                             yield f"event: content_block_stop\ndata: {json.dumps(stop_block)}\n\n"
                             content_block_index += 1
-                        start_block = {'type': 'content_block_start', 'index': content_block_index, 'content_block': {'type': 'text', 'text': ''}}
-                        logger.debug(f"[Anthropic Stream Event] content_block_start (text): {json.dumps(start_block, ensure_ascii=False)}")
+                        start_block = {
+                            "type": "content_block_start",
+                            "index": content_block_index,
+                            "content_block": {"type": "text", "text": ""},
+                        }
+                        logger.debug(
+                            f"[Anthropic Stream Event] content_block_start (text): {json.dumps(start_block, ensure_ascii=False)}"
+                        )
                         yield f"event: content_block_start\ndata: {json.dumps(start_block)}\n\n"
                         content_block_started = True
-                        current_block_type = 'text'
+                        current_block_type = "text"
 
-                    delta_block = {'type': 'content_block_delta', 'index': content_block_index, 'delta': {'type': 'text_delta', 'text': delta['content']}}
+                    delta_block = {
+                        "type": "content_block_delta",
+                        "index": content_block_index,
+                        "delta": {"type": "text_delta", "text": delta["content"]},
+                    }
                     yield f"event: content_block_delta\ndata: {json.dumps(delta_block)}\n\n"
 
                 # Handle tool calls
-                if delta.get("tool_calls"):
-                    tool_call = delta["tool_calls"][0]
+                tool_calls = delta.get("tool_calls", [])
+                if tool_calls:
+                    tool_call = tool_calls[0]
 
+                    # Handle new tool call (with id) - use separate if, not elif
+                    # because a chunk may have both id AND arguments
                     if tool_call.get("id"):
                         if content_block_started:
                             yield f"event: content_block_stop\ndata: {json.dumps({'type': 'content_block_stop', 'index': content_block_index})}\n\n"
                             content_block_started = False
                             content_block_index += 1
 
-                        func = tool_call.get('function') or {}
+                        func = tool_call.get("function") or {}
                         yield f"event: content_block_start\ndata: {json.dumps({'type': 'content_block_start', 'index': content_block_index, 'content_block': {'type': 'tool_use', 'id': tool_call['id'], 'name': func.get('name', ''), 'input': {}}})}\n\n"
                         content_block_started = True
-                        current_block_type = 'tool_use'
+                        current_block_type = "tool_use"
 
-                    elif (tool_call.get('function') or {}).get("arguments"):
-                        args = (tool_call.get('function') or {}).get("arguments", "")
+                    # Handle tool call arguments - always check separately
+                    # Note: This is intentionally NOT elif, as a single chunk may contain both
+                    if (tool_call.get("function") or {}).get("arguments"):
+                        args = (tool_call.get("function") or {}).get("arguments", "")
                         yield f"event: content_block_delta\ndata: {json.dumps({'type': 'content_block_delta', 'index': content_block_index, 'delta': {'type': 'input_json_delta', 'partial_json': args}})}\n\n"
 
             # Close final content block
             if content_block_started:
-                stop_block = {'type': 'content_block_stop', 'index': content_block_index}
-                logger.debug(f"[Anthropic Stream Event] content_block_stop (final): {json.dumps(stop_block, ensure_ascii=False)}")
+                stop_block = {
+                    "type": "content_block_stop",
+                    "index": content_block_index,
+                }
+                logger.debug(
+                    f"[Anthropic Stream Event] content_block_stop (final): {json.dumps(stop_block, ensure_ascii=False)}"
+                )
                 yield f"event: content_block_stop\ndata: {json.dumps(stop_block)}\n\n"
 
             # Message stop
-            stop_event = {'type': 'message_stop'}
-            logger.debug(f"[Anthropic Stream Event] message_stop: {json.dumps(stop_event, ensure_ascii=False)}")
+            stop_event = {"type": "message_stop"}
+            logger.debug(
+                f"[Anthropic Stream Event] message_stop: {json.dumps(stop_event, ensure_ascii=False)}"
+            )
             yield f"event: message_stop\ndata: {json.dumps(stop_event)}\n\n"
 
     except Exception as e:
         import traceback
+
         error_msg = f"{str(e)}\n{traceback.format_exc()}"
         logger.error(f"Stream error: {error_msg}")
         error_event = AnthropicErrorResponse(
@@ -237,17 +320,21 @@ async def _convert_result_to_stream(
 ) -> AsyncGenerator[str, None]:
     """Convert a JSONResponse to streaming SSE format."""
     import time
-    
+
     body = json.loads(result.body)
     message_id = body.get("id", f"msg_{int(time.time() * 1000)}")
     content = body.get("content", [])
     usage = body.get("usage", {})
     stop_reason = body.get("stop_reason", "end_turn")
-    
+
     # Map stop_reason
-    stop_reason_map = {"end_turn": "stop", "max_tokens": "length", "tool_use": "tool_calls"}
+    stop_reason_map = {
+        "end_turn": "stop",
+        "max_tokens": "length",
+        "tool_use": "tool_calls",
+    }
     openai_stop_reason = stop_reason_map.get(stop_reason, "stop")
-    
+
     # 1. message_start event
     start_event = {
         "type": "message_start",
@@ -268,7 +355,7 @@ async def _convert_result_to_stream(
         },
     }
     yield f"event: message_start\ndata: {json.dumps(start_event)}\n\n"
-    
+
     # 2. Process content blocks
     for i, block in enumerate(content):
         block_type = block.get("type")
@@ -305,7 +392,7 @@ async def _convert_result_to_stream(
             if thinking_text:
                 yield f"event: content_block_delta\ndata: {json.dumps({'type': 'content_block_delta', 'index': i, 'delta': {'type': 'thinking_delta', 'thinking': thinking_text}})}\n\n"
             yield f"event: content_block_stop\ndata: {json.dumps({'type': 'content_block_stop', 'index': i})}\n\n"
-    
+
     # 3. message_delta with final usage
     delta_event = {
         "type": "message_delta",
@@ -319,7 +406,7 @@ async def _convert_result_to_stream(
         },
     }
     yield f"event: message_delta\ndata: {json.dumps(delta_event)}\n\n"
-    
+
     # 4. message_stop
     yield f"event: message_stop\ndata: {json.dumps({'type': 'message_stop'})}\n\n"
 
@@ -406,12 +493,16 @@ async def _handle_with_server_tools(
         async with httpx.AsyncClient(timeout=settings.request_timeout) as client:
             try:
                 # Log full request for debugging
-                logger.debug(f"Request body: {json.dumps(params, indent=2, default=str)[:3000]}")
-                
+                logger.debug(
+                    f"Request body: {json.dumps(params, indent=2, default=str)[:3000]}"
+                )
+
                 response = await client.post(url, headers=headers, json=params)
 
                 if response.status_code != 200:
-                    logger.error(f"OpenAI API error: {response.status_code} - {response.text}")
+                    logger.error(
+                        f"OpenAI API error: {response.status_code} - {response.text}"
+                    )
                     error_response = AnthropicErrorResponse(
                         error=AnthropicError(type="api_error", message=response.text)
                     )
@@ -421,36 +512,45 @@ async def _handle_with_server_tools(
                     )
 
                 completion_data = response.json()
-                logger.debug(f"OpenAI response: {json.dumps(completion_data, indent=2)[:500]}...")
+                logger.debug(
+                    f"OpenAI response: {json.dumps(completion_data, indent=2)[:500]}..."
+                )
                 from openai.types.chat import ChatCompletion
+
                 completion = ChatCompletion.model_validate(completion_data)
 
                 # Check for server tool calls
                 server_tool_calls = []
                 other_tool_calls = []
-                
+
                 tool_calls = completion.choices[0].message.tool_calls
-                logger.info(f"Model returned tool_calls: {len(tool_calls) if tool_calls else 0}")
+                logger.info(
+                    f"Model returned tool_calls: {len(tool_calls) if tool_calls else 0}"
+                )
 
                 if tool_calls:
                     for tc in tool_calls:
                         func_name = tc.function.name if tc.function else ""
                         logger.info(f"  Tool call: {func_name}")
-                        
+
                         # Generate Anthropic-style ID for server tools
-                        is_server = handler.is_server_tool_call({
-                            "id": tc.id,
-                            "function": {"name": func_name, "arguments": ""},
-                        })
-                        
+                        is_server = handler.is_server_tool_call(
+                            {
+                                "id": tc.id,
+                                "function": {"name": func_name, "arguments": ""},
+                            }
+                        )
+
                         # Use Anthropic-style ID for server tools, original ID otherwise
                         tool_id = _generate_server_tool_id() if is_server else tc.id
-                        
+
                         tc_dict = {
                             "id": tool_id,
                             "function": {
                                 "name": func_name,
-                                "arguments": tc.function.arguments if tc.function else "{}",
+                                "arguments": tc.function.arguments
+                                if tc.function
+                                else "{}",
                             },
                         }
                         logger.info(f"    Is server tool: {is_server}, ID: {tool_id}")
@@ -460,19 +560,25 @@ async def _handle_with_server_tools(
                             other_tool_calls.append(tc)
 
                 # No server tool calls - we're done
-                logger.info(f"Server tool calls: {len(server_tool_calls)}, Other: {len(other_tool_calls)}")
+                logger.info(
+                    f"Server tool calls: {len(server_tool_calls)}, Other: {len(other_tool_calls)}"
+                )
                 if not server_tool_calls:
                     message = convert_openai_to_anthropic(completion, model)
 
                     if accumulated_content:
                         message_dict = message.model_dump()
-                        message_dict["content"] = accumulated_content + message_dict.get("content", [])
-                        
+                        message_dict["content"] = (
+                            accumulated_content + message_dict.get("content", [])
+                        )
+
                         if message_dict.get("usage"):
                             message_dict["usage"]["server_tool_use"] = handler.usage
-                        
+
                         # Log full response for debugging
-                        logger.info(f"Response content blocks: {json.dumps(message_dict.get('content', []), ensure_ascii=False)[:1000]}")
+                        logger.info(
+                            f"Response content blocks: {json.dumps(message_dict.get('content', []), ensure_ascii=False)[:1000]}"
+                        )
                         logger.info(f"Response usage: {message_dict.get('usage')}")
                         logger.info(f"Server tool use count: {handler.usage}")
 
@@ -489,6 +595,7 @@ async def _handle_with_server_tools(
                         tool_class = handler.server_tools.get(func_name)
                         if tool_class:
                             from local_openai2anthropic.server_tools import ToolResult
+
                             error_result = ToolResult(
                                 success=False,
                                 content=[],
@@ -520,14 +627,16 @@ async def _handle_with_server_tools(
                     accumulated_content.extend(content_blocks)
 
                     # Track for assistant message
-                    assistant_tool_calls.append({
-                        "id": call["id"],
-                        "type": "function",
-                        "function": {
-                            "name": call["function"]["name"],
-                            "arguments": call["function"]["arguments"],
-                        },
-                    })
+                    assistant_tool_calls.append(
+                        {
+                            "id": call["id"],
+                            "type": "function",
+                            "function": {
+                                "name": call["function"]["name"],
+                                "arguments": call["function"]["arguments"],
+                            },
+                        }
+                    )
                     tool_results.append(tool_result)
 
                 # Add to messages for next iteration
@@ -538,7 +647,9 @@ async def _handle_with_server_tools(
 
             except httpx.TimeoutException:
                 error_response = AnthropicErrorResponse(
-                    error=AnthropicError(type="timeout_error", message="Request timed out")
+                    error=AnthropicError(
+                        type="timeout_error", message="Request timed out"
+                    )
                 )
                 raise HTTPException(
                     status_code=HTTPStatus.GATEWAY_TIMEOUT,
@@ -576,14 +687,18 @@ def _add_tool_results_to_messages(
     # Add tool results
     if is_error:
         for call in tool_calls:
-            messages.append({
-                "role": "tool",
-                "tool_call_id": call["id"],
-                "content": json.dumps({
-                    "error": "max_uses_exceeded",
-                    "message": "Maximum tool uses exceeded.",
-                }),
-            })
+            messages.append(
+                {
+                    "role": "tool",
+                    "tool_call_id": call["id"],
+                    "content": json.dumps(
+                        {
+                            "error": "max_uses_exceeded",
+                            "message": "Maximum tool uses exceeded.",
+                        }
+                    ),
+                }
+            )
     elif tool_results:
         messages.extend(tool_results)
 
@@ -611,12 +726,16 @@ async def create_message(
     try:
         body_bytes = await request.body()
         body_json = json.loads(body_bytes.decode("utf-8"))
-        logger.debug(f"[Anthropic Request] {json.dumps(body_json, ensure_ascii=False, indent=2)}")
+        logger.debug(
+            f"[Anthropic Request] {json.dumps(body_json, ensure_ascii=False, indent=2)}"
+        )
         anthropic_params = body_json
     except json.JSONDecodeError as e:
         logger.error(f"Invalid JSON in request body: {e}")
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="invalid_request_error", message=f"Invalid JSON: {e}")
+            error=AnthropicError(
+                type="invalid_request_error", message=f"Invalid JSON: {e}"
+            )
         )
         return JSONResponse(status_code=422, content=error_response.model_dump())
     except Exception as e:
@@ -629,28 +748,38 @@ async def create_message(
     # Validate request shape early (avoid making upstream calls for obviously invalid requests)
     if not isinstance(anthropic_params, dict):
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="invalid_request_error", message="Request body must be a JSON object")
+            error=AnthropicError(
+                type="invalid_request_error",
+                message="Request body must be a JSON object",
+            )
         )
         return JSONResponse(status_code=422, content=error_response.model_dump())
 
     model_value = anthropic_params.get("model")
     if not isinstance(model_value, str) or not model_value.strip():
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="invalid_request_error", message="Model must be a non-empty string")
+            error=AnthropicError(
+                type="invalid_request_error", message="Model must be a non-empty string"
+            )
         )
         return JSONResponse(status_code=422, content=error_response.model_dump())
 
     messages_value = anthropic_params.get("messages")
     if not isinstance(messages_value, list) or len(messages_value) == 0:
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="invalid_request_error", message="Messages must be a non-empty list")
+            error=AnthropicError(
+                type="invalid_request_error",
+                message="Messages must be a non-empty list",
+            )
         )
         return JSONResponse(status_code=422, content=error_response.model_dump())
 
     max_tokens_value = anthropic_params.get("max_tokens")
     if not isinstance(max_tokens_value, int):
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="invalid_request_error", message="max_tokens is required")
+            error=AnthropicError(
+                type="invalid_request_error", message="max_tokens is required"
+            )
         )
         return JSONResponse(status_code=422, content=error_response.model_dump())
 
@@ -668,10 +797,12 @@ async def create_message(
         enabled_server_tools=enabled_server_tools if has_server_tools else None,
     )
     openai_params: dict[str, Any] = dict(openai_params_obj)  # type: ignore
-    
+
     # Log converted OpenAI request (remove internal fields)
-    log_params = {k: v for k, v in openai_params.items() if not k.startswith('_')}
-    logger.debug(f"[OpenAI Request] {json.dumps(log_params, ensure_ascii=False, indent=2)}")
+    log_params = {k: v for k, v in openai_params.items() if not k.startswith("_")}
+    logger.debug(
+        f"[OpenAI Request] {json.dumps(log_params, ensure_ascii=False, indent=2)}"
+    )
 
     stream = openai_params.get("stream", False)
     model = openai_params.get("model", "")
@@ -698,7 +829,7 @@ async def create_message(
         result = await _handle_with_server_tools(
             openai_params, url, headers, settings, tool_classes, model
         )
-        
+
         # If original request was streaming, convert result to streaming format
         if stream:
             return StreamingResponse(
@@ -728,20 +859,27 @@ async def create_message(
                     )
 
                 openai_completion = response.json()
-                logger.debug(f"[OpenAI Response] {json.dumps(openai_completion, ensure_ascii=False, indent=2)}")
-                
+                logger.debug(
+                    f"[OpenAI Response] {json.dumps(openai_completion, ensure_ascii=False, indent=2)}"
+                )
+
                 from openai.types.chat import ChatCompletion
+
                 completion = ChatCompletion.model_validate(openai_completion)
                 anthropic_message = convert_openai_to_anthropic(completion, model)
-                
+
                 anthropic_response = anthropic_message.model_dump()
-                logger.debug(f"[Anthropic Response] {json.dumps(anthropic_response, ensure_ascii=False, indent=2)}")
+                logger.debug(
+                    f"[Anthropic Response] {json.dumps(anthropic_response, ensure_ascii=False, indent=2)}"
+                )
 
                 return JSONResponse(content=anthropic_response)
 
             except httpx.TimeoutException:
                 error_response = AnthropicErrorResponse(
-                    error=AnthropicError(type="timeout_error", message="Request timed out")
+                    error=AnthropicError(
+                        type="timeout_error", message="Request timed out"
+                    )
                 )
                 raise HTTPException(
                     status_code=HTTPStatus.GATEWAY_TIMEOUT,
@@ -798,10 +936,14 @@ async def count_tokens(
     try:
         body_bytes = await request.body()
         body_json = json.loads(body_bytes.decode("utf-8"))
-        logger.debug(f"[Count Tokens Request] {json.dumps(body_json, ensure_ascii=False, indent=2)}")
+        logger.debug(
+            f"[Count Tokens Request] {json.dumps(body_json, ensure_ascii=False, indent=2)}"
+        )
     except json.JSONDecodeError as e:
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="invalid_request_error", message=f"Invalid JSON: {e}")
+            error=AnthropicError(
+                type="invalid_request_error", message=f"Invalid JSON: {e}"
+            )
         )
         return JSONResponse(status_code=422, content=error_response.model_dump())
     except Exception as e:
@@ -813,14 +955,19 @@ async def count_tokens(
     # Validate required fields
     if not isinstance(body_json, dict):
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="invalid_request_error", message="Request body must be a JSON object")
+            error=AnthropicError(
+                type="invalid_request_error",
+                message="Request body must be a JSON object",
+            )
         )
         return JSONResponse(status_code=422, content=error_response.model_dump())
 
     messages = body_json.get("messages", [])
     if not isinstance(messages, list):
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="invalid_request_error", message="messages must be a list")
+            error=AnthropicError(
+                type="invalid_request_error", message="messages must be a list"
+            )
         )
         return JSONResponse(status_code=422, content=error_response.model_dump())
 
@@ -831,13 +978,13 @@ async def count_tokens(
     try:
         # Use tiktoken for token counting
         import tiktoken
-        
+
         # Map model names to tiktoken encoding
         # Claude models don't have direct tiktoken encodings, so we use cl100k_base as approximation
         encoding = tiktoken.get_encoding("cl100k_base")
-        
+
         total_tokens = 0
-        
+
         # Count system prompt tokens if present
         if system:
             if isinstance(system, str):
@@ -846,7 +993,7 @@ async def count_tokens(
                 for block in system:
                     if isinstance(block, dict) and block.get("type") == "text":
                         total_tokens += len(encoding.encode(block.get("text", "")))
-        
+
         # Count message tokens
         for msg in messages:
             content = msg.get("content", "")
@@ -861,24 +1008,24 @@ async def count_tokens(
                             # Images are typically counted as a fixed number of tokens
                             # This is an approximation
                             total_tokens += 85  # Standard approximation for images
-        
+
         # Count tool definitions tokens
         if tools:
             for tool in tools:
                 tool_def = tool if isinstance(tool, dict) else tool.model_dump()
                 # Rough approximation for tool definitions
                 total_tokens += len(encoding.encode(json.dumps(tool_def)))
-        
+
         logger.debug(f"[Count Tokens Response] input_tokens: {total_tokens}")
-        
-        return JSONResponse(content={
-            "input_tokens": total_tokens
-        })
-        
+
+        return JSONResponse(content={"input_tokens": total_tokens})
+
     except Exception as e:
         logger.error(f"Token counting error: {e}")
         error_response = AnthropicErrorResponse(
-            error=AnthropicError(type="internal_error", message=f"Failed to count tokens: {str(e)}")
+            error=AnthropicError(
+                type="internal_error", message=f"Failed to count tokens: {str(e)}"
+            )
         )
         return JSONResponse(status_code=500, content=error_response.model_dump())
 

{local_openai2anthropic-0.2.7.dist-info → local_openai2anthropic-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: local-openai2anthropic
-Version: 0.2.7
+Version: 0.2.9
 Summary: A lightweight proxy server that converts Anthropic Messages API to OpenAI API
 Project-URL: Homepage, https://github.com/dongfangzan/local-openai2anthropic
 Project-URL: Repository, https://github.com/dongfangzan/local-openai2anthropic

{local_openai2anthropic-0.2.7.dist-info → local_openai2anthropic-0.2.9.dist-info}/RECORD

@@ -1,19 +1,19 @@
 local_openai2anthropic/__init__.py,sha256=IEn8YcQGsaEaCr04s3hS2AcgsIt5NU5Qa2C8Uwz7RdY,1059
 local_openai2anthropic/__main__.py,sha256=K21u5u7FN8-DbO67TT_XDF0neGqJeFrVNkteRauCRQk,179
 local_openai2anthropic/config.py,sha256=3M5ZAz3uYNMGxaottEBseEOZF-GnVaGuioH9Hpmgnd8,1918
-local_openai2anthropic/converter.py,sha256=d-qYwtv6FIbpKSRsZN4jhnKM4D4k52la-_bpEYPTAS0,15790
+local_openai2anthropic/converter.py,sha256=-cxPlZIPcey4LFIb7250YLlhLntN2uuh1YUpWGCsmfQ,15969
 local_openai2anthropic/daemon.py,sha256=pZnRojGFcuIpR8yLDNjV-b0LJRBVhgRAa-dKeRRse44,10017
 local_openai2anthropic/daemon_runner.py,sha256=rguOH0PgpbjqNsKYei0uCQX8JQOQ1wmtQH1CtW95Dbw,3274
 local_openai2anthropic/main.py,sha256=FK5JBBpzB_T44y3N16lPl1hK4ht4LEQqRKzVmkIjIoo,9866
 local_openai2anthropic/openai_types.py,sha256=jFdCvLwtXYoo5gGRqOhbHQcVaxcsxNnCP_yFPIv7rG4,3823
 local_openai2anthropic/protocol.py,sha256=vUEgxtRPFll6jEtLc4DyxTLCBjrWIEScZXhEqe4uibk,5185
-local_openai2anthropic/router.py,sha256=imzvgduneiniwHroTgeT9d8q4iF5GAuptaVP38sakUg,40226
+local_openai2anthropic/router.py,sha256=YZkpncYX9bI1VYtUE7srSImF3o0FZLAfM1Lfc2G-AeI,43927
 local_openai2anthropic/tavily_client.py,sha256=QsBhnyF8BFWPAxB4XtWCCpHCquNL5SW93-zjTTi4Meg,3774
 local_openai2anthropic/server_tools/__init__.py,sha256=QlJfjEta-HOCtLe7NaY_fpbEKv-ZpInjAnfmSqE9tbk,615
 local_openai2anthropic/server_tools/base.py,sha256=pNFsv-jSgxVrkY004AHAcYMNZgVSO8ZOeCzQBUtQ3vU,5633
 local_openai2anthropic/server_tools/web_search.py,sha256=1C7lX_cm-tMaN3MsCjinEZYPJc_Hj4yAxYay9h8Zbvs,6543
-local_openai2anthropic-0.2.7.dist-info/METADATA,sha256=eA34CtgLACHsE4gf4Scuj7yU5IBg_Ys26x8nMnCd_eM,11240
-local_openai2anthropic-0.2.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-local_openai2anthropic-0.2.7.dist-info/entry_points.txt,sha256=hdc9tSJUNxyNLXcTYye5SuD2K0bEQhxBhGnWTFup6ZM,116
-local_openai2anthropic-0.2.7.dist-info/licenses/LICENSE,sha256=X3_kZy3lJvd_xp8IeyUcIAO2Y367MXZc6aaRx8BYR_s,11369
-local_openai2anthropic-0.2.7.dist-info/RECORD,,
+local_openai2anthropic-0.2.9.dist-info/METADATA,sha256=tDbUvOtBGJo5DXRzVfxm7UH7XgGzRTLvokU_XcrKnkA,11240
+local_openai2anthropic-0.2.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+local_openai2anthropic-0.2.9.dist-info/entry_points.txt,sha256=hdc9tSJUNxyNLXcTYye5SuD2K0bEQhxBhGnWTFup6ZM,116
+local_openai2anthropic-0.2.9.dist-info/licenses/LICENSE,sha256=X3_kZy3lJvd_xp8IeyUcIAO2Y367MXZc6aaRx8BYR_s,11369
+local_openai2anthropic-0.2.9.dist-info/RECORD,,