Refactor Mistral model classes to remove modelId and update rate limit hashing

Author: Jan-Kazlouski-elastic

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/LlamaModel.java

@@ -61,7 +61,7 @@ public RateLimitSettings rateLimitSettings() {
 
     @Override
     public int rateLimitGroupingHash() {
-        return Objects.hash(uri, getSecretSettings());
+        return Objects.hash(getServiceSettings().modelId(), uri, getSecretSettings());
     }
 
     // Needed for testing only

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/MistralModel.java

@@ -16,13 +16,13 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Objects;
 
 /**
  * Represents a Mistral model that can be used for inference tasks.
  * This class extends RateLimitGroupingModel to handle rate limiting based on model and API key.
  */
 public abstract class MistralModel extends RateLimitGroupingModel {
-    protected String model;
     protected URI uri;
     protected RateLimitSettings rateLimitSettings;
 
@@ -34,10 +34,6 @@ protected MistralModel(RateLimitGroupingModel model, ServiceSettings serviceSett
         super(model, serviceSettings);
     }
 
-    public String model() {
-        return this.model;
-    }
-
     public URI uri() {
         return this.uri;
     }
@@ -49,7 +45,7 @@ public RateLimitSettings rateLimitSettings() {
 
     @Override
     public int rateLimitGroupingHash() {
-        return 0;
+        return Objects.hash(getServiceSettings().modelId(), getSecretSettings().apiKey());
     }
 
     // Needed for testing only

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/completion/MistralChatCompletionModel.java

@@ -22,7 +22,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
-import java.util.Objects;
 
 import static org.elasticsearch.xpack.inference.services.mistral.MistralConstants.API_COMPLETIONS_PATH;
 
@@ -102,16 +101,10 @@ public MistralChatCompletionModel(
     }
 
     private void setPropertiesFromServiceSettings(MistralChatCompletionServiceSettings serviceSettings) {
-        this.model = serviceSettings.modelId();
         this.rateLimitSettings = serviceSettings.rateLimitSettings();
         setEndpointUrl();
     }
 
-    @Override
-    public int rateLimitGroupingHash() {
-        return Objects.hash(model, getSecretSettings().apiKey());
-    }
-
     private void setEndpointUrl() {
         try {
             this.uri = new URI(API_COMPLETIONS_PATH);

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/embeddings/MistralEmbeddingsModel.java

@@ -59,7 +59,6 @@ public MistralEmbeddingsModel(MistralEmbeddingsModel model, MistralEmbeddingsSer
     }
 
     private void setPropertiesFromServiceSettings(MistralEmbeddingsServiceSettings serviceSettings) {
-        this.model = serviceSettings.modelId();
         this.rateLimitSettings = serviceSettings.rateLimitSettings();
         setEndpointUrl();
     }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/mistral/request/embeddings/MistralEmbeddingsRequest.java

@@ -42,7 +42,7 @@ public HttpRequest createHttpRequest() {
         HttpPost httpPost = new HttpPost(this.uri);
 
         ByteArrayEntity byteEntity = new ByteArrayEntity(
-            Strings.toString(new MistralEmbeddingsRequestEntity(embeddingsModel.model(), truncationResult.input()))
+            Strings.toString(new MistralEmbeddingsRequestEntity(embeddingsModel.getServiceSettings().modelId(), truncationResult.input()))
                 .getBytes(StandardCharsets.UTF_8)
         );
         httpPost.setEntity(byteEntity);