Do not suppress unsuccessful requests (#19)

philipp94831 · web-flow · commit ea0f438aee0b · 2025-10-24T12:46:12.000+02:00
diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   build-and-publish:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.64.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.70.0
     with:
       java-version: 17
     secrets:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ on:
 jobs:
   java-gradle-release:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.64.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.70.0
     with:
       java-version: 17
       release-type: "${{ inputs.release-type }}"
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,10 +2,10 @@ description = "A Java client for KServe inference services."
 
 plugins {
     `java-library`
-    id("com.bakdata.release") version "1.9.1"
-    id("com.bakdata.sonar") version "1.9.1"
-    id("com.bakdata.sonatype") version "1.9.1"
-    id("io.freefair.lombok") version "8.12.2.1"
+    id("com.bakdata.release") version "1.11.1"
+    id("com.bakdata.sonar") version "1.11.1"
+    id("com.bakdata.sonatype") version "1.11.1"
+    id("io.freefair.lombok") version "8.14.2"
     id("java-test-fixtures")
 }
 
@@ -33,13 +33,12 @@ dependencies {
     implementation(group = "com.squareup.okhttp3", name = "okhttp", version = okHttpVersion)
     implementation(group = "org.json", name = "json", version = "20250107")
     implementation(group = "io.github.resilience4j", name = "resilience4j-retry", version = "1.7.1")
-    implementation(group = "org.slf4j", name = "slf4j-api", version = "2.0.16")
+    implementation(group = "org.slf4j", name = "slf4j-api", version = "2.0.17")
 
     val junitVersion: String by project
-    testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junitVersion)
-    testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-params", version = junitVersion)
-    testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junitVersion)
-    testImplementation(group = "org.assertj", name = "assertj-core", version = "3.27.2")
+    testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-launcher")
+    testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = junitVersion)
+    testImplementation(group = "org.assertj", name = "assertj-core", version = "3.27.6")
     testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = okHttpVersion)
 
     testFixturesImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = okHttpVersion)
diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,4 @@ version=2.1.2-SNAPSHOT
 org.gradle.caching=true
 org.gradle.parallel=true
 okHttpVersion=4.12.0
-junitVersion=5.11.4
+junitVersion=5.13.4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/com/bakdata/kserve/client/InferenceRequestException.java b/src/main/java/com/bakdata/kserve/client/InferenceRequestException.java
@@ -0,0 +1,35 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2025 bakdata
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.bakdata.kserve.client;
+
+/**
+ * Exception thrown when inference service request was unsuccessful.
+ */
+public final class InferenceRequestException extends IllegalArgumentException {
+
+    public InferenceRequestException(final String message) {
+        super("Inference request failed: " + message);
+    }
+}
diff --git a/src/main/java/com/bakdata/kserve/client/KServeClient.java b/src/main/java/com/bakdata/kserve/client/KServeClient.java
@@ -106,9 +106,9 @@ private static String getStringBody(final Response response) throws IOException
         }
     }
 
-    private static <T> Optional<T> processJsonResponse(final String stringBody, final Class<? extends T> responseType) {
+    private static <T> T processJsonResponse(final String stringBody, final Class<? extends T> responseType) {
         try {
-            return Optional.of(OBJECT_MAPPER.readValue(stringBody, responseType));
+            return OBJECT_MAPPER.readValue(stringBody, responseType);
         } catch (final JsonProcessingException e) {
             throw new IllegalArgumentException("Could not process response json", e);
         }
@@ -139,7 +139,7 @@ private static Request getRequest(final String bodyString, final HttpUrl url) {
      * @throws IOException Thrown if the execution of the request fails or if the body of the response can not be
      * decoded to a string
      */
-    public <T> Optional<T> makeInferenceRequest(final I inputObject, final Class<? extends T> responseType,
+    public <T> T makeInferenceRequest(final I inputObject, final Class<? extends T> responseType,
             final String modelNameSuffix)
             throws IOException {
         final Request httpRequest = getRequest(
@@ -168,19 +168,14 @@ private Response executeRequest(final Request httpRequest)
                 .newCall(httpRequest).execute();
     }
 
-    private <T> Optional<T> processResponse(final Response response, final Class<? extends T> responseType)
+    private <T> T processResponse(final Response response, final Class<? extends T> responseType)
             throws IOException {
-        switch (response.code()) {
-            case HttpURLConnection.HTTP_OK:
-                return processJsonResponse(getStringBody(response), responseType);
-            case HttpURLConnection.HTTP_NOT_FOUND:
-            case HttpURLConnection.HTTP_BAD_REQUEST:
-                final String errorMessage = this.extractErrorMessage(getStringBody(response));
-                throw new InferenceRequestException(errorMessage);
-            default:
-                log.debug("Unknown response code: {}", response.code());
-                return Optional.empty();
+        final int responseCode = response.code();
+        if (responseCode == HttpURLConnection.HTTP_OK) {
+            return processJsonResponse(getStringBody(response), responseType);
         }
+        final String errorMessage = this.extractErrorMessage(getStringBody(response));
+        throw new InferenceRequestException(String.format("%d: %s", responseCode, errorMessage));
     }
 
     @Slf4j
@@ -217,9 +212,4 @@ public Response intercept(final Chain chain) throws IOException {
         }
     }
 
-    protected static final class InferenceRequestException extends IllegalArgumentException {
-        InferenceRequestException(final String message) {
-            super("Inference request failed: " + message);
-        }
-    }
 }
diff --git a/src/test/java/com/bakdata/kserve/client/KServeClientV1Test.java b/src/test/java/com/bakdata/kserve/client/KServeClientV1Test.java
@@ -24,7 +24,7 @@
 
 package com.bakdata.kserve.client;
 
-import com.bakdata.kserve.client.KServeClient.InferenceRequestException;
+import com.bakdata.kserve.KServeMockV1;
 import java.io.IOException;
 import java.time.Duration;
 import lombok.Getter;
@@ -48,7 +48,7 @@ class KServeClientV1Test {
 
     @BeforeEach
     void init() {
-        this.mockServer = new com.bakdata.kserve.KServeMockV1();
+        this.mockServer = new KServeMockV1();
     }
 
     @Test
@@ -63,7 +63,7 @@ void makeInferenceRequest() throws IOException {
 
         this.softly.assertThat(client.makeInferenceRequest(new JSONObject("{ \"input\": \"data\" }"),
                         FakePrediction.class, ""))
-                .hasValueSatisfying(
+                .satisfies(
                         fakePrediction -> this.softly.assertThat(fakePrediction.getFake()).isEqualTo("data"));
     }
 
@@ -80,7 +80,7 @@ void testPredictionNotExistingModel() {
         this.softly.assertThatThrownBy(() -> client.makeInferenceRequest(new JSONObject("{ \"input\": \"data\" }"),
                         FakePrediction.class, ""))
                 .isInstanceOf(InferenceRequestException.class)
-                .hasMessage("Inference request failed: 404: Model with name model does not exist.");
+                .hasMessage("Inference request failed: 404: 404: Model with name model does not exist.");
     }
 
     @Test
@@ -109,10 +109,10 @@ public MockResponse dispatch(@NotNull final RecordedRequest recordedRequest) {
 
         this.softly.assertThatThrownBy(() -> client.makeInferenceRequest(new JSONObject("{ \"input\": \"data\" }"),
                         FakePrediction.class, ""))
-                .isInstanceOf(KServeClient.InferenceRequestException.class)
+                .isInstanceOf(InferenceRequestException.class)
                 .hasMessage(
-                        "Inference request failed: 400: Unrecognized request format: Expecting ',' delimiter: line 3 "
-                                + "column 1 (char 48)");
+                        "Inference request failed: 400: 400: Unrecognized request format: Expecting ',' delimiter: "
+                                + "line 3 column 1 (char 48)");
     }
 
     @Test
@@ -128,11 +128,11 @@ void testRetry() throws IOException {
 
         this.softly.assertThat(client.makeInferenceRequest(new JSONObject("{ \"input\": \"data\" }"),
                         CallCounterFakePrediction.class, ""))
-                .hasValueSatisfying(fakePrediction -> this.softly.assertThat(fakePrediction.getCounter()).isEqualTo(2));
+                .satisfies(fakePrediction -> this.softly.assertThat(fakePrediction.getCounter()).isEqualTo(2));
 
         this.softly.assertThat(client.makeInferenceRequest(new JSONObject("{ \"input\": \"data\" }"),
                         CallCounterFakePrediction.class, ""))
-                .hasValueSatisfying(fakePrediction -> this.softly.assertThat(fakePrediction.getCounter()).isEqualTo(3));
+                .satisfies(fakePrediction -> this.softly.assertThat(fakePrediction.getCounter()).isEqualTo(3));
     }
 
     @Getter
diff --git a/src/test/java/com/bakdata/kserve/client/KServeClientV2Test.java b/src/test/java/com/bakdata/kserve/client/KServeClientV2Test.java
@@ -26,7 +26,6 @@
 
 import com.bakdata.kserve.KServeMock;
 import com.bakdata.kserve.KServeMockV2;
-import com.bakdata.kserve.client.KServeClient.InferenceRequestException;
 import com.bakdata.kserve.predictv2.InferenceRequest;
 import com.bakdata.kserve.predictv2.Parameters;
 import com.bakdata.kserve.predictv2.RequestInput;
@@ -81,9 +80,8 @@ void makeInferenceRequest() throws IOException {
                 .build();
 
         this.softly.assertThat(client.makeInferenceRequest(getFakeInferenceRequest("data"),
-                        FakePrediction.class, ""))
-                .map(FakePrediction::getFake)
-                .hasValue("data");
+                        FakePrediction.class, "").getFake())
+                .isEqualTo("data");
     }
 
     @Test
@@ -99,7 +97,7 @@ void testPredictionNotExistingModel() {
         this.softly.assertThatThrownBy(
                         () -> client.makeInferenceRequest(fakeInferenceRequest, FakePrediction.class, ""))
                 .isInstanceOf(InferenceRequestException.class)
-                .hasMessage("Inference request failed: Model test-model not found");
+                .hasMessage("Inference request failed: 404: Model test-model not found");
     }
 
     @Test
@@ -125,7 +123,7 @@ public MockResponse dispatch(@NotNull final RecordedRequest recordedRequest) {
         this.softly.assertThatThrownBy(
                         () -> client.makeInferenceRequest(fakeInferenceRequest, FakePrediction.class, ""))
                 .isInstanceOf(InferenceRequestException.class)
-                .hasMessage("Inference request failed: Not Found");
+                .hasMessage("Inference request failed: 400: Not Found");
     }
 
     @Test
@@ -142,11 +140,11 @@ void testRetry() throws IOException {
         final InferenceRequest<String> fakeInferenceRequest = getFakeInferenceRequest("data");
         this.softly.assertThat(client.makeInferenceRequest(fakeInferenceRequest,
                         CallCounterFakePrediction.class, ""))
-                .hasValueSatisfying(fakePrediction -> this.softly.assertThat(fakePrediction.getCounter()).isEqualTo(2));
+                .satisfies(fakePrediction -> this.softly.assertThat(fakePrediction.getCounter()).isEqualTo(2));
 
         this.softly.assertThat(client.makeInferenceRequest(fakeInferenceRequest,
                         CallCounterFakePrediction.class, ""))
-                .hasValueSatisfying(fakePrediction -> this.softly.assertThat(fakePrediction.getCounter()).isEqualTo(3));
+                .satisfies(fakePrediction -> this.softly.assertThat(fakePrediction.getCounter()).isEqualTo(3));
     }
 
     @Getter
