LLM-Bridge 1.15.7__tar.gz → 1.15.9__tar.gz

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LLM-Bridge
-Version: 1.15.7
+Version: 1.15.9
 Summary: A Bridge for LLMs
 Author-email: windsnow1025 <windsnow1025@gmail.com>
 License-Expression: MIT
@@ -24,7 +24,7 @@ Description-Content-Type: text/markdown
 
 # LLM Bridge
 
-LLM Bridge is a unified Python interface for native interactions with various LLM providers.
+LLM Bridge is a unified API wrapper for native interactions with various LLM providers.
 
 GitHub: [https://github.com/windsnow1025/LLM-Bridge](https://github.com/windsnow1025/LLM-Bridge)
 
@@ -48,7 +48,7 @@ The features listed represent the maximum capabilities of each API type supporte
 
 | API Type | Input Format                   | Capabilities                                            | Output Format     |
 |----------|--------------------------------|---------------------------------------------------------|-------------------|
-| OpenAI   | Text, Image, PDF               | Thinking, Web Search, Code Execution                    | Text, Image       |
+| OpenAI   | Text, Image, PDF               | Thinking, Web Search, Code Execution, Structured Output | Text, Image       |
 | Gemini   | Text, Image, Video, Audio, PDF | Thinking, Web Search, Code Execution, Structured Output | Text, Image, File |
 | Claude   | Text, Image, PDF               | Thinking, Web Search, Code Execution                    | Text, File        |
 | Grok     | Text, Image                    |                                                         | Text              |

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/README.md

@@ -1,6 +1,6 @@
 # LLM Bridge
 
-LLM Bridge is a unified Python interface for native interactions with various LLM providers.
+LLM Bridge is a unified API wrapper for native interactions with various LLM providers.
 
 GitHub: [https://github.com/windsnow1025/LLM-Bridge](https://github.com/windsnow1025/LLM-Bridge)
 
@@ -24,7 +24,7 @@ The features listed represent the maximum capabilities of each API type supporte
 
 | API Type | Input Format                   | Capabilities                                            | Output Format     |
 |----------|--------------------------------|---------------------------------------------------------|-------------------|
-| OpenAI   | Text, Image, PDF               | Thinking, Web Search, Code Execution                    | Text, Image       |
+| OpenAI   | Text, Image, PDF               | Thinking, Web Search, Code Execution, Structured Output | Text, Image       |
 | Gemini   | Text, Image, Video, Audio, PDF | Thinking, Web Search, Code Execution, Structured Output | Text, Image, File |
 | Claude   | Text, Image, PDF               | Thinking, Web Search, Code Execution                    | Text, File        |
 | Grok     | Text, Image                    |                                                         | Text              |

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/llm_bridge/client/implementations/openai/non_stream_openai_responses_client.py

@@ -32,7 +32,7 @@ class NonStreamOpenAIResponsesClient(OpenAIClient):
                 stream=False,
                 tools=self.tools,
                 include=self.include,
-                # text_format=self.structured_output_base_model, # Async OpenAPI Responses Client does not support structured output
+                text=self.text,
             )
 
             return await process_openai_responses_non_stream_response(

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/llm_bridge/client/implementations/openai/steam_openai_responses_client.py

@@ -56,7 +56,7 @@ class StreamOpenAIResponsesClient(OpenAIClient):
                 stream=True,
                 tools=self.tools,
                 include=self.include,
-                # text_format=self.structured_output_base_model, # Async OpenAPI Responses Client does not support structured output
+                text=self.text,
             )
 
         except httpx.HTTPStatusError as e:

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/llm_bridge/client/model_client/openai_client.py

@@ -1,9 +1,8 @@
-from typing import AsyncGenerator, Iterable, Type, Any
-from pydantic import BaseModel
+from typing import AsyncGenerator, Iterable
 
 import openai.lib.azure
 from openai.types import Reasoning
-from openai.types.responses import ToolParam, ResponseIncludable
+from openai.types.responses import ToolParam, ResponseIncludable, ResponseTextConfigParam
 
 from llm_bridge.client.chat_client import ChatClient
 from llm_bridge.type.chat_response import ChatResponse
@@ -22,7 +21,7 @@ class OpenAIClient(ChatClient):
             tools: Iterable[ToolParam],
             reasoning: Reasoning,
             include: list[ResponseIncludable],
-            structured_output_base_model: Type[BaseModel] | None = None,
+            text: ResponseTextConfigParam,
     ):
         self.model = model
         self.messages = messages
@@ -32,7 +31,7 @@ class OpenAIClient(ChatClient):
         self.tools = tools
         self.reasoning = reasoning
         self.include = include
-        self.structured_output_base_model = structured_output_base_model
+        self.text = text
 
     async def generate_non_stream_response(self) -> ChatResponse:
         raise NotImplementedError

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/llm_bridge/logic/chat_generate/chat_client_factory.py

@@ -10,7 +10,7 @@ from llm_bridge.type.message import Message
 
 
 async def create_chat_client(
-        api_keys: dict,
+        api_keys: dict[str, str],
         messages: list[Message],
         model: str,
         api_type: str,

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/llm_bridge/logic/chat_generate/model_client_factory/openai_client_factory.py

@@ -5,7 +5,8 @@ import openai
 from fastapi import HTTPException
 from openai import Omit
 from openai.types import Reasoning
-from openai.types.responses import WebSearchToolParam, ResponseIncludable
+from openai.types.responses import WebSearchToolParam, ResponseIncludable, ResponseTextConfigParam, \
+    ResponseFormatTextJSONSchemaConfigParam
 from openai.types.responses.tool_param import CodeInterpreter, CodeInterpreterContainerCodeInterpreterToolAuto, \
     ImageGeneration, ToolParam
 
@@ -15,12 +16,11 @@ from llm_bridge.client.implementations.openai.steam_openai_responses_client impo
 from llm_bridge.client.implementations.openai.stream_openai_client import StreamOpenAIClient
 from llm_bridge.logic.chat_generate.chat_message_converter import convert_messages_to_openai_responses, \
     convert_messages_to_openai
-from llm_bridge.logic.chat_generate.model_client_factory.schema_converter import json_schema_to_pydantic_model
 from llm_bridge.type.message import Message
 
 
 async def create_openai_client(
-        api_keys: dict,
+        api_keys: dict[str, str],
         messages: list[Message],
         model: str,
         api_type: str,
@@ -98,10 +98,16 @@ async def create_openai_client(
             )
         )
 
-    structured_output_base_model = None
+    text: ResponseTextConfigParam | Omit = omit
     if structured_output_schema:
-        structured_output_base_model = json_schema_to_pydantic_model(structured_output_schema)
-
+        text = ResponseTextConfigParam(
+            format=ResponseFormatTextJSONSchemaConfigParam(
+                name="structured_output",
+                schema=structured_output_schema,
+                type="json_schema",
+                strict=True,
+            )
+        )
 
     if use_responses_api:
         if stream:
@@ -114,7 +120,7 @@ async def create_openai_client(
                 tools=tools,
                 reasoning=reasoning,
                 include=include,
-                structured_output_base_model=structured_output_base_model,
+                text=text,
             )
         else:
             return NonStreamOpenAIResponsesClient(
@@ -126,7 +132,7 @@ async def create_openai_client(
                 tools=tools,
                 reasoning=reasoning,
                 include=include,
-                structured_output_base_model=structured_output_base_model,
+                text=text,
             )
     else:
         if stream:

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/llm_bridge/logic/chat_generate/model_message_converter/openai_responses_message_converter.py

@@ -3,18 +3,19 @@ from openai.types.responses import ResponseInputTextParam, ResponseInputImagePar
 
 from llm_bridge.logic.chat_generate import media_processor
 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.message import Message, ContentType, Role
 from llm_bridge.type.model_message.openai_responses_message import OpenAIResponsesMessage
 
 
 async def convert_message_to_openai_responses(message: Message) -> OpenAIResponsesMessage:
-    role = message.role.value
+    role = message.role
     content: list[ResponseInputContentParam | ResponseOutputTextParam] = []
+    contains_pdf = False
 
     for content_item in message.contents:
         if content_item.type == ContentType.Text:
-            if role == "assistant":
-                text_content = ResponseOutputTextParam(type="output_text", text=content_item.data)
+            if role == Role.Assistant:
+                text_content = ResponseOutputTextParam(type="output_text", text=content_item.data, annotations=[])
             else:
                 text_content = ResponseInputTextParam(type="input_text", text=content_item.data)
             content.append(text_content)
@@ -30,6 +31,7 @@ async def convert_message_to_openai_responses(message: Message) -> OpenAIRespons
                 )
                 content.append(image_content)
             elif sub_type == "pdf":
+                contains_pdf = True
                 file_data, _ = await media_processor.get_base64_content_from_url(file_url)
                 pdf_content = ResponseInputFileParam(
                     type="input_file",
@@ -52,7 +54,11 @@ async def convert_message_to_openai_responses(message: Message) -> OpenAIRespons
                 )
                 content.append(text_content)
 
-    if role in ("user", "system"):
-        return EasyInputMessageParam(role=role, content=content)
+    # Force system role to user if the message contains a PDF
+    if role == Role.System and contains_pdf:
+        role = Role.User
+
+    if role in (Role.User, Role.System):
+        return EasyInputMessageParam(role=role.value, content=content)
     else:
-        return ResponseOutputMessageParam(role=role, content=content)
+        return ResponseOutputMessageParam(role=role.value, content=content)

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "LLM-Bridge"
-version = "1.15.7"
+version = "1.15.9"
 dependencies = [
     "fastapi",
     "httpx",
@@ -33,9 +33,9 @@ classifiers = [
 
 [dependency-groups]
 dev = [
-    "pytest",
-    "pytest-asyncio",
-    "python-dotenv", #dotenv
+    "pytest==9.0.2",
+    "pytest-asyncio==1.3.0",
+    "python-dotenv==1.2.1", #dotenv
 ]
 
 [tool.pytest.ini_options]

llm_bridge-1.15.9/usage/config.py

@@ -0,0 +1,176 @@
+from llm_bridge import *
+
+# Standard JSON Schema
+# structured_output_schema = {
+#   "$schema": "https://json-schema.org/draft/2020-12/schema",
+#   "$id": "https://example.com/product.schema.json",
+#   "title": "Product",
+#   "description": "A product from Acme's catalog",
+#   "type": "object",
+#   "properties": {
+#     "productId": {
+#       "description": "The unique identifier for a product",
+#       "type": "integer"
+#     },
+#     "productName": {
+#       "description": "Name of the product",
+#       "type": "string"
+#     },
+#     "price": {
+#       "description": "The price of the product",
+#       "type": "number",
+#       "exclusiveMinimum": 0
+#     },
+#     "tags": {
+#       "description": "Tags for the product",
+#       "type": "array",
+#       "items": {
+#         "type": "string"
+#       },
+#       "minItems": 1,
+#       "uniqueItems": True
+#     }
+#   },
+#   "required": [
+#     "productId",
+#     "productName",
+#     "price"
+#   ],
+#   "additionalProperties": False
+# }
+
+# OpenAI Responses API JSON Schema
+structured_output_schema = {
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://example.com/product.schema.json",
+  "title": "Product",
+  "description": "A product from Acme's catalog",
+  "type": "object",
+  "properties": {
+    "productId": {
+      "description": "The unique identifier for a product",
+      "type": "integer"
+    },
+    "productName": {
+      "description": "Name of the product",
+      "type": "string"
+    },
+    "price": {
+      "description": "The price of the product",
+      "type": "number",
+      "exclusiveMinimum": 0
+    },
+    "tags": {
+      "description": "Tags for the product",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "minItems": 1,
+    }
+  },
+  "required": [
+    "productId",
+    "productName",
+    "price",
+    "tags"
+  ],
+  "additionalProperties": False
+}
+# structured_output_schema = None
+
+messages = [
+    Message(
+        role=Role.System,
+        contents=[
+            Content(type=ContentType.Text, data="You are a helpful assistant."),
+            # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746209841847-A%20Tutorial%20on%20Spectral%20Clustering.pdf")
+        ]
+    ),
+    # Message(
+    #     role=Role.User,
+    #     contents=[
+    #         Content(type=ContentType.Text, data="Hello")
+    #     ]
+    # ),
+    # Message(
+    #     role=Role.Assistant,
+    #     contents=[
+    #         Content(type=ContentType.Text, data="Hello! How can I assist you today?")
+    #     ]
+    # ),
+    Message(
+        role=Role.User,
+        contents=[
+            # Simple Question
+            # Content(type=ContentType.Text, data="What's this?"),
+
+            # Thinking
+            # Content(type=ContentType.Text, data="Explain the concept of Occam's Razor and provide a simple, everyday example."),
+
+            # Web Search
+            # Content(type=ContentType.Text, data="What's the weather in NYC today?"),
+
+            # Image Understanding
+            # Content(type=ContentType.File, data="https://www.gstatic.com/webp/gallery3/1.png"),
+            # Content(type=ContentType.Text, data="What is in this image?"),
+
+            # Image Generation
+            # Content(type=ContentType.Text, data="Please generate an image of a cat."),
+
+            # URL Context
+            # Content(type=ContentType.Text, data="What is in https://www.windsnow1025.com/"),
+
+            # Code Execution
+            # Content(type=ContentType.Text, data="What is the sum of the first 50 prime numbers? Generate and run code for the calculation, and make sure you get all 50."),
+
+            # File Output
+            # Content(type=ContentType.Text, data="Create a matplotlib visualization and save it as output.png"),
+
+            # Structured Output
+            Content(type=ContentType.Text, data="Please generate a product."),
+        ]
+    ),
+    # Message(
+    #     role=Role.User,
+    #     contents=[
+    #         Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1769429581512-Test.txt"),
+    #         # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746208707489-image.png"),
+    #         # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746209841847-A%20Tutorial%20on%20Spectral%20Clustering.pdf"),
+    #         # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746212253473-file_example_MP3_700KB.mp3"),
+    #         # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746212980820-file_example_MP4_480_1_5MG.mp4"),
+    #         Content(type=ContentType.Text, data="What's this?"),
+    #     ]
+    # ),
+]
+
+# See /llm_bridge/resources/model_prices.json for available models
+model = "gpt-5.2"
+# model = "gpt-5.1"
+# model = "gpt-5-pro"
+# model = "gpt-5"
+# model = "gpt-4.1"
+# model = "gpt-5-codex"
+# model = "gemini-3-pro-preview"
+# model = "gemini-3-pro-image-preview"
+# model = "gemini-3-flash-preview"
+# model = "grok-4-1-fast-reasoning"
+# model = "claude-sonnet-4-5"
+# model = "claude-opus-4-5"
+
+# api_type = "Gemini-Vertex"
+# api_type = "Gemini-Free"
+# api_type = "Gemini-Paid"
+api_type = "OpenAI"
+# api_type = "OpenAI-Azure"
+# api_type = "OpenAI-GitHub"
+# api_type = "Claude"
+# api_type = "Grok"
+
+temperature = 0
+stream = True
+# stream = False
+thought = True
+# thought = False
+# code_execution = True
+code_execution = False

{llm_bridge-1.15.7 → llm_bridge-1.15.9}/uv.lock

@@ -357,7 +357,7 @@ wheels = [
 
 [[package]]
 name = "llm-bridge"
-version = "1.15.7"
+version = "1.15.9"
 source = { editable = "." }
 dependencies = [
     { name = "anthropic" },
@@ -397,9 +397,9 @@ requires-dist = [
 
 [package.metadata.requires-dev]
 dev = [
-    { name = "pytest" },
-    { name = "pytest-asyncio" },
-    { name = "python-dotenv" },
+    { name = "pytest", specifier = "==9.0.2" },
+    { name = "pytest-asyncio", specifier = "==1.3.0" },
+    { name = "python-dotenv", specifier = "==1.2.1" },
 ]
 
 [[package]]

llm_bridge-1.15.7/usage/config.py

@@ -1,129 +0,0 @@
-from llm_bridge import *
-
-structured_output_schema = {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://example.com/product.schema.json",
-  "title": "Product",
-  "description": "A product from Acme's catalog",
-  "type": "object",
-  "properties": {
-    "productId": {
-      "description": "The unique identifier for a product",
-      "type": "integer"
-    },
-    "productName": {
-      "description": "Name of the product",
-      "type": "string"
-    },
-    "price": {
-      "description": "The price of the product",
-      "type": "number",
-      "exclusiveMinimum": 0
-    },
-    "tags": {
-      "description": "Tags for the product",
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "minItems": 1,
-      "uniqueItems": True
-    }
-  },
-  "required": [
-    "productId",
-    "productName",
-    "price"
-  ]
-}
-structured_output_schema = None
-
-messages = [
-    Message(
-        role=Role.System,
-        contents=[
-            Content(type=ContentType.Text, data="You are a helpful assistant.")
-        ]
-    ),
-    Message(
-        role=Role.User,
-        contents=[
-            Content(type=ContentType.Text, data="Hello")
-        ]
-    ),
-    Message(
-        role=Role.Assistant,
-        contents=[
-            Content(type=ContentType.Text, data="Hello! How can I assist you today?")
-        ]
-    ),
-    # Message(
-    #     role=Role.User,
-    #     contents=[
-    #         # Thinking
-    #         # Content(type=ContentType.Text, data="Explain the concept of Occam's Razor and provide a simple, everyday example."),
-    #
-    #         # Web Search
-    #         # Content(type=ContentType.Text, data="What's the weather in NYC today?"),
-    #
-    #         # Image Understanding
-    #         # Content(type=ContentType.File, data="https://www.gstatic.com/webp/gallery3/1.png"),
-    #         # Content(type=ContentType.Text, data="What is in this image?"),
-    #
-    #         # Image Generation
-    #         # Content(type=ContentType.Text, data="Please generate an image of a cat."),
-    #
-    #         # URL Context
-    #         # Content(type=ContentType.Text, data="What is in https://www.windsnow1025.com/"),
-    #
-    #         # Code Execution
-    #         # Content(type=ContentType.Text, data="What is the sum of the first 50 prime numbers? Generate and run code for the calculation, and make sure you get all 50."),
-    #
-    #         # File Output
-    #         # Content(type=ContentType.Text, data="Create a matplotlib visualization and save it as output.png"),
-    #
-    #         # Structured Output
-    #         # Content(type=ContentType.Text, data="Please generate a product."),
-    #     ]
-    # ),
-    Message(
-        role=Role.User,
-        contents=[
-            Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1769429581512-Test.txt"),
-            # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746208707489-image.png"),
-            # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746209841847-A%20Tutorial%20on%20Spectral%20Clustering.pdf"),
-            # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746212253473-file_example_MP3_700KB.mp3"),
-            # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1746212980820-file_example_MP4_480_1_5MG.mp4"),
-            # Content(type=ContentType.File, data="https://www.windsnow1025.com/minio/windsnow/uploads/1/1753804900037-Calculus.docx"),
-            Content(type=ContentType.Text, data="What's this?"),
-        ]
-    ),
-]
-# See /llm_bridge/resources/model_prices.json for available models
-# model = "gpt-5.2"
-# model = "gpt-5.1"
-# model = "gpt-5-pro"
-# model = "gpt-5"
-# model = "gpt-4.1"
-# model = "gpt-5-codex"
-# model = "gemini-3-pro-preview"
-# model = "gemini-3-pro-image-preview"
-model = "gemini-3-flash-preview"
-# model = "grok-4-1-fast-reasoning"
-# model = "claude-sonnet-4-5"
-# model = "claude-opus-4-5"
-api_type = "Gemini-Vertex"
-# api_type = "Gemini-Free"
-# api_type = "Gemini-Paid"
-# api_type = "OpenAI"
-# api_type = "OpenAI-Azure"
-# api_type = "OpenAI-GitHub"
-# api_type = "Claude"
-# api_type = "Grok"
-temperature = 0
-stream = True
-# stream = False
-thought = True
-# thought = False
-code_execution = True
-# code_execution = False