Add ServiceRegistry backed by File persistence

Author: Croway

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

@@ -15,16 +15,6 @@ public class Service {
      */
     private String target;
 
-    /**
-     * The unique name of the Service
-     */
-    private String name;
-
-    /**
-     * Tpye of the service, can be a resource or a tool
-     */
-    private String serviceType;
-
     /**
      * The configuration settings for the service, which can include various parameters and values.
      */
@@ -66,22 +56,6 @@ public void setConfigurations(Configurations configurations) {
         this.configurations = configurations;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getServiceType() {
-        return serviceType;
-    }
-
-    public void setServiceType(String serviceType) {
-        this.serviceType = serviceType;
-    }
-
     /**
      * Creates a new instance of the service with the given target and configurations.
      *

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-persistence/core-persistence-api/src/main/java/ai/wanaku/core/persistence/api/ServiceRepository.java

@@ -3,11 +3,11 @@
 import ai.wanaku.api.types.management.Configuration;
 import ai.wanaku.api.types.management.Configurations;
 import ai.wanaku.api.types.management.Service;
+import ai.wanaku.core.mcp.providers.ServiceTarget;
 import ai.wanaku.core.mcp.providers.ServiceType;
 import ai.wanaku.core.persistence.types.ConfigurationEntity;
-import ai.wanaku.core.persistence.types.ServiceEntity;
+import ai.wanaku.core.persistence.types.ServiceTargetEntity;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,15 +19,15 @@
  * <p>This interface extends WanakuRepository to provide specific operations
  * for Service objects, including querying by service type and updating services.</p>
  */
-public interface ServiceRepository extends WanakuRepository<Service, ServiceEntity, String> {
+public interface ServiceRepository extends WanakuRepository<ServiceTarget, ServiceTargetEntity, String> {
 
     /**
      * Lists all services of a specific service type.
      *
      * @param serviceType the type of service to list
      * @return a list of services matching the specified type
      */
-    List<Service> listByServiceType(ServiceType serviceType);
+    List<ServiceTarget> listByServiceType(ServiceType serviceType);
 
     /**
      * Finds a service by its ID and service type.
@@ -36,15 +36,15 @@ public interface ServiceRepository extends WanakuRepository<Service, ServiceEnti
      * @param serviceType the type of the service to find
      * @return the matching service, or null if not found
      */
-    Service findByIdAndServiceType(String id, ServiceType serviceType);
+    ServiceTarget findByIdAndServiceType(String id, ServiceType serviceType);
 
     /**
      * Updates an existing service.
      *
      * @param entity the service with updated information
      * @return the updated service
      */
-    Service update(Service entity);
+    ServiceTarget update(ServiceTarget entity);
 
     /**
      * Converts a ServiceEntity to its corresponding Service model.
@@ -56,19 +56,8 @@ public interface ServiceRepository extends WanakuRepository<Service, ServiceEnti
      * @return the converted Service model
      */
     @Override
-    default Service convertToModel(ServiceEntity entity) {
-        Service service = new Service();
-        service.setTarget(entity.getTargetAddress());
-        service.setName(entity.getName());
-        service.setServiceType(entity.getServiceType().asValue());
-        Map<String, Configuration> configurationMap = new HashMap<>();
-        for (ConfigurationEntity configurationEntity : entity.getConfigurationEntities()) {
-            configurationMap.put(configurationEntity.getKey(), configurationEntity.getConfiguration());
-        }
-        service.setConfigurations(new Configurations());
-        service.getConfigurations().setConfigurations(configurationMap);
-
-        return service;
+    default ServiceTarget convertToModel(ServiceTargetEntity entity) {
+        return new ServiceTarget(entity.getService(), entity.getHost(), entity.getPort(), entity.getServiceType());
     }
 
     /**
@@ -81,18 +70,7 @@ default Service convertToModel(ServiceEntity entity) {
      * @return the converted ServiceEntity
      */
     @Override
-    default ServiceEntity convertToEntity(Service model) {
-        ServiceEntity entity = new ServiceEntity();
-        entity.setName(model.getName());
-        entity.setId(model.getName());
-        entity.setTargetAddress(model.getTarget());
-        entity.setServiceType(ServiceType.fromValue(model.getServiceType()));
-        entity.setConfigurationEntities(
-                model.getConfigurations().getConfigurations().entrySet().stream()
-                        .map(configuration -> new ConfigurationEntity(configuration.getKey(), configuration.getValue()))
-                        .collect(Collectors.toList())
-        );
-
-        return entity;
+    default ServiceTargetEntity convertToEntity(ServiceTarget model) {
+        return new ServiceTargetEntity(model.getService(), model.getHost(), model.getPort(), model.getServiceType());
     }
 }

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

@@ -1,6 +1,6 @@
 package ai.wanaku.core.persistence.api;
 
-import ai.wanaku.core.persistence.types.IdEntity;
+import ai.wanaku.core.persistence.types.WanakuEntity;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -15,7 +15,7 @@
  * @param <B> the entity type which must extend IdEntity
  * @param <C> the ID type
  */
-public interface WanakuRepository<A, B extends IdEntity, C> {
+public interface WanakuRepository<A, B extends WanakuEntity, C> {
 
     /**
      * Persists a model to the repository.

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

@@ -2,7 +2,7 @@
 
 import ai.wanaku.api.types.ResourceReference;
 
-public class ResourceReferenceEntity extends ResourceReference implements IdEntity {
+public class ResourceReferenceEntity extends ResourceReference implements WanakuEntity {
     @Override
     public String getId() {
         return getName();

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

@@ -0,0 +1,40 @@
+package ai.wanaku.core.persistence.types;
+
+import ai.wanaku.api.types.management.Configuration;
+import ai.wanaku.core.mcp.providers.ServiceTarget;
+import ai.wanaku.core.mcp.providers.ServiceType;
+
+import java.util.List;
+import java.util.Map;
+
+public class ServiceTargetEntity extends ServiceTarget implements WanakuEntity {
+
+    private Map<String, Configuration> configurations;
+
+    public ServiceTargetEntity(String service, String host, int port, ServiceType serviceType) {
+        super(service, host, port, serviceType);
+    }
+
+    // Constructor needed by Jackson
+    public ServiceTargetEntity() {
+        super(null, null, 0, null);
+    }
+
+    @Override
+    public String getId() {
+        return getService();
+    }
+
+    @Override
+    public void setId(String id) {
+        // Do nothing, the Id is mapped via service
+    }
+
+    public Map<String, Configuration> getConfigurations() {
+        return configurations;
+    }
+
+    public void setConfigurations(Map<String, Configuration> configurations) {
+        this.configurations = configurations;
+    }
+}

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

@@ -2,7 +2,7 @@
 
 import ai.wanaku.api.types.ToolReference;
 
-public class ToolReferenceEntity extends ToolReference implements IdEntity {
+public class ToolReferenceEntity extends ToolReference implements WanakuEntity {
     @Override
     public String getId() {
         return getName();

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

@@ -1,6 +1,6 @@
 package ai.wanaku.core.persistence.types;
 
-public interface IdEntity<T> {
+public interface WanakuEntity<T> {
 
     String getId();
 

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

@@ -3,18 +3,17 @@
 import ai.wanaku.api.exceptions.WanakuException;
 import ai.wanaku.core.persistence.WanakuMarshallerService;
 import ai.wanaku.core.persistence.api.WanakuRepository;
-import ai.wanaku.core.persistence.types.IdEntity;
+import ai.wanaku.core.persistence.types.WanakuEntity;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public abstract class AbstractFileRepository<A, T extends IdEntity, K> implements WanakuRepository<A, T, K> {
+public abstract class AbstractFileRepository<A, T extends WanakuEntity, K> implements WanakuRepository<A, T, K> {
 
     protected WanakuMarshallerService wanakuMarshallerService;
     protected Path file;

core/core-persistence/core-persistence-file/src/main/java/ai/wanaku/core/persistence/file/AbstractFileRepository.java

@@ -1,5 +1,6 @@
 package ai.wanaku.core.persistence.file;
 
+import ai.wanaku.core.mcp.providers.ServiceRegistry;
 import ai.wanaku.core.persistence.WanakuMarshallerService;
 import ai.wanaku.core.persistence.api.ResourceReferenceRepository;
 import ai.wanaku.core.persistence.api.ServiceRepository;
@@ -47,4 +48,13 @@ ServiceRepository serviceRepository() {
         return new FileServiceRepository(new WanakuMarshallerService(), Path.of(
                 baseFolder.replace("${user.home}", System.getProperty("user.home")), servicesFileName));
     }
+
+    @DefaultBean
+    @Produces
+    ServiceRegistry serviceRegistry() {
+        return new FileServiceRegistry(new WanakuMarshallerService(), Path.of(
+                baseFolder.replace("${user.home}", System.getProperty("user.home")), servicesFileName),
+                Path.of(
+                        baseFolder.replace("${user.home}", System.getProperty("user.home"))));
+    }
 }