diff --git a/common/src/main/java/com/g4vrk/react/inference/server/InferenceServer.java b/common/src/main/java/com/g4vrk/react/inference/server/InferenceServer.java index aab9a30..c654eb8 100644 --- a/common/src/main/java/com/g4vrk/react/inference/server/InferenceServer.java +++ b/common/src/main/java/com/g4vrk/react/inference/server/InferenceServer.java @@ -65,7 +65,7 @@ public InferenceServer( ); } - final HttpUrl url = authApplier.applyToUrl(withModelSelection(parsedUrl)); + final HttpUrl url = authApplier.applyToUrl(parsedUrl); final Request.Builder requestBuilder = new Request.Builder() .url(url) @@ -132,16 +132,6 @@ private void validate( } } - private @NotNull HttpUrl withModelSelection(final @NotNull HttpUrl url) { - if (endpoint.getModelFamily().isEmpty()) { - return url; - } - return url.newBuilder() - .setQueryParameter("model-family", endpoint.getModelFamily()) - .setQueryParameter("model-name", endpoint.getModelName()) - .build(); - } - private static void warnIfBlank( final @NotNull Logger logger, final @NotNull String key, diff --git a/common/src/main/java/com/g4vrk/react/inference/server/settings/InferenceEndpointSettings.java b/common/src/main/java/com/g4vrk/react/inference/server/settings/InferenceEndpointSettings.java index 69f228a..09148d8 100644 --- a/common/src/main/java/com/g4vrk/react/inference/server/settings/InferenceEndpointSettings.java +++ b/common/src/main/java/com/g4vrk/react/inference/server/settings/InferenceEndpointSettings.java @@ -8,6 +8,4 @@ public class InferenceEndpointSettings { @NotNull String baseUrl; @NotNull String path; - @NotNull String modelFamily; - @NotNull String modelName; } diff --git a/common/src/main/java/com/g4vrk/react/inference/server/settings/InferenceSettingsFactory.java b/common/src/main/java/com/g4vrk/react/inference/server/settings/InferenceSettingsFactory.java index bbb278b..e4ae1a8 100644 --- a/common/src/main/java/com/g4vrk/react/inference/server/settings/InferenceSettingsFactory.java +++ b/common/src/main/java/com/g4vrk/react/inference/server/settings/InferenceSettingsFactory.java @@ -51,16 +51,8 @@ public class InferenceSettingsFactory { ) { final String baseUrl = endpointNode.node("base-url").getString("http://localhost:8080"); final String path = normalizePath(endpointNode.node("path").getString("/api/v1/inference/")); - final String modelFamily = endpointNode.node("model-family").getString("").trim(); - final String modelName = endpointNode.node("model-name").getString("").trim(); - if (modelFamily.isEmpty() != modelName.isEmpty()) { - throw new IllegalArgumentException( - "inference.endpoint.model-family and model-name must be set together" - ); - } - - return new InferenceEndpointSettings(baseUrl, path, modelFamily, modelName); + return new InferenceEndpointSettings(baseUrl, path); } private @NotNull InferenceRequestSettings parseRequest( diff --git a/common/src/main/resources/en/inference.yml b/common/src/main/resources/en/inference.yml index 6e463e1..586b875 100644 --- a/common/src/main/resources/en/inference.yml +++ b/common/src/main/resources/en/inference.yml @@ -20,8 +20,7 @@ inference: base-url: 'https://api.react-ac.space' path: '/api/v2/inference/' - model-family: 'flower' - model-name: 'baseline' + # The server selects the model from the subscription token. # Only required for custom models request: diff --git a/common/src/main/resources/ru/inference.yml b/common/src/main/resources/ru/inference.yml index e5bfd89..6ad379e 100644 --- a/common/src/main/resources/ru/inference.yml +++ b/common/src/main/resources/ru/inference.yml @@ -43,8 +43,7 @@ inference: base-url: 'https://api.react-ac.space' path: '/api/v2/inference/' - model-family: 'flower' - model-name: 'baseline' + # The server selects the model from the subscription token. # Нужно только для своих кастомных моделей request: