LLM-Bridge 1.15.3__py3-none-any.whl → 1.15.6__py3-none-any.whl

llm_bridge/logic/chat_generate/model_message_converter/openai_responses_message_converter.py

@@ -2,7 +2,7 @@ from openai.types.responses import ResponseInputTextParam, ResponseInputImagePar
     ResponseInputContentParam, EasyInputMessageParam, ResponseOutputMessageParam, ResponseInputFileParam
 
 from llm_bridge.logic.chat_generate import media_processor
-from llm_bridge.logic.message_preprocess.file_type_checker import get_file_type, get_file_name
+from llm_bridge.logic.message_preprocess.file_type_checker import get_file_type, get_filename_without_timestamp
 from llm_bridge.type.message import Message, ContentType
 from llm_bridge.type.model_message.openai_responses_message import OpenAIResponsesMessage
 
@@ -33,7 +33,7 @@ async def convert_message_to_openai_responses(message: Message) -> OpenAIRespons
                 file_data, _ = await media_processor.get_base64_content_from_url(file_url)
                 pdf_content = ResponseInputFileParam(
                     type="input_file",
-                    filename=get_file_name(file_url),
+                    filename=get_filename_without_timestamp(file_url),
                     file_data=f"data:application/pdf;base64,{file_data}",
                 )
                 content.append(pdf_content)

llm_bridge/logic/message_preprocess/file_type_checker.py

@@ -1,6 +1,7 @@
 import mimetypes
 import os
 import re
+from pathlib import PurePosixPath
 
 from llm_bridge.logic.file_fetch import fetch_file_data
 from llm_bridge.logic.message_preprocess.code_file_extensions import code_file_extensions
@@ -14,9 +15,12 @@ def is_file_type_supported(file_name: str) -> bool:
 
 
 async def get_file_type(file_url: str) -> tuple[str, str]:
-    file_name = get_file_name(file_url)
+    file_name = get_filename_without_timestamp(file_url)
+
+    # Treat filenames without an extension as their own extension
+    suffix = PurePosixPath(file_name).suffix.lower()
+    file_extension = suffix if suffix else '.' + file_name.lower()
 
-    file_extension = '.' + file_name.split('.')[-1].lower() # Treat filenames without an extension as their own extension
     if file_extension in code_file_extensions:
         return 'text', 'code'
     if file_extension == '.pdf':
@@ -41,9 +45,8 @@ async def get_file_type(file_url: str) -> tuple[str, str]:
     return 'unknown', 'unknown'
 
 
-# Without Timestamp
-def get_file_name(file_url: str) -> str:
-    base_name = os.path.basename(file_url)
+def get_filename_without_timestamp(file_url: str) -> str:
+    base_name = PurePosixPath(file_url).name
     match = re.search(r'-(.+)', base_name)
     if match:
         return match.group(1)

llm_bridge/logic/message_preprocess/message_preprocessor.py

@@ -1,5 +1,5 @@
 from llm_bridge.logic.message_preprocess import document_processor
-from llm_bridge.logic.message_preprocess.file_type_checker import get_file_type, get_file_name
+from llm_bridge.logic.message_preprocess.file_type_checker import get_file_type, get_filename_without_timestamp
 from llm_bridge.type.message import Message, Role, Content, ContentType
 
 
@@ -24,12 +24,12 @@ async def extract_text_files_to_message(message: Message, api_type: str) -> None
         if sub_type == "pdf" and api_type in ("OpenAI", "OpenAI-Azure", "Gemini-Vertex", "Gemini-Free", "Gemini-Paid", "Claude"):
             continue
             
-        filename = get_file_name(file_url)
+        filename = get_filename_without_timestamp(file_url)
         file_text = await document_processor.extract_text_from_file(file_url)
         
         message.contents[i] = Content(
             type=ContentType.Text,
-            data=f"{filename}: \n{file_text}\n"
+            data=f"<file name=\"{filename}\">\n{file_text}\n</file>"
         )
 
 

llm_bridge/logic/model_prices.py

@@ -1,5 +1,5 @@
-import importlib.resources
 import json
+from importlib.resources import files
 from typing import TypedDict
 
 from fastapi import HTTPException
@@ -12,13 +12,17 @@ class ModelPrice(TypedDict):
     output: float
 
 
-def load_json_file(package, filename):
-    with importlib.resources.open_text(package, filename) as f:
-        return json.load(f)
+def load_json_file(package: str, filename: str):
+    content = files(package).joinpath(filename).read_text(encoding="utf-8")
+    return json.loads(content)
 
 
 def get_model_prices() -> list[ModelPrice]:
-    return load_json_file("llm_bridge.resources", "model_prices.json")
+    prices = load_json_file("llm_bridge.resources", "model_prices.json")
+    for price in prices:
+        price["input"] = float(price["input"])
+        price["output"] = float(price["output"])
+    return prices
 
 
 def find_model_prices(api_type: str, model: str) -> ModelPrice | None:

llm_bridge/resources/model_prices.json

@@ -1,46 +1,46 @@
 [
   {
-    "apiType": "Gemini-Paid",
+    "apiType": "Gemini-Vertex",
     "model": "gemini-3-pro-preview",
     "input": 4,
     "output": 18
   },
   {
-    "apiType": "Gemini-Paid",
+    "apiType": "Gemini-Vertex",
     "model": "gemini-3-flash-preview",
     "input": 1,
     "output": 3
   },
   {
-    "apiType": "Gemini-Paid",
+    "apiType": "Gemini-Vertex",
     "model": "gemini-3-pro-image-preview",
     "input": 2,
     "output": 120
   },
   {
     "apiType": "Gemini-Paid",
-    "model": "gemini-flash-latest",
-    "input": 1,
-    "output": 2.5
-  },
-  {
-    "apiType": "Gemini-Vertex",
     "model": "gemini-3-pro-preview",
     "input": 4,
     "output": 18
   },
   {
-    "apiType": "Gemini-Vertex",
+    "apiType": "Gemini-Paid",
     "model": "gemini-3-flash-preview",
     "input": 1,
     "output": 3
   },
   {
-    "apiType": "Gemini-Vertex",
+    "apiType": "Gemini-Paid",
     "model": "gemini-3-pro-image-preview",
     "input": 2,
     "output": 120
   },
+  {
+    "apiType": "Gemini-Paid",
+    "model": "gemini-flash-latest",
+    "input": 1,
+    "output": 2.5
+  },
   {
     "apiType": "Gemini-Free",
     "model": "gemini-3-flash-preview",

{llm_bridge-1.15.3.dist-info → llm_bridge-1.15.6.dist-info}/METADATA

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

{llm_bridge-1.15.3.dist-info → llm_bridge-1.15.6.dist-info}/RECORD

@@ -26,7 +26,7 @@ llm_bridge/client/model_client/gemini_client.py,sha256=4dcueIbpLFqkT98WxmeVmW9Vb
 llm_bridge/client/model_client/openai_client.py,sha256=tRb5-T5J5swwEwQW4ryz1L1KBoWF_VGwkQQpeVVy854,1526
 llm_bridge/logic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_bridge/logic/file_fetch.py,sha256=Q8PGNj76E25sKD70TmlnSIdPgAxpNlb89syk87DbAGg,1341
-llm_bridge/logic/model_prices.py,sha256=hiXVbki3004Rrm5LQrmVfdm0lLABeygxtFB-Qn9_mm0,1219
+llm_bridge/logic/model_prices.py,sha256=yQ65U-OBtsw1dhYhEn9a59RisHiIegaLHDI3Ak3OMXY,1396
 llm_bridge/logic/chat_generate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_bridge/logic/chat_generate/chat_client_factory.py,sha256=g34iodMfCqopsPu2aDYp9hsEBY2ap7I_io620y1wy-Q,4385
 llm_bridge/logic/chat_generate/chat_message_converter.py,sha256=40VTBOPXg_ocrEZMdt1ObYlm-mhRL35zWzzxv8m2xRc,1538
@@ -40,14 +40,14 @@ llm_bridge/logic/chat_generate/model_message_converter/__init__.py,sha256=47DEQp
 llm_bridge/logic/chat_generate/model_message_converter/claude_message_converter.py,sha256=YiPqMkybCXrsAJOFcUfPOHXdMkn3mZxq7gft_W449dA,2439
 llm_bridge/logic/chat_generate/model_message_converter/gemini_message_converter.py,sha256=m6IeeQ_-yKcyBwLcEO_1HOoQAXDR5nl0mz_DNSsjieo,1529
 llm_bridge/logic/chat_generate/model_message_converter/openai_message_converter.py,sha256=lmc-lUVZ_LgHcJZVB-l989TgrB4FtbCyGlRDp4eXycE,2179
-llm_bridge/logic/chat_generate/model_message_converter/openai_responses_message_converter.py,sha256=R1cl0rhkbG_PditrVGqrP_CiDi_KsmibqciVgPbuFxc,2977
+llm_bridge/logic/chat_generate/model_message_converter/openai_responses_message_converter.py,sha256=kJt5wwcte5xsqQLsysfYeH5iGtawiKt6EGHUsVq9ZOk,3011
 llm_bridge/logic/message_preprocess/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_bridge/logic/message_preprocess/code_file_extensions.py,sha256=5bsnSKC9PGbl6ZMy80sXfagAbz77pGjt6Z2-qwzUw48,9306
 llm_bridge/logic/message_preprocess/document_processor.py,sha256=IsVqoFgWNa9i8cRsDAfmCynJMdlvBqiCKIT9kbx96kg,2861
-llm_bridge/logic/message_preprocess/file_type_checker.py,sha256=nkrVki1a2udCeVqUnfIVi7Wxx8OMKbBuHw3FOlm17uo,1603
-llm_bridge/logic/message_preprocess/message_preprocessor.py,sha256=VR4__ip4ytAo62DHn9HeeYdbcx5lWItBnKsm9l3gmY4,1924
+llm_bridge/logic/message_preprocess/file_type_checker.py,sha256=JWhzQSB8i_5-59UyYr-dV7wiCoLgW7Y6OthHG9prXY0,1718
+llm_bridge/logic/message_preprocess/message_preprocessor.py,sha256=ECKHF6BHsucs7QZ8b4WgPDX9vKseziHSK7jaIBB9NgM,1979
 llm_bridge/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llm_bridge/resources/model_prices.json,sha256=WSTvAlTJm_gzGHysE1ma1pXtVt4ppJrtPdb2R2ZbHxA,2674
+llm_bridge/resources/model_prices.json,sha256=dgjdMXcm0JxTZgcfVsJ8dbYnwtVmMBu84aUkp4sDyGw,2674
 llm_bridge/type/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_bridge/type/chat_response.py,sha256=6sz6g4Ns720Q-k6-7YYqrT2mANArKng4Svc8WxCP6I8,483
 llm_bridge/type/message.py,sha256=NyWmSSrciFfvF81aBwAH8qFpo5IpRhh8QXMselbYen8,370
@@ -57,7 +57,7 @@ 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.15.3.dist-info/METADATA,sha256=620d7VMkdOWX33-9w9nFGbhKLpAmcmVjgBxCA7p0VGU,3417
-llm_bridge-1.15.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-llm_bridge-1.15.3.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
-llm_bridge-1.15.3.dist-info/RECORD,,
+llm_bridge-1.15.6.dist-info/METADATA,sha256=b4taWiLZdIxOmC0LwW4qu-0gD-nwkVbwDnh0nvs2VrI,3417
+llm_bridge-1.15.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+llm_bridge-1.15.6.dist-info/licenses/LICENSE,sha256=m6uon-6P_CaiqcBfApMfjG9YRtDxcr40Z52JcqUCEAE,1069
+llm_bridge-1.15.6.dist-info/RECORD,,