LLM-Bridge 1.10.2__py3-none-any.whl → 1.11.0__py3-none-any.whl

llm_bridge/client/implementations/gemini/gemini_token_counter.py

@@ -8,8 +8,13 @@ async def count_gemini_tokens(
     if usage_metadata is None:
         return 0, 0
     input_tokens = usage_metadata.prompt_token_count
+    if input_tokens is None: # For Vertex AI
+        input_tokens = 0
     output_tokens = usage_metadata.candidates_token_count
     if output_tokens is None:
-        output_tokens = usage_metadata.total_token_count - usage_metadata.prompt_token_count
+        total_token_count = usage_metadata.total_token_count
+        if total_token_count is None: # For Vertex AI
+            total_token_count = 0
+        output_tokens = total_token_count - input_tokens
     return input_tokens, output_tokens
 

llm_bridge/logic/chat_generate/chat_client_factory.py

@@ -60,7 +60,8 @@ async def create_chat_client(
             model=model,
             temperature=temperature,
             stream=stream,
-            api_key=api_keys["GEMINI_FREE_API_KEY"]
+            api_key=api_keys["GEMINI_FREE_API_KEY"],
+            vertexai=False,
         )
     elif api_type == 'Gemini-Paid':
         return await create_gemini_client(
@@ -68,7 +69,17 @@ async def create_chat_client(
             model=model,
             temperature=temperature,
             stream=stream,
-            api_key=api_keys["GEMINI_PAID_API_KEY"]
+            api_key=api_keys["GEMINI_PAID_API_KEY"],
+            vertexai=False,
+        )
+    elif api_type == 'Gemini-Vertex':
+        return await create_gemini_client(
+            messages=messages,
+            model=model,
+            temperature=temperature,
+            stream=stream,
+            api_key=api_keys["GEMINI_VERTEX_API_KEY"],
+            vertexai=True,
         )
     elif api_type == 'Claude':
         return await create_claude_client(

llm_bridge/logic/chat_generate/model_client_factory/gemini_client_factory.py

@@ -1,6 +1,7 @@
 from google import genai
 from google.genai import types
 from google.genai._api_client import HttpOptions
+from google.genai.types import Modality
 
 from llm_bridge.client.implementations.gemini.non_stream_gemini_client import NonStreamGeminiClient
 from llm_bridge.client.implementations.gemini.stream_gemini_client import StreamGeminiClient
@@ -15,19 +16,20 @@ async def create_gemini_client(
         temperature: float,
         stream: bool,
         api_key: str,
+        vertexai: bool,
 ):
     client = genai.Client(
+        vertexai=vertexai,
         api_key=api_key,
-        http_options=HttpOptions(api_version='v1alpha') # Thinking
     )
 
     system_instruction = None
     tools = []
     thinking_config = None
-    response_modalities = ['Text']
+    response_modalities = [Modality.TEXT]
 
     system_instruction = extract_system_messages(messages) or " "
-    if "image" not in model:
+    if "image" not in model and not vertexai:
         tools.append(
             types.Tool(
                 google_search=types.GoogleSearch()
@@ -43,10 +45,24 @@ async def create_gemini_client(
                 code_execution=types.ToolCodeExecution()
             )
         )
+    if "image" not in model and vertexai:
+        tools.append(
+            types.Tool(
+                google_search=types.GoogleSearch()
+            )
+        )
+        tools.append(
+            types.Tool(
+                url_context=types.UrlContext()
+            )
+        )
     if "image" not in model:
-        thinking_config = types.ThinkingConfig(include_thoughts=True)
+        thinking_config = types.ThinkingConfig(
+            include_thoughts=True,
+            thinking_budget=-1,
+        )
     if "image" in model:
-        response_modalities = ['Text', 'Image']
+        response_modalities = [Modality.TEXT, Modality.IMAGE]
 
     config = types.GenerateContentConfig(
         system_instruction=system_instruction,
@@ -54,23 +70,23 @@ async def create_gemini_client(
         safety_settings=[
             types.SafetySetting(
                 category=types.HarmCategory.HARM_CATEGORY_HATE_SPEECH,
-                threshold=types.HarmBlockThreshold.BLOCK_NONE,
+                threshold=types.HarmBlockThreshold.OFF,
             ),
             types.SafetySetting(
                 category=types.HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
-                threshold=types.HarmBlockThreshold.BLOCK_NONE,
+                threshold=types.HarmBlockThreshold.OFF,
             ),
             types.SafetySetting(
                 category=types.HarmCategory.HARM_CATEGORY_HARASSMENT,
-                threshold=types.HarmBlockThreshold.BLOCK_NONE,
+                threshold=types.HarmBlockThreshold.OFF,
             ),
             types.SafetySetting(
                 category=types.HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
-                threshold=types.HarmBlockThreshold.BLOCK_NONE,
+                threshold=types.HarmBlockThreshold.OFF,
             ),
             types.SafetySetting(
                 category=types.HarmCategory.HARM_CATEGORY_CIVIC_INTEGRITY,
-                threshold=types.HarmBlockThreshold.BLOCK_NONE,
+                threshold=types.HarmBlockThreshold.OFF,
             ),
         ],
         tools=tools,

llm_bridge/logic/chat_generate/model_client_factory/openai_client_factory.py

@@ -60,19 +60,20 @@ async def create_openai_client(
     tools = []
     reasoning = None
 
-    if model != "gpt-5-chat-latest":
-        tools.append(
-            WebSearchToolParam(
-                type="web_search",
-                search_context_size="high",
-            )
-        )
+    if model not in ["gpt-5-chat-latest", "gpt-5-pro"]:
         tools.append(
             CodeInterpreter(
                 type="code_interpreter",
                 container=CodeInterpreterContainerCodeInterpreterToolAuto(type="auto")
             )
         )
+    if model not in ["gpt-5-chat-latest"]:
+        tools.append(
+            WebSearchToolParam(
+                type="web_search",
+                search_context_size="high",
+            )
+        )
     if re.match(r"^o\d", model) or (re.match(r"gpt-5.*", model) and model != "gpt-5-chat-latest"):
         temperature = 1
     if re.match(r"gpt-5.*", model) and model != "gpt-5-chat-latest":

llm_bridge/resources/model_prices.json

@@ -127,7 +127,25 @@
   },
   {
     "apiType": "Gemini-Paid",
-    "model": "gemini-2.5-flash-image-preview",
+    "model": "gemini-2.5-flash-image",
+    "input": 1.0,
+    "output": 2.5
+  },
+  {
+    "apiType": "Gemini-Vertex",
+    "model": "gemini-2.5-flash",
+    "input": 1,
+    "output": 2.5
+  },
+  {
+    "apiType": "Gemini-Vertex",
+    "model": "gemini-2.5-pro",
+    "input": 2.5,
+    "output": 15
+  },
+  {
+    "apiType": "Gemini-Vertex",
+    "model": "gemini-2.5-flash-image",
     "input": 1.0,
     "output": 2.5
   },

{llm_bridge-1.10.2.dist-info → llm_bridge-1.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LLM-Bridge
-Version: 1.10.2
+Version: 1.11.0
 Summary: A Bridge for LLMs
 Author-email: windsnow1025 <windsnow1025@gmail.com>
 License-Expression: MIT
@@ -15,7 +15,7 @@ Requires-Dist: httpx
 Requires-Dist: tenacity
 Requires-Dist: openai==1.106.1
 Requires-Dist: tiktoken==0.11.0
-Requires-Dist: google-genai==1.28.0
+Requires-Dist: google-genai==1.46.0
 Requires-Dist: anthropic==0.66.0
 Requires-Dist: PyMuPDF
 Requires-Dist: docxlatex>=1.1.1

{llm_bridge-1.10.2.dist-info → llm_bridge-1.11.0.dist-info}/RECORD

@@ -10,7 +10,7 @@ llm_bridge/client/implementations/claude/non_stream_claude_client.py,sha256=xnge
 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=M_mlrtu_dZTgEG9JgRaPDVyXqFtHSSVAIhsknhOaVrs,504
+llm_bridge/client/implementations/gemini/gemini_token_counter.py,sha256=GdnwJWPhGZMB_xC0fz88zQRparIHzTemkQoqfDcxVEA,687
 llm_bridge/client/implementations/gemini/non_stream_gemini_client.py,sha256=JGNNpeln42SoXg2vGIC9xG5GGlBh6dIhz4BzYIkgraA,1302
 llm_bridge/client/implementations/gemini/stream_gemini_client.py,sha256=vqPhQdr-jaHXzn-_1PSZfpo96zM-_89XOEXIx7UBBIw,1545
 llm_bridge/client/implementations/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,13 +27,13 @@ llm_bridge/logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 llm_bridge/logic/file_fetch.py,sha256=Q8PGNj76E25sKD70TmlnSIdPgAxpNlb89syk87DbAGg,1341
 llm_bridge/logic/model_prices.py,sha256=hiXVbki3004Rrm5LQrmVfdm0lLABeygxtFB-Qn9_mm0,1219
 llm_bridge/logic/chat_generate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llm_bridge/logic/chat_generate/chat_client_factory.py,sha256=huZO5pqRNFDUK9KpCk3-pLTgxAjbVGFRu3Y56w2QPxI,2814
+llm_bridge/logic/chat_generate/chat_client_factory.py,sha256=H0rcRHytSfYKz_mwRfJgJYyI-d3S3nxBssREYWPyOWw,3165
 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/gemini_client_factory.py,sha256=ORiyVkLytTN4nyvdzH6P7BCbpj07CHVNFWuNuL0d6UQ,3252
-llm_bridge/logic/chat_generate/model_client_factory/openai_client_factory.py,sha256=5DLyWhl5Ab5cRA6awTdAlBTmzmy65iiXKxysaDc2XzU,4301
+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
 llm_bridge/logic/chat_generate/model_message_converter/claude_message_converter.py,sha256=SfDhQXR7L5nCPHS4MIjwgzK_wER7qOUCc8gh-K77kKY,2441
 llm_bridge/logic/chat_generate/model_message_converter/gemini_message_converter.py,sha256=UjhzRX7sBa3-Zv1flMJd8bc8uRWMMav4UdJFhE6nVq4,1527
@@ -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=PZDW5TA8pORW7AV_Pc5iIImx2wBcq_f1ua3_S_8fwUw,3018
+llm_bridge/resources/model_prices.json,sha256=ymIJYdw17N_BocwIAFdKY0CACSbADaA1vuUPPDJrS68,3341
 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.10.2.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
-llm_bridge-1.10.2.dist-info/METADATA,sha256=ZYOmvvIpobtyf9wWPine5DvQ1eD-oHXwsyt8Thi01AY,7849
-llm_bridge-1.10.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llm_bridge-1.10.2.dist-info/top_level.txt,sha256=PtxyrgNX1lSa1Ab_qswg0sekSXejG5zrS6b_v3Po05g,11
-llm_bridge-1.10.2.dist-info/RECORD,,
+llm_bridge-1.11.0.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
+llm_bridge-1.11.0.dist-info/METADATA,sha256=L_Nbp8YMTmkZJD3G1-X3XyyxiZfVrgat1r5bF4Ze9-s,7849
+llm_bridge-1.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+llm_bridge-1.11.0.dist-info/top_level.txt,sha256=PtxyrgNX1lSa1Ab_qswg0sekSXejG5zrS6b_v3Po05g,11
+llm_bridge-1.11.0.dist-info/RECORD,,