Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,19 @@

import java.lang.reflect.Method;
import java.util.function.Predicate;
import java.util.regex.Pattern;

import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

public class ProvidrerUtils {
public class McpProviderUtils {

private static final Pattern URI_VARIABLE_PATTERN = Pattern.compile("\\{([^/]+?)\\}");

public static boolean isUriTemplate(String uri) {
return URI_VARIABLE_PATTERN.matcher(uri).find();
}

public final static Predicate<Method> isReactiveReturnType = method -> Mono.class
.isAssignableFrom(method.getReturnType()) || Flux.class.isAssignableFrom(method.getReturnType())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,23 @@

import java.lang.reflect.Method;
import java.util.List;
import java.util.Objects;
import java.util.function.BiFunction;
import java.util.stream.Stream;

import org.reactivestreams.Publisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springaicommunity.mcp.annotation.McpResource;
import org.springaicommunity.mcp.method.resource.AsyncMcpResourceMethodCallback;

import io.modelcontextprotocol.server.McpAsyncServerExchange;
import io.modelcontextprotocol.server.McpServerFeatures.AsyncResourceSpecification;
import io.modelcontextprotocol.server.McpServerFeatures.AsyncResourceTemplateSpecification;
import io.modelcontextprotocol.spec.McpSchema;
import io.modelcontextprotocol.spec.McpSchema.ReadResourceRequest;
import io.modelcontextprotocol.spec.McpSchema.ReadResourceResult;
import io.modelcontextprotocol.util.Assert;
import org.reactivestreams.Publisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springaicommunity.mcp.annotation.McpResource;
import org.springaicommunity.mcp.method.resource.AsyncMcpResourceMethodCallback;
import org.springaicommunity.mcp.provider.McpProviderUtils;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down Expand Up @@ -79,6 +81,11 @@ public List<AsyncResourceSpecification> getResourceSpecifications() {
var resourceAnnotation = doGetMcpResourceAnnotation(mcpResourceMethod);

var uri = resourceAnnotation.uri();

if (McpProviderUtils.isUriTemplate(uri)) {
return null;
}

var name = getName(mcpResourceMethod, resourceAnnotation);
var description = resourceAnnotation.description();
var mimeType = resourceAnnotation.mimeType();
Expand All @@ -101,6 +108,60 @@ public List<AsyncResourceSpecification> getResourceSpecifications() {

return resourceSpec;
})
.filter(Objects::nonNull)
.toList())
.flatMap(List::stream)
.toList();

if (resourceSpecs.isEmpty()) {
logger.warn("No resource methods found in the provided resource objects: {}", this.resourceObjects);
}

return resourceSpecs;
}

public List<AsyncResourceTemplateSpecification> getResourceTemplateSpecifications() {

List<AsyncResourceTemplateSpecification> resourceSpecs = this.resourceObjects.stream()
.map(resourceObject -> Stream.of(doGetClassMethods(resourceObject))
.filter(method -> method.isAnnotationPresent(McpResource.class))
.filter(method -> Mono.class.isAssignableFrom(method.getReturnType())
|| Flux.class.isAssignableFrom(method.getReturnType())
|| Publisher.class.isAssignableFrom(method.getReturnType()))
.sorted((m1, m2) -> m1.getName().compareTo(m2.getName()))
.map(mcpResourceMethod -> {

var resourceAnnotation = doGetMcpResourceAnnotation(mcpResourceMethod);

var uri = resourceAnnotation.uri();

if (!McpProviderUtils.isUriTemplate(uri)) {
return null;
}

var name = getName(mcpResourceMethod, resourceAnnotation);
var description = resourceAnnotation.description();
var mimeType = resourceAnnotation.mimeType();

var mcpResourceTemplate = McpSchema.ResourceTemplate.builder()
.uriTemplate(uri)
.name(name)
.description(description)
.mimeType(mimeType)
.build();

BiFunction<McpAsyncServerExchange, ReadResourceRequest, Mono<ReadResourceResult>> methodCallback = AsyncMcpResourceMethodCallback
.builder()
.method(mcpResourceMethod)
.bean(resourceObject)
.resource(mcpResourceTemplate)
.build();

var resourceSpec = new AsyncResourceTemplateSpecification(mcpResourceTemplate, methodCallback);

return resourceSpec;
})
.filter(Objects::nonNull)
.toList())
.flatMap(List::stream)
.toList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.lang.reflect.Method;
import java.util.List;
import java.util.Objects;
import java.util.function.BiFunction;
import java.util.stream.Stream;

Expand All @@ -26,8 +27,9 @@
import org.slf4j.LoggerFactory;
import org.springaicommunity.mcp.annotation.McpResource;
import org.springaicommunity.mcp.method.resource.AsyncStatelessMcpResourceMethodCallback;

import org.springaicommunity.mcp.provider.McpProviderUtils;
import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncResourceSpecification;
import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncResourceTemplateSpecification;
import io.modelcontextprotocol.common.McpTransportContext;
import io.modelcontextprotocol.spec.McpSchema;
import io.modelcontextprotocol.spec.McpSchema.ReadResourceRequest;
Expand Down Expand Up @@ -79,6 +81,11 @@ public List<AsyncResourceSpecification> getResourceSpecifications() {
var resourceAnnotation = doGetMcpResourceAnnotation(mcpResourceMethod);

var uri = resourceAnnotation.uri();

if (McpProviderUtils.isUriTemplate(uri)) {
return null;
}

var name = getName(mcpResourceMethod, resourceAnnotation);
var description = resourceAnnotation.description();
var mimeType = resourceAnnotation.mimeType();
Expand All @@ -101,6 +108,60 @@ public List<AsyncResourceSpecification> getResourceSpecifications() {

return resourceSpec;
})
.filter(Objects::nonNull)
.toList())
.flatMap(List::stream)
.toList();

if (resourceSpecs.isEmpty()) {
logger.warn("No resource methods found in the provided resource objects: {}", this.resourceObjects);
}

return resourceSpecs;
}

public List<AsyncResourceTemplateSpecification> getResourceTemplateSpecifications() {

List<AsyncResourceTemplateSpecification> resourceSpecs = this.resourceObjects.stream()
.map(resourceObject -> Stream.of(doGetClassMethods(resourceObject))
.filter(method -> method.isAnnotationPresent(McpResource.class))
.filter(method -> Mono.class.isAssignableFrom(method.getReturnType())
|| Flux.class.isAssignableFrom(method.getReturnType())
|| Publisher.class.isAssignableFrom(method.getReturnType()))
.sorted((m1, m2) -> m1.getName().compareTo(m2.getName()))
.map(mcpResourceMethod -> {

var resourceAnnotation = doGetMcpResourceAnnotation(mcpResourceMethod);

var uri = resourceAnnotation.uri();

if (!McpProviderUtils.isUriTemplate(uri)) {
return null;
}

var name = getName(mcpResourceMethod, resourceAnnotation);
var description = resourceAnnotation.description();
var mimeType = resourceAnnotation.mimeType();

var mcpResource = McpSchema.ResourceTemplate.builder()
.uriTemplate(uri)
.name(name)
.description(description)
.mimeType(mimeType)
.build();

BiFunction<McpTransportContext, ReadResourceRequest, Mono<ReadResourceResult>> methodCallback = AsyncStatelessMcpResourceMethodCallback
.builder()
.method(mcpResourceMethod)
.bean(resourceObject)
.resource(mcpResource)
.build();

var resourceSpec = new AsyncResourceTemplateSpecification(mcpResource, methodCallback);

return resourceSpec;
})
.filter(Objects::nonNull)
.toList())
.flatMap(List::stream)
.toList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@

import java.lang.reflect.Method;
import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;

import org.springaicommunity.mcp.annotation.McpResource;
import org.springaicommunity.mcp.method.resource.SyncMcpResourceMethodCallback;

import org.springaicommunity.mcp.provider.McpProviderUtils;
import io.modelcontextprotocol.server.McpServerFeatures.SyncResourceSpecification;
import io.modelcontextprotocol.server.McpServerFeatures.SyncResourceTemplateSpecification;
import io.modelcontextprotocol.spec.McpSchema;
import io.modelcontextprotocol.util.Assert;
import reactor.core.publisher.Mono;
Expand All @@ -50,6 +52,11 @@ public List<SyncResourceSpecification> getResourceSpecifications() {
var resourceAnnotation = mcpResourceMethod.getAnnotation(McpResource.class);

var uri = resourceAnnotation.uri();

if (McpProviderUtils.isUriTemplate(uri)) {
return null;
}

var name = getName(mcpResourceMethod, resourceAnnotation);
var description = resourceAnnotation.description();
var mimeType = resourceAnnotation.mimeType();
Expand All @@ -69,6 +76,50 @@ public List<SyncResourceSpecification> getResourceSpecifications() {

return new SyncResourceSpecification(mcpResource, methodCallback);
})
.filter(Objects::nonNull)
.toList())
.flatMap(List::stream)
.toList();

return methodCallbacks;
}

public List<SyncResourceTemplateSpecification> getResourceTemplateSpecifications() {

List<SyncResourceTemplateSpecification> methodCallbacks = this.resourceObjects.stream()
.map(resourceObject -> Stream.of(this.doGetClassMethods(resourceObject))
.filter(resourceMethod -> resourceMethod.isAnnotationPresent(McpResource.class))
.filter(method -> !Mono.class.isAssignableFrom(method.getReturnType()))
.sorted((m1, m2) -> m1.getName().compareTo(m2.getName()))
.map(mcpResourceMethod -> {
var resourceAnnotation = mcpResourceMethod.getAnnotation(McpResource.class);

var uri = resourceAnnotation.uri();

if (!McpProviderUtils.isUriTemplate(uri)) {
return null;
}

var name = getName(mcpResourceMethod, resourceAnnotation);
var description = resourceAnnotation.description();
var mimeType = resourceAnnotation.mimeType();

var mcpResourceTemplate = McpSchema.ResourceTemplate.builder()
.uriTemplate(uri)
.name(name)
.description(description)
.mimeType(mimeType)
.build();

var methodCallback = SyncMcpResourceMethodCallback.builder()
.method(mcpResourceMethod)
.bean(resourceObject)
.resource(mcpResourceTemplate)
.build();

return new SyncResourceTemplateSpecification(mcpResourceTemplate, methodCallback);
})
.filter(Objects::nonNull)
.toList())
.flatMap(List::stream)
.toList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@

import java.lang.reflect.Method;
import java.util.List;
import java.util.Objects;
import java.util.function.BiFunction;
import java.util.stream.Stream;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springaicommunity.mcp.annotation.McpResource;
import org.springaicommunity.mcp.method.resource.SyncStatelessMcpResourceMethodCallback;

import org.springaicommunity.mcp.provider.McpProviderUtils;
import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncResourceTemplateSpecification;
import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncResourceSpecification;
import io.modelcontextprotocol.common.McpTransportContext;
import io.modelcontextprotocol.spec.McpSchema;
Expand Down Expand Up @@ -75,6 +77,11 @@ public List<SyncResourceSpecification> getResourceSpecifications() {
var resourceAnnotation = doGetMcpResourceAnnotation(mcpResourceMethod);

var uri = resourceAnnotation.uri();

if (McpProviderUtils.isUriTemplate(uri)) {
return null;
}

var name = getName(mcpResourceMethod, resourceAnnotation);
var description = resourceAnnotation.description();
var mimeType = resourceAnnotation.mimeType();
Expand All @@ -97,6 +104,58 @@ public List<SyncResourceSpecification> getResourceSpecifications() {

return resourceSpec;
})
.filter(Objects::nonNull)
.toList())
.flatMap(List::stream)
.toList();

if (resourceSpecs.isEmpty()) {
logger.warn("No resource methods found in the provided resource objects: {}", this.resourceObjects);
}

return resourceSpecs;
}

public List<SyncResourceTemplateSpecification> getResourceTemplateSpecifications() {

List<SyncResourceTemplateSpecification> resourceSpecs = this.resourceObjects.stream()
.map(resourceObject -> Stream.of(doGetClassMethods(resourceObject))
.filter(method -> method.isAnnotationPresent(McpResource.class))
.filter(method -> !Mono.class.isAssignableFrom(method.getReturnType()))
.sorted((m1, m2) -> m1.getName().compareTo(m2.getName()))
.map(mcpResourceMethod -> {

var resourceAnnotation = doGetMcpResourceAnnotation(mcpResourceMethod);

var uri = resourceAnnotation.uri();

if (!McpProviderUtils.isUriTemplate(uri)) {
return null;
}

var name = getName(mcpResourceMethod, resourceAnnotation);
var description = resourceAnnotation.description();
var mimeType = resourceAnnotation.mimeType();

var mcpResource = McpSchema.ResourceTemplate.builder()
.uriTemplate(uri)
.name(name)
.description(description)
.mimeType(mimeType)
.build();

BiFunction<McpTransportContext, ReadResourceRequest, ReadResourceResult> methodCallback = SyncStatelessMcpResourceMethodCallback
.builder()
.method(mcpResourceMethod)
.bean(resourceObject)
.resource(mcpResource)
.build();

var resourceSpec = new SyncResourceTemplateSpecification(mcpResource, methodCallback);

return resourceSpec;
})
.filter(Objects::nonNull)
.toList())
.flatMap(List::stream)
.toList();
Expand Down
Loading