WIP: clean up build issues

Author: willschipp

.github/workflows/build_data.yml

@@ -22,4 +22,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -U -B test -Dtest=com.embabel.database.server.EmbableDatabaseServerITest -Daws.region=us-east-1 -pl embabel-database-server
+        run: mvn -U -B test -Dtest=com.embabel.database.server.EmbabelDatabaseServerITest -Daws.region=us-east-1 -pl embabel-database-server

embabel-database-agent/src/test/java/com/embabel/database/agent/AiModelRepositoryAgentTest.java

@@ -40,6 +40,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Scanner;
+import java.util.UUID;
 
 public class AiModelRepositoryAgentTest {
 
@@ -50,7 +51,7 @@ void testMaintainCatalog() throws Exception {
         String modelName = "model-0";
         String providerName = "provider-0";
         //setup a single model
-        LlmModelMetadata singleModel = new LlmModelMetadata(modelName, providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
+        LlmModelMetadata singleModel = new LlmModelMetadata(UUID.randomUUID().toString(),modelName, providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
         //setup the repo
         AiModelRepository aiModelRepository = mock(AiModelRepository.class);
         when(aiModelRepository.lastUpdated()).thenReturn(matchTime);
@@ -94,7 +95,7 @@ void testNeedsRefresh() throws Exception {
         String modelName = "model-0";
         String providerName = "provider-0";
         //setup a single model
-        LlmModelMetadata singleModel = new LlmModelMetadata(modelName, providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
+        LlmModelMetadata singleModel = new LlmModelMetadata(UUID.randomUUID().toString(),modelName, providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
         List<ModelMetadata> models = new ArrayList<>();
         models.add(singleModel);
         //set the trigger

embabel-database-agent/src/test/java/com/embabel/database/agent/service/AiRepositoryModelMetadataValidationServiceTest 2.java

@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 
@@ -39,7 +40,7 @@ void testValidate() {
         String modelName = "model-0";
         String providerName = "provider-0";
         //setup a single model
-        LlmModelMetadata singleModel = new LlmModelMetadata(modelName, providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
+        LlmModelMetadata singleModel = new LlmModelMetadata(UUID.randomUUID().toString(),modelName, providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
         //setup the repo
         AiModelRepository aiModelRepository = new InMemoryAiModelRepository();
         //save
@@ -51,7 +52,7 @@ void testValidate() {
         //add existing
         newModels.add(singleModel);
         //add a new one
-        LlmModelMetadata newModel = new LlmModelMetadata(modelName + "-1", providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
+        LlmModelMetadata newModel = new LlmModelMetadata(UUID.randomUUID().toString(),modelName + "-1", providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
         newModels.add(newModel);
         //process
         ModelMetadataValidationService modelMetadataValidationService = new AiRepositoryModelMetadataValidationService(aiModelRepository);
@@ -66,7 +67,7 @@ void testValidate() {
     void testInverse() {
         LocalDate dateStamp = LocalDate.now();
         //setup a single model
-        LlmModelMetadata singleModel = new LlmModelMetadata("model-0", "provider-0", dateStamp, null, 1l,Collections.singletonList("task"),"test");
+        LlmModelMetadata singleModel = new LlmModelMetadata(UUID.randomUUID().toString(),"model-0", "provider-0", dateStamp, null, 1l,Collections.singletonList("task"),"test");
         //setup the repo
         AiModelRepository aiModelRepository = new InMemoryAiModelRepository();
         //save

embabel-database-agent/src/test/java/com/embabel/database/agent/service/AiRepositoryModelMetadataValidationServiceTest.java

@@ -135,5 +135,5 @@ interface AiModelRepository {
      * @param modelId
      * @return the model
      */
-    fun get(modelId: String): ModelMetadata?
+    fun findById(modelId: String): ModelMetadata?
 }

embabel-database-agent/src/test/java/com/embabel/database/agent/service/LlmLeaderboardModelMetadataDiscoveryServiceITest 2.java

@@ -116,8 +116,9 @@ class InMemoryAiModelRepository(allModels: List<ModelMetadata> = emptyList()) :
         return models.filter { it.name.contains(name,ignoreCase = true) }
     }
 
-    override fun get(modelId: String): ModelMetadata? {
-        return models.find { it.modelId == modelId }
+    override fun findById(modelId: String): ModelMetadata? {
+        return models.filterIsInstance<LlmModelMetadata>()
+            .find { it.modelId == modelId }
     }
 
     //serialize the current list to json

embabel-database-agent/src/test/java/com/embabel/database/agent/util/LlmLeaderboardParserTest 2.java

@@ -38,6 +38,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 @SpringBootTest(classes={InMemoryAiModelRepositoryITest.class,InMemoryAiModelRepositoryITest.TestConfig.class})
 public class InMemoryAiModelRepositoryITest {
@@ -54,7 +55,7 @@ public void testSave() throws Exception {
         String modelName = "model-0";
         String providerName = "provider-0";
         //setup a single model
-        LlmModelMetadata singleModel = new LlmModelMetadata(modelName, providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
+        LlmModelMetadata singleModel = new LlmModelMetadata(UUID.randomUUID().toString(),modelName, providerName, dateStamp, null, 1l,Collections.singletonList("task"),"test");
         //save
         aiModelRepository.save(singleModel);
         //check

embabel-database-core/src/main/kotlin/com/embabel/database/core/repository/AiModelRepository.kt

@@ -93,13 +93,8 @@ class AiModelRepositoryController {
         return aiModelRepository.findByTags(*tags.toTypedArray()) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND,"No matching model found")
     }
 
-     @GetMapping("/models/{modelId}")
-    fun getById(@PathVariable modelId: String): ResponseEntity<ModelMetadata> {
-        val model = aiModelRepository.getById(modelId)
-        return if (model != null) {
-            ResponseEntity.ok(model)
-        } else {
-            ResponseEntity.notFound().build()
-        }
+    @GetMapping("/{modelId}")
+    fun getById(@PathVariable modelId: String): ModelMetadata? {
+        return aiModelRepository.findById(modelId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND,"No model found for ID")
     }
 }