local-openai2anthropic 0.2.8__py3-none-any.whl → 0.3.0__py3-none-any.whl

local_openai2anthropic/router.py

@@ -179,6 +179,19 @@ 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"]
@@ -253,6 +266,8 @@ async def _stream_response(
                 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"
@@ -264,7 +279,9 @@ async def _stream_response(
                         content_block_started = True
                         current_block_type = "tool_use"
 
-                    elif (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"
 
@@ -495,8 +512,9 @@ async def _handle_with_server_tools(
                     )
 
                 completion_data = response.json()
-                logger.debug(
-                    f"OpenAI response: {json.dumps(completion_data, indent=2)[:500]}..."
+                # Log raw OpenAI response for server tools
+                logger.info(
+                    f"[OpenAI Response (Server Tools)] {json.dumps(completion_data, ensure_ascii=False, indent=2)[:2000]}"
                 )
                 from openai.types.chat import ChatCompletion
 
@@ -514,7 +532,12 @@ async def _handle_with_server_tools(
                 if tool_calls:
                     for tc in tool_calls:
                         func_name = tc.function.name if tc.function else ""
+                        func_args = tc.function.arguments if tc.function else "{}"
                         logger.info(f"  Tool call: {func_name}")
+                        logger.info(f"    Tool ID: {tc.id}")
+                        logger.info(
+                            f"    Arguments: {func_args[:200]}"
+                        )  # Log first 200 chars
 
                         # Generate Anthropic-style ID for server tools
                         is_server = handler.is_server_tool_call(
@@ -842,20 +865,60 @@ async def create_message(
                     )
 
                 openai_completion = response.json()
-                logger.debug(
-                    f"[OpenAI Response] {json.dumps(openai_completion, ensure_ascii=False, indent=2)}"
+                # Log raw OpenAI response
+                logger.info(
+                    f"[OpenAI Raw Response] {json.dumps(openai_completion, ensure_ascii=False, indent=2)[:2000]}"
                 )
 
+                # Log response details
+                if openai_completion.get("choices"):
+                    choice = openai_completion["choices"][0]
+                    message = choice.get("message", {})
+                    finish_reason = choice.get("finish_reason")
+                    content_preview = (
+                        message.get("content", "")[:100]
+                        if message.get("content")
+                        else ""
+                    )
+                    tool_calls_count = (
+                        len(message.get("tool_calls", []))
+                        if message.get("tool_calls")
+                        else 0
+                    )
+                    logger.info(
+                        f"[OpenAI Response Details] finish_reason={finish_reason}, "
+                        f"content_length={len(message.get('content', ''))}, "
+                        f"tool_calls={tool_calls_count}, "
+                        f"content_preview={content_preview[:50]!r}"
+                    )
+
                 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)}"
+                # Log converted Anthropic response
+                logger.info(
+                    f"[Anthropic Converted Response] {json.dumps(anthropic_response, ensure_ascii=False, indent=2)[:2000]}"
                 )
 
+                # Log Anthropic response details
+                content_blocks = anthropic_response.get("content", [])
+                stop_reason = anthropic_response.get("stop_reason")
+                usage = anthropic_response.get("usage", {})
+                logger.info(
+                    f"[Anthropic Response Details] stop_reason={stop_reason}, "
+                    f"content_blocks={len(content_blocks)}, "
+                    f"input_tokens={usage.get('input_tokens')}, "
+                    f"output_tokens={usage.get('output_tokens')}"
+                )
+
+                # Log content block types
+                if content_blocks:
+                    block_types = [block.get("type") for block in content_blocks]
+                    logger.info(f"[Anthropic Content Blocks] types={block_types}")
+
                 return JSONResponse(content=anthropic_response)
 
             except httpx.TimeoutException:

{local_openai2anthropic-0.2.8.dist-info → local_openai2anthropic-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: local-openai2anthropic
-Version: 0.2.8
+Version: 0.3.0
 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.8.dist-info → local_openai2anthropic-0.3.0.dist-info}/RECORD

@@ -7,13 +7,13 @@ local_openai2anthropic/daemon_runner.py,sha256=rguOH0PgpbjqNsKYei0uCQX8JQOQ1wmtQ
 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=SCmwXSh02E8QX_oNCSXC5JvMDDI8Zfso0YBnPIykBss,42853
+local_openai2anthropic/router.py,sha256=ci8G3XL3eHzpn3kOko5QhnqLtIQTrlAaIhvzrvuk_Jc,46271
 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.8.dist-info/METADATA,sha256=VfHnmWbI52pgbH9kzjimeUJ3r0XVwvdMnTodX8-3nH4,11240
-local_openai2anthropic-0.2.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-local_openai2anthropic-0.2.8.dist-info/entry_points.txt,sha256=hdc9tSJUNxyNLXcTYye5SuD2K0bEQhxBhGnWTFup6ZM,116
-local_openai2anthropic-0.2.8.dist-info/licenses/LICENSE,sha256=X3_kZy3lJvd_xp8IeyUcIAO2Y367MXZc6aaRx8BYR_s,11369
-local_openai2anthropic-0.2.8.dist-info/RECORD,,
+local_openai2anthropic-0.3.0.dist-info/METADATA,sha256=e8dCKWpeT7dth6tqLfW7RvRaJxrUUr4DRg3OJDc3MBI,11240
+local_openai2anthropic-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+local_openai2anthropic-0.3.0.dist-info/entry_points.txt,sha256=hdc9tSJUNxyNLXcTYye5SuD2K0bEQhxBhGnWTFup6ZM,116
+local_openai2anthropic-0.3.0.dist-info/licenses/LICENSE,sha256=X3_kZy3lJvd_xp8IeyUcIAO2Y367MXZc6aaRx8BYR_s,11369
+local_openai2anthropic-0.3.0.dist-info/RECORD,,