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

llm_bridge/client/implementations/claude/claude_stream_response_handler.py

@@ -1,4 +1,8 @@
 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
@@ -14,16 +18,42 @@ class ClaudeStreamResponseHandler:
     ) -> ChatResponse:
         text = ""
         thought = ""
+        code = ""
+        code_output = ""
 
         if event.type == "content_block_delta":
-            if event.delta.type == "thinking_delta":
-                thought += event.delta.thinking
-            elif event.delta.type == "text_delta":
-                text += event.delta.text
+            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,
@@ -33,6 +63,8 @@ class ClaudeStreamResponseHandler:
         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/claude_token_counter.py

@@ -28,7 +28,11 @@ async def count_claude_output_tokens(
         model: str,
         chat_response: ChatResponse,
 ) -> int:
-    text = chat_response.text.strip()
+    text = ""
+    text += chat_response.text.strip()
+    text += chat_response.thought.strip()
+    text += chat_response.code.strip()
+    text += chat_response.code_output.strip()
     if text == "":
         return 0
 

llm_bridge/client/implementations/claude/non_stream_claude_client.py

@@ -3,7 +3,8 @@ import re
 
 import httpx
 from anthropic import AsyncAnthropic
-from anthropic.types.beta import BetaMessage
+from anthropic.types.beta import BetaMessage, BetaBashCodeExecutionToolResultBlock, BetaTextBlock, BetaThinkingBlock, \
+    BetaServerToolUseBlock
 from fastapi import HTTPException
 
 from llm_bridge.client.implementations.claude.claude_token_counter import count_claude_output_tokens
@@ -20,16 +21,37 @@ async def process_claude_non_stream_response(
 ) -> ChatResponse:
     text = ""
     thought = ""
+    code = ""
+    code_output = ""
 
-    for content in message.content:
-        if content.type == "thinking":
-            thought += content.thinking
-        if content.type == "text":
-            text += content.text
+    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
 
     chat_response = ChatResponse(
         text=text,
         thought=thought,
+        code=code,
+        code_output=code_output,
     )
     output_tokens = await count_claude_output_tokens(
         client=client,
@@ -39,6 +61,8 @@ async def process_claude_non_stream_response(
     return ChatResponse(
         text=text,
         thought=thought,
+        code=code,
+        code_output=code_output,
         input_tokens=input_tokens,
         output_tokens=output_tokens,
     )

llm_bridge/logic/chat_generate/model_client_factory/claude_client_factory.py

@@ -1,6 +1,6 @@
 import anthropic
 from anthropic.types import ThinkingConfigEnabledParam, AnthropicBetaParam
-from anthropic.types.beta import BetaCodeExecutionTool20250825Param, BetaWebSearchTool20250305Param
+from anthropic.types.beta import BetaWebSearchTool20250305Param, BetaToolUnionParam, BetaCodeExecutionTool20250825Param
 
 from llm_bridge.client.implementations.claude.claude_token_counter import count_claude_input_tokens
 from llm_bridge.client.implementations.claude.non_stream_claude_client import NonStreamClaudeClient
@@ -34,23 +34,29 @@ async def create_claude_client(
         messages=claude_messages,
     )
 
-    max_tokens = min(32000, 200000 - input_tokens)
+    max_tokens = min(
+        32_000,  # Max output: Claude 4.5 64K; Claude 4.1 32K
+        200_000 - input_tokens  # Context window: Claude Sonnet 4.5 beta: 1M; otherwise 200K
+    )
     thinking = ThinkingConfigEnabledParam(
         type="enabled",
-        budget_tokens=16000
+        budget_tokens=min(32_000, max_tokens) // 2
     )
     temperature = 1
-    betas: list[AnthropicBetaParam] = ["output-128k-2025-02-19", "code-execution-2025-08-25"]
-    tools = [
+    betas: list[AnthropicBetaParam] = [
+        "context-1m-2025-08-07",
+        "output-128k-2025-02-19",
+        "code-execution-2025-08-25",
+    ]
+    tools: list[BetaToolUnionParam] = [
         BetaWebSearchTool20250305Param(
             type="web_search_20250305",
             name="web_search",
         ),
-        # Code Execution is unavailable in Claude
-        # BetaCodeExecutionTool20250825Param(
-        #     type="code_execution_20250825",
-        #     name="code_execution",
-        # )
+        BetaCodeExecutionTool20250825Param(
+            type="code_execution_20250825",
+            name="code_execution",
+        )
     ]
 
     if stream:
@@ -79,5 +85,3 @@ async def create_claude_client(
             input_tokens=input_tokens,
             tools=tools,
         )
-
-

llm_bridge/resources/model_prices.json

@@ -152,8 +152,8 @@
   {
     "apiType": "Claude",
     "model": "claude-sonnet-4-5",
-    "input": 3,
-    "output": 15
+    "input": 6,
+    "output": 22.5
   },
   {
     "apiType": "Claude",

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

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

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

@@ -4,9 +4,9 @@ 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_stream_response_handler.py,sha256=qNy0w3ObKopYp3NBWaz25tGm_bEO9RnEk6qi94W1WIs,1190
-llm_bridge/client/implementations/claude/claude_token_counter.py,sha256=g8M7BFY2zM0jrLFyfGPW-4KYetib3x098XKvEdbZh30,1182
-llm_bridge/client/implementations/claude/non_stream_claude_client.py,sha256=xnge1J-j_Er4K4L1UxhjuxAs_Pl6vralxTKk9yItwjI,2500
+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=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
@@ -31,7 +31,7 @@ llm_bridge/logic/chat_generate/chat_client_factory.py,sha256=H0rcRHytSfYKz_mwRfJ
 llm_bridge/logic/chat_generate/chat_message_converter.py,sha256=40VTBOPXg_ocrEZMdt1ObYlm-mhRL35zWzzxv8m2xRc,1538
 llm_bridge/logic/chat_generate/media_processor.py,sha256=ZR8G24EHwZZr2T9iFDRmScDGyJ_kvThApABzSzK0CL0,702
 llm_bridge/logic/chat_generate/model_client_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llm_bridge/logic/chat_generate/model_client_factory/claude_client_factory.py,sha256=j8RwLDul_zdZIIZfzrJji3VmqnYVAV61Xjrbp4NC69k,2603
+llm_bridge/logic/chat_generate/model_client_factory/claude_client_factory.py,sha256=unSrPGhQ4wO4xeMnXOGlCfd6BZE7NNYs6mYVcchXOvc,2800
 llm_bridge/logic/chat_generate/model_client_factory/gemini_client_factory.py,sha256=ms0v1TnVA_JJFKhOkbF_qHeRJEAZ3SH2QOYUi2w_FBI,3614
 llm_bridge/logic/chat_generate/model_client_factory/openai_client_factory.py,sha256=uSDkNcUKdyzfJBE_KPq9Uqpt_DpDulluGjUT-iq8li0,4363
 llm_bridge/logic/chat_generate/model_message_converter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,7 +45,7 @@ llm_bridge/logic/message_preprocess/document_processor.py,sha256=IsVqoFgWNa9i8cR
 llm_bridge/logic/message_preprocess/file_type_checker.py,sha256=nkrVki1a2udCeVqUnfIVi7Wxx8OMKbBuHw3FOlm17uo,1603
 llm_bridge/logic/message_preprocess/message_preprocessor.py,sha256=ERws57Dsu-f5LpWKqJ_SEP7omNWXeGoJaocX91P6QDQ,1907
 llm_bridge/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llm_bridge/resources/model_prices.json,sha256=-6KjPzsOtqC6EYL-WFTnszoVzrP5GOFJhPX943BNYZU,3440
+llm_bridge/resources/model_prices.json,sha256=JFCzCLulZ6z9qKKMjMuvZPk_d8Z9rM1GF0szkvfypv0,3442
 llm_bridge/type/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_bridge/type/chat_response.py,sha256=zEw-my_I0-7msmlTySdBGE2vWUIPILex0UrUPqTJiYY,754
 llm_bridge/type/message.py,sha256=NyWmSSrciFfvF81aBwAH8qFpo5IpRhh8QXMselbYen8,370
@@ -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.2.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
-llm_bridge-1.11.2.dist-info/METADATA,sha256=GeH0Z_IgD9zRenLpq-p7OFYc5JGazD4Lqr5xvBNz9AM,7849
-llm_bridge-1.11.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llm_bridge-1.11.2.dist-info/top_level.txt,sha256=PtxyrgNX1lSa1Ab_qswg0sekSXejG5zrS6b_v3Po05g,11
-llm_bridge-1.11.2.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,,