add AiServiceRegisteredEvent

langchain4j-spring-boot-starter/src/main/java/dev/langchain4j/service/spring/AiServicesAutoConfig.java

@@ -1,6 +1,8 @@
 package dev.langchain4j.service.spring;
 
 import dev.langchain4j.agent.tool.Tool;
+import dev.langchain4j.agent.tool.ToolSpecification;
+import dev.langchain4j.agent.tool.ToolSpecifications;
 import dev.langchain4j.exception.IllegalConfigurationException;
 import dev.langchain4j.memory.ChatMemory;
 import dev.langchain4j.memory.chat.ChatMemoryProvider;
@@ -9,19 +11,25 @@
 import dev.langchain4j.model.moderation.ModerationModel;
 import dev.langchain4j.rag.RetrievalAugmentor;
 import dev.langchain4j.rag.content.retriever.ContentRetriever;
+import dev.langchain4j.service.spring.event.AiServiceRegisteredEvent;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.annotation.Bean;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static dev.langchain4j.exception.IllegalConfigurationException.illegalConfiguration;
 import static dev.langchain4j.internal.Exceptions.illegalArgument;
@@ -31,7 +39,14 @@
 import static dev.langchain4j.service.spring.AiServiceWiringMode.EXPLICIT;
 import static java.util.Arrays.asList;
 
-public class AiServicesAutoConfig {
+public class AiServicesAutoConfig implements ApplicationEventPublisherAware {
+
+    private ApplicationEventPublisher eventPublisher;
+
+    @Override
+    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+        this.eventPublisher = applicationEventPublisher;
+    }
 
     @Bean
     BeanFactoryPostProcessor aiServicesRegisteringBeanFactoryPostProcessor() {
@@ -47,6 +62,7 @@ BeanFactoryPostProcessor aiServicesRegisteringBeanFactoryPostProcessor() {
             String[] moderationModels = beanFactory.getBeanNamesForType(ModerationModel.class);
 
             Set<String> tools = new HashSet<>();
+            Map<String, ToolSpecification> toolSpecifications = new HashMap<>();
             for (String beanName : beanFactory.getBeanDefinitionNames()) {
                 try {
                     String beanClassName = beanFactory.getBeanDefinition(beanName).getBeanClassName();
@@ -56,7 +72,9 @@ BeanFactoryPostProcessor aiServicesRegisteringBeanFactoryPostProcessor() {
                     Class<?> beanClass = Class.forName(beanClassName);
                     for (Method beanMethod : beanClass.getDeclaredMethods()) {
                         if (beanMethod.isAnnotationPresent(Tool.class)) {
-                            tools.add(beanName);
+                            if (tools.add(beanName)) {
+                                toolSpecifications.put(beanName, ToolSpecifications.toolSpecificationFrom(beanMethod));
+                            }
                         }
                     }
                 } catch (Exception e) {
@@ -74,7 +92,6 @@ BeanFactoryPostProcessor aiServicesRegisteringBeanFactoryPostProcessor() {
                 MutablePropertyValues propertyValues = aiServiceBeanDefinition.getPropertyValues();
 
                 AiService aiServiceAnnotation = aiServiceClass.getAnnotation(AiService.class);
-
                 addBeanReference(
                         ChatLanguageModel.class,
                         aiServiceAnnotation,
@@ -144,18 +161,24 @@ BeanFactoryPostProcessor aiServicesRegisteringBeanFactoryPostProcessor() {
                         "moderationModel",
                         propertyValues
                 );
-
+                AiServiceRegisteredEvent registeredEvent;
                 if (aiServiceAnnotation.wiringMode() == EXPLICIT) {
                     propertyValues.add("tools", toManagedList(asList(aiServiceAnnotation.tools())));
+                    registeredEvent = buildEvent(aiServiceClass, toolSpecifications, asList(aiServiceAnnotation.tools()));
                 } else if (aiServiceAnnotation.wiringMode() == AUTOMATIC) {
                     propertyValues.add("tools", toManagedList(tools));
+                    registeredEvent = buildEvent(aiServiceClass, toolSpecifications, tools);
                 } else {
                     throw illegalArgument("Unknown wiring mode: " + aiServiceAnnotation.wiringMode());
                 }
 
                 BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
                 registry.removeBeanDefinition(aiService);
                 registry.registerBeanDefinition(lowercaseFirstLetter(aiService), aiServiceBeanDefinition);
+
+                if (eventPublisher != null) {
+                    eventPublisher.publishEvent(registeredEvent);
+                }
             }
         };
     }
@@ -203,4 +226,13 @@ private static ManagedList<RuntimeBeanReference> toManagedList(Collection<String
         }
         return managedList;
     }
+
+    private static AiServiceRegisteredEvent buildEvent(Class<?> aiServiceClass,
+                                                       Map<String, ToolSpecification> toolSpecifications,
+                                                       Collection<String> tools) {
+        return new AiServiceRegisteredEvent(aiServiceClass, aiServiceClass, tools.stream()
+                                                                                 .filter(toolSpecifications::containsKey)
+                                                                                 .map(toolSpecifications::get)
+                                                                                 .collect(Collectors.toList()));
+    }
 }

langchain4j-spring-boot-starter/src/main/java/dev/langchain4j/service/spring/event/AiServiceRegisteredEvent.java

@@ -0,0 +1,26 @@
+package dev.langchain4j.service.spring.event;
+
+import dev.langchain4j.agent.tool.ToolSpecification;
+import org.springframework.context.ApplicationEvent;
+
+import java.util.List;
+
+public class AiServiceRegisteredEvent extends ApplicationEvent {
+
+    private final Class<?> aiServiceClass;
+    private final List<ToolSpecification> toolSpecifications;
+
+    public AiServiceRegisteredEvent(Object source, Class<?> aiServiceClass, List<ToolSpecification> toolSpecifications) {
+        super(source);
+        this.aiServiceClass = aiServiceClass;
+        this.toolSpecifications = toolSpecifications;
+    }
+
+    public Class<?> getAiServiceClass() {
+        return aiServiceClass;
+    }
+
+    public List<ToolSpecification> getToolSpecifications() {
+        return toolSpecifications;
+    }
+}

langchain4j-spring-boot-starter/src/test/java/dev/langchain4j/service/spring/mode/automatic/withTools/AiServiceWithToolsApplication.java

@@ -1,12 +1,29 @@
 package dev.langchain4j.service.spring.mode.automatic.withTools;
 
+import dev.langchain4j.agent.tool.ToolSpecification;
+import dev.langchain4j.service.spring.event.AiServiceRegisteredEvent;
+import dev.langchain4j.service.spring.mode.automatic.withTools.listener.AbstractApplicationListener;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Import;
 
+import java.util.List;
+
+@Import(AbstractApplicationListener.class)
 @SpringBootApplication
-class AiServiceWithToolsApplication {
+class AiServiceWithToolsApplication implements ApplicationListener<AiServiceRegisteredEvent> {
 
     public static void main(String[] args) {
         SpringApplication.run(AiServiceWithToolsApplication.class, args);
     }
+
+    @Override
+    public void onApplicationEvent(AiServiceRegisteredEvent event) {
+        Class<?> aiServiceClass = event.getAiServiceClass();
+        List<ToolSpecification> toolSpecifications = event.getToolSpecifications();
+        for (int i = 0; i < toolSpecifications.size(); i++) {
+            System.out.printf("[%s]: [Tool-%s]: %s%n", aiServiceClass.getSimpleName(), i + 1, toolSpecifications.get(i));
+        }
+    }
 }

langchain4j-spring-boot-starter/src/test/java/dev/langchain4j/service/spring/mode/automatic/withTools/AiServicesAutoConfigIT.java

@@ -1,11 +1,16 @@
 package dev.langchain4j.service.spring.mode.automatic.withTools;
 
+import dev.langchain4j.agent.tool.ToolSpecification;
 import dev.langchain4j.service.spring.AiServicesAutoConfig;
+import dev.langchain4j.service.spring.event.AiServiceRegisteredEvent;
+import dev.langchain4j.service.spring.mode.automatic.withTools.listener.AiServiceRegisteredEventListener;
 import dev.langchain4j.service.spring.mode.automatic.withTools.aop.ToolObserverAspect;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
+import java.util.List;
+
 import static dev.langchain4j.service.spring.mode.ApiKeys.OPENAI_API_KEY;
 import static dev.langchain4j.service.spring.mode.automatic.withTools.AopEnhancedTools.TOOL_OBSERVER_KEY;
 import static dev.langchain4j.service.spring.mode.automatic.withTools.AopEnhancedTools.TOOL_OBSERVER_KEY_NAME_DESCRIPTION;
@@ -15,6 +20,7 @@
 import static dev.langchain4j.service.spring.mode.automatic.withTools.PublicTools.CURRENT_DATE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -69,6 +75,30 @@ void should_create_AI_service_with_tool_that_is_package_private_method_in_packag
                 });
     }
 
+    @Test
+    void should_receive_ai_service_registered_event() {
+        contextRunner
+                .withUserConfiguration(AiServiceWithToolsApplication.class)
+                .run(context -> {
+
+                    // given
+                    AiServiceRegisteredEventListener listener = context.getBean(AiServiceRegisteredEventListener.class);
+
+                    // then should receive AiServiceRegisteredEvent
+                    assertTrue(listener.isEventReceived());
+                    assertEquals(1, listener.getReceivedEvents().size());
+
+                    AiServiceRegisteredEvent event = listener.getReceivedEvents().stream().findFirst().orElse(null);
+                    assertNotNull(event);
+                    assertEquals(AiServiceWithTools.class, event.getAiServiceClass());
+                    assertEquals(2, event.getToolSpecifications().size());
+
+                    List<String> tools = event.getToolSpecifications().stream().map(ToolSpecification::name).toList();
+                    assertTrue(tools.contains("getCurrentDate"));
+                    assertTrue(tools.contains("getCurrentTime"));
+                 });
+     }
+
     @Test
     void should_create_AI_service_with_tool_which_is_enhanced_by_spring_aop() {
         contextRunner
@@ -80,7 +110,7 @@ void should_create_AI_service_with_tool_which_is_enhanced_by_spring_aop() {
                 )
                 .withUserConfiguration(AiServiceWithToolsApplication.class)
                 .run(context -> {
-
+                  
                     // given
                     AiServiceWithTools aiService = context.getBean(AiServiceWithTools.class);
 
@@ -114,4 +144,4 @@ void should_create_AI_service_with_tool_which_is_enhanced_by_spring_aop() {
     // TODO no @AiServices in app, just models
     // TODO @AiServices as inner class?
     // TODO streaming, memory, tools, etc
-}
+}

langchain4j-spring-boot-starter/src/test/java/dev/langchain4j/service/spring/mode/automatic/withTools/listener/AbstractApplicationListener.java

@@ -0,0 +1,32 @@
+package dev.langchain4j.service.spring.mode.automatic.withTools.listener;
+
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AbstractApplicationListener<E extends ApplicationEvent> implements ApplicationListener<E> {
+
+    private boolean eventReceived = false;
+    private final List<E> receivedEvents = new ArrayList<>();
+
+    @Override
+    public void onApplicationEvent(E event) {
+        eventReceived = true;
+        receivedEvents.add(event);
+    }
+
+    public List<E> getReceivedEvents() {
+        return receivedEvents;
+    }
+
+    public boolean isEventReceived() {
+        return eventReceived;
+    }
+
+    public void reset() {
+        eventReceived = false;
+        receivedEvents.clear();
+    }
+}

langchain4j-spring-boot-starter/src/test/java/dev/langchain4j/service/spring/mode/automatic/withTools/listener/AiServiceRegisteredEventListener.java

@@ -0,0 +1,7 @@
+package dev.langchain4j.service.spring.mode.automatic.withTools.listener;
+
+import dev.langchain4j.service.spring.event.AiServiceRegisteredEvent;
+import org.springframework.stereotype.Component;
+@Component
+public class AiServiceRegisteredEventListener extends AbstractApplicationListener<AiServiceRegisteredEvent> {
+}