Merge branch 'main' into ia-ccm-validation-call

Author: jonathan-buttner

docs/changelog/138726.yaml

@@ -0,0 +1,5 @@
+pr: 136624
+summary: Added Azure OpenAI chat_completion support to the Inference Plugin
+area: Machine Learning
+type: enhancement
+issues: []

rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureopenai.json

@@ -27,6 +27,7 @@
               "description": "The task type",
               "options": [
                 "completion",
+                "chat_completion",
                 "text_embedding"
               ]
             },

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -56,8 +56,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_8_0_0 = def(8_00_00_99);
     public static final TransportVersion V_8_7_0 = def(8_07_00_99);
     public static final TransportVersion V_8_7_1 = def(8_07_01_99);
-    public static final TransportVersion V_8_8_0 = def(8_08_00_99);
-    public static final TransportVersion V_8_8_1 = def(8_08_01_99);
     /*
      * READ THE COMMENT BELOW THIS BLOCK OF DECLARATIONS BEFORE ADDING NEW TRANSPORT VERSIONS
      * Detached transport versions added below here.

server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java

@@ -75,11 +75,7 @@ public NodeInfo(StreamInput in) throws IOException {
         } else {
             Version legacyVersion = Version.readVersion(in);
             version = legacyVersion.toString();
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-                compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions
-            } else {
-                compatibilityVersions = new CompatibilityVersions(TransportVersion.fromId(legacyVersion.id), Map.of());
-            }
+            compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions;
             if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
                 indexVersion = IndexVersion.readVersion(in);
             } else {
@@ -111,9 +107,7 @@ public NodeInfo(StreamInput in) throws IOException {
         addInfoIfNonNull(PluginsAndModules.class, in.readOptionalWriteable(PluginsAndModules::new));
         addInfoIfNonNull(IngestInfo.class, in.readOptionalWriteable(IngestInfo::new));
         addInfoIfNonNull(AggregationInfo.class, in.readOptionalWriteable(AggregationInfo::new));
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            addInfoIfNonNull(RemoteClusterServerInfo.class, in.readOptionalWriteable(RemoteClusterServerInfo::new));
-        }
+        addInfoIfNonNull(RemoteClusterServerInfo.class, in.readOptionalWriteable(RemoteClusterServerInfo::new));
     }
 
     public NodeInfo(
@@ -253,8 +247,6 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
             compatibilityVersions.writeTo(out);
-        } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out);
         }
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
             IndexVersion.writeVersion(indexVersion, out);
@@ -282,8 +274,6 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalWriteable(getInfo(PluginsAndModules.class));
         out.writeOptionalWriteable(getInfo(IngestInfo.class));
         out.writeOptionalWriteable(getInfo(AggregationInfo.class));
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            out.writeOptionalWriteable(getInfo(RemoteClusterServerInfo.class));
-        }
+        out.writeOptionalWriteable(getInfo(RemoteClusterServerInfo.class));
     }
 }

server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java

@@ -8,7 +8,6 @@
  */
 package org.elasticsearch.action.admin.indices.shards;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -58,12 +57,7 @@ public IndicesShardStoresRequest(StreamInput in) throws IOException {
             statuses.add(ClusterHealthStatus.readFrom(in));
         }
         indicesOptions = IndicesOptions.readIndicesOptions(in);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            maxConcurrentShardRequests = in.readVInt();
-        } else {
-            // earlier versions had unlimited concurrency
-            maxConcurrentShardRequests = Integer.MAX_VALUE;
-        }
+        maxConcurrentShardRequests = in.readVInt();
     }
 
     @Override
@@ -72,17 +66,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeStringArrayNullable(indices);
         out.writeCollection(statuses, (o, v) -> o.writeByte(v.value()));
         indicesOptions.writeIndicesOptions(out);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            out.writeVInt(maxConcurrentShardRequests);
-        } else if (maxConcurrentShardRequests != DEFAULT_MAX_CONCURRENT_SHARD_REQUESTS) {
-            throw new IllegalArgumentException(
-                "support for maxConcurrentShardRequests=["
-                    + maxConcurrentShardRequests
-                    + "] was added in version [8.8.0], cannot send this request using transport version ["
-                    + out.getTransportVersion().toReleaseVersion()
-                    + "]"
-            );
-        } // else just drop the value and use the default behaviour
+        out.writeVInt(maxConcurrentShardRequests);
     }
 
     /**

server/src/main/java/org/elasticsearch/action/support/broadcast/unpromotable/BroadcastUnpromotableRequest.java

@@ -78,9 +78,7 @@ public ActionRequestValidationException validate() {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeWriteable(shardId);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            out.writeBoolean(failShardOnError);
-        }
+        out.writeBoolean(failShardOnError);
     }
 
     @Override

server/src/main/java/org/elasticsearch/health/metadata/HealthMetadata.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.health.metadata;
 
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.AbstractNamedDiffable;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.NamedDiff;
@@ -52,9 +51,7 @@ public HealthMetadata(Disk diskMetadata, ShardLimits shardLimitsMetadata) {
 
     public HealthMetadata(StreamInput in) throws IOException {
         this.diskMetadata = Disk.readFrom(in);
-        this.shardLimitsMetadata = in.getTransportVersion().onOrAfter(ShardLimits.VERSION_SUPPORTING_SHARD_LIMIT_FIELDS)
-            ? in.readOptionalWriteable(ShardLimits::readFrom)
-            : null;
+        this.shardLimitsMetadata = in.readOptionalWriteable(ShardLimits::readFrom);
     }
 
     @Override
@@ -70,9 +67,7 @@ public TransportVersion getMinimalSupportedVersion() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         diskMetadata.writeTo(out);
-        if (out.getTransportVersion().onOrAfter(ShardLimits.VERSION_SUPPORTING_SHARD_LIMIT_FIELDS)) {
-            out.writeOptionalWriteable(shardLimitsMetadata);
-        }
+        out.writeOptionalWriteable(shardLimitsMetadata);
     }
 
     public static NamedDiff<ClusterState.Custom> readDiffFrom(StreamInput in) throws IOException {
@@ -172,7 +167,6 @@ public record ShardLimits(
         private static final ParseField SHARD_CAPACITY_UNHEALTHY_THRESHOLD_RED_FIELD = new ParseField(
             "shard_capacity_unhealthy_threshold_red"
         );
-        static final TransportVersion VERSION_SUPPORTING_SHARD_LIMIT_FIELDS = TransportVersions.V_8_8_0;
         static final TransportVersion VERSION_SHARD_CAPACITY_UNHEALTH_THRESHOLDS = TransportVersion.fromName(
             "shard_capacity_unhealthy_thresholds"
         );

server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java

@@ -9,7 +9,6 @@
 
 package org.elasticsearch.index.fielddata;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.FieldMemoryStats;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -48,18 +47,12 @@ public FieldDataStats(StreamInput in) throws IOException {
         memorySize = in.readVLong();
         evictions = in.readVLong();
         fields = in.readOptionalWriteable(FieldMemoryStats::new);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            long buildTimeMillis = in.readVLong();
-            Map<String, GlobalOrdinalsStats.GlobalOrdinalFieldStats> fieldGlobalOrdinalsStats = null;
-            if (in.readBoolean()) {
-                fieldGlobalOrdinalsStats = in.readMap(
-                    in1 -> new GlobalOrdinalsStats.GlobalOrdinalFieldStats(in1.readVLong(), in1.readVLong())
-                );
-            }
-            globalOrdinalsStats = new GlobalOrdinalsStats(buildTimeMillis, fieldGlobalOrdinalsStats);
-        } else {
-            globalOrdinalsStats = new GlobalOrdinalsStats(0, null);
+        long buildTimeMillis = in.readVLong();
+        Map<String, GlobalOrdinalsStats.GlobalOrdinalFieldStats> fieldGlobalOrdinalsStats = null;
+        if (in.readBoolean()) {
+            fieldGlobalOrdinalsStats = in.readMap(in1 -> new GlobalOrdinalsStats.GlobalOrdinalFieldStats(in1.readVLong(), in1.readVLong()));
         }
+        globalOrdinalsStats = new GlobalOrdinalsStats(buildTimeMillis, fieldGlobalOrdinalsStats);
     }
 
     public FieldDataStats(long memorySize, long evictions, @Nullable FieldMemoryStats fields, GlobalOrdinalsStats globalOrdinalsStats) {
@@ -111,17 +104,15 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeVLong(memorySize);
         out.writeVLong(evictions);
         out.writeOptionalWriteable(fields);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            out.writeVLong(globalOrdinalsStats.buildTimeMillis);
-            if (globalOrdinalsStats.fieldGlobalOrdinalsStats != null) {
-                out.writeBoolean(true);
-                out.writeMap(globalOrdinalsStats.fieldGlobalOrdinalsStats, (out1, value) -> {
-                    out1.writeVLong(value.totalBuildingTime);
-                    out1.writeVLong(value.valueCount);
-                });
-            } else {
-                out.writeBoolean(false);
-            }
+        out.writeVLong(globalOrdinalsStats.buildTimeMillis);
+        if (globalOrdinalsStats.fieldGlobalOrdinalsStats != null) {
+            out.writeBoolean(true);
+            out.writeMap(globalOrdinalsStats.fieldGlobalOrdinalsStats, (out1, value) -> {
+                out1.writeVLong(value.totalBuildingTime);
+                out1.writeVLong(value.valueCount);
+            });
+        } else {
+            out.writeBoolean(false);
         }
     }
 

server/src/main/java/org/elasticsearch/index/translog/Translog.java

@@ -1731,16 +1731,10 @@ public static List<Operation> readOperations(StreamInput input, String source) t
         ArrayList<Operation> operations = new ArrayList<>();
         int numOps = input.readInt();
         final BufferedChecksumStreamInput checksumStreamInput = new BufferedChecksumStreamInput(input, source);
-        if (input.getTransportVersion().before(TransportVersions.V_8_8_0)) {
-            for (int i = 0; i < numOps; i++) {
-                operations.add(readOperation(checksumStreamInput));
-            }
-        } else {
-            for (int i = 0; i < numOps; i++) {
-                checksumStreamInput.resetDigest();
-                operations.add(Translog.Operation.readOperation(checksumStreamInput));
-                verifyChecksum(checksumStreamInput);
-            }
+        for (int i = 0; i < numOps; i++) {
+            checksumStreamInput.resetDigest();
+            operations.add(Operation.readOperation(checksumStreamInput));
+            verifyChecksum(checksumStreamInput);
         }
         return operations;
     }
@@ -1781,13 +1775,9 @@ public static void writeOperations(StreamOutput outStream, List<Operation> toWri
         if (size == 0) {
             return;
         }
-        if (outStream.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
-            final BufferedChecksumStreamOutput checksumStreamOutput = new BufferedChecksumStreamOutput(outStream);
-            for (Operation op : toWrite) {
-                writeOperationNoSize(checksumStreamOutput, op);
-            }
-        } else {
-            writeOperationsToStreamLegacyFormat(outStream, toWrite);
+        final BufferedChecksumStreamOutput checksumStreamOutput = new BufferedChecksumStreamOutput(outStream);
+        for (Operation op : toWrite) {
+            writeOperationNoSize(checksumStreamOutput, op);
         }
     }
 

server/src/main/java/org/elasticsearch/inference/UnifiedCompletionRequest.java

@@ -135,7 +135,7 @@ public static Params withMaxCompletionTokens(String modelId, Params params) {
      * Creates a {@link org.elasticsearch.xcontent.ToXContent.Params} that causes ToXContent to include the key values:
      * - Key: {@link #MAX_COMPLETION_TOKENS_FIELD}, Value: {@link #maxCompletionTokens()}
      */
-    public static Params withMaxCompletionTokensTokens(Params params) {
+    public static Params withMaxCompletionTokens(Params params) {
         return new DelegatingMapParams(Map.of(MAX_TOKENS_PARAM, MAX_COMPLETION_TOKENS_FIELD), params);
     }