embeddings(test): plumbing for integration tests

Author: b-fein

src/main/java/de/uni_passau/fim/se2/scratchlog/ScratchLogApplication.java

@@ -27,6 +27,7 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -45,6 +46,7 @@
  */
 @SpringBootApplication
 @EnableScheduling
+@EnableConfigurationProperties
 public class ScratchLogApplication implements CommandLineRunner {
 
     private static final Logger log = LoggerFactory.getLogger(ScratchLogApplication.class);

src/main/java/de/uni_passau/fim/se2/scratchlog/application/service/EmbeddingModelService.java

@@ -27,7 +27,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.ConcurrentLruCache;
 import org.springframework.util.StopWatch;
+import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestClient;
+import org.springframework.web.client.RestClientResponseException;
 import tools.jackson.databind.json.JsonMapper;
 
 import java.io.ByteArrayInputStream;
@@ -93,7 +95,7 @@ public EmbeddingModelService(
         this.codeService = codeService;
         this.testFitnessService = testFitnessService;
 
-        this.restClient = RestClient.create(codeEmbeddingConfiguration.getEmbeddingConnectorUrl());
+        this.restClient = RestClient.create();
 
         MLPreprocessorCommonOptions mlOptions = new MLPreprocessorCommonOptions(
             MLOutputPath.console(),
@@ -141,6 +143,9 @@ public ProgramProjection2D getProgressVarianceProjectionAllLatest(
                 projectsById.put(project.id(), project.projectJson());
                 projectIdToStudentId.put(project.id(), project.userId());
             });
+        if (projectsById.isEmpty()) {
+            return new ProgramProjection2D(Collections.emptyList());
+        }
 
         final var starterProject = getStarterProject(experimentId);
         final var solutionProject = getSolutionProject(experimentId);
@@ -558,16 +563,21 @@ private String getProjectJson(final byte[] programSb3) throws IOException {
     private <B, R> R apiRequest(final String path, final B body, final Class<R> responseType) {
         final StopWatch watch = new StopWatch();
 
-        watch.start();
-        var response = restClient.post()
-            .uri(path)
-            .body(body)
-            .retrieve()
-            .body(responseType);
-        watch.stop();
-        log.debug("Embedding API request done in {}ms.", watch.getTotalTimeMillis());
-
-        return response;
+        try {
+            watch.start();
+            var response = restClient.post()
+                .uri(codeEmbeddingConfiguration.getEmbeddingConnectorUrl().resolve(path))
+                .body(body)
+                .retrieve()
+                .body(responseType);
+            watch.stop();
+            log.debug("Embedding API request done in {}ms.", watch.getTotalTimeMillis());
+
+            return response;
+        } catch (RestClientResponseException | ResourceAccessException e) {
+            log.error("Could not make API call to embedding model.", e);
+            throw e;
+        }
     }
 
     public record ProgressVarianceProjectionRequest(
@@ -577,12 +587,12 @@ public record ProgressVarianceProjectionRequest(
     ) {
     }
 
-    private record ProgressVarianceProjectionResponse(
+    public record ProgressVarianceProjectionResponse(
         List<Projection> projections
     ) {
     }
 
-    private record Projection(int id, List<Double> xy) {
+    public record Projection(int id, List<Double> xy) {
     }
 
     public record ProgramProjection2D(List<DataSeries> data) {

src/main/java/de/uni_passau/fim/se2/scratchlog/application/service/WhiskerService.java

@@ -26,11 +26,14 @@ public class WhiskerService {
 
     private static final Logger log = LoggerFactory.getLogger(WhiskerService.class);
 
+    private final WhiskerConfiguration whiskerConfiguration;
+
     private final RestClient restClient;
 
     @Autowired
     public WhiskerService(final WhiskerConfiguration whiskerConfiguration) {
-        this.restClient = RestClient.create(whiskerConfiguration.getBaseUrl());
+        this.whiskerConfiguration = whiskerConfiguration;
+        this.restClient = RestClient.create();
     }
 
     /**
@@ -49,7 +52,7 @@ WhiskerApiResponse runTests(final byte[] projectSb3, final String testSuite) {
         try {
             return restClient
                 .post()
-                .uri("/test")
+                .uri(whiskerConfiguration.getBaseUrl().resolve("/test"))
                 .body(body)
                 .retrieve()
                 .body(WhiskerApiResponse.class);

src/main/java/de/uni_passau/fim/se2/scratchlog/spring/configuration/CodeEmbeddingConfiguration.java

@@ -1,19 +1,12 @@
 package de.uni_passau.fim.se2.scratchlog.spring.configuration;
 
-import de.uni_passau.fim.se2.scratchlog.util.Constants;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 
 import java.net.URI;
 
 @Getter
 @Setter
-@Configuration
-@ConfigurationProperties(prefix = "code-embeddings")
-@Profile(Constants.PROFILE_CODE_EMBEDDINGS)
 public class CodeEmbeddingConfiguration {
 
     private String model;

src/main/java/de/uni_passau/fim/se2/scratchlog/spring/configuration/ConfigurationPropertiesFactory.java

@@ -0,0 +1,35 @@
+package de.uni_passau.fim.se2.scratchlog.spring.configuration;
+
+import de.uni_passau.fim.se2.scratchlog.util.Constants;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("!test")
+public class ConfigurationPropertiesFactory {
+
+    /**
+     * Automatically provided code embedding model configuration.
+     * @return The configuration
+     */
+    @Bean
+    @Profile(Constants.PROFILE_CODE_EMBEDDINGS)
+    @ConfigurationProperties(prefix = "code-embeddings")
+    public CodeEmbeddingConfiguration codeEmbeddingConfiguration() {
+        return new CodeEmbeddingConfiguration();
+    }
+
+    /**
+     * Automatically provided Whisker configuration.
+     * @return The configuration
+     */
+    @Bean
+    @Profile(Constants.PROFILE_WHISKER)
+    @ConfigurationProperties(prefix = "whisker")
+    public WhiskerConfiguration whiskerConfiguration() {
+        return new WhiskerConfiguration();
+    }
+
+}

src/main/java/de/uni_passau/fim/se2/scratchlog/spring/configuration/WhiskerConfiguration.java

@@ -1,19 +1,12 @@
 package de.uni_passau.fim.se2.scratchlog.spring.configuration;
 
-import de.uni_passau.fim.se2.scratchlog.util.Constants;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 
 import java.net.URI;
 
 @Getter
 @Setter
-@Configuration
-@ConfigurationProperties(prefix = "whisker")
-@Profile(Constants.PROFILE_WHISKER)
 public class WhiskerConfiguration {
 
     private URI baseUrl;

src/test/java/de/uni_passau/fim/se2/scratchlog/AbstractScratchLogControllerTest.java

@@ -6,8 +6,12 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
+/**
+ * @deprecated New tests should use the {@link AbstractScratchLogTest} with non-mocked services.
+ */
 @AutoConfigureMockMvc
 @ExtendWith(SpringExtension.class)
+@Deprecated
 public abstract class AbstractScratchLogControllerTest extends AbstractScratchLogTest {
 
     @Autowired

src/test/java/de/uni_passau/fim/se2/scratchlog/AbstractScratchLogTest.java

@@ -1,5 +1,7 @@
 package de.uni_passau.fim.se2.scratchlog;
 
+import de.uni_passau.fim.se2.scratchlog.spring.configuration.CodeEmbeddingConfiguration;
+import de.uni_passau.fim.se2.scratchlog.spring.configuration.WhiskerConfiguration;
 import de.uni_passau.fim.se2.scratchlog.testing_utils.EntityUtilService;
 import de.uni_passau.fim.se2.scratchlog.testing_utils.EventUtilService;
 import de.uni_passau.fim.se2.scratchlog.util.ApplicationProperties;
@@ -9,15 +11,20 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import tools.jackson.databind.json.JsonMapper;
+import org.springframework.core.Ordered;
 
 import java.io.IOException;
 
@@ -40,7 +47,7 @@
  * the database and/or ScratchLog service/repository/controller beans.
  */
 @SpringBootTest
-@ActiveProfiles({"test", Constants.PROFILE_WHISKER})
+@ActiveProfiles({"test", Constants.PROFILE_WHISKER, Constants.PROFILE_CODE_EMBEDDINGS})
 @Testcontainers
 public abstract class AbstractScratchLogTest {
 
@@ -56,6 +63,12 @@ public abstract class AbstractScratchLogTest {
     @Autowired
     private JsonMapper jsonMapper;
 
+    @Autowired
+    private WhiskerConfiguration whiskerConfiguration;
+
+    @Autowired
+    private CodeEmbeddingConfiguration codeEmbeddingConfiguration;
+
     protected static MockWebServer mockWebServer;
 
     @BeforeAll
@@ -69,6 +82,12 @@ static void afterAll() {
         mockWebServer.close();
     }
 
+    @BeforeEach
+    void setUp() {
+        whiskerConfiguration.setBaseUrl(mockWebServer.url("/").uri());
+        codeEmbeddingConfiguration.setEmbeddingConnectorUrl(mockWebServer.url("/").uri());
+    }
+
     @AfterEach
     void resetMocks() {
         Mockito.reset(applicationProperties);
@@ -93,4 +112,25 @@ protected <T> void enqueueMockWebServerJsonResponse(final T response, final Http
         );
     }
 
+    @Configuration
+    public static class ScratchLogTestConfiguration {
+        @Bean
+        @Order(Ordered.HIGHEST_PRECEDENCE)
+        public CodeEmbeddingConfiguration codeEmbeddingConfiguration () {
+            final CodeEmbeddingConfiguration configuration = new CodeEmbeddingConfiguration();
+            configuration.setModel("llm");
+            configuration.setEmbeddingConnectorUrl(mockWebServer.url("/").uri());
+
+            return configuration;
+        }
+
+        @Bean
+        @Order(Ordered.HIGHEST_PRECEDENCE)
+        public WhiskerConfiguration whiskerConfiguration () {
+            final WhiskerConfiguration configuration = new WhiskerConfiguration();
+            configuration.setBaseUrl(mockWebServer.url("/").uri());
+
+            return configuration;
+        }
+    }
 }

src/test/java/de/uni_passau/fim/se2/scratchlog/application/TestFitnessServiceTest.java

@@ -12,14 +12,12 @@
 import de.uni_passau.fim.se2.scratchlog.persistence.repository.TestCaseRepository;
 import de.uni_passau.fim.se2.scratchlog.persistence.repository.TestResultRepository;
 import de.uni_passau.fim.se2.scratchlog.persistence.repository.TestSuiteRepository;
-import de.uni_passau.fim.se2.scratchlog.spring.configuration.WhiskerConfiguration;
 import de.uni_passau.fim.se2.scratchlog.util.enums.BlockEventSpecific;
 import de.uni_passau.fim.se2.scratchlog.util.enums.BlockEventType;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -34,9 +32,6 @@ class TestFitnessServiceTest extends AbstractScratchLogTest {
     @Autowired
     private TestFitnessService testFitnessService;
 
-    @Autowired
-    private WhiskerConfiguration whiskerConfiguration;
-
     @Autowired
     private TestSuiteRepository testSuiteRepository;
 
@@ -54,9 +49,6 @@ class TestFitnessServiceTest extends AbstractScratchLogTest {
 
     @BeforeEach
     void setUp() {
-        final URI uri = URI.create("http://localhost:" + mockWebServer.getPort());
-        whiskerConfiguration.setBaseUrl(uri);
-
         final User user = entityUtilService.generateUser("testFitness");
         final Experiment experiment = entityUtilService.generateExperiment("testFitness");
         blockEvent = eventUtilService.generateBlockEvent(