LLM-Bridge 2.3.3__tar.gz → 2.4.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (110) hide show
  1. llm_bridge-2.4.0/.run/batch.run.xml +28 -0
  2. llm_bridge-2.4.0/.run/pytest.run.xml +28 -0
  3. llm_bridge-2.4.0/.run/single.run.xml +28 -0
  4. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/PKG-INFO +1 -1
  5. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_client_factory/claude_client_factory.py +2 -2
  6. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_client_factory/gemini_client_factory.py +2 -2
  7. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_message_converter/gemini_message_converter.py +1 -38
  8. llm_bridge-2.4.0/llm_bridge/logic/chat_generate/model_message_converter/gemini_mime_types.py +45 -0
  9. llm_bridge-2.4.0/llm_bridge/logic/message_process/message_processor.py +28 -0
  10. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/pyproject.toml +1 -1
  11. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/chat_generate/model_message_converter/claude_message_converter_test.py +1 -1
  12. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/chat_generate/model_message_converter/gemini_message_converter_test.py +1 -1
  13. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/chat_generate/model_message_converter/openai_completion_message_converter_test.py +1 -1
  14. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/chat_generate/model_message_converter/openai_responses_message_converter_test.py +1 -1
  15. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/chat_generate/model_message_converter/xai_message_converter_test.py +1 -1
  16. llm_bridge-2.4.0/tests/logic/message_process/message_processor_test.py +40 -0
  17. llm_bridge-2.4.0/usage/example_file_urls.py +9 -0
  18. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/messages.py +20 -9
  19. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/single/config.py +12 -1
  20. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/uv.lock +1 -1
  21. llm_bridge-2.3.3/.run/batch.run.xml +0 -19
  22. llm_bridge-2.3.3/.run/pytest.run.xml +0 -18
  23. llm_bridge-2.3.3/.run/single.run.xml +0 -19
  24. llm_bridge-2.3.3/llm_bridge/logic/message_process/message_processor.py +0 -33
  25. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/.gitattributes +0 -0
  26. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/.github/workflows/pypi-publish.yaml +0 -0
  27. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/.github/workflows/python-test.yaml +0 -0
  28. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/.gitignore +0 -0
  29. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/LICENSE +0 -0
  30. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/README.md +0 -0
  31. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/__init__.py +0 -0
  32. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/__init__.py +0 -0
  33. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/chat_client.py +0 -0
  34. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/__init__.py +0 -0
  35. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/claude/__init__.py +0 -0
  36. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/claude/claude_response_handler.py +0 -0
  37. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/claude/claude_token_counter.py +0 -0
  38. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/claude/non_stream_claude_client.py +0 -0
  39. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/claude/stream_claude_client.py +0 -0
  40. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/gemini/__init__.py +0 -0
  41. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/gemini/gemini_response_handler.py +0 -0
  42. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/gemini/gemini_token_counter.py +0 -0
  43. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/gemini/non_stream_gemini_client.py +0 -0
  44. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/gemini/stream_gemini_client.py +0 -0
  45. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/http_error.py +0 -0
  46. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/openai_completion/__init__.py +0 -0
  47. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/openai_completion/non_stream_openai_completion_client.py +0 -0
  48. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/openai_completion/stream_openai_completion_client.py +0 -0
  49. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/openai_responses/__init__.py +0 -0
  50. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/openai_responses/non_stream_openai_responses_client.py +0 -0
  51. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/openai_responses/openai_responses_response_handler.py +0 -0
  52. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/openai_responses/stream_openai_responses_client.py +0 -0
  53. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/xai/__init__.py +0 -0
  54. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/xai/non_stream_xai_client.py +0 -0
  55. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/implementations/xai/stream_xai_client.py +0 -0
  56. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/model_client/__init__.py +0 -0
  57. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/model_client/claude_client.py +0 -0
  58. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/model_client/gemini_client.py +0 -0
  59. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/model_client/openai_completion_client.py +0 -0
  60. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/model_client/openai_responses_client.py +0 -0
  61. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/client/model_client/xai_client.py +0 -0
  62. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/__init__.py +0 -0
  63. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/__init__.py +0 -0
  64. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/chat_client_factory.py +0 -0
  65. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/chat_message_converter.py +0 -0
  66. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/media_processor.py +0 -0
  67. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_client_factory/__init__.py +0 -0
  68. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_client_factory/openai_completion_client_factory.py +0 -0
  69. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_client_factory/openai_responses_client_factory.py +0 -0
  70. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_client_factory/xai_client_factory.py +0 -0
  71. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_message_converter/__init__.py +0 -0
  72. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_message_converter/claude_message_converter.py +0 -0
  73. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_message_converter/openai_completion_message_converter.py +0 -0
  74. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_message_converter/openai_responses_message_converter.py +0 -0
  75. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/chat_generate/model_message_converter/xai_message_converter.py +0 -0
  76. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/file_fetch.py +0 -0
  77. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/message_process/__init__.py +0 -0
  78. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/message_process/code_file_extensions.py +0 -0
  79. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/message_process/document_processor.py +0 -0
  80. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/message_process/file_type_checker.py +0 -0
  81. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/logic/model_prices.py +0 -0
  82. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/resources/__init__.py +0 -0
  83. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/resources/model_prices.json +0 -0
  84. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/__init__.py +0 -0
  85. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/chat_response.py +0 -0
  86. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/message.py +0 -0
  87. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/model_message/__init__.py +0 -0
  88. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/model_message/claude_message.py +0 -0
  89. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/model_message/gemini_message.py +0 -0
  90. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/model_message/openai_completion_message.py +0 -0
  91. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/model_message/openai_responses_message.py +0 -0
  92. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/model_message/xai_message.py +0 -0
  93. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/llm_bridge/type/serializer.py +0 -0
  94. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/__init__.py +0 -0
  95. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/__init__.py +0 -0
  96. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/chat_generate/__init__.py +0 -0
  97. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/chat_generate/model_message_converter/__init__.py +0 -0
  98. {llm_bridge-2.3.3/tests/logic/chat_generate/model_message_converter → llm_bridge-2.4.0/tests/logic}/message_factory.py +0 -0
  99. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/message_process/__init__.py +0 -0
  100. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/message_process/file_type_checker_test.py +0 -0
  101. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/tests/logic/model_prices_test.py +0 -0
  102. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/.env.example +0 -0
  103. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/__init__.py +0 -0
  104. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/batch/__init__.py +0 -0
  105. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/batch/batch.py +0 -0
  106. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/batch/config.py +0 -0
  107. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/keys.py +0 -0
  108. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/single/__init__.py +0 -0
  109. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/single/single.py +0 -0
  110. {llm_bridge-2.3.3 → llm_bridge-2.4.0}/usage/workflow.py +0 -0
@@ -0,0 +1,28 @@
1
+ <component name="ProjectRunConfigurationManager">
2
+ <configuration default="false" name="uv run batch" type="PythonConfigurationType" factoryName="Python">
3
+ <module name="LLM-Bridge" />
4
+ <option name="ENV_FILES" value="" />
5
+ <option name="INTERPRETER_OPTIONS" value="" />
6
+ <option name="PARENT_ENVS" value="true" />
7
+ <envs>
8
+ <env name="PYTHONUNBUFFERED" value="1" />
9
+ </envs>
10
+ <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/Scripts/python.exe" />
11
+ <option name="SDK_NAME" value="uv (LLM-Bridge)" />
12
+ <option name="WORKING_DIRECTORY" value="" />
13
+ <option name="IS_MODULE_SDK" value="false" />
14
+ <option name="ADD_CONTENT_ROOTS" value="true" />
15
+ <option name="ADD_SOURCE_ROOTS" value="true" />
16
+ <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
17
+ <option name="RUN_TOOL" value="true" />
18
+ <option name="RUN_AS_SCRIPT" value="" />
19
+ <option name="SCRIPT_NAME" value="usage.batch.batch" />
20
+ <option name="PARAMETERS" value="" />
21
+ <option name="SHOW_COMMAND_LINE" value="false" />
22
+ <option name="EMULATE_TERMINAL" value="false" />
23
+ <option name="MODULE_MODE" value="true" />
24
+ <option name="REDIRECT_INPUT" value="false" />
25
+ <option name="INPUT_FILE" value="" />
26
+ <method v="2" />
27
+ </configuration>
28
+ </component>
@@ -0,0 +1,28 @@
1
+ <component name="ProjectRunConfigurationManager">
2
+ <configuration default="false" name="uv run pytest" type="PythonConfigurationType" factoryName="Python">
3
+ <module name="LLM-Bridge" />
4
+ <option name="ENV_FILES" value="" />
5
+ <option name="INTERPRETER_OPTIONS" value="" />
6
+ <option name="PARENT_ENVS" value="true" />
7
+ <envs>
8
+ <env name="PYTHONUNBUFFERED" value="1" />
9
+ </envs>
10
+ <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/Scripts/python.exe" />
11
+ <option name="SDK_NAME" value="uv (LLM-Bridge)" />
12
+ <option name="WORKING_DIRECTORY" value="" />
13
+ <option name="IS_MODULE_SDK" value="false" />
14
+ <option name="ADD_CONTENT_ROOTS" value="true" />
15
+ <option name="ADD_SOURCE_ROOTS" value="true" />
16
+ <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
17
+ <option name="RUN_TOOL" value="true" />
18
+ <option name="RUN_AS_SCRIPT" value="" />
19
+ <option name="SCRIPT_NAME" value="pytest" />
20
+ <option name="PARAMETERS" value="" />
21
+ <option name="SHOW_COMMAND_LINE" value="false" />
22
+ <option name="EMULATE_TERMINAL" value="false" />
23
+ <option name="MODULE_MODE" value="true" />
24
+ <option name="REDIRECT_INPUT" value="false" />
25
+ <option name="INPUT_FILE" value="" />
26
+ <method v="2" />
27
+ </configuration>
28
+ </component>
@@ -0,0 +1,28 @@
1
+ <component name="ProjectRunConfigurationManager">
2
+ <configuration default="false" name="uv run single" type="PythonConfigurationType" factoryName="Python">
3
+ <module name="LLM-Bridge" />
4
+ <option name="ENV_FILES" value="" />
5
+ <option name="INTERPRETER_OPTIONS" value="" />
6
+ <option name="PARENT_ENVS" value="true" />
7
+ <envs>
8
+ <env name="PYTHONUNBUFFERED" value="1" />
9
+ </envs>
10
+ <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/Scripts/python.exe" />
11
+ <option name="SDK_NAME" value="uv (LLM-Bridge)" />
12
+ <option name="WORKING_DIRECTORY" value="" />
13
+ <option name="IS_MODULE_SDK" value="false" />
14
+ <option name="ADD_CONTENT_ROOTS" value="true" />
15
+ <option name="ADD_SOURCE_ROOTS" value="true" />
16
+ <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
17
+ <option name="RUN_TOOL" value="true" />
18
+ <option name="RUN_AS_SCRIPT" value="" />
19
+ <option name="SCRIPT_NAME" value="usage.single.single" />
20
+ <option name="PARAMETERS" value="" />
21
+ <option name="SHOW_COMMAND_LINE" value="false" />
22
+ <option name="EMULATE_TERMINAL" value="false" />
23
+ <option name="MODULE_MODE" value="true" />
24
+ <option name="REDIRECT_INPUT" value="false" />
25
+ <option name="INPUT_FILE" value="" />
26
+ <method v="2" />
27
+ </configuration>
28
+ </component>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: LLM-Bridge
3
- Version: 2.3.3
3
+ Version: 2.4.0
4
4
  Summary: A library that wraps multiple LLM providers into a consistent API while using each provider's native SDK internally, supporting multimodal I/O, file processing, and stream output.
5
5
  Author-email: windsnow1025 <windsnow1025@gmail.com>
6
6
  License-Expression: MIT
@@ -12,7 +12,7 @@ from llm_bridge.client.implementations.claude.claude_token_counter import count_
12
12
  from llm_bridge.client.implementations.claude.non_stream_claude_client import NonStreamClaudeClient
13
13
  from llm_bridge.client.implementations.claude.stream_claude_client import StreamClaudeClient
14
14
  from llm_bridge.logic.chat_generate.chat_message_converter import convert_messages_to_claude
15
- from llm_bridge.logic.message_process.message_processor import extract_system_messages
15
+ from llm_bridge.logic.message_process.message_processor import extract_system_message
16
16
  from llm_bridge.type.message import Message
17
17
 
18
18
 
@@ -33,7 +33,7 @@ async def create_claude_client(
33
33
  api_key=api_key,
34
34
  )
35
35
 
36
- system = await extract_system_messages(messages)
36
+ system = extract_system_message(messages)
37
37
  if system == "":
38
38
  system = "/"
39
39
 
@@ -8,7 +8,7 @@ from llm_bridge.client.implementations.gemini.non_stream_gemini_client import No
8
8
  from llm_bridge.client.implementations.gemini.stream_gemini_client import StreamGeminiClient
9
9
  from llm_bridge.logic.chat_generate.chat_message_converter import convert_messages_to_gemini
10
10
  from llm_bridge.logic.message_process.file_type_checker import get_file_type
11
- from llm_bridge.logic.message_process.message_processor import extract_system_messages
11
+ from llm_bridge.logic.message_process.message_processor import extract_system_message
12
12
  from llm_bridge.type.message import Message, ContentType
13
13
 
14
14
 
@@ -50,7 +50,7 @@ async def create_gemini_client(
50
50
  api_key=api_key,
51
51
  )
52
52
 
53
- system_instruction = await extract_system_messages(messages) or " "
53
+ system_instruction = extract_system_message(messages) or " "
54
54
  tools = []
55
55
  thinking_config = None
56
56
  response_modalities = [Modality.TEXT]
@@ -1,49 +1,12 @@
1
1
  from google.genai import types
2
2
 
3
3
  from llm_bridge.logic.chat_generate import media_processor
4
+ from llm_bridge.logic.chat_generate.model_message_converter.gemini_mime_types import GeminiSupportedMimeTypes
4
5
  from llm_bridge.logic.message_process.file_type_checker import get_file_type
5
6
  from llm_bridge.logic.message_process.message_processor import extract_file_as_text
6
7
  from llm_bridge.type.message import Message, Role, ContentType
7
8
  from llm_bridge.type.model_message.gemini_message import GeminiMessage, GeminiRole, GeminiContent
8
9
 
9
- # https://ai.google.dev/gemini-api/docs/file-input-methods
10
- GeminiSupportedMimeTypes = {
11
- "text/html",
12
- "text/css",
13
- "text/plain",
14
- "text/xml",
15
- "text/csv",
16
- "text/rtf",
17
- "text/javascript",
18
-
19
- "application/json",
20
- "application/pdf",
21
-
22
- "image/bmp",
23
- "image/jpeg",
24
- "image/png",
25
- "image/webp",
26
-
27
- # https://ai.google.dev/gemini-api/docs/audio#supported-formats
28
- "audio/wav",
29
- "audio/mp3",
30
- "audio/aiff",
31
- "audio/aac",
32
- "audio/ogg",
33
- "audio/flac",
34
-
35
- # https://ai.google.dev/gemini-api/docs/video-understanding#supported-formats
36
- "video/mp4",
37
- "video/mpeg",
38
- "video/mov",
39
- "video/avi",
40
- "video/x-flv",
41
- "video/mpg",
42
- "video/webm",
43
- "video/wmv",
44
- "video/3gpp",
45
- }
46
-
47
10
 
48
11
  async def convert_message_to_gemini(message: Message) -> GeminiMessage:
49
12
  role: GeminiRole
@@ -0,0 +1,45 @@
1
+ # https://ai.google.dev/gemini-api/docs/file-input-methods
2
+ GeminiDocumentMimeTypes = {
3
+ "text/html",
4
+ "text/css",
5
+ "text/plain",
6
+ "text/xml",
7
+ "text/csv",
8
+ "text/rtf",
9
+ "text/javascript",
10
+
11
+ "application/json",
12
+ "application/pdf",
13
+ }
14
+
15
+ GeminiImageMimeTypes = {
16
+ "image/bmp",
17
+ "image/jpeg",
18
+ "image/png",
19
+ "image/webp",
20
+ }
21
+
22
+ # https://ai.google.dev/gemini-api/docs/audio#supported-formats
23
+ GeminiAudioMimeTypes = {
24
+ "audio/wav",
25
+ "audio/mp3",
26
+ "audio/aiff",
27
+ "audio/aac",
28
+ "audio/ogg",
29
+ "audio/flac",
30
+ }
31
+
32
+ # https://ai.google.dev/gemini-api/docs/video-understanding#supported-formats
33
+ GeminiVideoMimeTypes = {
34
+ "video/mp4",
35
+ "video/mpeg",
36
+ "video/mov",
37
+ "video/avi",
38
+ "video/x-flv",
39
+ "video/mpg",
40
+ "video/webm",
41
+ "video/wmv",
42
+ "video/3gpp",
43
+ }
44
+
45
+ GeminiSupportedMimeTypes = GeminiDocumentMimeTypes | GeminiImageMimeTypes | GeminiAudioMimeTypes | GeminiVideoMimeTypes
@@ -0,0 +1,28 @@
1
+ from llm_bridge.logic.message_process import document_processor
2
+ from llm_bridge.logic.message_process.file_type_checker import get_filename_without_timestamp
3
+ from llm_bridge.type.message import Message, Role, ContentType
4
+
5
+
6
+ async def extract_file_as_text(file_url: str) -> str:
7
+ filename = get_filename_without_timestamp(file_url)
8
+ file_text = await document_processor.extract_text_from_file(file_url)
9
+ return f"<file name=\"{filename}\">\n{file_text}\n</file>"
10
+
11
+
12
+ def extract_system_message(messages: list[Message]) -> str:
13
+ if not messages:
14
+ return ""
15
+
16
+ message = messages[0]
17
+ if message.role != Role.System:
18
+ return ""
19
+ if any(content_item.type == ContentType.File for content_item in message.contents):
20
+ return ""
21
+
22
+ system_message = ""
23
+ for content_item in message.contents:
24
+ system_message += f"{content_item.data}\n"
25
+
26
+ del messages[0]
27
+
28
+ return system_message
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "LLM-Bridge"
7
- version = "2.3.3"
7
+ version = "2.4.0"
8
8
  dependencies = [
9
9
  "fastapi",
10
10
  "httpx",
@@ -2,7 +2,7 @@ import pytest
2
2
 
3
3
  from llm_bridge.logic.chat_generate.model_message_converter.claude_message_converter import convert_message_to_claude
4
4
  from llm_bridge.type.message import Role
5
- from tests.logic.chat_generate.model_message_converter.message_factory import create_text_message
5
+ from tests.logic.message_factory import create_text_message
6
6
 
7
7
 
8
8
  @pytest.mark.parametrize("role, claude_role", [
@@ -3,7 +3,7 @@ from google.genai import types
3
3
 
4
4
  from llm_bridge.logic.chat_generate.model_message_converter.gemini_message_converter import convert_message_to_gemini
5
5
  from llm_bridge.type.message import Role
6
- from tests.logic.chat_generate.model_message_converter.message_factory import create_text_message
6
+ from tests.logic.message_factory import create_text_message
7
7
 
8
8
 
9
9
  @pytest.mark.parametrize("role, gemini_role", [
@@ -3,7 +3,7 @@ import pytest
3
3
  from llm_bridge.logic.chat_generate.model_message_converter.openai_completion_message_converter import \
4
4
  convert_message_to_openai_completion
5
5
  from llm_bridge.type.message import Role
6
- from tests.logic.chat_generate.model_message_converter.message_factory import create_text_message
6
+ from tests.logic.message_factory import create_text_message
7
7
 
8
8
 
9
9
  @pytest.mark.parametrize("role, openai_role", [
@@ -4,7 +4,7 @@ from llm_bridge.logic.chat_generate.model_message_converter.openai_responses_mes
4
4
  convert_message_to_openai_responses
5
5
  from llm_bridge.type.message import Role
6
6
  from llm_bridge.type.model_message.openai_responses_message import OpenAIResponsesMessage
7
- from tests.logic.chat_generate.model_message_converter.message_factory import create_text_message
7
+ from tests.logic.message_factory import create_text_message
8
8
 
9
9
 
10
10
  @pytest.mark.parametrize("role, expected", [
@@ -6,7 +6,7 @@ from xai_sdk.chat import assistant, system, text, user
6
6
  from llm_bridge.logic.chat_generate.model_message_converter.xai_message_converter import convert_message_to_xai
7
7
  from llm_bridge.type.message import Role
8
8
  from llm_bridge.type.model_message.xai_message import XAIContent, XAIMessage
9
- from tests.logic.chat_generate.model_message_converter.message_factory import create_text_message
9
+ from tests.logic.message_factory import create_text_message
10
10
 
11
11
 
12
12
  @pytest.mark.parametrize("role, create_message", [
@@ -0,0 +1,40 @@
1
+ from llm_bridge.logic.message_process.message_processor import extract_system_message
2
+ from llm_bridge.type.message import Content, ContentType, Message, Role
3
+ from tests.logic.message_factory import create_text_message
4
+
5
+
6
+ def test_extract_system_message_empty():
7
+ messages = []
8
+
9
+ assert extract_system_message(messages) == ""
10
+ assert messages == []
11
+
12
+
13
+ def test_extract_system_message_text():
14
+ system_message = create_text_message(Role.System, "You are a helpful assistant.")
15
+ user_message = create_text_message(Role.User, "Hello")
16
+ messages = [system_message, user_message]
17
+
18
+ assert extract_system_message(messages) == "You are a helpful assistant.\n"
19
+ assert messages == [user_message]
20
+
21
+
22
+ def test_extract_system_message_file():
23
+ system_message = Message(role=Role.System, contents=[
24
+ Content(type=ContentType.Text, data="You are a helpful assistant."),
25
+ Content(type=ContentType.File, data="https://example.com/1767243600000-document.pdf"),
26
+ ])
27
+ user_message = create_text_message(Role.User, "Hello")
28
+ messages = [system_message, user_message]
29
+
30
+ assert extract_system_message(messages) == ""
31
+ assert messages == [system_message, user_message]
32
+
33
+
34
+ def test_extract_system_message_not_first():
35
+ user_message = create_text_message(Role.User, "Hello")
36
+ system_message = create_text_message(Role.System, "You are a helpful assistant.")
37
+ messages = [user_message, system_message]
38
+
39
+ assert extract_system_message(messages) == ""
40
+ assert messages == [user_message, system_message]
@@ -0,0 +1,9 @@
1
+ TextFileUrl = "https://example-files.online-convert.com/document/txt/example.txt"
2
+ CodeFileUrl = "https://raw.githubusercontent.com/windsnow1025/LLM-Bridge/main/pyproject.toml"
3
+ PdfFileUrl = "https://pdfobject.com/pdf/sample.pdf"
4
+ ImageFileUrl = "https://www.gstatic.com/webp/gallery3/1.png"
5
+ AudioFileUrl = "https://samplelib.com/wav/sample-3s.wav"
6
+ VideoFileUrl = "https://samplelib.com/mp4/sample-5s.mp4"
7
+ DocxFileUrl = "https://example-files.online-convert.com/document/docx/example.docx"
8
+ XlsxFileUrl = "https://download.microsoft.com/download/1/4/E/14EDED28-6C58-4055-A65C-23B4DA81C4DE/Financial Sample.xlsx"
9
+ PptxFileUrl = "https://wiki.documentfoundation.org/images/4/47/Extlst-test.pptx"
@@ -1,4 +1,15 @@
1
1
  from llm_bridge import Content, ContentType, Message, Role
2
+ from usage.example_file_urls import (
3
+ TextFileUrl,
4
+ CodeFileUrl,
5
+ PdfFileUrl,
6
+ ImageFileUrl,
7
+ AudioFileUrl,
8
+ VideoFileUrl,
9
+ DocxFileUrl,
10
+ XlsxFileUrl,
11
+ PptxFileUrl,
12
+ )
2
13
 
3
14
  LatencyMessages = [
4
15
  Message(
@@ -11,7 +22,7 @@ TextFileMessages = [
11
22
  Message(
12
23
  role=Role.User,
13
24
  contents=[
14
- Content(type=ContentType.File, data="https://example-files.online-convert.com/document/txt/example.txt"),
25
+ Content(type=ContentType.File, data=TextFileUrl),
15
26
  Content(type=ContentType.Text, data="What's this?"),
16
27
  ]
17
28
  )
@@ -21,7 +32,7 @@ CodeFileMessages = [
21
32
  Message(
22
33
  role=Role.User,
23
34
  contents=[
24
- Content(type=ContentType.File, data="https://raw.githubusercontent.com/windsnow1025/LLM-Bridge/main/pyproject.toml"),
35
+ Content(type=ContentType.File, data=CodeFileUrl),
25
36
  Content(type=ContentType.Text, data="What's this?"),
26
37
  ]
27
38
  )
@@ -31,7 +42,7 @@ PdfFileMessages = [
31
42
  Message(
32
43
  role=Role.User,
33
44
  contents=[
34
- Content(type=ContentType.File, data="https://pdfobject.com/pdf/sample.pdf"),
45
+ Content(type=ContentType.File, data=PdfFileUrl),
35
46
  Content(type=ContentType.Text, data="What's this?"),
36
47
  ]
37
48
  )
@@ -41,7 +52,7 @@ ImageFileMessages = [
41
52
  Message(
42
53
  role=Role.User,
43
54
  contents=[
44
- Content(type=ContentType.File, data="https://www.gstatic.com/webp/gallery3/1.png"),
55
+ Content(type=ContentType.File, data=ImageFileUrl),
45
56
  Content(type=ContentType.Text, data="What's this?"),
46
57
  ]
47
58
  )
@@ -51,7 +62,7 @@ AudioFileMessages = [
51
62
  Message(
52
63
  role=Role.User,
53
64
  contents=[
54
- Content(type=ContentType.File, data="https://samplelib.com/wav/sample-3s.wav"),
65
+ Content(type=ContentType.File, data=AudioFileUrl),
55
66
  Content(type=ContentType.Text, data="What's this?"),
56
67
  ]
57
68
  )
@@ -61,7 +72,7 @@ VideoFileMessages = [
61
72
  Message(
62
73
  role=Role.User,
63
74
  contents=[
64
- Content(type=ContentType.File, data="https://samplelib.com/mp4/sample-5s.mp4"),
75
+ Content(type=ContentType.File, data=VideoFileUrl),
65
76
  Content(type=ContentType.Text, data="What's this?"),
66
77
  ]
67
78
  )
@@ -71,7 +82,7 @@ DocxFileMessages = [
71
82
  Message(
72
83
  role=Role.User,
73
84
  contents=[
74
- Content(type=ContentType.File, data="https://example-files.online-convert.com/document/docx/example.docx"),
85
+ Content(type=ContentType.File, data=DocxFileUrl),
75
86
  Content(type=ContentType.Text, data="What's this?"),
76
87
  ]
77
88
  )
@@ -81,7 +92,7 @@ XlsxFileMessages = [
81
92
  Message(
82
93
  role=Role.User,
83
94
  contents=[
84
- Content(type=ContentType.File, data="https://download.microsoft.com/download/1/4/E/14EDED28-6C58-4055-A65C-23B4DA81C4DE/Financial Sample.xlsx"),
95
+ Content(type=ContentType.File, data=XlsxFileUrl),
85
96
  Content(type=ContentType.Text, data="What's this?"),
86
97
  ]
87
98
  )
@@ -91,7 +102,7 @@ PptxFileMessages = [
91
102
  Message(
92
103
  role=Role.User,
93
104
  contents=[
94
- Content(type=ContentType.File, data="https://wiki.documentfoundation.org/images/4/47/Extlst-test.pptx"),
105
+ Content(type=ContentType.File, data=PptxFileUrl),
95
106
  Content(type=ContentType.Text, data="What's this?"),
96
107
  ]
97
108
  )
@@ -1,4 +1,15 @@
1
1
  from llm_bridge import *
2
+ from usage.example_file_urls import (
3
+ TextFileUrl,
4
+ CodeFileUrl,
5
+ PdfFileUrl,
6
+ ImageFileUrl,
7
+ AudioFileUrl,
8
+ VideoFileUrl,
9
+ DocxFileUrl,
10
+ XlsxFileUrl,
11
+ PptxFileUrl,
12
+ )
2
13
  from usage.messages import (
3
14
  AudioFileMessages,
4
15
  CodeFileMessages,
@@ -99,7 +110,7 @@ messages = [
99
110
  Content(type=ContentType.Text, data="You are a helpful assistant."),
100
111
 
101
112
  # PDF Input in System Message
102
- # Content(type=ContentType.File, data="https://pdfobject.com/pdf/sample.pdf")
113
+ # Content(type=ContentType.File, data=PdfFileUrl)
103
114
  ]
104
115
  ),
105
116
  # Message History
@@ -798,7 +798,7 @@ wheels = [
798
798
 
799
799
  [[package]]
800
800
  name = "llm-bridge"
801
- version = "2.3.3"
801
+ version = "2.3.4"
802
802
  source = { editable = "." }
803
803
  dependencies = [
804
804
  { name = "anthropic" },
@@ -1,19 +0,0 @@
1
- <component name="ProjectRunConfigurationManager">
2
- <configuration default="false" name="batch" type="UvRunConfigurationType" factoryName="UvRunConfigurationType">
3
- <option name="args">
4
- <list />
5
- </option>
6
- <option name="checkSync" value="true" />
7
- <option name="debugJustMyCode" value="false" />
8
- <option name="env">
9
- <map />
10
- </option>
11
- <option name="runType" value="MODULE" />
12
- <option name="scriptOrModule" value="usage.batch.batch" />
13
- <option name="uvArgs">
14
- <list />
15
- </option>
16
- <option name="uvSdkKey" value="uv (LLM-Bridge)" />
17
- <method v="2" />
18
- </configuration>
19
- </component>
@@ -1,18 +0,0 @@
1
- <component name="ProjectRunConfigurationManager">
2
- <configuration default="false" name="pytest" type="UvRunConfigurationType" factoryName="UvRunConfigurationType">
3
- <option name="args">
4
- <list />
5
- </option>
6
- <option name="checkSync" value="true" />
7
- <option name="env">
8
- <map />
9
- </option>
10
- <option name="runType" value="MODULE" />
11
- <option name="scriptOrModule" value="pytest" />
12
- <option name="uvArgs">
13
- <list />
14
- </option>
15
- <option name="uvSdkKey" value="uv (LLM-Bridge)" />
16
- <method v="2" />
17
- </configuration>
18
- </component>
@@ -1,19 +0,0 @@
1
- <component name="ProjectRunConfigurationManager">
2
- <configuration default="false" name="single" type="UvRunConfigurationType" factoryName="UvRunConfigurationType">
3
- <option name="args">
4
- <list />
5
- </option>
6
- <option name="checkSync" value="true" />
7
- <option name="debugJustMyCode" value="false" />
8
- <option name="env">
9
- <map />
10
- </option>
11
- <option name="runType" value="MODULE" />
12
- <option name="scriptOrModule" value="usage.single.single" />
13
- <option name="uvArgs">
14
- <list />
15
- </option>
16
- <option name="uvSdkKey" value="uv (LLM-Bridge)" />
17
- <method v="2" />
18
- </configuration>
19
- </component>
@@ -1,33 +0,0 @@
1
- from llm_bridge.logic.message_process import document_processor
2
- from llm_bridge.logic.message_process.file_type_checker import get_file_type, get_filename_without_timestamp
3
- from llm_bridge.type.message import Message, Role, ContentType
4
-
5
-
6
- async def extract_file_as_text(file_url: str) -> str:
7
- filename = get_filename_without_timestamp(file_url)
8
- file_text = await document_processor.extract_text_from_file(file_url)
9
- return f"<file name=\"{filename}\">\n{file_text}\n</file>"
10
-
11
-
12
- async def extract_system_messages(messages: list[Message]) -> str:
13
- system_message = ""
14
- indices_to_delete = []
15
-
16
- for i, message in enumerate(messages):
17
- if message.role != Role.System:
18
- continue
19
-
20
- for content_item in message.contents:
21
- if content_item.type == ContentType.Text:
22
- system_message += f"{content_item.data}\n"
23
- elif content_item.type == ContentType.File:
24
- file_url = content_item.data
25
- file_type, sub_type = await get_file_type(file_url)
26
- system_message += f"\n{file_url}: {file_type}/{sub_type} in system message not supported by the current model.\n"
27
-
28
- indices_to_delete.append(i)
29
-
30
- for index in sorted(indices_to_delete, reverse=True):
31
- del messages[index]
32
-
33
- return system_message
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes