LLM-Bridge 1.11.3__py3-none-any.whl → 1.11.3b0__py3-none-any.whl

llm_bridge/client/implementations/claude/claude_stream_response_handler.py

@@ -0,0 +1,70 @@
+from anthropic import BetaMessageStreamEvent, AsyncAnthropic
+from anthropic.types.beta import BetaRawContentBlockDelta, BetaThinkingDelta, BetaTextDelta, BetaInputJSONDelta, \
+    BetaBashCodeExecutionToolResultBlock, \
+    BetaTextEditorCodeExecutionToolResultBlock
+from anthropic.types.beta.beta_raw_content_block_start_event import ContentBlock
+
+from llm_bridge.client.implementations.claude.claude_token_counter import count_claude_output_tokens
+from llm_bridge.type.chat_response import ChatResponse
+
+
+class ClaudeStreamResponseHandler:
+    async def process_claude_stream_response(
+            self,
+            event: BetaMessageStreamEvent,
+            input_tokens: int,
+            client: AsyncAnthropic,
+            model: str,
+    ) -> ChatResponse:
+        text = ""
+        thought = ""
+        code = ""
+        code_output = ""
+
+        if event.type == "content_block_delta":
+            event_delta: BetaRawContentBlockDelta = event.delta
+
+            if event_delta.type == "text_delta":
+                text_delta: BetaTextDelta = event_delta
+                text += text_delta.text
+
+            elif event_delta.type == "thinking_delta":
+                thinking_delta: BetaThinkingDelta = event_delta
+                thought += thinking_delta.thinking
+
+            elif event_delta.type == "input_json_delta":
+                input_json_delta: BetaInputJSONDelta = event_delta
+                code += input_json_delta.partial_json
+
+        if event.type == "content_block_start":
+            event_content_block: ContentBlock = event.content_block
+
+            if event_content_block.type == "bash_code_execution_tool_result":
+                bash_code_execution_tool_result_block: BetaBashCodeExecutionToolResultBlock = event_content_block
+                if bash_code_execution_tool_result_block.content.type == "bash_code_execution_result":
+                    code_output += event_content_block.content.stdout
+
+            elif event_content_block.type == "text_editor_code_execution_tool_result":
+                text_editor_code_execution_tool_result: BetaTextEditorCodeExecutionToolResultBlock = event_content_block
+                if text_editor_code_execution_tool_result.content.type == "text_editor_code_execution_view_result":
+                    code_output += event_content_block.content.content
+
+        chat_response = ChatResponse(
+            text=text,
+            thought=thought,
+            code=code,
+            code_output=code_output,
+        )
+        output_tokens = await count_claude_output_tokens(
+            client=client,
+            model=model,
+            chat_response=chat_response,
+        )
+        return ChatResponse(
+            text=text,
+            thought=thought,
+            code=code,
+            code_output=code_output,
+            input_tokens=input_tokens,
+            output_tokens=output_tokens,
+        )

llm_bridge/client/implementations/claude/non_stream_claude_client.py

@@ -7,7 +7,6 @@ from anthropic.types.beta import BetaMessage, BetaBashCodeExecutionToolResultBlo
     BetaServerToolUseBlock
 from fastapi import HTTPException
 
-from llm_bridge.client.implementations.claude.claude_response_handler import process_content_block
 from llm_bridge.client.implementations.claude.claude_token_counter import count_claude_output_tokens
 from llm_bridge.client.model_client.claude_client import ClaudeClient
 from llm_bridge.type.chat_response import ChatResponse
@@ -26,11 +25,27 @@ async def process_claude_non_stream_response(
     code_output = ""
 
     for content_block in message.content:
-        content_block_chat_response = process_content_block(content_block)
-        text += content_block_chat_response.text
-        thought += content_block_chat_response.thought
-        code += content_block_chat_response.code
-        code_output += content_block_chat_response.code_output
+        if content_block.type == "text":
+            text_block: BetaTextBlock = content_block
+            text += text_block.text
+
+        elif content_block.type == "thinking":
+            thinking_block: BetaThinkingBlock = content_block
+            thought += thinking_block.thinking
+
+        elif content_block.type == "server_tool_use":
+            server_tool_use_block: BetaServerToolUseBlock = content_block
+            code += server_tool_use_block.input
+
+        elif content_block.type == "bash_code_execution_tool_result":
+            bash_code_execution_tool_result_block: BetaBashCodeExecutionToolResultBlock = content_block
+            if bash_code_execution_tool_result_block.content.type == "bash_code_execution_result":
+                code_output += bash_code_execution_tool_result_block.content.stdout
+
+        elif content_block.type == "text_editor_code_execution_tool_result":
+            text_editor_code_execution_tool_result: BetaBashCodeExecutionToolResultBlock = content_block
+            if text_editor_code_execution_tool_result.content.type == "text_editor_code_execution_view_result":
+                code_output += content_block.content.content
 
     chat_response = ChatResponse(
         text=text,

llm_bridge/client/implementations/claude/stream_claude_client.py

@@ -5,7 +5,7 @@ from typing import AsyncGenerator
 import httpx
 from fastapi import HTTPException
 
-from llm_bridge.client.implementations.claude.claude_response_handler import process_claude_stream_response
+from llm_bridge.client.implementations.claude.claude_stream_response_handler import ClaudeStreamResponseHandler
 from llm_bridge.client.model_client.claude_client import ClaudeClient
 from llm_bridge.type.chat_response import ChatResponse
 from llm_bridge.type.serializer import serialize
@@ -26,8 +26,9 @@ class StreamClaudeClient(ClaudeClient):
                     betas=self.betas,
                     tools=self.tools,
                 ) as stream:
+                    stream_response_handler = ClaudeStreamResponseHandler()
                     async for event in stream:
-                        yield await process_claude_stream_response(
+                        yield await stream_response_handler.process_claude_stream_response(
                             event=event,
                             input_tokens=self.input_tokens,
                             client=self.client,

{llm_bridge-1.11.3.dist-info → llm_bridge-1.11.3b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LLM-Bridge
-Version: 1.11.3
+Version: 1.11.3b0
 Summary: A Bridge for LLMs
 Author-email: windsnow1025 <windsnow1025@gmail.com>
 License-Expression: MIT

{llm_bridge-1.11.3.dist-info → llm_bridge-1.11.3b0.dist-info}/RECORD

@@ -4,10 +4,10 @@ llm_bridge/client/chat_client.py,sha256=XISF2BM-WkZJNbnvcLfMcbSzlrE0XMDulyE_VG9z
 llm_bridge/client/implementations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_bridge/client/implementations/printing_status.py,sha256=ok3ihBRIEan3qMbc62HeXTThDx1L6Zbs_IT0HPLPspI,102
 llm_bridge/client/implementations/claude/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llm_bridge/client/implementations/claude/claude_response_handler.py,sha256=d5e1rlxfao_rjhgT1Rky-xlCRJIK2M-e9LKNUATOczc,4143
+llm_bridge/client/implementations/claude/claude_stream_response_handler.py,sha256=3fRyaQ_uZiPC-UyNq5OXCH6a_TFlqL3x1um1kd4knwc,2886
 llm_bridge/client/implementations/claude/claude_token_counter.py,sha256=m_aoLJkFPJqSBA3Thzv5vg3GnaucZh41SAgT28sLeBA,1324
-llm_bridge/client/implementations/claude/non_stream_claude_client.py,sha256=1khCk0vJkCQ09Q8wuCqX1ZUV54qcwtTGa21ij8ziyak,2990
-llm_bridge/client/implementations/claude/stream_claude_client.py,sha256=gOvdoSa_pNAbZ882pG4NAOOwNtjth-X4M3Gt34orXww,2005
+llm_bridge/client/implementations/claude/non_stream_claude_client.py,sha256=OljVF37RaP98WhPnSgLRgqTMPSWJ4dGjeashg3f5dRo,3779
+llm_bridge/client/implementations/claude/stream_claude_client.py,sha256=q4w1UYc1yZJw5UFOtnxCoeg8MFp5soc1d57YiCTCCGE,2109
 llm_bridge/client/implementations/gemini/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_bridge/client/implementations/gemini/gemini_response_handler.py,sha256=LADXq5h_bbuCclp4RTf70YtQ0_9JFRRzo7j4V5Ts7y4,4388
 llm_bridge/client/implementations/gemini/gemini_token_counter.py,sha256=GdnwJWPhGZMB_xC0fz88zQRparIHzTemkQoqfDcxVEA,687
@@ -55,8 +55,8 @@ llm_bridge/type/model_message/claude_message.py,sha256=gYJUTbLUeifQMva3Axarc-VFe
 llm_bridge/type/model_message/gemini_message.py,sha256=mh8pf929g7_NkBzSOwnLXyrwSzTT4yt2FmyX7NZn0sM,4302
 llm_bridge/type/model_message/openai_message.py,sha256=xFaLY-cZoSwNd7E9BSWQjBNcRfCVH11X9s2yxXlctR0,453
 llm_bridge/type/model_message/openai_responses_message.py,sha256=be1q2euA0ybjj4NO6NxOGIRB9eJuXSb4ssUm_bM4Ocs,1529
-llm_bridge-1.11.3.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
-llm_bridge-1.11.3.dist-info/METADATA,sha256=iyJlwk0I2O3Qm6hEwEGhTFpsYxKK7GUJZE8X9Zw9Z9c,7849
-llm_bridge-1.11.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llm_bridge-1.11.3.dist-info/top_level.txt,sha256=PtxyrgNX1lSa1Ab_qswg0sekSXejG5zrS6b_v3Po05g,11
-llm_bridge-1.11.3.dist-info/RECORD,,
+llm_bridge-1.11.3b0.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
+llm_bridge-1.11.3b0.dist-info/METADATA,sha256=Skjps0NM7c883d_Mx5PQ0cpbDrEiYLXLu6nbc9qsWdI,7851
+llm_bridge-1.11.3b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+llm_bridge-1.11.3b0.dist-info/top_level.txt,sha256=PtxyrgNX1lSa1Ab_qswg0sekSXejG5zrS6b_v3Po05g,11
+llm_bridge-1.11.3b0.dist-info/RECORD,,

llm_bridge/client/implementations/claude/claude_response_handler.py

@@ -1,106 +0,0 @@
-from anthropic import BetaMessageStreamEvent, AsyncAnthropic
-from anthropic.types.beta import BetaRawContentBlockDelta, BetaThinkingDelta, BetaTextDelta, BetaInputJSONDelta, \
-    BetaBashCodeExecutionToolResultBlock, \
-    BetaTextEditorCodeExecutionToolResultBlock, BetaTextEditorCodeExecutionViewResultBlock, \
-    BetaTextEditorCodeExecutionStrReplaceResultBlock, \
-    BetaServerToolUseBlock, BetaBashCodeExecutionResultBlock, BetaTextBlock, BetaThinkingBlock
-from anthropic.types.beta.beta_raw_content_block_start_event import ContentBlock
-
-from llm_bridge.client.implementations.claude.claude_token_counter import count_claude_output_tokens
-from llm_bridge.type.chat_response import ChatResponse
-
-
-def process_content_block(content_block: ContentBlock) -> ChatResponse:
-    text = ""
-    thought = ""
-    code = ""
-    code_output = ""
-
-    if content_block.type == "text":
-        text_block: BetaTextBlock = content_block
-        text += text_block.text
-
-    elif content_block.type == "thinking":
-        thinking_block: BetaThinkingBlock = content_block
-        thought += thinking_block.thinking
-
-    elif content_block.type == "server_tool_use":
-        server_tool_use_block: BetaServerToolUseBlock = content_block
-        code += str(server_tool_use_block.input)
-
-    elif content_block.type == "bash_code_execution_tool_result":
-        bash_code_execution_tool_result_block: BetaBashCodeExecutionToolResultBlock = content_block
-        if bash_code_execution_tool_result_block.content.type == "bash_code_execution_result":
-            content: BetaBashCodeExecutionResultBlock = content_block.content
-            code_output += content.stdout
-
-    elif content_block.type == "text_editor_code_execution_tool_result":
-        text_editor_code_execution_tool_result: BetaTextEditorCodeExecutionToolResultBlock = content_block
-        if text_editor_code_execution_tool_result.content.type == "text_editor_code_execution_view_result":
-            content: BetaTextEditorCodeExecutionViewResultBlock = content_block.content
-            code_output += content.content
-        elif text_editor_code_execution_tool_result.content.type == "text_editor_code_execution_str_replace_result":
-            content: BetaTextEditorCodeExecutionStrReplaceResultBlock = content_block.content
-            code_output += content.lines
-
-    return ChatResponse(
-        text=text,
-        thought=thought,
-        code=code,
-        code_output=code_output,
-    )
-
-
-async def process_claude_stream_response(
-        event: BetaMessageStreamEvent,
-        input_tokens: int,
-        client: AsyncAnthropic,
-        model: str,
-) -> ChatResponse:
-    text = ""
-    thought = ""
-    code = ""
-    code_output = ""
-
-    if event.type == "content_block_delta":
-        event_delta: BetaRawContentBlockDelta = event.delta
-
-        if event_delta.type == "text_delta":
-            text_delta: BetaTextDelta = event_delta
-            text += text_delta.text
-
-        elif event_delta.type == "thinking_delta":
-            thinking_delta: BetaThinkingDelta = event_delta
-            thought += thinking_delta.thinking
-
-        elif event_delta.type == "input_json_delta":
-            input_json_delta: BetaInputJSONDelta = event_delta
-            code += input_json_delta.partial_json
-
-    if event.type == "content_block_start":
-        content_block: ContentBlock = event.content_block
-        content_block_chat_response = process_content_block(content_block)
-        text += content_block_chat_response.text
-        thought += content_block_chat_response.thought
-        code += content_block_chat_response.code
-        code_output += content_block_chat_response.code_output
-
-    chat_response = ChatResponse(
-        text=text,
-        thought=thought,
-        code=code,
-        code_output=code_output,
-    )
-    output_tokens = await count_claude_output_tokens(
-        client=client,
-        model=model,
-        chat_response=chat_response,
-    )
-    return ChatResponse(
-        text=text,
-        thought=thought,
-        code=code,
-        code_output=code_output,
-        input_tokens=input_tokens,
-        output_tokens=output_tokens,
-    )