improve

Author: weizijun

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/action/alibabacloudsearch/AlibabaCloudSearchEmbeddingsAction.java

@@ -28,8 +28,6 @@
 import static org.elasticsearch.xpack.inference.external.action.ActionUtils.wrapFailuresInElasticsearchException;
 
 public class AlibabaCloudSearchEmbeddingsAction implements ExecutableAction {
-    private static final Logger logger = LogManager.getLogger(AlibabaCloudSearchEmbeddingsAction.class);
-
     private final AlibabaCloudSearchAccount account;
     private final AlibabaCloudSearchEmbeddingsModel model;
     private final String failedToSendRequestErrorMessage;

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/alibabacloudsearch/AlibabaCloudSearchEmbeddingsRequestEntity.java

@@ -41,8 +41,10 @@ public record AlibabaCloudSearchEmbeddingsRequestEntity(
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
         builder.field(TEXTS_FIELD, input);
-        if (taskSettings.getInputType() != null) {
-            builder.field(INPUT_TYPE_FIELD, covertToString(taskSettings.getInputType()));
+
+        String inputType = covertToString(taskSettings.getInputType());
+        if (inputType != null) {
+            builder.field(INPUT_TYPE_FIELD, inputType);
         }
 
         builder.endObject();
@@ -51,6 +53,10 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     // default for testing
     static String covertToString(InputType inputType) {
+        if(inputType == null) {
+            return null;
+        }
+
         return switch (inputType) {
             case INGEST -> SEARCH_DOCUMENT;
             case SEARCH -> SEARCH_QUERY;

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/alibabacloudsearch/AlibabaCloudSearchSparseRequestEntity.java

@@ -36,8 +36,9 @@ public record AlibabaCloudSearchSparseRequestEntity(
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
         builder.field(TEXTS_FIELD, input);
-        if (taskSettings.getInputType() != null) {
-            builder.field(INPUT_TYPE_FIELD, AlibabaCloudSearchEmbeddingsRequestEntity.covertToString(taskSettings.getInputType()));
+        String inputType = AlibabaCloudSearchEmbeddingsRequestEntity.covertToString(taskSettings.getInputType());
+        if (inputType != null) {
+            builder.field(INPUT_TYPE_FIELD, inputType);
         }
         if (taskSettings.isReturnToken() != null) {
             builder.field(RETURN_TOKEN_FIELD, taskSettings.isReturnToken());

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/AlibabaCloudSearchServiceSettings.java

@@ -26,6 +26,7 @@
 import java.net.URI;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import static org.elasticsearch.xpack.inference.services.ServiceFields.DIMENSIONS;
 import static org.elasticsearch.xpack.inference.services.ServiceFields.MAX_INPUT_TOKENS;
@@ -49,8 +50,7 @@ public class AlibabaCloudSearchServiceSettings extends FilteredXContentObject
     public static final String WORKSPACE_NAME = "workspace";
     public static final String HTTP_SCHEMA_NAME = "http_schema";
 
-    // todo: 确认开放搜索平台的ratelimt
-    private static final RateLimitSettings DEFAULT_RATE_LIMIT_SETTINGS = new RateLimitSettings(10_000);
+    private static final RateLimitSettings DEFAULT_RATE_LIMIT_SETTINGS = new RateLimitSettings(1_000);
 
     public static AlibabaCloudSearchServiceSettings fromMap(Map<String, Object> map, ConfigurationParseContext context) {
         ValidationException validationException = new ValidationException();
@@ -66,6 +66,13 @@ public static AlibabaCloudSearchServiceSettings fromMap(Map<String, Object> map,
         var workspaceName = extractRequiredString(map, WORKSPACE_NAME, ModelConfigurations.SERVICE_SETTINGS, validationException);
         var httpSchema = extractOptionalString(map, HTTP_SCHEMA_NAME, ModelConfigurations.SERVICE_SETTINGS, validationException);
 
+        if (httpSchema != null) {
+            var validSchemas = Set.of("https", "http");
+            if (validSchemas.contains(httpSchema) == false) {
+                validationException.addValidationError("Invalid value for [http_schema]. Must be one of [https, http]");
+            }
+        }
+
         RateLimitSettings rateLimitSettings = RateLimitSettings.of(
             map,
             DEFAULT_RATE_LIMIT_SETTINGS,

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/embeddings/AlibabaCloudSearchEmbeddingsTaskSettings.java

@@ -43,9 +43,7 @@ public class AlibabaCloudSearchEmbeddingsTaskSettings implements TaskSettings {
     static final String INPUT_TYPE = "input_type";
     static final EnumSet<InputType> VALID_REQUEST_VALUES = EnumSet.of(
         InputType.INGEST,
-        InputType.SEARCH,
-        InputType.CLASSIFICATION,
-        InputType.CLUSTERING
+        InputType.SEARCH
     );
 
     public static AlibabaCloudSearchEmbeddingsTaskSettings fromMap(Map<String, Object> map) {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/rerank/AlibabaCloudSearchRerankTaskSettings.java

@@ -35,78 +35,49 @@
  */
 public class AlibabaCloudSearchRerankTaskSettings implements TaskSettings {
     public static final String NAME = "alibabacloud_search_rerank_task_settings";
-    public static final String RETURN_DOCUMENTS = "return_documents";
-    public static final String TOP_N_DOCS_ONLY = "top_n";
 
-    static final AlibabaCloudSearchRerankTaskSettings EMPTY_SETTINGS = new AlibabaCloudSearchRerankTaskSettings(null, null);
+    static final AlibabaCloudSearchRerankTaskSettings EMPTY_SETTINGS = new AlibabaCloudSearchRerankTaskSettings();
 
     public static AlibabaCloudSearchRerankTaskSettings fromMap(Map<String, Object> map) {
         ValidationException validationException = new ValidationException();
 
         if (map == null || map.isEmpty()) {
             return EMPTY_SETTINGS;
         }
-        Boolean returnDocuments = extractOptionalBoolean(map, RETURN_DOCUMENTS, validationException);
-        Integer topNDocumentsOnly = extractOptionalPositiveInteger(
-            map,
-            TOP_N_DOCS_ONLY,
-            ModelConfigurations.TASK_SETTINGS,
-            validationException
-        );
 
         if (validationException.validationErrors().isEmpty() == false) {
             throw validationException;
         }
 
-        return of(topNDocumentsOnly, returnDocuments);
+        return of();
     }
 
     /**
      * Creates a new {@link AlibabaCloudSearchRerankTaskSettings}
      * by preferring non-null fields from the request settings over the original settings.
-     * @param originalSettings    the settings stored as part of the inference entity configuration
-     * @param requestTaskSettings the settings passed in within the task_settings field of the request
      * @return a constructed {@link AlibabaCloudSearchRerankTaskSettings}
      */
     public static AlibabaCloudSearchRerankTaskSettings of(
         AlibabaCloudSearchRerankTaskSettings originalSettings,
         AlibabaCloudSearchRerankTaskSettings requestTaskSettings
     ) {
-        return new AlibabaCloudSearchRerankTaskSettings(
-            requestTaskSettings.getTopNDocumentsOnly() != null
-                ? requestTaskSettings.getTopNDocumentsOnly()
-                : originalSettings.getTopNDocumentsOnly(),
-            requestTaskSettings.getReturnDocuments() != null
-                ? requestTaskSettings.getReturnDocuments()
-                : originalSettings.getReturnDocuments()
-        );
+        return new AlibabaCloudSearchRerankTaskSettings();
     }
 
-    public static AlibabaCloudSearchRerankTaskSettings of(Integer topNDocumentsOnly, Boolean returnDocuments) {
-        return new AlibabaCloudSearchRerankTaskSettings(topNDocumentsOnly, returnDocuments);
+    public static AlibabaCloudSearchRerankTaskSettings of() {
+        return new AlibabaCloudSearchRerankTaskSettings();
     }
 
-    private final Integer topNDocumentsOnly;
-    private final Boolean returnDocuments;
-
-    public AlibabaCloudSearchRerankTaskSettings(StreamInput in) throws IOException {
-        this(in.readOptionalVInt(), in.readOptionalBoolean());
+    public AlibabaCloudSearchRerankTaskSettings(StreamInput in) {
+        this();
     }
 
-    public AlibabaCloudSearchRerankTaskSettings(@Nullable Integer topNDocumentsOnly, @Nullable Boolean returnDocuments) {
-        this.topNDocumentsOnly = topNDocumentsOnly;
-        this.returnDocuments = returnDocuments;
+    public AlibabaCloudSearchRerankTaskSettings() {
     }
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        if (topNDocumentsOnly != null) {
-            builder.field(TOP_N_DOCS_ONLY, topNDocumentsOnly);
-        }
-        if (returnDocuments != null) {
-            builder.field(RETURN_DOCUMENTS, returnDocuments);
-        }
         builder.endObject();
         return builder;
     }
@@ -123,37 +94,17 @@ public TransportVersion getMinimalSupportedVersion() {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeOptionalInt(topNDocumentsOnly);
-        out.writeOptionalBoolean(returnDocuments);
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        AlibabaCloudSearchRerankTaskSettings that = (AlibabaCloudSearchRerankTaskSettings) o;
-        return Objects.equals(returnDocuments, that.returnDocuments) && Objects.equals(topNDocumentsOnly, that.topNDocumentsOnly);
+        return true;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(returnDocuments, topNDocumentsOnly);
-    }
-
-    public static String invalidInputTypeMessage(InputType inputType) {
-        return Strings.format("received invalid input type value [%s]", inputType.toString());
-    }
-
-    // todo : understand this
-    public Boolean getDoesReturnDocuments() {
-        return returnDocuments;
-    }
-
-    public Integer getTopNDocumentsOnly() {
-        return topNDocumentsOnly;
-    }
-
-    public Boolean getReturnDocuments() {
-        return returnDocuments;
+        return Objects.hash();
     }
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/sparse/AlibabaCloudSearchSparseTaskSettings.java

@@ -43,9 +43,7 @@ public class AlibabaCloudSearchSparseTaskSettings implements TaskSettings {
     static final String RETURN_TOKEN = "return_token";
     static final EnumSet<InputType> VALID_REQUEST_VALUES = EnumSet.of(
         InputType.INGEST,
-        InputType.SEARCH,
-        InputType.CLASSIFICATION,
-        InputType.CLUSTERING
+        InputType.SEARCH
     );
 
     public static AlibabaCloudSearchSparseTaskSettings fromMap(Map<String, Object> map) {