Store vector init

.devcontainer/devcontainer.json

@@ -13,6 +13,7 @@
 	"postStartCommand": ".devcontainer/postStart.sh",
 	"postCreateCommand": ".devcontainer/postCreate.sh",
 	"forwardPorts": [
+		1984,
 		1985,
 		3000,
 		4173

backend/build.gradle

@@ -20,26 +20,37 @@ repositories {
 }
 
 dependencies {
-	compileOnly 'org.projectlombok:lombok:1.18.32'
-	annotationProcessor 'org.projectlombok:lombok:1.18.32'
 	annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.5'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.hibernate.validator:hibernate-validator'
-	implementation 'dev.langchain4j:langchain4j-open-ai:0.30.0'
+	developmentOnly 'org.springframework.boot:spring-boot-devtools'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
+
+	implementation 'dev.langchain4j:langchain4j-open-ai:0.31.0'
+	implementation 'dev.langchain4j:langchain4j:0.31.0'
+    implementation 'dev.langchain4j:langchain4j-core:0.31.0'
+    implementation 'dev.langchain4j:langchain4j-embeddings:0.31.0'
+    implementation 'dev.langchain4j:langchain4j-open-ai:0.31.0'
+    implementation 'dev.langchain4j:langchain4j-easy-rag:0.31.0'
+
 	implementation platform('org.dizitart:nitrite-bom:4.2.1')
 	implementation 'org.dizitart:nitrite'
 	implementation 'org.dizitart:nitrite-support'
 	implementation 'org.dizitart:nitrite-mvstore-adapter'
 	implementation 'org.dizitart:nitrite-jackson-mapper'
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
+
 	implementation 'net.sourceforge.argparse4j:argparse4j:0.9.0'
-	developmentOnly("org.springframework.boot:spring-boot-devtools")
+	implementation 'org.jobrunr:jobrunr-spring-boot-3-starter:7.1.2'
+
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
+
+	compileOnly 'org.projectlombok:lombok:1.18.32'
+	annotationProcessor 'org.projectlombok:lombok:1.18.32'
 	testCompileOnly 'org.projectlombok:lombok:1.18.32'
 	testAnnotationProcessor 'org.projectlombok:lombok:1.18.32'
 }
@@ -49,12 +60,12 @@ application {
 }
 
 openApi {
-	groupedApiMappings.set(["http://localhost:1985/api/docs/backendapi": "swagger-backendapi.json",
-                            "http://localhost:1985/api/docs/publicapi": "swagger-publicapi.json"])
+	groupedApiMappings.set(['http://localhost:1985/api/docs/backendapi': 'swagger-backendapi.json',
+                            'http://localhost:1985/api/docs/publicapi': 'swagger-publicapi.json'])
     outputDir.set(file("$buildDir/docs"))
     waitTimeInSeconds.set(10)
     customBootRun {
-        args.set(["--spring.profiles.active=test"]) 
+        args.set(['--spring.profiles.active=test']) 
     }
 }
 

backend/src/main/java/ai/dragon/config/AppConfig.java

@@ -8,5 +8,4 @@
 @Configuration
 @EnableConfigurationProperties(DataProperties.class)
 public class AppConfig {
-
 }

backend/src/main/java/ai/dragon/config/JobRunrConfig.java

@@ -0,0 +1,17 @@
+package ai.dragon.config;
+
+import org.jobrunr.jobs.mappers.JobMapper;
+import org.jobrunr.storage.InMemoryStorageProvider;
+import org.jobrunr.storage.StorageProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class JobRunrConfig {
+    @Bean
+    public StorageProvider storageProvider(JobMapper jobMapper) {
+        InMemoryStorageProvider storageProvider = new InMemoryStorageProvider();
+        storageProvider.setJobMapper(jobMapper);
+        return storageProvider;
+    }
+}

backend/src/main/java/ai/dragon/config/SecurityConfiguration.java → backend/src/main/java/ai/dragon/config/SecurityConfig.java

@@ -8,7 +8,7 @@
 import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration(proxyBeanMethods = false)
-public class SecurityConfiguration {
+public class SecurityConfig {
     @Bean
     @Order(Ordered.HIGHEST_PRECEDENCE)
     SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {

backend/src/main/java/ai/dragon/controller/api/backendapi/repository/AbstractCrudBackendApiController.java

@@ -0,0 +1,74 @@
+package ai.dragon.controller.api.backendapi.repository;
+
+import java.lang.reflect.Constructor;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.dizitart.no2.exceptions.UniqueConstraintException;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ResponseStatusException;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+
+import ai.dragon.entity.IAbstractEntity;
+import ai.dragon.repository.AbstractRepository;
+
+abstract class AbstractCrudBackendApiController<T extends IAbstractEntity> {
+    public T update(String uuid, Map<String, Object> fields, AbstractRepository<T> repository) {
+        T entityToUpdate = repository.getByUuid(uuid);
+        if (entityToUpdate == null) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Entity not found");
+        }
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            String fieldsAsJson = objectMapper.writeValueAsString(fields);
+            ObjectReader objectReader = objectMapper.readerForUpdating(entityToUpdate);
+            entityToUpdate = objectReader.readValue(fieldsAsJson);
+        } catch (Exception ex) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Error parsing fields as JSON", ex);
+        }
+        if (!uuid.equals(entityToUpdate.getUuid().toString())) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "UUID must not be changed.");
+        }
+        repository.save(entityToUpdate);
+        return entityToUpdate;
+    }
+
+    public List<T> list(AbstractRepository<T> repository) {
+        return repository.find().toList();
+    }
+
+    public T create(AbstractRepository<T> repository) throws Exception {
+        return create(repository, null);
+    }
+
+    public T create(AbstractRepository<T> repository, Function<T, T> beforeSaveCallback) throws Exception {
+        Class<T> clazz = repository.getGenericSuperclass();
+        Constructor<T> cons = clazz.getConstructor();
+        T entity = cons.newInstance();
+        if (beforeSaveCallback != null) {
+            entity = beforeSaveCallback.apply(entity);
+        }
+        try {
+            repository.save(entity);
+        } catch (UniqueConstraintException ex) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "Unique key constraint violation", ex);
+        }
+        return entity;
+    }
+
+    public T get(String uuid, AbstractRepository<T> repository) {
+        return Optional.ofNullable(repository.getByUuid(uuid))
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Entity not found."));
+    }
+
+    public void delete(String uuid, AbstractRepository<T> repository) {
+        if (!repository.exists(uuid)) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Entity not found.");
+        }
+        repository.delete(uuid);
+    }
+}

backend/src/main/java/ai/dragon/controller/api/backendapi/repository/IngestorBackendApiController.java

@@ -1,22 +1,19 @@
 package ai.dragon.controller.api.backendapi.repository;
 
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Optional;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import ai.dragon.entity.IngestorEntity;
 import ai.dragon.repository.IngestorRepository;
@@ -29,65 +26,49 @@
 @RestController
 @RequestMapping("/api/backendapi/repository/ingestor")
 @Tag(name = "Ingestor Repository", description = "Ingestor Repository Management API Endpoints")
-public class IngestorBackendApiController {
+public class IngestorBackendApiController extends AbstractCrudBackendApiController<IngestorEntity> {
     @Autowired
     private IngestorRepository ingestorRepository;
 
     @GetMapping("/")
     @ApiResponse(responseCode = "200", description = "List has been successfully retrieved.")
     @Operation(summary = "List all Ingestors", description = "Returns all Ingestor entities stored in the database.")
     public List<IngestorEntity> list() {
-        return ingestorRepository.find().toList();
+        return super.list(ingestorRepository);
     }
 
     @PostMapping("/")
     @ApiResponse(responseCode = "200", description = "Ingestor has been successfully created.")
+    @ApiResponse(responseCode = "409", description = "Constraint violation.", content = @Content)
     @Operation(summary = "Create a new Ingestor", description = "Creates one Ingestor entity in the database.")
-    public IngestorEntity create() {
-        String ingestorName = String.format("Ingestor %s",
-                LocalDateTime.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
-
-        IngestorEntity ingestor = new IngestorEntity();
-        ingestor.setName(ingestorName);
-        ingestorRepository.save(ingestor);
-        return ingestor;
+    public IngestorEntity create() throws Exception {
+        return super.create(ingestorRepository);
     }
 
     @GetMapping("/{uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}}")
     @ApiResponse(responseCode = "200", description = "Ingestor has been successfully retrieved.")
     @ApiResponse(responseCode = "404", description = "Ingestor not found.", content = @Content)
     @Operation(summary = "Retrieve one Ingestor", description = "Returns one Ingestor entity from its UUID stored in the database.")
-    public IngestorEntity get(@PathVariable("uuid") @Parameter(description = "Identifier of the Ingestor") String uuid) {
-        return Optional.ofNullable(ingestorRepository.getByUuid(uuid))
-                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Ingestor not found."));
+    public IngestorEntity get(
+            @PathVariable("uuid") @Parameter(description = "Identifier of the Ingestor") String uuid) {
+        return super.get(uuid, ingestorRepository);
     }
 
     @PatchMapping("/{uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}}")
     @ApiResponse(responseCode = "200", description = "Ingestor has been successfully created.")
     @ApiResponse(responseCode = "404", description = "Ingestor not found.", content = @Content)
     @Operation(summary = "Update a Ingestor", description = "Updates one Ingestor entity in the database.")
-    public IngestorEntity update(@PathVariable("uuid") @Parameter(description = "Identifier of the Ingestor", required = true) String uuid,
-            IngestorEntity ingestor) throws JsonMappingException {
-        if (!ingestorRepository.exists(uuid) || ingestor == null || !uuid.equals(ingestor.getUuid().toString())) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Ingestor not found");
-        }
-
-        IngestorEntity ingestorToUpdate = ingestorRepository.getByUuid(uuid);
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.updateValue(ingestorToUpdate, ingestor);
-        ingestorRepository.save(ingestorToUpdate);
-
-        return ingestorToUpdate;
+    public IngestorEntity update(
+            @PathVariable("uuid") @Parameter(description = "Identifier of the Ingestor", required = true) String uuid,
+            @RequestBody Map<String, Object> fields) throws JsonMappingException {
+        return super.update(uuid, fields, ingestorRepository);
     }
 
     @DeleteMapping("/{uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}}")
     @ApiResponse(responseCode = "200", description = "Ingestor has been successfully deleted.")
     @ApiResponse(responseCode = "404", description = "Ingestor not found.", content = @Content)
     @Operation(summary = "Delete a Ingestor", description = "Deletes one Ingestor entity from its UUID stored in the database.")
     public void delete(@PathVariable("uuid") @Parameter(description = "Identifier of the Ingestor") String uuid) {
-        if (!ingestorRepository.exists(uuid)) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ingestor not found.");
-        }
-        ingestorRepository.delete(uuid);
+        super.delete(uuid, ingestorRepository);
     }
 }

backend/src/main/java/ai/dragon/controller/api/backendapi/repository/ProviderBackendApiController.java

@@ -1,23 +1,20 @@
 package ai.dragon.controller.api.backendapi.repository;
 
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Optional;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import ai.dragon.entity.ProviderEntity;
 import ai.dragon.enumeration.ProviderType;
@@ -31,30 +28,28 @@
 @RestController
 @RequestMapping("/api/backendapi/repository/provider")
 @Tag(name = "Provider Repository", description = "Provider Repository Management API Endpoints")
-public class ProviderBackendApiController {
+public class ProviderBackendApiController extends AbstractCrudBackendApiController<ProviderEntity> {
     @Autowired
     private ProviderRepository providerRepository;
 
     @GetMapping("/")
     @ApiResponse(responseCode = "200", description = "List has been successfully retrieved.")
     @Operation(summary = "List all Providers", description = "Returns all Provider entities stored in the database.")
     public List<ProviderEntity> list() {
-        return providerRepository.find().toList();
+        return super.list(providerRepository);
     }
 
     @PostMapping("/")
     @ApiResponse(responseCode = "200", description = "Provider has been successfully created.")
+    @ApiResponse(responseCode = "409", description = "Constraint violation.", content = @Content)
     @Operation(summary = "Create a new Provider", description = "Creates one Provider entity in the database.")
     public ProviderEntity create(
-            @RequestParam(name = "type", required = true) @Parameter(description = "Type of the provider") String providerType) {
-        String providerName = String.format("Provider %s",
-                LocalDateTime.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
-
-        ProviderEntity provider = new ProviderEntity();
-        provider.setName(providerName);
-        provider.setType(ProviderType.valueOf(providerType));
-        providerRepository.save(provider);
-        return provider;
+            @RequestParam(name = "type", required = true) @Parameter(description = "Type of the provider") String providerType)
+            throws Exception {
+        return super.create(providerRepository, provider -> {
+            provider.setType(ProviderType.fromString(providerType));
+            return provider;
+        });
     }
 
     @GetMapping("/{uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}}")
@@ -63,8 +58,7 @@ public ProviderEntity create(
     @Operation(summary = "Retrieve one Provider", description = "Returns one Provider entity from its UUID stored in the database.")
     public ProviderEntity get(
             @PathVariable("uuid") @Parameter(description = "Identifier of the Provider") String uuid) {
-        return Optional.ofNullable(providerRepository.getByUuid(uuid))
-                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Provider not found."));
+        return super.get(uuid, providerRepository);
     }
 
     @PatchMapping("/{uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}}")
@@ -73,27 +67,15 @@ public ProviderEntity get(
     @Operation(summary = "Update a Provider", description = "Updates one Provider entity in the database.")
     public ProviderEntity update(
             @PathVariable("uuid") @Parameter(description = "Identifier of the Provider", required = true) String uuid,
-            ProviderEntity provider) throws JsonMappingException {
-        if (!providerRepository.exists(uuid) || provider == null || !uuid.equals(provider.getUuid().toString())) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Provider not found");
-        }
-
-        ProviderEntity providerToUpdate = providerRepository.getByUuid(uuid);
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.updateValue(providerToUpdate, provider);
-        providerRepository.save(providerToUpdate);
-
-        return providerToUpdate;
+            @RequestBody Map<String, Object> fields) throws JsonMappingException {
+        return super.update(uuid, fields, providerRepository);
     }
 
     @DeleteMapping("/{uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}}")
     @ApiResponse(responseCode = "200", description = "Provider has been successfully deleted.")
     @ApiResponse(responseCode = "404", description = "Provider not found.", content = @Content)
     @Operation(summary = "Delete a Provider", description = "Deletes one Provider entity from its UUID stored in the database.")
     public void delete(@PathVariable("uuid") @Parameter(description = "Identifier of the Provider") String uuid) {
-        if (!providerRepository.exists(uuid)) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Provider not found.");
-        }
-        providerRepository.delete(uuid);
+        super.delete(uuid, providerRepository);
     }
 }