From 3bea2a38920924d9e741d3d96a4a1df1a89b27df Mon Sep 17 00:00:00 2001 From: Ashera Silva Date: Fri, 14 Feb 2025 15:18:36 +0530 Subject: [PATCH 1/2] Fix AIAPITestCase failure --- .../clients/admin/api/LlmProviderApi.java | 26 +++++++++----- .../clients/admin/api/LlmProvidersApi.java | 26 +++++++++----- .../admin/api/dto/LLMProviderRequestDTO.java | 33 +++++++++++++++-- .../admin/api/dto/LLMProviderResponseDTO.java | 35 +++++++++++++++++-- .../admin/src/main/resources/admin-api.yaml | 8 +++++ .../test/impl/RestAPIAdminImpl.java | 21 ++++++----- .../tests/aiapi/AIAPITestCase.java | 7 ++-- all-in-one-apim/pom.xml | 4 +-- api-control-plane/pom.xml | 4 +-- gateway/pom.xml | 4 +-- traffic-manager/pom.xml | 4 +-- 11 files changed, 130 insertions(+), 42 deletions(-) diff --git a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/LlmProviderApi.java b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/LlmProviderApi.java index f3144a1c5f..758b117ee9 100644 --- a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/LlmProviderApi.java +++ b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/LlmProviderApi.java @@ -286,6 +286,7 @@ public okhttp3.Call llmProvidersLlmProviderIdGetAsync(String llmProviderId, fina * @param description (optional) * @param configurations LLM Provider configurations (optional) * @param apiDefinition OpenAPI specification (optional) + * @param modelList List of models supported by the LLM Provider as a stringified JSON array (optional) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -297,7 +298,7 @@ public okhttp3.Call llmProvidersLlmProviderIdGetAsync(String llmProviderId, fina 404 Not Found. The specified resource does not exist. - */ - public okhttp3.Call llmProvidersLlmProviderIdPutCall(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition, final ApiCallback _callback) throws ApiException { + public okhttp3.Call llmProvidersLlmProviderIdPutCall(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList, final ApiCallback _callback) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -329,6 +330,10 @@ public okhttp3.Call llmProvidersLlmProviderIdPutCall(String llmProviderId, Strin localVarFormParams.put("apiDefinition", apiDefinition); } + if (modelList != null) { + localVarFormParams.put("modelList", modelList); + } + final String[] localVarAccepts = { "application/json" }; @@ -348,7 +353,7 @@ public okhttp3.Call llmProvidersLlmProviderIdPutCall(String llmProviderId, Strin } @SuppressWarnings("rawtypes") - private okhttp3.Call llmProvidersLlmProviderIdPutValidateBeforeCall(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition, final ApiCallback _callback) throws ApiException { + private okhttp3.Call llmProvidersLlmProviderIdPutValidateBeforeCall(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList, final ApiCallback _callback) throws ApiException { // verify the required parameter 'llmProviderId' is set if (llmProviderId == null) { @@ -356,7 +361,7 @@ private okhttp3.Call llmProvidersLlmProviderIdPutValidateBeforeCall(String llmPr } - okhttp3.Call localVarCall = llmProvidersLlmProviderIdPutCall(llmProviderId, name, apiVersion, description, configurations, apiDefinition, _callback); + okhttp3.Call localVarCall = llmProvidersLlmProviderIdPutCall(llmProviderId, name, apiVersion, description, configurations, apiDefinition, modelList, _callback); return localVarCall; } @@ -370,6 +375,7 @@ private okhttp3.Call llmProvidersLlmProviderIdPutValidateBeforeCall(String llmPr * @param description (optional) * @param configurations LLM Provider configurations (optional) * @param apiDefinition OpenAPI specification (optional) + * @param modelList List of models supported by the LLM Provider as a stringified JSON array (optional) * @return LLMProviderResponseDTO * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -380,8 +386,8 @@ private okhttp3.Call llmProvidersLlmProviderIdPutValidateBeforeCall(String llmPr 404 Not Found. The specified resource does not exist. - */ - public LLMProviderResponseDTO llmProvidersLlmProviderIdPut(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition) throws ApiException { - ApiResponse localVarResp = llmProvidersLlmProviderIdPutWithHttpInfo(llmProviderId, name, apiVersion, description, configurations, apiDefinition); + public LLMProviderResponseDTO llmProvidersLlmProviderIdPut(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList) throws ApiException { + ApiResponse localVarResp = llmProvidersLlmProviderIdPutWithHttpInfo(llmProviderId, name, apiVersion, description, configurations, apiDefinition, modelList); return localVarResp.getData(); } @@ -394,6 +400,7 @@ public LLMProviderResponseDTO llmProvidersLlmProviderIdPut(String llmProviderId, * @param description (optional) * @param configurations LLM Provider configurations (optional) * @param apiDefinition OpenAPI specification (optional) + * @param modelList List of models supported by the LLM Provider as a stringified JSON array (optional) * @return ApiResponse<LLMProviderResponseDTO> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -404,8 +411,8 @@ public LLMProviderResponseDTO llmProvidersLlmProviderIdPut(String llmProviderId, 404 Not Found. The specified resource does not exist. - */ - public ApiResponse llmProvidersLlmProviderIdPutWithHttpInfo(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition) throws ApiException { - okhttp3.Call localVarCall = llmProvidersLlmProviderIdPutValidateBeforeCall(llmProviderId, name, apiVersion, description, configurations, apiDefinition, null); + public ApiResponse llmProvidersLlmProviderIdPutWithHttpInfo(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList) throws ApiException { + okhttp3.Call localVarCall = llmProvidersLlmProviderIdPutValidateBeforeCall(llmProviderId, name, apiVersion, description, configurations, apiDefinition, modelList, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -419,6 +426,7 @@ public ApiResponse llmProvidersLlmProviderIdPutWithHttpI * @param description (optional) * @param configurations LLM Provider configurations (optional) * @param apiDefinition OpenAPI specification (optional) + * @param modelList List of models supported by the LLM Provider as a stringified JSON array (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -430,9 +438,9 @@ public ApiResponse llmProvidersLlmProviderIdPutWithHttpI 404 Not Found. The specified resource does not exist. - */ - public okhttp3.Call llmProvidersLlmProviderIdPutAsync(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition, final ApiCallback _callback) throws ApiException { + public okhttp3.Call llmProvidersLlmProviderIdPutAsync(String llmProviderId, String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = llmProvidersLlmProviderIdPutValidateBeforeCall(llmProviderId, name, apiVersion, description, configurations, apiDefinition, _callback); + okhttp3.Call localVarCall = llmProvidersLlmProviderIdPutValidateBeforeCall(llmProviderId, name, apiVersion, description, configurations, apiDefinition, modelList, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; diff --git a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/LlmProvidersApi.java b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/LlmProvidersApi.java index dbb3b110ee..308d3e2294 100644 --- a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/LlmProvidersApi.java +++ b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/LlmProvidersApi.java @@ -165,6 +165,7 @@ public okhttp3.Call llmProvidersGetAsync(final ApiCallback 400 Bad Request. Invalid request or validation error. - */ - public okhttp3.Call llmProvidersPostCall(String name, String apiVersion, String description, String configurations, File apiDefinition, final ApiCallback _callback) throws ApiException { + public okhttp3.Call llmProvidersPostCall(String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList, final ApiCallback _callback) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -206,6 +207,10 @@ public okhttp3.Call llmProvidersPostCall(String name, String apiVersion, String localVarFormParams.put("apiDefinition", apiDefinition); } + if (modelList != null) { + localVarFormParams.put("modelList", modelList); + } + final String[] localVarAccepts = { "application/json" }; @@ -225,10 +230,10 @@ public okhttp3.Call llmProvidersPostCall(String name, String apiVersion, String } @SuppressWarnings("rawtypes") - private okhttp3.Call llmProvidersPostValidateBeforeCall(String name, String apiVersion, String description, String configurations, File apiDefinition, final ApiCallback _callback) throws ApiException { + private okhttp3.Call llmProvidersPostValidateBeforeCall(String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = llmProvidersPostCall(name, apiVersion, description, configurations, apiDefinition, _callback); + okhttp3.Call localVarCall = llmProvidersPostCall(name, apiVersion, description, configurations, apiDefinition, modelList, _callback); return localVarCall; } @@ -241,6 +246,7 @@ private okhttp3.Call llmProvidersPostValidateBeforeCall(String name, String apiV * @param description (optional) * @param configurations LLM Provider configurations (optional) * @param apiDefinition OpenAPI specification (optional) + * @param modelList List of models supported by the LLM Provider as a stringified JSON array (optional) * @return LLMProviderResponseDTO * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -250,8 +256,8 @@ private okhttp3.Call llmProvidersPostValidateBeforeCall(String name, String apiV 400 Bad Request. Invalid request or validation error. - */ - public LLMProviderResponseDTO llmProvidersPost(String name, String apiVersion, String description, String configurations, File apiDefinition) throws ApiException { - ApiResponse localVarResp = llmProvidersPostWithHttpInfo(name, apiVersion, description, configurations, apiDefinition); + public LLMProviderResponseDTO llmProvidersPost(String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList) throws ApiException { + ApiResponse localVarResp = llmProvidersPostWithHttpInfo(name, apiVersion, description, configurations, apiDefinition, modelList); return localVarResp.getData(); } @@ -263,6 +269,7 @@ public LLMProviderResponseDTO llmProvidersPost(String name, String apiVersion, S * @param description (optional) * @param configurations LLM Provider configurations (optional) * @param apiDefinition OpenAPI specification (optional) + * @param modelList List of models supported by the LLM Provider as a stringified JSON array (optional) * @return ApiResponse<LLMProviderResponseDTO> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -272,8 +279,8 @@ public LLMProviderResponseDTO llmProvidersPost(String name, String apiVersion, S 400 Bad Request. Invalid request or validation error. - */ - public ApiResponse llmProvidersPostWithHttpInfo(String name, String apiVersion, String description, String configurations, File apiDefinition) throws ApiException { - okhttp3.Call localVarCall = llmProvidersPostValidateBeforeCall(name, apiVersion, description, configurations, apiDefinition, null); + public ApiResponse llmProvidersPostWithHttpInfo(String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList) throws ApiException { + okhttp3.Call localVarCall = llmProvidersPostValidateBeforeCall(name, apiVersion, description, configurations, apiDefinition, modelList, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -286,6 +293,7 @@ public ApiResponse llmProvidersPostWithHttpInfo(String n * @param description (optional) * @param configurations LLM Provider configurations (optional) * @param apiDefinition OpenAPI specification (optional) + * @param modelList List of models supported by the LLM Provider as a stringified JSON array (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -296,9 +304,9 @@ public ApiResponse llmProvidersPostWithHttpInfo(String n 400 Bad Request. Invalid request or validation error. - */ - public okhttp3.Call llmProvidersPostAsync(String name, String apiVersion, String description, String configurations, File apiDefinition, final ApiCallback _callback) throws ApiException { + public okhttp3.Call llmProvidersPostAsync(String name, String apiVersion, String description, String configurations, File apiDefinition, String modelList, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = llmProvidersPostValidateBeforeCall(name, apiVersion, description, configurations, apiDefinition, _callback); + okhttp3.Call localVarCall = llmProvidersPostValidateBeforeCall(name, apiVersion, description, configurations, apiDefinition, modelList, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; diff --git a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/dto/LLMProviderRequestDTO.java b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/dto/LLMProviderRequestDTO.java index daecdc4b3b..b33ff5e594 100644 --- a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/dto/LLMProviderRequestDTO.java +++ b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/dto/LLMProviderRequestDTO.java @@ -50,6 +50,10 @@ public class LLMProviderRequestDTO { @SerializedName(SERIALIZED_NAME_API_DEFINITION) private File apiDefinition; + public static final String SERIALIZED_NAME_MODEL_LIST = "modelList"; + @SerializedName(SERIALIZED_NAME_MODEL_LIST) + private String modelList; + public LLMProviderRequestDTO name(String name) { @@ -166,6 +170,29 @@ public void setApiDefinition(File apiDefinition) { } + public LLMProviderRequestDTO modelList(String modelList) { + + this.modelList = modelList; + return this; + } + + /** + * List of models supported by the LLM Provider as a stringified JSON array + * @return modelList + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "List of models supported by the LLM Provider as a stringified JSON array") + + public String getModelList() { + return modelList; + } + + + public void setModelList(String modelList) { + this.modelList = modelList; + } + + @Override public boolean equals(Object o) { if (this == o) { @@ -179,12 +206,13 @@ public boolean equals(Object o) { Objects.equals(this.apiVersion, llMProviderRequest.apiVersion) && Objects.equals(this.description, llMProviderRequest.description) && Objects.equals(this.configurations, llMProviderRequest.configurations) && - Objects.equals(this.apiDefinition, llMProviderRequest.apiDefinition); + Objects.equals(this.apiDefinition, llMProviderRequest.apiDefinition) && + Objects.equals(this.modelList, llMProviderRequest.modelList); } @Override public int hashCode() { - return Objects.hash(name, apiVersion, description, configurations, apiDefinition); + return Objects.hash(name, apiVersion, description, configurations, apiDefinition, modelList); } @@ -197,6 +225,7 @@ public String toString() { sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" configurations: ").append(toIndentedString(configurations)).append("\n"); sb.append(" apiDefinition: ").append(toIndentedString(apiDefinition)).append("\n"); + sb.append(" modelList: ").append(toIndentedString(modelList)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/dto/LLMProviderResponseDTO.java b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/dto/LLMProviderResponseDTO.java index 03354f0121..2c36d1eb86 100644 --- a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/dto/LLMProviderResponseDTO.java +++ b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/gen/java/org/wso2/am/integration/clients/admin/api/dto/LLMProviderResponseDTO.java @@ -23,6 +23,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import com.fasterxml.jackson.annotation.JsonCreator; /** * LLMProviderResponseDTO @@ -57,6 +59,10 @@ public class LLMProviderResponseDTO { @SerializedName(SERIALIZED_NAME_API_DEFINITION) private String apiDefinition; + public static final String SERIALIZED_NAME_MODEL_LIST = "modelList"; + @SerializedName(SERIALIZED_NAME_MODEL_LIST) + private List modelList = null; + public LLMProviderResponseDTO id(String id) { @@ -219,6 +225,29 @@ public void setApiDefinition(String apiDefinition) { } + public LLMProviderResponseDTO modelList(List modelList) { + + this.modelList = modelList; + return this; + } + + /** + * List of models supported by the LLM Provider + * @return modelList + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "List of models supported by the LLM Provider") + + public List getModelList() { + return modelList; + } + + + public void setModelList(List modelList) { + this.modelList = modelList; + } + + @Override public boolean equals(Object o) { if (this == o) { @@ -234,12 +263,13 @@ public boolean equals(Object o) { Objects.equals(this.builtInSupport, llMProviderResponse.builtInSupport) && Objects.equals(this.description, llMProviderResponse.description) && Objects.equals(this.configurations, llMProviderResponse.configurations) && - Objects.equals(this.apiDefinition, llMProviderResponse.apiDefinition); + Objects.equals(this.apiDefinition, llMProviderResponse.apiDefinition) && + Objects.equals(this.modelList, llMProviderResponse.modelList); } @Override public int hashCode() { - return Objects.hash(id, name, apiVersion, builtInSupport, description, configurations, apiDefinition); + return Objects.hash(id, name, apiVersion, builtInSupport, description, configurations, apiDefinition, modelList); } @@ -254,6 +284,7 @@ public String toString() { sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" configurations: ").append(toIndentedString(configurations)).append("\n"); sb.append(" apiDefinition: ").append(toIndentedString(apiDefinition)).append("\n"); + sb.append(" modelList: ").append(toIndentedString(modelList)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/main/resources/admin-api.yaml b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/main/resources/admin-api.yaml index 062a0a2327..315377bc63 100644 --- a/all-in-one-apim/modules/integration/tests-common/clients/admin/src/main/resources/admin-api.yaml +++ b/all-in-one-apim/modules/integration/tests-common/clients/admin/src/main/resources/admin-api.yaml @@ -5515,6 +5515,9 @@ components: type: string description: OpenAPI specification format: binary + modelList: + type: string + description: List of models supported by the LLM Provider as a stringified JSON array LLMProviderResponse: title: LLMProviderResponse type: object @@ -5546,6 +5549,11 @@ components: apiDefinition: type: string description: OpenAPI specification + modelList: + type: array + items: + type: string + description: List of models supported by the LLM Provider LLMProviderSummaryResponse: title: LLMProviderSummaryResponse type: object diff --git a/all-in-one-apim/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java b/all-in-one-apim/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java index 601c2736d7..61e1ab51a9 100644 --- a/all-in-one-apim/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java +++ b/all-in-one-apim/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java @@ -278,31 +278,34 @@ public ApiResponse getLLMProvider(String llmProviderId) * @param description A brief description of the LLM provider. * @param configuration Configuration details for the LLM provider. * @param apiDefinition The API definition file for the LLM provider. + * @param modelList The list of models for the LLM provider. * @return ApiResponse containing LLMProviderResponseDTO with the updated details of the LLM provider. * @throws ApiException if there is an error during the API call. */ public ApiResponse addLLMProvider(String name, String apiVersion, String description, - String configuration, File apiDefinition) throws ApiException { + String configuration, File apiDefinition, String modelList) throws ApiException { - return llmProvidersApi.llmProvidersPostWithHttpInfo(name, apiVersion, description, configuration, - apiDefinition); + return llmProvidersApi.llmProvidersPostWithHttpInfo(name, apiVersion, description, configuration, apiDefinition, + modelList); } /** * Updates the details of a specific LLM Provider by its ID. * * @param llmProviderId The unique identifier of the LLM provider. - * @param name The new name of the LLM provider. - * @param apiVersion The API version of the LLM provider. - * @param description A brief description of the LLM provider. + * @param name The new name of the LLM provider. + * @param apiVersion The API version of the LLM provider. + * @param description A brief description of the LLM provider. * @param configuration Configuration details for the LLM provider. * @param apiDefinition The API definition file for the LLM provider. + * @param modelList The list of models for the LLM provider. * @return ApiResponse containing LLMProviderResponseDTO with the updated details of the LLM provider. * @throws ApiException if there is an error during the API call. */ - public ApiResponse updateLLMProvider(String llmProviderId, String name, String apiVersion, String description, - String configuration, File apiDefinition) throws ApiException { - return llmProviderApi.llmProvidersLlmProviderIdPutWithHttpInfo(llmProviderId, name, apiVersion, description, configuration, apiDefinition); + public ApiResponse updateLLMProvider(String llmProviderId, String name, String apiVersion, + String description, String configuration, File apiDefinition, String modelList) throws ApiException { + return llmProviderApi.llmProvidersLlmProviderIdPutWithHttpInfo(llmProviderId, name, apiVersion, description, + configuration, apiDefinition, modelList); } /** diff --git a/all-in-one-apim/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/aiapi/AIAPITestCase.java b/all-in-one-apim/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/aiapi/AIAPITestCase.java index e036f2e5f0..6dfc961c58 100644 --- a/all-in-one-apim/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/aiapi/AIAPITestCase.java +++ b/all-in-one-apim/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/aiapi/AIAPITestCase.java @@ -101,6 +101,7 @@ public class AIAPITestCase extends APIMIntegrationBaseTest { private final String llmProviderApiVersion = "1.0.0"; private final String llmProviderDescription = "This is a copy of MistralAI service"; + private final String modelList = "[\"model-1\", \"model-2\"]"; private final String incorrectLlmProviderConfigurations = "{\"connectorType\":\"mistralAi_1.0.0\"," + "\"metadata\":[{\"attributeName\":\"model\"," + @@ -193,7 +194,7 @@ public void addCustomLLMProvider() throws Exception { File file = getTempFileWithContent(originalDefinition); ApiResponse createProviderResponse = restAPIAdmin.addLLMProvider(llmProviderName, - llmProviderApiVersion, llmProviderDescription, incorrectLlmProviderConfigurations, file); + llmProviderApiVersion, llmProviderDescription, incorrectLlmProviderConfigurations, file, modelList); assertEquals(Response.Status.CREATED.getStatusCode(), createProviderResponse.getStatusCode(), "Failed to add a LLM provider"); @@ -230,7 +231,7 @@ public void updateCustomLLMProvider() throws Exception { ApiResponse updateProviderResponse = restAPIAdmin.updateLLMProvider(llmProviderId, llmProviderName, llmProviderApiVersion, llmProviderDescription, - correctLlmProviderConfigurations, file); + correctLlmProviderConfigurations, file, modelList); assertEquals(Response.Status.OK.getStatusCode(), updateProviderResponse.getStatusCode(), "Failed to update LLM provider"); @@ -310,7 +311,7 @@ public void testMistralAIApiInvocation() throws Exception { HttpResponse serviceResponse = HTTPSClientUtils. doPost(invokeURL, requestHeaders, mistralPayload); - assertEquals(HttpStatus.SC_OK, serviceResponse.getResponseCode(), "Failed to invoke Mistral AI API"); + assertEquals(serviceResponse.getResponseCode(), HttpStatus.SC_OK, "Failed to invoke Mistral AI API"); assertEquals(mistralResponse, serviceResponse.getData(), "Mistral AI API response mismatch"); } diff --git a/all-in-one-apim/pom.xml b/all-in-one-apim/pom.xml index e726b7004f..862d03c737 100644 --- a/all-in-one-apim/pom.xml +++ b/all-in-one-apim/pom.xml @@ -1284,11 +1284,11 @@ 5.3.15 - 9.2.15 + 9.2.21 - 9.31.14 + 9.31.23 [9.0.0, 10.0.0) diff --git a/api-control-plane/pom.xml b/api-control-plane/pom.xml index e1566af30a..1350b22bf7 100644 --- a/api-control-plane/pom.xml +++ b/api-control-plane/pom.xml @@ -1280,11 +1280,11 @@ 5.3.15 - 9.2.15 + 9.2.21 - 9.31.14 + 9.31.23 [9.0.0, 10.0.0) diff --git a/gateway/pom.xml b/gateway/pom.xml index 7c86ddf7ee..a25d5eaa50 100644 --- a/gateway/pom.xml +++ b/gateway/pom.xml @@ -1280,11 +1280,11 @@ 5.3.15 - 9.2.15 + 9.2.21 - 9.31.14 + 9.31.23 [9.0.0, 10.0.0) diff --git a/traffic-manager/pom.xml b/traffic-manager/pom.xml index 98e49dedca..a63150b39b 100644 --- a/traffic-manager/pom.xml +++ b/traffic-manager/pom.xml @@ -1280,11 +1280,11 @@ 5.3.15 - 9.2.15 + 9.2.21 - 9.31.14 + 9.31.23 [9.0.0, 10.0.0) From 0cf516b0caca36f041b9f2d2fe70c36b9b56ac07 Mon Sep 17 00:00:00 2001 From: Ashera Silva Date: Fri, 14 Feb 2025 19:42:47 +0530 Subject: [PATCH 2/2] Bump carbon.apimgt.version --- all-in-one-apim/pom.xml | 2 +- api-control-plane/pom.xml | 2 +- gateway/pom.xml | 2 +- traffic-manager/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/all-in-one-apim/pom.xml b/all-in-one-apim/pom.xml index 862d03c737..875f1192ff 100644 --- a/all-in-one-apim/pom.xml +++ b/all-in-one-apim/pom.xml @@ -1288,7 +1288,7 @@ - 9.31.23 + 9.31.25 [9.0.0, 10.0.0) diff --git a/api-control-plane/pom.xml b/api-control-plane/pom.xml index 1350b22bf7..809487d628 100644 --- a/api-control-plane/pom.xml +++ b/api-control-plane/pom.xml @@ -1284,7 +1284,7 @@ - 9.31.23 + 9.31.25 [9.0.0, 10.0.0) diff --git a/gateway/pom.xml b/gateway/pom.xml index a25d5eaa50..ee9a9d026c 100644 --- a/gateway/pom.xml +++ b/gateway/pom.xml @@ -1284,7 +1284,7 @@ - 9.31.23 + 9.31.25 [9.0.0, 10.0.0) diff --git a/traffic-manager/pom.xml b/traffic-manager/pom.xml index a63150b39b..deeff0db31 100644 --- a/traffic-manager/pom.xml +++ b/traffic-manager/pom.xml @@ -1284,7 +1284,7 @@ - 9.31.23 + 9.31.25 [9.0.0, 10.0.0)