Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AiService support @Profile #41

Merged
merged 5 commits into from
Sep 18, 2024
Merged

AiService support @Profile #41

merged 5 commits into from
Sep 18, 2024

Conversation

Martin7-1
Copy link
Contributor

Close langchain4j#1430

  1. Support @AiService with @Profile.

langchain4j
langchain4j reviewed Sep 11, 2024
View reviewed changes
Copy link
Owner

@langchain4j langchain4j left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Martin7-1 thank you!

...j-spring-boot-starter/src/main/java/dev/langchain4j/service/spring/AiServicesAutoConfig.java Outdated
if (aiServiceClass.isAnnotationPresent(Profile.class)) {
Profile profileAnnotation = aiServiceClass.getAnnotation(Profile.class);
String[] profiles = profileAnnotation.value();
if (!environment.matchesProfiles(profiles)) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this filtering really required twice? (also in AiServiceScannerProcessor)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm.. Good question. Maybe we only need to filter it in AiServiceScannerProcessor to skip scanning the BeanDefinition with AiService.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Now only the AiServiceScannerProcessor do filtering with @Profile

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to filter only in AiServicesAutoConfig?
AiServiceScannerProcessor is dealing with packages for scanning, AiServicesAutoConfig is the one who decides if @AiService bean should be created or not

langchain4j
langchain4j reviewed Sep 17, 2024
View reviewed changes
...j-spring-boot-starter/src/main/java/dev/langchain4j/service/spring/AiServicesAutoConfig.java Outdated Show resolved Hide resolved
...j-spring-boot-starter/src/main/java/dev/langchain4j/service/spring/AiServicesAutoConfig.java Outdated Show resolved Hide resolved
...j-spring-boot-starter/src/main/java/dev/langchain4j/service/spring/AiServicesAutoConfig.java Outdated Show resolved Hide resolved
...j-spring-boot-starter/src/main/java/dev/langchain4j/service/spring/AiServicesAutoConfig.java Outdated
if (aiServiceClass.isAnnotationPresent(Profile.class)) {
Profile profileAnnotation = aiServiceClass.getAnnotation(Profile.class);
String[] profiles = profileAnnotation.value();
if (!environment.matchesProfiles(profiles)) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to filter only in AiServicesAutoConfig?
AiServiceScannerProcessor is dealing with packages for scanning, AiServicesAutoConfig is the one who decides if @AiService bean should be created or not

@Martin7-1
Copy link
Contributor Author

Martin7-1 commented Sep 17, 2024 •
edited
Loading

@langchain4j At first I did want to do filtering in AiServiceAutoConfig, but when I implemented it I ran into: Failed to instantiate [dev.langchain4j.service.spring.mode.automatic.withProfiles. AiServiceWithProfiles]: Specified class is an interface. It seems that Spring Boot still wants to find an implementation of @AiService and register it. so I think we should filter it during the registration phase of the BeanDefinition.

I haven't found a way to do this in AiServiceAutoConfig yet, let me know if you know one.

langchain4j
langchain4j approved these changes Sep 18, 2024
View reviewed changes
Copy link
Owner

@langchain4j langchain4j left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Martin7-1 great job, thank you!

...ing-boot-starter/src/main/java/dev/langchain4j/service/spring/AiServiceScannerProcessor.java Outdated Show resolved Hide resolved
...ing-boot-starter/src/main/java/dev/langchain4j/service/spring/AiServiceScannerProcessor.java Outdated Show resolved Hide resolved
@langchain4j langchain4j merged commit 3648f2c into langchain4j:main Sep 18, 2024
0 of 5 checks passed
langchain4j added a commit that referenced this pull request Sep 18, 2024
@langchain4j
AiService support @Profile (#41)
cb78ad3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@langchain4j langchain4j langchain4j approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG] @AiService cannot be used along with the @Profile annotation
2 participants
@Martin7-1 @langchain4j