Simplifies service management

- Move the registry of services to an external Valkey instance
- Register the instances on service startup
- Remove the link/unlink APIs and commands

This resolves #78.

Author: orpiske

.env

@@ -0,0 +1,3 @@
+VALKEY_HOST=host.docker.internal
+VALKEY_PORT=6379
+VALKEY_TIMEOUT=10

archetypes/wanaku-provider-archetype/src/main/resources/archetype-resources/pom.xml

@@ -63,6 +63,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>ai.wanaku</groupId>
+            <artifactId>core-service-discovery</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>

archetypes/wanaku-provider-archetype/src/main/resources/archetype-resources/src/main/java/ResourceService.java

@@ -17,25 +17,38 @@
 
 package ai.wanaku.provider;
 
+import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
 
 import ai.wanaku.core.exchange.InquireReply;
 import ai.wanaku.core.exchange.InquireRequest;
 import ai.wanaku.core.exchange.Inquirer;
-import io.quarkus.grpc.GrpcService;
-import io.smallrye.common.annotation.Blocking;
-import io.smallrye.mutiny.Uni;
 import ai.wanaku.core.exchange.ResourceAcquirer;
 import ai.wanaku.core.exchange.ResourceAcquirerDelegate;
 import ai.wanaku.core.exchange.ResourceReply;
 import ai.wanaku.core.exchange.ResourceRequest;
+import ai.wanaku.core.service.discovery.util.DiscoveryUtil;
+import ai.wanaku.core.services.config.WanakuProviderConfig;
+import io.quarkus.grpc.GrpcService;
+import io.quarkus.runtime.ShutdownEvent;
+import io.quarkus.runtime.StartupEvent;
+import io.smallrye.mutiny.Uni;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.logging.Logger;
 
 @GrpcService
 public class ResourceService implements ResourceAcquirer, Inquirer {
+    private static final Logger LOG = Logger.getLogger(ResourceService.class);
 
     @Inject
     ResourceAcquirerDelegate delegate;
 
+    @Inject
+    WanakuProviderConfig config;
+
+    @ConfigProperty(name = "quarkus.grpc.server.port")
+    int port;
+
     @Override
     @Blocking
     public Uni<ResourceReply> resourceAcquire(ResourceRequest request) {
@@ -51,4 +64,16 @@ public Uni<InquireReply> inquire(InquireRequest request) {
 
         return Uni.createFrom().item(() -> reply);
     }
+
+    void register(@Observes StartupEvent ev) {
+        LOG.info("Registering resource service");
+
+        delegate.register(config.name(), DiscoveryUtil.resolveRegistrationAddress(), port);
+    }
+
+    void deregister(@Observes ShutdownEvent ev) {
+        LOG.info("De-registering resource service");
+
+        delegate.deregister(config.name(), DiscoveryUtil.resolveRegistrationAddress(), port);
+    }
 }

archetypes/wanaku-provider-archetype/src/main/resources/archetype-resources/src/main/resources/application.properties

@@ -31,6 +31,9 @@ quarkus.log.category."ai.wanaku".level=INFO
 wanaku.service.provider.name=${name.toLowerCase()}
 wanaku.service.provider.base-uri=${name.toLowerCase()}://
 
+%dev.wanaku.service.provider.router.address=http://localhost:8080
+%test.wanaku.service.provider.router.address=http://localhost:8080
+
 # The service may have user-exposable parameters that can be set via CLI. The
 # example below is exposed as "noop" with the description
 # "Whether to do nothing or do something".
@@ -40,6 +43,15 @@ wanaku.service.provider.base-uri=${name.toLowerCase()}://
 # not set by the user
 # wanaku.service.provider.service.defaults.noop=true
 
+# Valkey configuration
+
+# Address of the Valkey host
+# valkey.host=address
+
+# Port which Valkey is listening to on
+# valkey.port=6379
 
+# Timeout
+# valkey.timeout=10
 
 

archetypes/wanaku-tool-service-archetype/src/main/resources/archetype-resources/pom.xml

@@ -63,6 +63,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>ai.wanaku</groupId>
+            <artifactId>core-service-discovery</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>

archetypes/wanaku-tool-service-archetype/src/main/resources/archetype-resources/src/main/java/InvocationService.java

@@ -17,22 +17,37 @@
 
 package ai.wanaku.routing.service;
 
+import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
 
-import io.quarkus.grpc.GrpcService;
-import io.smallrye.mutiny.Uni;
-import ai.wanaku.core.exchange.InvocationDelegate;
+import ai.wanaku.core.exchange.InquireReply;
+import ai.wanaku.core.exchange.InquireRequest;
 import ai.wanaku.core.exchange.Inquirer;
+import ai.wanaku.core.exchange.InvocationDelegate;
 import ai.wanaku.core.exchange.ToolInvokeReply;
 import ai.wanaku.core.exchange.ToolInvokeRequest;
 import ai.wanaku.core.exchange.ToolInvoker;
+import ai.wanaku.core.service.discovery.util.DiscoveryUtil;
+import ai.wanaku.core.services.config.WanakuRoutingConfig;
+import io.quarkus.grpc.GrpcService;
+import io.quarkus.runtime.ShutdownEvent;
+import io.quarkus.runtime.StartupEvent;
+import io.smallrye.mutiny.Uni;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.logging.Logger;
 
 @GrpcService
 public class InvocationService implements ToolInvoker, Inquirer {
 
     @Inject
     InvocationDelegate delegate;
 
+    @Inject
+    WanakuRoutingConfig config;
+
+    @ConfigProperty(name = "quarkus.grpc.server.port")
+    int port;
+
     @Override
     public Uni<ToolInvokeReply> invokeTool(ToolInvokeRequest request) {
         return Uni.createFrom().item(() -> delegate.invoke(request));
@@ -47,4 +62,16 @@ public Uni<InquireReply> inquire(InquireRequest request) {
 
         return Uni.createFrom().item(() -> reply);
     }
+
+    void register(@Observes StartupEvent ev) {
+        LOG.info("Registering resource service");
+
+        delegate.register(config.name(), DiscoveryUtil.resolveRegistrationAddress(), port);
+    }
+
+    void deregister(@Observes ShutdownEvent ev) {
+        LOG.info("De-registering resource service");
+
+        delegate.deregister(config.name(), DiscoveryUtil.resolveRegistrationAddress(), port);
+    }
 }

archetypes/wanaku-tool-service-archetype/src/main/resources/archetype-resources/src/main/resources/application.properties

@@ -29,3 +29,13 @@ quarkus.log.category."ai.wanaku".level=INFO
 %test.quarkus.log.category."ai.wanaku".level=INFO
 
 
+# Valkey configuration
+
+# Address of the Valkey host
+# valkey.host=address
+
+# Port which Valkey is listening to on
+# valkey.port=6379
+
+# Timeout
+# valkey.timeout=10

cli/src/main/java/ai/wanaku/cli/main/commands/targets/resources/Resources.java

@@ -4,7 +4,7 @@
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "resources",
-        description = "Manage targets", subcommands = { ResourcesLink.class, ResourcesUnlink.class, ResourcesLinkedList.class, ResourcesConfigure.class })
+        description = "Manage targets", subcommands = { ResourcesLinkedList.class, ResourcesConfigure.class })
 public class Resources extends BaseCommand {
     @Override
     public void run() {

cli/src/main/java/ai/wanaku/cli/main/commands/targets/resources/ResourcesLink.java

@@ -4,7 +4,7 @@
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "tools",
-        description = "Manage targets", subcommands = { ToolsLink.class, ToolsUnlink.class, ToolsLinkedList.class, ToolsConfigure.class })
+        description = "Manage targets", subcommands = { ToolsLinkedList.class, ToolsConfigure.class })
 public class Tools extends BaseCommand {
     @Override
     public void run() {

cli/src/main/java/ai/wanaku/cli/main/commands/targets/resources/ResourcesUnlink.java

@@ -17,16 +17,6 @@
 @Path("/api/v1/management/targets")
 public interface LinkService {
 
-    @Path("/tools/link")
-    @PUT
-    @Consumes(MediaType.TEXT_PLAIN)
-    void toolsLink(@QueryParam("service") String service, @QueryParam("target") String target);
-
-    @Path("/tools/unlink")
-    @PUT
-    @Consumes(MediaType.TEXT_PLAIN)
-    void toolsUnlink(@QueryParam("service") String service);
-
     @Path("/tools/list")
     @GET
     @Consumes(MediaType.TEXT_PLAIN)
@@ -37,16 +27,6 @@ public interface LinkService {
     @Consumes(MediaType.TEXT_PLAIN)
     Response toolsConfigure(@RestPath("service") String service, @QueryParam("option") String option, @QueryParam("value") String value);
 
-    @Path("/resources/link")
-    @PUT
-    @Consumes(MediaType.TEXT_PLAIN)
-    void resourcesLink(@QueryParam("service") String service, @QueryParam("target") String target);
-
-    @Path("/resources/unlink")
-    @PUT
-    @Consumes(MediaType.TEXT_PLAIN)
-    void resourcesUnlink(@QueryParam("service") String service);
-
     @Path("/resources/list")
     @GET
     @Consumes(MediaType.TEXT_PLAIN)

cli/src/main/java/ai/wanaku/cli/main/commands/targets/tools/Tools.java

@@ -3,7 +3,7 @@
 /**
  * A delegate that can be used by services that invoke tools
  */
-public interface InvocationDelegate extends ConfigurableDelegate {
+public interface InvocationDelegate extends ConfigurableDelegate, RegisterAware {
     /**
      * Invokes the tool
      * @param request

cli/src/main/java/ai/wanaku/cli/main/commands/targets/tools/ToolsLink.java

@@ -0,0 +1,21 @@
+package ai.wanaku.core.exchange;
+
+/**
+ * Defines services that can be registered with the router
+ */
+public interface RegisterAware {
+    /**
+     * Register a service with the router
+     * @param host the router host
+     * @param service the service to register
+     * @param port the port where the service is listening to on
+     */
+    void register(String host, String service, int port);
+
+    /**
+     * Deregister a service with the router
+     * @param host the router host
+     * @param service the service to deregister
+     */
+    void deregister(String host, String service, int port);
+}

cli/src/main/java/ai/wanaku/cli/main/commands/targets/tools/ToolsUnlink.java

@@ -3,7 +3,7 @@
 /**
  * A delegate that can be used by services that provide resources
  */
-public interface ResourceAcquirerDelegate extends ConfigurableDelegate {
+public interface ResourceAcquirerDelegate extends ConfigurableDelegate, RegisterAware {
 
     /**
      * Acquire the resource and provide it to the requester