feat: support the chat_template_kwargs, with OpenAI-Compatible Server… #3744
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Willam2004 force-pushed the feature/openai_enable_thinking branch from a4fadc2 to 6021943 Compare 
| I've noticed that some pull requests submitted after mine have already received feedback, while mine has not. Could you please let me know if there's anything I need to improve or adjust? |
…ects#4124) Signed-off-by: Oleksandr Klymenko <alexanderklmn@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…ing-projects#4131) * fix(azure): parse metadata JSON into mutable Map before injecting distance Avoid UnsupportedOperationException by ensuring metadata is always a LinkedHashMap. Add `parseMetadataToMutable` helper and use it in similarity search path. * test(azure): add unit tests for mutable metadata parsing and distance Add `AzureVectorStoreMetadataParsingTests` to verify: - valid JSON → mutable LinkedHashMap copy - blank/invalid JSON → empty LinkedHashMap - can inject `distance` without throwing UnsupportedOperationException These tests fail on the previous implementation and pass with the fix, guarding against regressions. * refactor(azure): replace LinkedHashMap with HashMap in parseMetadataToMutable We don’t rely on insertion order for metadata, so a regular HashMap is sufficient. This change addresses reviewer feedback while still ensuring the returned map is always mutable by creating a defensive copy or returning an empty instance. Auto-cherry-pick to 1.0.x Fixes spring-projects#4117 Signed-off-by: Jinwoo Lee <jinlee1703@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
) Adds a null check before injecting the distance property into metadata to prevent a NullPointerException if metadata is missing from the row record. The change is intentionally minimal and does not alter existing behavior beyond avoiding the crash. Some search results do not carry metadata (or the metadata value is null). Calling JsonObject.addProperty(...) on a null reference throws an NPE and breaks the mapping pipeline. Add a null guard around the distance injection step to ensure we do not call addProperty(...) on a null metadata. Fixes spring-projects#4115 Auto-cherry-pick to 1.0.x Signed-off-by: little_huang <53588889+little-huang@users.noreply.github.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…g-projects#4154) Signed-off-by: Oleksandr Klymenko <alexanderklmn@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…4153) Fixes spring-projects#4153 Auto-cherry-pick to 1.0.x Signed-off-by: Gareth Evans <gareth@bryncynfelin.co.uk> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…pring-projects#4157) * test: Enhance test coverage for EmbeddingModelObservationContext Signed-off-by: Oleksandr Klymenko <alexanderklmn@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- update gpt-5 tests - add verbosity parameter - udpate documentation and add tests Fixes spring-projects#4086 Auto-cherry-pick to 1.0.x Signed-off-by: Alexandros Pappas <apappascs@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com> # Conflicts: # models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatOptions.java # models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java
…pring-projects#4152) Signed-off-by: Gareth Evans <gareth@bryncynfelin.co.uk> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…ctionDetails.getSslBundle()` (spring-projects#4149) Fixes spring-projects#4133 Auto-cherry-pick to 1.0.x Signed-off-by: Yanming Zhou <zhouyanming@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…jects#4146) Signed-off-by: Yanming Zhou <zhouyanming@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…pring-projects#4165) Signed-off-by: Oleksandr Klymenko <alexanderklmn@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Add new main-push-fast.yml workflow for quick feedback on main branch pushes - Uses test_discovery.py to run only affected module tests (10-20 min vs 1.5 hrs) - Convert continuous-integration.yml from push-triggered to scheduled builds - Schedule covers EST and CET working hours with 10 builds per weekday (9 AM - 9 PM) - Enhanced test_discovery.py to properly handle main branch commits - Maintains full test coverage while enabling rapid PR merge cycles - Builds spaced 2.5+ hours apart to prevent overlap with 90-minute build duration Signed-off-by: mark.pollack@broadcom.com Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…iggers - Fix bash parsing logic that incorrectly extracted debug output instead of actual module list - Separate stdout (module result) from stderr (debug logging) in test discovery - Add .github/workflows/** to paths-ignore to prevent workflow from triggering on its own changes - Workflow now properly handles infrastructure-only changes with empty module list Signed-off-by: mark.pollack@broadcom.com Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…le-http support - Extract MCP server functionality into specialized modules: * STDIO/SSE servers (existing functionality) * Streamable-HTTP servers with change notifications * Stateless servers for simplified deployments - Add new auto-configuration modules: * spring-ai-autoconfigure-mcp-streamable-server-common * spring-ai-autoconfigure-mcp-streamable-server-webflux/webmvc * spring-ai-autoconfigure-mcp-stateless-server-common * spring-ai-autoconfigure-mcp-stateless-server-webflux/webmvc * Add server-specific property prefixes for different server types - Extract ToolCallbackConverter into separate auto-configuration with conditional enablement via tool-callback-converter property - Enhance transport providers with builder patterns and new features: * Keep-alive interval support for connection health * Add keep-alive-interval and other transport-specific options - Add comprehensive integration tests for all server types - Update documentation to reflect new architecture and server options Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Exclude root module from test discovery to prevent full builds - Add -q flag to Maven commands to reduce log verbosity - Remove Free Disk Space step that was causing hangs - Optimize workflow for true fast feedback (10-20 min vs 1.5 hrs) Signed-off-by: mark.pollack@broadcom.com Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Allow manual triggering with optional commit SHA parameter - Enables testing improved workflow against previous commits - Defaults to latest commit when no SHA specified - Shows clear commit info in logs for manual runs Signed-off-by: mark.pollack@broadcom.com Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Skip compilation entirely when no modules affected (saves 1m 47s) - Add conditional Ollama startup only when tests needed (saves 40s setup) - Reduce debug output verbosity for cleaner logs - Early exit for workflow/docs-only changes - Maintain full functionality for actual code changes Expected performance: - No-op builds: ~45 seconds (vs 3m 25s previously) - Code changes: Still fast with targeted testing Signed-off-by: mark.pollack@broadcom.com Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Fix git checkout failure when testing specific commit SHAs - Use conditional fetch depth: shallow for auto runs, full for manual - Add explicit commit fetch and checkout for manual runs - Enhance run-name to show commit SHA for manual tests - Add detailed commit info display with author, date, and changed files Fixes issue where actions/checkout@v4 treated commit SHA as branch name Signed-off-by: mark.pollack@broadcom.com Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Use full history fetch for all runs to ensure commit availability - Remove problematic git fetch command that treated SHA as ref - Directly checkout commit SHA after full clone - Prioritize reliability over shallow clone optimization This should resolve the "couldn't find remote ref" error when testing specific commits via workflow_dispatch. Signed-off-by: mark.pollack@broadcom.com Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Add explicit exclusion of root pom.xml in test_discovery.py - Prevents root module (.) from appearing in affected modules list - Adds Ollama-specific conditional logic to only start Ollama for Ollama modules - Ensures fast workflows stay targeted and don't trigger full builds This fixes the MCP commit test that was incorrectly including root module and triggering full project build instead of targeted MCP module testing. Signed-off-by: mark.pollack@broadcom.com Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Never return root module (.) from _find_module_for_file to prevent full project builds via Maven's -amd flag. Signed-off-by: Mark Pollack <mark.pollack@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Exclude entire .github/ directory from triggering fast builds to reduce noise. Manual workflow_dispatch can be used for testing when needed. Signed-off-by: Mark Pollack <mark.pollack@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
The bug was that empty string '' was not being caught by the 'potential_module == "."' check. Now properly convert empty string to '.' before the root module exclusion check. This should finally prevent the root module from appearing in affected modules list. Signed-off-by: Mark Pollack <mark.pollack@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Remove 2>/dev/null and add --verbose flag to see exactly what files are being processed and how they're being resolved to modules. This will help identify where the root module is being added. Signed-off-by: Mark Pollack <mark.pollack@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
When testing specific commit SHAs via workflow_dispatch, always use the latest versions of all GitHub Actions scripts from main branch to ensure we have all bug fixes and improvements. This prevents issues where old commits have outdated CI logic. Signed-off-by: Mark Pollack <mark.pollack@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Filter out __pycache__ when copying scripts from main - Create parent directories if they don't exist - Fix .gitignore to properly exclude Python cache files - Remove already-cached Python bytecode from git Signed-off-by: Mark Pollack <mark.pollack@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
1. Introduced the OpenAiFileApi class. 2. Implemented corresponding unit tests and integration tests. Signed-off-by: Sun Yuhan <sunyuhan1998@users.noreply.github.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: Pawel Potaczala <30981922+centrumek@users.noreply.github.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Create Utility class to expose the static methods for tooling/embedding autoconfigurations - Fix VertexAiModelConfigurationTests and other FunctionCall ITs to use the Utils Signed-off-by: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…iguration (spring-projects#4553) Signed-off-by: Dariusz Jędrzejczyk <dariusz.jedrzejczyk@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Related to spring-projects#4494 Signed-off-by: Hyoseop Song <crad_on25@naver.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…t integration Replace manual MCP annotation providers with autoconfiguration beans. Add ChatClient integration test with Anthropic model in sampling handler. Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: Issam El-atif <issam.elatif@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Co-authored-by: Oleksandr Klymenko <alexanderklmn@gmail.com> Signed-off-by: Oleksandr Klymenko <alexanderklmn@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: David Frizelle <david.frizelle@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: Dev Bulchandani <devbulchandani8@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Re-use import autoconfigs in the ITs Signed-off-by: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…pring-projects#4541) - Deleted `functions`, `functionCallbacks`, and `proxy-tool-calls` options in docs - Introduce `toolNames`, `toolCallbacks`, and `internal-tool-execution-enabled` as replacements - Update documentation for chat models Signed-off-by: YunKui Lu <luyunkui95@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Remove ImportAutoConfiguration usage and verify the ordering of autoconfiguration Signed-off-by: Suganthi Thomas <sugan.mercy@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
- Use common base class to serve the static methods for the ITs to import autoconfigurations Signed-off-by: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: Issam El-atif <issam.elatif@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Co-authored-by: Oleksandr Klymenko <alexanderklmn@gmail.com> Signed-off-by: Oleksandr Klymenko <alexanderklmn@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…va 25" This reverts commit 4ad1461. Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…eekAssistantMessage` and included corresponding unit tests. Signed-off-by: Sun Yuhan <sunyuhan1998@users.noreply.github.com> Signed-off-by: Eric Bottard <eric.bottard@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…AiAssistantMessage` and included corresponding unit tests. Fix spring-projects#4454 Signed-off-by: Sun Yuhan <sunyuhan1998@users.noreply.github.com> Signed-off-by: Eric Bottard <eric.bottard@broadcom.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Signed-off-by: Issam El-atif <issam.elatif@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
Related to spring-projects#4494 Signed-off-by: Hyunsang Han <gustkd3@gmail.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
CosmosDB Chat Memory wasn't available in 1.0.0, it was merged for 1.1.0-M3 Signed-off-by: Łukasz Jernaś <lukasz.jernas@allegro.com> Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…ttps://docs.vllm.ai/en/latest/serving/openai_compatible_server.html#extra-parameters_3), relate: (spring-projects#3409) Signed-off-by: 家娃 <guanjing.pangj@alibaba-inc.com>
…into feature/openai_enable_thinking # Conflicts: # models/spring-ai-openai/src/test/java/org/springframework/ai/openai/OpenAiChatOptionsTests.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
68 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
…(https://docs.vllm.ai/en/latest/serving/openai_compatible_server.html#extra-parameters_3), relate: (#3409)
Thank you for taking time to contribute this pull request!
You might have already read the contributor guide, but as a reminder, please make sure to:
git commit -s) per the DCOmainbranch and squash your commitsFor more details, please check the contributor guide.
Thank you upfront!