LLM-Bridge 1.10.3__tar.gz → 1.11.0__tar.gz

{llm_bridge-1.10.3 → llm_bridge-1.11.0/LLM_Bridge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LLM-Bridge
-Version: 1.10.3
+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.3 → llm_bridge-1.11.0}/LLM_Bridge.egg-info/requires.txt

@@ -3,7 +3,7 @@ httpx
 tenacity
 openai==1.106.1
 tiktoken==0.11.0
-google-genai==1.28.0
+google-genai==1.46.0
 anthropic==0.66.0
 PyMuPDF
 docxlatex>=1.1.1

{llm_bridge-1.10.3/LLM_Bridge.egg-info → llm_bridge-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LLM-Bridge
-Version: 1.10.3
+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.3 → llm_bridge-1.11.0}/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-1.10.3 → llm_bridge-1.11.0}/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-1.10.3 → llm_bridge-1.11.0}/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-1.10.3 → llm_bridge-1.11.0}/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.3 → llm_bridge-1.11.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "LLM-Bridge"
-version = "1.10.3"
+version = "1.11.0"
 authors = [
     {name = "windsnow1025", email = "windsnow1025@gmail.com"}
 ]
@@ -23,7 +23,7 @@ dependencies = [
     "tenacity",
     "openai==1.106.1",
     "tiktoken==0.11.0",
-    "google-genai==1.28.0",
+    "google-genai==1.46.0",
     "anthropic==0.66.0",
     "PyMuPDF",
     "docxlatex>=1.1.1",