From 81d61cb02ff1061feb725e189e74ae594da5268a Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Tue, 16 Sep 2025 23:37:19 +0300 Subject: [PATCH] fix for #3 --- .../org/etsi/osl/mcp/server/ProductCatalogTools.java | 2 +- .../org/etsi/osl/mcp/server/ServiceCatalogTools.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/etsi/osl/mcp/server/ProductCatalogTools.java b/src/main/java/org/etsi/osl/mcp/server/ProductCatalogTools.java index f47f159..8d96645 100644 --- a/src/main/java/org/etsi/osl/mcp/server/ProductCatalogTools.java +++ b/src/main/java/org/etsi/osl/mcp/server/ProductCatalogTools.java @@ -177,7 +177,7 @@ public class ProductCatalogTools { // Filter and get result as JSON string try { - String[] tokens = {"id", "name", "description", "isBundle", "@type", "configurable", "valueType", "isBundle" }; + String[] tokens = {"productOfferingId", "productName", "productDescription", "isBundle", "@type", "isBundle", "categoryName" }; JsonNode filtered = JsonMassage.filterJsonByTokens( spec, tokens); return filtered; } catch (Exception e) { diff --git a/src/main/java/org/etsi/osl/mcp/server/ServiceCatalogTools.java b/src/main/java/org/etsi/osl/mcp/server/ServiceCatalogTools.java index 365fb6b..0508f40 100644 --- a/src/main/java/org/etsi/osl/mcp/server/ServiceCatalogTools.java +++ b/src/main/java/org/etsi/osl/mcp/server/ServiceCatalogTools.java @@ -31,10 +31,12 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.etsi.osl.tmf.so641.model.ServiceRestriction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.ai.chat.model.ToolContext; import org.springframework.ai.tool.annotation.Tool; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.ParameterizedTypeReference; +//import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.client.RestClient; import jakarta.validation.Valid; @@ -55,6 +57,13 @@ public class ServiceCatalogTools { ServiceCatalogQClient aCatalogClient; +// @Tool(description="Get your name") +// public String getYourName(ToolContext context) { +// logger.info("ToolContext: {}", McpRequestHolder.get(context).headers()); +// return SecurityContextHolder.getContext().getAuthentication().getName(); +// } + + @Tool(description = "Get a list of all published OSL OpenSlice service catalogs." + "Each catalog contains service categories, that we can search individually to get the details and contents of each category.") public JsonNode getOSLServiceCatalogs() { @@ -191,7 +200,7 @@ public class ServiceCatalogTools { // Filter and get result as JSON string try { - String[] tokens = {"id", "name", "description", "@type", "configurable", "valueType", "isBundle" }; + String[] tokens = {"serviceSpecificationId", "serviceName", "serviceDescription", "@type", "isBundle", "categoryName" }; JsonNode filtered = JsonMassage.filterJsonByTokens( spec, tokens); return filtered; } catch (Exception e) { -- GitLab