File Persistence and MongoDB persistence (#178)

* File Persistence and MongoDB persistence

rename persistence modules

Use repository in wanaku server

File Persistence and MongoDB persistence

Use repository in wanaku server

rebase main

fix Resources test

* Keep using Valkey

* Align properties files

* Add ServiceRegistry backed by File persistence

* test + prod docker compose

Author: Croway

api/src/main/java/ai/wanaku/api/types/management/Configuration.java

@@ -1,5 +1,8 @@
 package ai.wanaku.api.types.management;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Represents a configuration for the downstream service.
  *
@@ -52,4 +55,30 @@ public String getDescription() {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public String toJson() {
+        return String.format("""
+            {"value":%s,"description":%s}
+            """, getValue() == null ? "null" : "\"" + getValue() + "\"",
+                getDescription() == null ? "null" : "\"" + getDescription() + "\"");
+    }
+
+    private static Pattern valuePattern = Pattern.compile("\"value\":\"(.*)\",");
+    private static Pattern descriptionPattern = Pattern.compile("\"description\":\"(.*)\"");
+
+    public static Configuration fromJson(String json) {
+        Configuration configuration = new Configuration();
+
+        Matcher matcher = valuePattern.matcher(json);
+        if (matcher.find()) {
+            configuration.setValue(matcher.group(1));
+        }
+
+        Matcher descriptionMatcher = descriptionPattern.matcher(json);
+        if (descriptionMatcher.find()) {
+            configuration.setDescription(descriptionMatcher.group(1));
+        }
+
+        return configuration;
+    }
 }

core/core-mcp/src/main/java/ai/wanaku/core/mcp/providers/ServiceRegistry.java

@@ -53,4 +53,6 @@ public interface ServiceRegistry {
      * @return a map of all registered services and their configurations
      */
     Map<String, Service> getEntries(ServiceType serviceType);
+
+    void update(String target, String option, String value);
 }

core/core-mcp/src/main/java/ai/wanaku/core/mcp/providers/ServiceTarget.java

@@ -17,7 +17,7 @@ public class ServiceTarget {
      * @param port The port number of the service.
      * @param serviceType The type of service, either RESOURCE_PROVIDER or TOOL_INVOKER.
      */
-    private ServiceTarget(String service, String host, int port, ServiceType serviceType) {
+    public ServiceTarget(String service, String host, int port, ServiceType serviceType) {
         this.service = service;
         this.host = host;
         this.port = port;

core/core-mcp/src/main/java/ai/wanaku/core/mcp/providers/ServiceType.java

@@ -27,4 +27,12 @@ public enum ServiceType {
     public String asValue() {
         return value;
     }
+
+    public static ServiceType fromValue(String value) {
+        switch (value) {
+            case "resource-provider": return RESOURCE_PROVIDER;
+            case "tool-invoker": return TOOL_INVOKER;
+            default: throw new IllegalArgumentException("Value " + value + " is not a valid service type");
+        }
+    }
 }

core/core-persistence/core-persistence-api/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>ai.wanaku</groupId>
+        <artifactId>core-persistence</artifactId>
+        <version>0.0.4-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>core-persistence-api</artifactId>
+    <name>Wanaku :: Core :: Persistence :: API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>ai.wanaku</groupId>
+            <artifactId>core-mcp</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

core/core-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/WanakuMarshallerService.java

@@ -0,0 +1,79 @@
+package ai.wanaku.core.persistence;
+
+import ai.wanaku.api.exceptions.WanakuException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Service class responsible for marshalling and unmarshalling objects to and from JSON format.
+ * This class provides functionality to convert Java objects to JSON strings and vice versa.
+ */
+@ApplicationScoped
+@Default
+public class WanakuMarshallerService {
+
+    private ObjectMapper mapper;
+
+    public WanakuMarshallerService() {
+        mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
+    /**
+     * Converts a Java object to its JSON string representation.
+     *
+     * @param object The object to be marshalled to JSON
+     * @return A JSON string representation of the object
+     * @throws WanakuException If marshalling fails
+     */
+    public String marshal(Object object) {
+        try {
+            return mapper.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            throw new WanakuException("Marshal failed", e);
+        }
+    }
+
+    /**
+     * Converts a JSON string to a list of Java objects of the specified type.
+     *
+     * @param json The JSON string to be unmarshalled
+     * @param clazz The class type to convert the JSON elements to
+     * @param <T> The generic type of the objects in the resulting list
+     * @return A list of objects of type T parsed from the JSON string
+     * @throws WanakuException If unmarshalling fails
+     */
+    public <T> List<T> unmarshal(String json, Class<T> clazz) {
+        if (json == null || json.isEmpty()) {
+            return new ArrayList<>();
+        }
+        try {
+            return mapper.readValue(json, mapper.getTypeFactory().constructCollectionType(List.class, clazz));
+        } catch (JsonProcessingException e) {
+            throw new WanakuException("Unmarshal failed", e);
+        }
+    }
+
+    /**
+     * Converts a JSON string to a single Java object of the specified type.
+     *
+     * @param json The JSON string to be unmarshalled
+     * @param clazz The class type to convert the JSON to
+     * @param <T> The generic type of the resulting object
+     * @return An object of type T parsed from the JSON string
+     * @throws WanakuException If unmarshalling fails
+     */
+    public <T> T unmarshalOne(String json, Class<T> clazz) {
+        try {
+            return mapper.readValue(json, clazz);
+        } catch (JsonProcessingException e) {
+            throw new WanakuException("Unmarshal failed", e);
+        }
+    }
+}

core/core-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/api/ResourceReferenceRepository.java

@@ -0,0 +1,56 @@
+package ai.wanaku.core.persistence.api;
+
+import ai.wanaku.api.types.ResourceReference;
+import ai.wanaku.core.persistence.types.ResourceReferenceEntity;
+
+/**
+ * Repository interface for managing ResourceReference entities.
+ *
+ * <p>This interface extends WanakuRepository to provide specific operations
+ * for ResourceReference objects, with default implementations for converting
+ * between model and entity representations.</p>
+ */
+public interface ResourceReferenceRepository extends WanakuRepository<ResourceReference, ResourceReferenceEntity, String> {
+
+    /**
+     * Converts a ResourceReferenceEntity to its corresponding ResourceReference model.
+     *
+     * <p>This method maps all properties from the entity to the model.</p>
+     *
+     * @param entity the ResourceReferenceEntity to convert
+     * @return the converted ResourceReference model
+     */
+    @Override
+    default ResourceReference convertToModel(ResourceReferenceEntity entity) {
+        ResourceReference model = new ResourceReference();
+        model.setLocation(entity.getLocation());
+        model.setName(entity.getName());
+        model.setType(entity.getType());
+        model.setDescription(entity.getDescription());
+        model.setMimeType(entity.getMimeType());
+        model.setType(entity.getType());
+
+        return model;
+    }
+
+    /**
+     * Converts a ResourceReference model to its corresponding ResourceReferenceEntity.
+     *
+     * <p>This method maps all properties from the model to the entity.</p>
+     *
+     * @param model the ResourceReference model to convert
+     * @return the converted ResourceReferenceEntity
+     */
+    @Override
+    default ResourceReferenceEntity convertToEntity(ResourceReference model) {
+        ResourceReferenceEntity entity = new ResourceReferenceEntity();
+        entity.setLocation(model.getLocation());
+        entity.setName(model.getName());
+        entity.setType(model.getType());
+        entity.setDescription(model.getDescription());
+        entity.setMimeType(model.getMimeType());
+        entity.setType(model.getType());
+
+        return entity;
+    }
+}

core/core-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/api/ToolReferenceRepository.java

@@ -0,0 +1,56 @@
+package ai.wanaku.core.persistence.api;
+
+import ai.wanaku.api.types.ToolReference;
+import ai.wanaku.core.persistence.types.ToolReferenceEntity;
+
+/**
+ * Repository interface for managing ToolReference entities.
+ *
+ * <p>This interface extends WanakuRepository to provide specific operations
+ * for ToolReference objects, with default implementations for converting
+ * between model and entity representations.</p>
+ */
+public interface ToolReferenceRepository extends WanakuRepository<ToolReference, ToolReferenceEntity, String> {
+
+    /**
+     * Converts a ToolReferenceEntity to its corresponding ToolReference model.
+     *
+     * <p>This method maps all properties from the entity to the model.</p>
+     *
+     * @param entity the ToolReferenceEntity to convert
+     * @return the converted ToolReference model
+     */
+    @Override
+    default ToolReference convertToModel(ToolReferenceEntity entity) {
+        ToolReference model = new ToolReference();
+        model.setName(entity.getName());
+        model.setDescription(entity.getDescription());
+        model.setType(entity.getType());
+        model.setUri(entity.getUri());
+        model.setInputSchema(entity.getInputSchema());
+
+        return model;
+    }
+
+    /**
+     * Converts a ToolReference model to its corresponding ToolReferenceEntity.
+     *
+     * <p>This method maps all properties from the model to the entity, and
+     * uses the model's name as the entity's ID.</p>
+     *
+     * @param model the ToolReference model to convert
+     * @return the converted ToolReferenceEntity
+     */
+    @Override
+    default ToolReferenceEntity convertToEntity(ToolReference model) {
+        ToolReferenceEntity entity = new ToolReferenceEntity();
+        entity.setName(model.getName());
+        entity.setDescription(model.getDescription());
+        entity.setType(model.getType());
+        entity.setUri(model.getUri());
+        entity.setInputSchema(model.getInputSchema());
+        entity.setId(model.getName());
+
+        return entity;
+    }
+}

core/core-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/api/WanakuRepository.java

@@ -0,0 +1,77 @@
+package ai.wanaku.core.persistence.api;
+
+import ai.wanaku.core.persistence.types.WanakuEntity;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Repository interface for the Wanaku persistence layer.
+ *
+ * <p>This interface provides standard operations for persisting, retrieving,
+ * and managing entities in the Wanaku system.</p>
+ *
+ * @param <A> the model type
+ * @param <B> the entity type which must extend IdEntity
+ * @param <C> the ID type
+ */
+public interface WanakuRepository<A, B extends WanakuEntity, C> {
+
+    /**
+     * Persists a model to the repository.
+     *
+     * @param model the model to persist
+     */
+    void persist(A model);
+
+    /**
+     * Retrieves all models from the repository.
+     *
+     * @return a list of all models
+     */
+    List<A> listAll();
+
+    /**
+     * Deletes an entity by its ID.
+     *
+     * @param id the ID of the entity to delete
+     * @return true if the entity was successfully deleted, false otherwise
+     */
+    boolean deleteById(C id);
+
+    /**
+     * Finds a model by its ID.
+     *
+     * @param id the ID of the model to find
+     * @return the found model, or null if not found
+     */
+    A findById(C id);
+
+    /**
+     * Converts a model to its entity representation.
+     *
+     * @param model the model to convert
+     * @return the entity representation of the model
+     */
+    B convertToEntity(A model);
+
+    /**
+     * Converts an entity to its model representation.
+     *
+     * @param model the entity to convert
+     * @return the model representation of the entity
+     */
+    A convertToModel(B model);
+
+    /**
+     * Converts a list of entities to a list of models.
+     *
+     * <p>This default implementation uses the convertToModel method to convert each entity.</p>
+     *
+     * @param entities the list of entities to convert
+     * @return a list of models
+     */
+    default List<A> convertToModels(List<B> entities) {
+        return entities.stream().map(entity -> convertToModel(entity)).collect(Collectors.toList());
+    }
+}

core/core-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/types/ResourceReferenceEntity.java

@@ -0,0 +1,15 @@
+package ai.wanaku.core.persistence.types;
+
+import ai.wanaku.api.types.ResourceReference;
+
+public class ResourceReferenceEntity extends ResourceReference implements WanakuEntity {
+    @Override
+    public String getId() {
+        return getName();
+    }
+
+    @Override
+    public void setId(String id) {
+        setName(id);
+    }
+}