LLM-Bridge 1.11.3b0__tar.gz → 1.11.4__tar.gz

{llm_bridge-1.11.3b0 → llm_bridge-1.11.4/LLM_Bridge.egg-info}/PKG-INFO

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

{llm_bridge-1.11.3b0 → llm_bridge-1.11.4}/LLM_Bridge.egg-info/SOURCES.txt

@@ -13,7 +13,7 @@ llm_bridge/client/chat_client.py
 llm_bridge/client/implementations/__init__.py
 llm_bridge/client/implementations/printing_status.py
 llm_bridge/client/implementations/claude/__init__.py
-llm_bridge/client/implementations/claude/claude_stream_response_handler.py
+llm_bridge/client/implementations/claude/claude_response_handler.py
 llm_bridge/client/implementations/claude/claude_token_counter.py
 llm_bridge/client/implementations/claude/non_stream_claude_client.py
 llm_bridge/client/implementations/claude/stream_claude_client.py

{llm_bridge-1.11.3b0/LLM_Bridge.egg-info → llm_bridge-1.11.4}/PKG-INFO

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

llm_bridge-1.11.4/llm_bridge/client/implementations/claude/claude_response_handler.py

@@ -0,0 +1,106 @@
+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,
+    )

{llm_bridge-1.11.3b0 → llm_bridge-1.11.4}/llm_bridge/client/implementations/claude/non_stream_claude_client.py

@@ -7,6 +7,7 @@ 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
@@ -25,27 +26,11 @@ async def process_claude_non_stream_response(
     code_output = ""
 
     for content_block in message.content:
-        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
+        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,

{llm_bridge-1.11.3b0 → llm_bridge-1.11.4}/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_stream_response_handler import ClaudeStreamResponseHandler
+from llm_bridge.client.implementations.claude.claude_response_handler import process_claude_stream_response
 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,9 +26,8 @@ class StreamClaudeClient(ClaudeClient):
                     betas=self.betas,
                     tools=self.tools,
                 ) as stream:
-                    stream_response_handler = ClaudeStreamResponseHandler()
                     async for event in stream:
-                        yield await stream_response_handler.process_claude_stream_response(
+                        yield await process_claude_stream_response(
                             event=event,
                             input_tokens=self.input_tokens,
                             client=self.client,

{llm_bridge-1.11.3b0 → llm_bridge-1.11.4}/llm_bridge/client/implementations/gemini/gemini_response_handler.py

@@ -3,6 +3,7 @@ import mimetypes
 from typing import Optional
 
 from google.genai import types
+from google.genai.types import Part
 
 from llm_bridge.client.implementations.gemini.gemini_token_counter import count_gemini_tokens
 from llm_bridge.client.implementations.printing_status import PrintingStatus
@@ -28,35 +29,39 @@ class GeminiResponseHandler:
         citations: list[Citation] = extract_citations(response)
         input_tokens, stage_output_tokens = await count_gemini_tokens(response)
 
-        printing_status = None
+        parts: list[Part] = []
         if candidates := response.candidates:
-            if candidates[0].content.parts:
-                for part in response.candidates[0].content.parts:
-                    if part.text is not None:
-                        # Thought
-                        if part.thought:
-                            printing_status = PrintingStatus.Thought
-                            thought += part.text
-                        # Text
-                        elif not part.thought:
-                            printing_status = PrintingStatus.Response
-                            text += part.text
-                    # Code
-                    if part.executable_code is not None:
-                        code += part.executable_code.code
-                    # Code Output
-                    if part.code_execution_result is not None:
-                        code_output += part.code_execution_result.output
-                    # File
-                    if part.inline_data is not None:
-                        mime_type = part.inline_data.mime_type
-                        extension = mimetypes.guess_extension(mime_type) or ""
-                        file = File(
-                            name=f"generated_file{extension}",
-                            data=base64.b64encode(part.inline_data.data).decode('utf-8'),
-                            type=mime_type,
-                        )
-                        files.append(file)
+            if content := candidates[0].content:
+                if content.parts:
+                    parts = content.parts
+
+        printing_status: PrintingStatus | None = None
+        for part in parts:
+            if part.text is not None:
+                # Thought
+                if part.thought:
+                    printing_status = PrintingStatus.Thought
+                    thought += part.text
+                # Text
+                elif not part.thought:
+                    printing_status = PrintingStatus.Response
+                    text += part.text
+            # Code
+            if part.executable_code is not None:
+                code += part.executable_code.code
+            # Code Output
+            if part.code_execution_result is not None:
+                code_output += part.code_execution_result.output
+            # File
+            if part.inline_data is not None:
+                mime_type = part.inline_data.mime_type
+                extension = mimetypes.guess_extension(mime_type) or ""
+                file = File(
+                    name=f"generated_file{extension}",
+                    data=base64.b64encode(part.inline_data.data).decode('utf-8'),
+                    type=mime_type,
+                )
+                files.append(file)
 
         # Grounding Sources
         if candidates := response.candidates:

{llm_bridge-1.11.3b0 → llm_bridge-1.11.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "LLM-Bridge"
-version = "1.11.3-beta.0"
+version = "1.11.4"
 authors = [
     {name = "windsnow1025", email = "windsnow1025@gmail.com"}
 ]

llm_bridge-1.11.3b0/llm_bridge/client/implementations/claude/claude_stream_response_handler.py

@@ -1,70 +0,0 @@
-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,
-        )