atiaomar1978-hub commented on PR #25172: URL: https://github.com/apache/camel/pull/25172#issuecomment-5148353960
_Rebased onto latest \`main\` and resolved merge conflicts (AI-generated on behalf of atiaomar1978-hub)._ **Conflicts resolved** by keeping both Gemini support and the watsonx.ai integration from \`main\`: - \`LlmClient.java\` — merged \`ApiType.gemini\` + \`watsonx\`, combined auto-detect order, both model-list methods - \`AiPanel.java\` — init hint mentions \`GEMINI_API_KEY\` and \`WATSONX_APIKEY\` - \`AiProviderSelectorTest.java\` — provider lists include both providers **Local tests:** \`LlmClientGeminiTest\`, \`LlmClientWatsonxTest\`, \`LlmClientAzureTest\`, \`AiProviderSelectorTest\` (8/8 passed) Branch rebased and force-pushed: \`77702fae2da\` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
