Skip to content

Commit c843da5

Browse files
authored
[ISSUE #15463] fix(ai): support nested Skill packages during upload (#15464)
* fix(ai): support nested skill resources in upload * build: exclude generated and test-only files from checks * build(console): update next static assets
1 parent 5c3a246 commit c843da5

69 files changed

Lines changed: 379 additions & 130 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ai/src/main/java/com/alibaba/nacos/ai/utils/SkillZipParser.java‎

Lines changed: 97 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ public class SkillZipParser {
5959
private static final char UTF8_BOM = '\uFEFF';
6060
/** macOS AppleDouble/resource fork metadata file prefix (e.g. ._LICENSE.txt). Should be excluded from skill zip. */
6161
private static final String MACOS_METADATA_PREFIX = "._";
62+
private static final String MACOS_DS_STORE_FILE = ".DS_Store";
63+
private static final String MACOSX_DIRECTORY = "__MACOSX";
6264
private static final String DOUBLE_QUOTE = "\"";
6365
private static final String SINGLE_QUOTE = "'";
6466
private static final String DOUBLE_SINGLE_QUOTE = "''";
6567
private static final String BACKSLASH = "\\";
6668
private static final String DOUBLE_BACKSLASH = "\\\\";
6769
private static final String ESCAPED_DOUBLE_QUOTE = "\\\"";
6870
private static final String SLASH = "/";
69-
private static final String DOT = ".";
7071
/**
7172
* Metadata key for binary resources: value "base64" means content is Base64-encoded.
7273
* Kept as constants on this class for backward compatibility with existing callers
@@ -218,30 +219,24 @@ public static Skill parseSkillFromZip(byte[] zipBytes, String namespaceId)
218219
}
219220
try {
220221
List<ZipEntryData> entries = unzipToEntries(zipBytes);
221-
String skillMdContent = null;
222-
for (ZipEntryData entry : entries) {
223-
String name = entry.name;
224-
if (isMacOsMetadataFile(name)) {
225-
continue;
226-
}
227-
boolean isSkillMdFile = SKILL_MD_FILE.equals(name);
228-
boolean isSkillMdInSubdir = name.endsWith(SLASH + SKILL_MD_FILE);
229-
boolean endsWithSkillMd = name.endsWith(SKILL_MD_FILE);
230-
boolean isSkillMd = isSkillMdFile || isSkillMdInSubdir;
231-
if (endsWithSkillMd && isSkillMd) {
232-
skillMdContent = stripBom(new String(entry.data, StandardCharsets.UTF_8));
233-
break;
234-
}
222+
ZipEntryData skillMdEntry = findSkillMdEntry(entries);
223+
if (skillMdEntry == null) {
224+
throw new NacosApiException(NacosApiException.INVALID_PARAM,
225+
ErrorCode.PARAMETER_VALIDATE_ERROR,
226+
"SKILL.md file not found in zip");
235227
}
236-
228+
String skillMdContent = stripBom(new String(skillMdEntry.data, StandardCharsets.UTF_8));
237229
if (StringUtils.isBlank(skillMdContent)) {
238230
throw new NacosApiException(NacosApiException.INVALID_PARAM,
239231
ErrorCode.PARAMETER_VALIDATE_ERROR,
240232
"SKILL.md file not found in zip");
241233
}
242234

243235
Skill skill = parseSkillMarkdown(skillMdContent, namespaceId);
244-
Map<String, SkillResource> resources = parseResources(entries, skill.getName());
236+
List<ZipEntryData> resourceEntries =
237+
filterEntriesByPrefix(entries, getSkillPrefix(skillMdEntry.name));
238+
Map<String, SkillResource> resources =
239+
parseResources(resourceEntries, skill.getName(), SKILL_MD_FILE);
245240
skill.setResource(resources);
246241

247242
return skill;
@@ -294,27 +289,28 @@ public static MultiSkillParseResult parseMultipleSkillsFromZip(byte[] zipBytes,
294289
List<ZipEntryData> entries = unzipToEntries(zipBytes);
295290

296291
// Find all SKILL.md entries and group by their parent directory
297-
List<ZipEntryData> skillMdEntries = new ArrayList<>();
292+
List<ZipEntryData> allSkillMdEntries = new ArrayList<>();
298293
for (ZipEntryData entry : entries) {
299294
String name = entry.name;
300-
if (isMacOsMetadataFile(name)) {
295+
if (isIgnoredZipMetadataEntry(name)) {
301296
continue;
302297
}
303-
boolean isSkillMdFile = SKILL_MD_FILE.equals(name);
304-
boolean isSkillMdInSubdir = name.endsWith(SLASH + SKILL_MD_FILE);
305-
if (isSkillMdFile || isSkillMdInSubdir) {
306-
skillMdEntries.add(entry);
298+
if (isSkillMdEntryName(name)) {
299+
allSkillMdEntries.add(entry);
307300
}
308301
}
309302

310-
if (skillMdEntries.isEmpty()) {
303+
if (allSkillMdEntries.isEmpty()) {
311304
throw new NacosApiException(NacosApiException.INVALID_PARAM,
312305
ErrorCode.PARAMETER_VALIDATE_ERROR,
313306
"SKILL.md file not found in zip");
314307
}
308+
List<ZipEntryData> skillMdEntries =
309+
filterNestedSkillMdEntries(allSkillMdEntries);
315310

316-
// If only one SKILL.md, delegate to single-skill parsing (preserves existing behavior)
317-
if (skillMdEntries.size() == 1) {
311+
// A root SKILL.md means the archive is one nested Skill package; nested SKILL.md files
312+
// are ordinary resources. Preserve the existing single-skill behavior for one package.
313+
if (containsRootSkillMdEntry(skillMdEntries) || allSkillMdEntries.size() == 1) {
318314
MultiSkillParseResult result = new MultiSkillParseResult();
319315
result.addSkill(parseSkillFromZip(zipBytes, namespaceId));
320316
return result;
@@ -378,7 +374,7 @@ public static MultiSkillParseResult parseMultipleSkillsFromZip(byte[] zipBytes,
378374
// Filter entries belonging to this skill's directory
379375
List<ZipEntryData> scopedEntries = filterEntriesByPrefix(entries, prefix);
380376
Map<String, SkillResource> resources =
381-
parseResources(scopedEntries, skill.getName());
377+
parseResources(scopedEntries, skill.getName(), SKILL_MD_FILE);
382378
skill.setResource(resources);
383379
parseResult.addSkill(skill);
384380
} catch (Exception e) {
@@ -415,6 +411,40 @@ private static String getSkillPrefix(String skillMdPath) {
415411
return skillMdPath.substring(0, lastSlash + 1);
416412
}
417413

414+
private static List<ZipEntryData> filterNestedSkillMdEntries(
415+
List<ZipEntryData> skillMdEntries) {
416+
Set<String> skillPrefixes = new HashSet<>();
417+
for (ZipEntryData skillMdEntry : skillMdEntries) {
418+
skillPrefixes.add(getSkillPrefix(skillMdEntry.name));
419+
}
420+
List<ZipEntryData> result = new ArrayList<>();
421+
for (ZipEntryData skillMdEntry : skillMdEntries) {
422+
String prefix = getSkillPrefix(skillMdEntry.name);
423+
if (!hasAncestorSkillPrefix(prefix, skillPrefixes)) {
424+
result.add(skillMdEntry);
425+
}
426+
}
427+
return result;
428+
}
429+
430+
private static boolean hasAncestorSkillPrefix(String prefix, Set<String> skillPrefixes) {
431+
if (StringUtils.isBlank(prefix)) {
432+
return false;
433+
}
434+
if (skillPrefixes.contains("")) {
435+
return true;
436+
}
437+
for (String candidate : skillPrefixes) {
438+
if (StringUtils.isBlank(candidate) || candidate.equals(prefix)) {
439+
continue;
440+
}
441+
if (prefix.startsWith(candidate)) {
442+
return true;
443+
}
444+
}
445+
return false;
446+
}
447+
418448
/**
419449
* Filter entries by directory prefix and strip the prefix from entry names.
420450
*/
@@ -473,9 +503,7 @@ private static List<ZipEntryData> unzipToEntries(byte[] zipBytes) throws IOExcep
473503
String name = entry.getName();
474504
// Security: reject path traversal and absolute paths
475505
SkillUtils.validatePathSafety(name);
476-
boolean isMacOsxEntry =
477-
name != null && (name.contains("__MACOSX") || name.contains("/__MACOSX/"));
478-
if (isMacOsxEntry) {
506+
if (isIgnoredZipMetadataEntry(name)) {
479507
continue;
480508
}
481509
if (result.size() >= maxEntries) {
@@ -552,19 +580,35 @@ private static ZipEntryData findSkillMdEntry(List<ZipEntryData> entries) {
552580
if (entries == null || entries.isEmpty()) {
553581
return null;
554582
}
583+
List<ZipEntryData> skillMdEntries = new ArrayList<>();
555584
for (ZipEntryData entry : entries) {
556585
String name = entry.name;
557-
if (isMacOsMetadataFile(name)) {
586+
if (isIgnoredZipMetadataEntry(name)) {
558587
continue;
559588
}
560-
boolean isSkillMdFile = SKILL_MD_FILE.equals(name);
561-
boolean isSkillMdInSubdir = name.endsWith(SLASH + SKILL_MD_FILE);
562-
boolean endsWithSkillMd = name.endsWith(SKILL_MD_FILE);
563-
if (endsWithSkillMd && (isSkillMdFile || isSkillMdInSubdir)) {
564-
return entry;
589+
if (isSkillMdEntryName(name)) {
590+
skillMdEntries.add(entry);
565591
}
566592
}
567-
return null;
593+
List<ZipEntryData> rootSkillMdEntries = filterNestedSkillMdEntries(skillMdEntries);
594+
return rootSkillMdEntries.isEmpty() ? null : rootSkillMdEntries.get(0);
595+
}
596+
597+
private static boolean containsRootSkillMdEntry(List<ZipEntryData> entries) {
598+
if (entries == null || entries.isEmpty()) {
599+
return false;
600+
}
601+
for (ZipEntryData entry : entries) {
602+
if (SKILL_MD_FILE.equals(entry.name)) {
603+
return true;
604+
}
605+
}
606+
return false;
607+
}
608+
609+
private static boolean isSkillMdEntryName(String name) {
610+
return SKILL_MD_FILE.equals(name)
611+
|| (name != null && name.endsWith(SLASH + SKILL_MD_FILE));
568612
}
569613

570614
private static String buildSiblingMetaJsonPath(String skillMdPath) {
@@ -594,15 +638,15 @@ private static ZipEntryData findEntryByPath(List<ZipEntryData> entries, String t
594638
* Parse resources from zip entries. Text files use UTF-8 content; binary (by extension) use Base64 content and metadata encoding=base64.
595639
*/
596640
private static Map<String, SkillResource> parseResources(List<ZipEntryData> entries,
597-
String skillName) {
641+
String skillName, String descriptorPath) {
598642
Map<String, SkillResource> resources = new HashMap<>(16);
599643

600644
for (ZipEntryData entry : entries) {
601645
String itemName = entry.name;
602-
if (isMacOsMetadataFile(itemName)) {
646+
if (isIgnoredZipMetadataEntry(itemName)) {
603647
continue;
604648
}
605-
if (itemName.endsWith(SKILL_MD_FILE) || itemName.endsWith("/")) {
649+
if (descriptorPath.equals(itemName) || itemName.endsWith("/")) {
606650
continue;
607651
}
608652

@@ -814,7 +858,17 @@ private static boolean isMacOsMetadataFile(String itemName) {
814858
}
815859
int lastSlash = itemName.lastIndexOf('/');
816860
String fileName = lastSlash >= 0 ? itemName.substring(lastSlash + 1) : itemName;
817-
return fileName.startsWith(MACOS_METADATA_PREFIX);
861+
return fileName.startsWith(MACOS_METADATA_PREFIX)
862+
|| MACOS_DS_STORE_FILE.equals(fileName);
863+
}
864+
865+
private static boolean isIgnoredZipMetadataEntry(String itemName) {
866+
if (StringUtils.isBlank(itemName)) {
867+
return false;
868+
}
869+
return itemName.equals(MACOSX_DIRECTORY) || itemName.startsWith(MACOSX_DIRECTORY + SLASH)
870+
|| itemName.contains(SLASH + MACOSX_DIRECTORY + SLASH)
871+
|| isMacOsMetadataFile(itemName);
818872
}
819873

820874
/**
@@ -826,7 +880,8 @@ private static boolean isIgnorableDirectory(String dirName) {
826880
// Check the last segment for dot-prefixed or known non-skill directories
827881
int lastSlash = name.lastIndexOf('/');
828882
String leaf = lastSlash >= 0 ? name.substring(lastSlash + 1) : name;
829-
return leaf.startsWith(".") || "__MACOSX".equals(leaf) || "node_modules".equals(leaf);
883+
return leaf.startsWith(".") || MACOSX_DIRECTORY.equals(leaf)
884+
|| "node_modules".equals(leaf);
830885
}
831886

832887
/**

0 commit comments

Comments
 (0)