LLM-Bridge 1.7.20__py3-none-any.whl → 1.8.0a0__py3-none-any.whl

llm_bridge/client/implementations/claude/claude_stream_response_handler.py

@@ -1,14 +1,10 @@
 from anthropic import BetaMessageStreamEvent, AsyncAnthropic
 
 from llm_bridge.client.implementations.claude.claude_token_counter import count_claude_output_tokens
-from llm_bridge.client.implementations.printing_status import PrintingStatus
 from llm_bridge.type.chat_response import ChatResponse
 
 
 class ClaudeStreamResponseHandler:
-    def __init__(self):
-        self.printing_status = None
-
     async def process_claude_stream_response(
             self,
             event: BetaMessageStreamEvent,
@@ -17,21 +13,21 @@ class ClaudeStreamResponseHandler:
             model: str,
     ) -> ChatResponse:
         text = ""
+        thought = ""
+
         if event.type == "content_block_delta":
             if event.delta.type == "thinking_delta":
-                if not self.printing_status:
-                    text += "# Model Thought:\n\n"
-                    self.printing_status = PrintingStatus.Thought
-                text += event.delta.thinking
+                thought += event.delta.thinking
             elif event.delta.type == "text_delta":
-                if self.printing_status == PrintingStatus.Thought:
-                    text += "\n\n# Model Response:\n\n"
-                    self.printing_status = PrintingStatus.Response
                 text += event.delta.text
         elif event.type == "citation":
             citation = event.citation
             text += f"([{citation.title}]({citation.url})) "
-        chat_response = ChatResponse(text=text)
+
+        chat_response = ChatResponse(
+            text=text,
+            thought=thought,
+        )
         output_tokens = await count_claude_output_tokens(
             client=client,
             model=model,
@@ -39,6 +35,7 @@ class ClaudeStreamResponseHandler:
         )
         return ChatResponse(
             text=text,
+            thought=thought,
             input_tokens=input_tokens,
             output_tokens=output_tokens,
         )

llm_bridge/client/implementations/claude/non_stream_claude_client.py

@@ -19,27 +19,30 @@ async def process_claude_non_stream_response(
         model: str,
 ) -> ChatResponse:
     text = ""
+    thought = ""
 
     for content in message.content:
         if content.type == "thinking":
-            text += "# Model Thought:\n\n"
-            text += content.thinking
+            thought += content.thinking
         if content.type == "text":
-            text += "\n\n# Model Response:\n\n"
             text += content.text
-            # Unable to test since streaming Claude is currently not allowed
+            # Unable to test: non-streaming Claude is currently not allowed
             if citations := content.citations:
                 for citation in citations:
                     text += f"([{citation.title}]({citation.url})) "
 
-    chat_response = ChatResponse(text=text)
+    chat_response = ChatResponse(
+        text=text,
+        thought=thought,
+    )
     output_tokens = await count_claude_output_tokens(
         client=client,
         model=model,
         chat_response=chat_response,
     )
     return ChatResponse(
-        text=content,
+        text=text,
+        thought=thought,
         input_tokens=input_tokens,
         output_tokens=output_tokens,
     )

llm_bridge/client/implementations/claude/stream_claude_client.py

@@ -3,13 +3,9 @@ import re
 from typing import AsyncGenerator
 
 import httpx
-from anthropic import AsyncAnthropic, BetaMessageStreamEvent
-from anthropic.types.beta import BetaMessage
 from fastapi import HTTPException
 
 from llm_bridge.client.implementations.claude.claude_stream_response_handler import ClaudeStreamResponseHandler
-from llm_bridge.client.implementations.claude.claude_token_counter import count_claude_input_tokens, \
-    count_claude_output_tokens
 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

llm_bridge/client/implementations/gemini/gemini_response_handler.py

@@ -1,4 +1,5 @@
 import base64
+from typing import Optional
 
 from google.genai import types
 
@@ -9,32 +10,33 @@ from llm_bridge.type.chat_response import Citation, ChatResponse
 
 class GeminiResponseHandler:
     def __init__(self):
-        self.printing_status = None
-        self.prev_output_tokens = 0
-        self.prev_printing_status = None
+        self.printing_status: Optional[PrintingStatus] = None
+        self.prev_output_tokens: int = 0
+        self.prev_printing_status: Optional[PrintingStatus] = None
 
     async def process_gemini_response(
             self,
             response: types.GenerateContentResponse,
     ) -> ChatResponse:
         text = ""
+        thought = ""
         display = None
         image_base64 = None
         citations = extract_citations(response)
         input_tokens, stage_output_tokens = await count_gemini_tokens(response)
 
+        printing_status = None
         if candidates := response.candidates:
             if candidates[0].content.parts:
                 for part in response.candidates[0].content.parts:
                     # Thought Output
                     if part.text:
-                        if part.thought and not self.printing_status:
-                            text += "# Model Thought:\n\n"
-                            self.printing_status = PrintingStatus.Thought
-                        elif not part.thought and self.printing_status == PrintingStatus.Thought:
-                            text += f"\n\n# Model Response:\n\n"
-                            self.printing_status = PrintingStatus.Response
-                        text += part.text
+                        if part.thought:
+                            printing_status = PrintingStatus.Thought
+                            thought += part.text
+                        elif not part.thought:
+                            printing_status = PrintingStatus.Response
+                            text += part.text
                     # Image Output
                     elif part.inline_data:
                         image_base64 = base64.b64encode(part.inline_data.data).decode('utf-8')
@@ -50,16 +52,17 @@ class GeminiResponseHandler:
                         if chunk.web:
                             text += f"{i}. [{chunk.web.title}]({chunk.web.uri})\n"
 
-        if self.printing_status == self.prev_printing_status:
+        if printing_status == self.prev_printing_status and printing_status == PrintingStatus.Response:
             output_tokens = stage_output_tokens - self.prev_output_tokens
         else:
             output_tokens = stage_output_tokens
 
         self.prev_output_tokens = stage_output_tokens
-        self.prev_printing_status = self.printing_status
+        self.prev_printing_status = printing_status
 
         return ChatResponse(
             text=text,
+            thought=thought,
             image=image_base64,
             display=display,
             citations=citations,

llm_bridge/type/chat_response.py

@@ -11,6 +11,7 @@ class Citation:
 @dataclass
 class ChatResponse:
     text: Optional[str] = None
+    thought: Optional[str] = None
     image: Optional[str] = None
     display: Optional[str] = None
     citations: Optional[list[Citation]] = None

{llm_bridge-1.7.20.dist-info → llm_bridge-1.8.0a0.dist-info}/METADATA

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

{llm_bridge-1.7.20.dist-info → llm_bridge-1.8.0a0.dist-info}/RECORD

@@ -4,12 +4,12 @@ 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=y7iwW5rk-zdqady-NfDajQlQP-BNtIs5a2v6kIUEMvw,1711
+llm_bridge/client/implementations/claude/claude_stream_response_handler.py,sha256=alBobZZLaCUSf3O09IrwT8NSrpgQJVS893ViPRK-khI,1328
 llm_bridge/client/implementations/claude/claude_token_counter.py,sha256=g8M7BFY2zM0jrLFyfGPW-4KYetib3x098XKvEdbZh30,1182
-llm_bridge/client/implementations/claude/non_stream_claude_client.py,sha256=d3vNeUn3YTYKAcn_zxeyIIltTNfWPL3oqqftzG6kAKo,2745
-llm_bridge/client/implementations/claude/stream_claude_client.py,sha256=K1HaLlXC5Y2h1f4jg_vH0iFJ0w0KxWZNn01ed8-e-XM,2349
+llm_bridge/client/implementations/claude/non_stream_claude_client.py,sha256=Zv0QmpIpEL0rXvy9f1EB_WC4YkhtUBc7IadsTZlWIec,2735
+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=Iv4NRqKeEppwidFcOy8ipF3nQUBKDyl2VYdF32f_wJs,3468
+llm_bridge/client/implementations/gemini/gemini_response_handler.py,sha256=qIEc4vC0vUfwkOgDjzq6sewQChpKuuayud1svvRU6Os,3510
 llm_bridge/client/implementations/gemini/gemini_token_counter.py,sha256=7vWdqv00enbQ1C4z2e-b3Hw2VxgScaf2mNnAEgjruoQ,453
 llm_bridge/client/implementations/gemini/non_stream_gemini_client.py,sha256=JGNNpeln42SoXg2vGIC9xG5GGlBh6dIhz4BzYIkgraA,1302
 llm_bridge/client/implementations/gemini/stream_gemini_client.py,sha256=GiLCZkl9mYtTP0RNqhFkYIuGT5UBJKw9ycWH5q49SHU,1577
@@ -47,7 +47,7 @@ llm_bridge/logic/message_preprocess/message_preprocessor.py,sha256=ERws57Dsu-f5L
 llm_bridge/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_bridge/resources/model_prices.json,sha256=_2ZXKjnMDa6YSKfnWEPR_vUtuMw3cEi1d2L3IZ2kVxs,2707
 llm_bridge/type/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llm_bridge/type/chat_response.py,sha256=nNAgcWeMBV14VKTMTxWuChgv4zYqy-mVi4Xq9tqV7uE,410
+llm_bridge/type/chat_response.py,sha256=pIiSVjW9SLVnV-3xaGjqZMfRVd0hP1Rz2dbq1m_mCWQ,444
 llm_bridge/type/message.py,sha256=NyWmSSrciFfvF81aBwAH8qFpo5IpRhh8QXMselbYen8,370
 llm_bridge/type/serializer.py,sha256=moCL9y_HTO2CFg2w_jc5MljDxKgHiCo_qiz-o4l2jYU,515
 llm_bridge/type/model_message/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.7.20.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
-llm_bridge-1.7.20.dist-info/METADATA,sha256=0Ot79AXFh8xDFB1OeI29IdOHhjzWRtM_daNYDMp6ejg,7505
-llm_bridge-1.7.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llm_bridge-1.7.20.dist-info/top_level.txt,sha256=PtxyrgNX1lSa1Ab_qswg0sekSXejG5zrS6b_v3Po05g,11
-llm_bridge-1.7.20.dist-info/RECORD,,
+llm_bridge-1.8.0a0.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
+llm_bridge-1.8.0a0.dist-info/METADATA,sha256=YQ72-UyYTit8-1KCubR6-aSefNwlMTggIDk0yKCl9Lc,7506
+llm_bridge-1.8.0a0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+llm_bridge-1.8.0a0.dist-info/top_level.txt,sha256=PtxyrgNX1lSa1Ab_qswg0sekSXejG5zrS6b_v3Po05g,11
+llm_bridge-1.8.0a0.dist-info/RECORD,,