fix: Fix the incorrect upstream port value used when the ollama instance uses a custom port (#430)

Author: CH3CHO

backend/sdk/src/main/java/com/alibaba/higress/sdk/service/ai/AbstractLlmProviderHandler.java

@@ -123,7 +123,7 @@ public void saveConfig(LlmProvider provider, Map<String, Object> configurations)
     }
 
     @Override
-    public void validateConfig(Map<String, Object> configurations) {}
+    public void normalizeConfigs(Map<String, Object> configurations) {}
 
     @Override
     public ServiceSource buildServiceSource(String providerName, Map<String, Object> providerConfig) {

backend/sdk/src/main/java/com/alibaba/higress/sdk/service/ai/AzureLlmProviderHandler.java

@@ -34,7 +34,7 @@ public String getType() {
     }
 
     @Override
-    public void validateConfig(Map<String, Object> configurations) {
+    public void normalizeConfigs(Map<String, Object> configurations) {
         if (MapUtils.isEmpty(configurations)) {
             throw new ValidationException("Missing Azure specific configurations.");
         }

backend/sdk/src/main/java/com/alibaba/higress/sdk/service/ai/LlmProviderHandler.java

@@ -30,7 +30,11 @@ default LlmProvider createProvider() {
 
     void saveConfig(LlmProvider provider, Map<String, Object> configurations);
 
-    void validateConfig(Map<String, Object> configurations);
+    /**
+     * Validate the provider configurations and normalize configuration values based on the provider type.
+     * @param configurations provider configurations
+     */
+    void normalizeConfigs(Map<String, Object> configurations);
 
     ServiceSource buildServiceSource(String providerName, Map<String, Object> providerConfig);
 

backend/sdk/src/main/java/com/alibaba/higress/sdk/service/ai/LlmProviderServiceImpl.java

@@ -98,7 +98,7 @@ public LlmProvider addOrUpdate(LlmProvider provider) {
             throw new ValidationException("Provider type " + provider.getType() + " is not supported");
         }
 
-        handler.validateConfig(provider.getRawConfigs());
+        handler.normalizeConfigs(provider.getRawConfigs());
 
         fillDefaultValues(provider);
 

backend/sdk/src/main/java/com/alibaba/higress/sdk/service/ai/OllamaLlmProviderHandler.java

@@ -35,7 +35,7 @@ public String getType() {
     }
 
     @Override
-    public void validateConfig(Map<String, Object> configurations) {
+    public void normalizeConfigs(Map<String, Object> configurations) {
         if (MapUtils.isEmpty(configurations)) {
             throw new ValidationException("Missing Azure specific configurations.");
         }
@@ -50,6 +50,7 @@ public void validateConfig(Map<String, Object> configurations) {
         if (!ValidateUtil.checkPort(serverPort)) {
             throw new ValidationException(SERVER_PORT_KEY + " must be a valid port number.");
         }
+        configurations.put(SERVER_PORT_KEY, serverPort);
     }
 
     @Override
@@ -77,11 +78,12 @@ protected int getServicePort(Map<String, Object> providerConfig) {
         if (MapUtils.isEmpty(providerConfig)) {
             return DEFAULT_PORT;
         }
-        Object serverPortObj = providerConfig.get(SERVER_PORT_KEY);
-        if (!(serverPortObj instanceof Integer serverPort) || !ValidateUtil.checkPort(serverPort)) {
+        try {
+            int serverPort = getIntConfig(providerConfig, SERVER_PORT_KEY);
+            return ValidateUtil.checkPort(serverPort) ? serverPort : DEFAULT_PORT;
+        } catch (ValidationException ve) {
             return DEFAULT_PORT;
         }
-        return serverPort;
     }
 
     @Override

backend/sdk/src/main/java/com/alibaba/higress/sdk/service/ai/OpenaiLlmProviderHandler.java

@@ -40,7 +40,7 @@ public String getType() {
     }
 
     @Override
-    public void validateConfig(Map<String, Object> configurations) {
+    public void normalizeConfigs(Map<String, Object> configurations) {
         if (MapUtils.isEmpty(configurations)) {
             return;
         }