Skip to content

support multiple template completion param values and CompleteContext #32

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

Open
jwflicker wants to merge 1 commit into
base: main
Choose a base branch
from
Open

support multiple template completion param values and CompleteContext #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion ...ain/java/org/springaicommunity/mcp/method/complete/AbstractMcpCompleteMethodCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ protected void validateParameters(Method method) {
boolean hasExchangeParam = false;
boolean hasRequestParam = false;
boolean hasArgumentParam = false;
boolean hasContextParam = false;
boolean hasProgressTokenParam = false;
boolean hasMetaParam = false;

Expand Down Expand Up @@ -196,6 +197,13 @@ else if (CompleteRequest.CompleteArgument.class.isAssignableFrom(paramType)) {
}
hasArgumentParam = true;
}
else if (CompleteRequest.CompleteContext.class.isAssignableFrom(paramType)) {
if (hasContextParam) {
throw new IllegalArgumentException("Method cannot have more than one CompleteContext parameter: "
+ method.getName() + " in " + method.getDeclaringClass().getName());
}
hasContextParam = true;
}
else if (!String.class.isAssignableFrom(paramType)) {
throw new IllegalArgumentException(
"Method parameters must be exchange, CompleteRequest, CompleteArgument, or String: "
Expand All @@ -218,6 +226,7 @@ else if (!String.class.isAssignableFrom(paramType)) {
protected Object[] buildArgs(Method method, Object exchange, CompleteRequest request) {
Parameter[] parameters = method.getParameters();
Object[] args = new Object[parameters.length];
int uriVarIndex = 0;

for (int i = 0; i < parameters.length; i++) {
Parameter param = parameters[i];
Expand All @@ -243,8 +252,20 @@ else if (CompleteRequest.class.isAssignableFrom(paramType)) {
else if (CompleteRequest.CompleteArgument.class.isAssignableFrom(paramType)) {
args[i] = request.argument();
}
else if (CompleteRequest.CompleteContext.class.isAssignableFrom(paramType)) {
args[i] = request.context();
}
else if (String.class.isAssignableFrom(paramType)) {
args[i] = request.argument().value();
//do the string params need to be in same order as in template uri?
//why are the param names arg0, arg1, etc...
String variableName = uriVariables.get(uriVarIndex++);
if (request.argument().name().equals(variableName)) {
args[i] = request.argument().value();
} else if (request.context().arguments().containsKey(variableName)) {
args[i] = request.context().arguments().get(variableName);
} else {
args[i] = null;
}
}
else {
args[i] = null; // For any other parameter types
Expand Down