diff --git a/cadworld-api/docs/robot-demand-api.md b/cadworld-api/docs/robot-demand-api.md index f3045ed..d315d29 100644 --- a/cadworld-api/docs/robot-demand-api.md +++ b/cadworld-api/docs/robot-demand-api.md @@ -659,6 +659,7 @@ async function sendMessage(token, conversationId, message, onEvent, signal) { - “换个头”替换现有头部;“换个腿”替换整组 LEG 实例,包括左右及中性组件;“脚”对应 FOOT,不联动替换。 - 纯换件沿用已保存的有效需求,不把模型重新描述的历史要求或“未指定新头部材质、尺寸”等说明当作新增条件;只有当轮明确附带的新要求才参与新增约束校验。 +- “加上左手”“补上左手”“装上右脚”等属于补充部件需求,走普通生成(`operation.type=generate`),不按替换排除现有组件。即使当前方案已经包含该部位,也不能擅自理解为“换成另一个”。 - 换件动作仅在当轮执行,不累计历史目标。例如先“换个头”、再“单独换个左臂”,第二轮只更换左臂;模型重复输出的历史目标会在来源校验后移除,没有当轮有效目标时拒绝执行。 - “换个左臂”只替换左侧全部实例,不为外观配套自动更换右臂;“换第二个左臂”只替换该侧按序号排列的第二个实例。也可在文字中明确当前完整实例编码。 - 多个目标一起选件和校验,排除目标组原组件编码;固定其他组件和父子拓扑,不增加组件,不丢弃原有子组件。新增硬参数必须满足且可验证,已有缺件和未验证项保留,不允许新增硬条件违例或扩大既有数值偏差。 diff --git a/cadworld-api/src/test/java/com/linkerbot/cadworld/api/DemandFlowApiTest.java b/cadworld-api/src/test/java/com/linkerbot/cadworld/api/DemandFlowApiTest.java index 52b413c..3bfc710 100644 --- a/cadworld-api/src/test/java/com/linkerbot/cadworld/api/DemandFlowApiTest.java +++ b/cadworld-api/src/test/java/com/linkerbot/cadworld/api/DemandFlowApiTest.java @@ -1316,6 +1316,61 @@ class DemandFlowApiTest { assertThat(generatedMatch(session, arm.path("analysisId").asText(), 3)).isEqualTo(arm.path("match")); } + @Test void armReplacementUsesTheNewHandPortIndexAndPreservesTheOriginalHand() throws Exception { + defaultHumanoidModel(); humanoidComponents("sided"); + JsonNode fixture; + try (java.io.InputStream stream = getClass().getResourceAsStream("/fixtures/arm-hand-port-shift.json")) { + fixture = json.readTree(stream); + } + jdbc.update("UPDATE component SET urdf_info=? WHERE component_code=?", fixture.path("oldArmInfo").toString(), "CW-ARM_L"); + Session session = create(); JsonNode first = submit(session, "m1", "给我一个人形机器人", List.of()); + JsonNode before = handConnection(first.path("match")); + assertThat(before.path("parentFrameIndex").asInt()).isEqualTo(2); + assertThat(before.path("parentLink").asText()).isEqualTo("LINK2"); + duplicate("CW-ARM_L", "CW-ARM_L-NEW", "臂_L_臂3自由度左"); + jdbc.update("UPDATE component SET urdf_info=? WHERE component_code=?", fixture.path("newArmInfo").toString(), "CW-ARM_L-NEW"); + replacementModel("ARM", "L"); JsonNode replaced = submit(session, "m2", "换个左臂", List.of()); + assertThat(replaced.path("match").path("change").path("status").asText()).isEqualTo("applied"); + JsonNode after = handConnection(replaced.path("match")); + assertThat(after.path("parentFrameIndex").asInt()).isEqualTo(3); + assertThat(after.path("parentLink").asText()).isEqualTo("LINK_3"); + assertThat(after.path("parentFrame").asText()).isEqualTo("LINK_HAND_L"); + assertThat(after.path("childRootLink").asText()).isEqualTo("LINK_HAND_L"); + Map expected = codesByRole(first.path("match")); expected.put("ARM_L:1", "CW-ARM_L-NEW"); + assertThat(codesByRole(replaced.path("match"))).isEqualTo(expected); + assertThat(replaced.path("match").path("components")).hasSize(11); + assertThat(replaced.path("match").path("assembly").path("connections")).hasSize(10); + } + + private JsonNode handConnection(JsonNode match) { + for (JsonNode edge : match.path("assembly").path("connections")) { + if (edge.path("childInstanceId").asText().endsWith(":HAND_L:1")) return edge; + } + throw new AssertionError("缺少左手连接"); + } + + @Test void capturedRealModelAddLeftHandAfterArmReplacementGeneratesInsteadOfReplacing() throws Exception { + defaultHumanoidModel(); humanoidComponents("sided"); + Session session = create(); submit(session, "m1", "给我一个人形机器人", List.of()); + duplicate("CW-HEAD_0", "CW-HEAD_0-NEW", "另一种头部"); replacementModel("HEAD", "all"); + submit(session, "m2", "换个头", List.of()); + duplicate("CW-ARM_L", "CW-ARM_L-NEW", "另一种左臂"); replacementModel("ARM", "L"); + JsonNode replaced = submit(session, "m3", "换个左臂", List.of()); + assertThat(codesByRole(replaced.path("match"))).containsEntry("HAND_L:1", "CW-HAND_L"); + assertThat(replaced.path("match").path("assembly").path("connections").toString()).contains(":HAND_L:1"); + try (java.io.InputStream stream = getClass().getResourceAsStream("/fixtures/add-left-hand-model-output.json")) { + JsonNode captured = json.readTree(stream); + doAnswer(invocation -> captured.deepCopy()).when(model).analyze(anyList()); + } + JsonNode added = submit(session, "m4", "加上左手", List.of()); + assertThat(added.path("result").path("analysis").path("operation").path("type").asText()).isEqualTo("generate"); + assertThat(added.path("match").has("change")).isFalse(); + assertThat(codesByRole(added.path("match"))).containsEntry("HAND_L:1", "CW-HAND_L"); + assertThat(added.path("match").path("assembly").path("connections").toString()).contains(":HAND_L:1"); + assertThat(added.path("match").path("components")).hasSize(11); + assertThat(generatedMatch(session, added.path("analysisId").asText(), 4)).isEqualTo(added.path("match")); + } + @Test void headReplacementIgnoresRestatedHistoryAndInventedMissingParameters() throws Exception { defaultHumanoidModel(); humanoidComponents("sided"); doAnswer(invocation -> { diff --git a/cadworld-api/src/test/resources/fixtures/add-left-hand-model-output.json b/cadworld-api/src/test/resources/fixtures/add-left-hand-model-output.json new file mode 100644 index 0000000..388bd1e --- /dev/null +++ b/cadworld-api/src/test/resources/fixtures/add-left-hand-model-output.json @@ -0,0 +1,180 @@ +{ + "summary": "当前为双足人形机器人方案,按当轮要求配置左手部件。", + "intentItems": [ + { + "id": "intent-1", + "dimension": "form", + "subject": "整机", + "requirement": "为人形构型机器人", + "priority": "must", + "source": "explicit", + "evidenceIds": [ + "obs-1" + ] + }, + { + "id": "intent-2", + "dimension": "quantity", + "subject": "整机", + "requirement": "整机数量为1台", + "priority": "must", + "source": "explicit", + "evidenceIds": [ + "obs-1" + ] + }, + { + "id": "intent-3", + "dimension": "form", + "subject": "左手", + "requirement": "需配置左手部件", + "priority": "must", + "source": "explicit", + "evidenceIds": [ + "obs-4" + ] + } + ], + "images": [], + "observations": [ + { + "id": "obs-1", + "messageId": "m1", + "imageId": "", + "kind": "user_text", + "content": "给我一个人形机器人", + "clarity": "clear", + "region": [] + }, + { + "id": "obs-2", + "messageId": "m2", + "imageId": "", + "kind": "user_text", + "content": "换个头", + "clarity": "clear", + "region": [] + }, + { + "id": "obs-3", + "messageId": "m3", + "imageId": "", + "kind": "user_text", + "content": "换个左臂", + "clarity": "clear", + "region": [] + }, + { + "id": "obs-4", + "messageId": "m4", + "imageId": "", + "kind": "user_text", + "content": "加上左手", + "clarity": "clear", + "region": [] + } + ], + "keywords": [ + { + "term": "人形机器人", + "source": "explicit", + "reason": "", + "negated": false, + "evidenceIds": [ + "obs-1" + ] + }, + { + "term": "双足", + "source": "inferred", + "reason": "人形构型对应双足人形模板", + "negated": false, + "evidenceIds": [ + "obs-1" + ] + }, + { + "term": "左手", + "source": "explicit", + "reason": "", + "negated": false, + "evidenceIds": [ + "obs-4" + ] + } + ], + "robotTypes": [ + { + "type": "biped", + "source": "inferred", + "reason": "用户要求人形机器人,采用双足人形模板", + "evidenceIds": [ + "obs-1" + ] + } + ], + "partCategories": [ + { + "category": "TORSO_0", + "source": "inferred", + "reason": "人形机器人需要躯干", + "evidenceIds": [ + "obs-1" + ] + }, + { + "category": "HEAD_0", + "source": "inferred", + "reason": "人形机器人通常包含头部", + "evidenceIds": [ + "obs-1" + ] + }, + { + "category": "WAIST_0", + "source": "inferred", + "reason": "人形机器人通常包含腰部", + "evidenceIds": [ + "obs-1" + ] + }, + { + "category": "HAND_L", + "source": "explicit", + "reason": "用户明确要求加上左手", + "evidenceIds": [ + "obs-4" + ] + } + ], + "excludedCategories": [], + "constraints": [ + { + "scope": "robot", + "categories": [], + "field": "quantity", + "value": "1", + "upperValue": "", + "operator": "eq", + "evidenceIds": [ + "obs-1" + ] + } + ], + "unmodeled": [], + "questions": [], + "operation": { + "type": "replace", + "targets": [ + { + "family": "HAND", + "side": "L", + "instanceId": "", + "ordinal": "", + "evidenceIds": [ + "obs-4" + ] + } + ] + } +} diff --git a/cadworld-api/src/test/resources/fixtures/consecutive-replacement-model-output.json b/cadworld-api/src/test/resources/fixtures/consecutive-replacement-model-output.json new file mode 100644 index 0000000..2fcd516 --- /dev/null +++ b/cadworld-api/src/test/resources/fixtures/consecutive-replacement-model-output.json @@ -0,0 +1,145 @@ +{ + "summary" : "基于现有双足人形机器人有效方案,替换头部部件,并单独更换左臂部件,保持其余原有构型不变", + "intentItems" : [ { + "id" : "i1", + "dimension" : "form", + "subject" : "整机", + "requirement" : "具备人形双足类人构型", + "priority" : "must", + "source" : "explicit", + "evidenceIds" : [ "o1" ] + } ], + "images" : [ ], + "observations" : [ { + "id" : "o1", + "messageId" : "r1", + "imageId" : "", + "kind" : "user_text", + "content" : "给我一个人形机器人", + "clarity" : "clear", + "region" : [ ] + }, { + "id" : "o2", + "messageId" : "r2", + "imageId" : "", + "kind" : "user_text", + "content" : "换个头", + "clarity" : "clear", + "region" : [ ] + }, { + "id" : "o3", + "messageId" : "r3", + "imageId" : "", + "kind" : "user_text", + "content" : "单独换个左臂", + "clarity" : "clear", + "region" : [ ] + } ], + "keywords" : [ { + "term" : "人形机器人", + "source" : "explicit", + "reason" : "用户明确提出的核心机器人主体需求", + "negated" : false, + "evidenceIds" : [ "o1" ] + }, { + "term" : "双足", + "source" : "inferred", + "reason" : "人形机器人为双足构型,匹配biped模板特征", + "negated" : false, + "evidenceIds" : [ "o1" ] + }, { + "term" : "头部", + "source" : "explicit", + "reason" : "用户要求执行替换操作的目标部件", + "negated" : false, + "evidenceIds" : [ "o2" ] + }, { + "term" : "左臂", + "source" : "explicit", + "reason" : "用户要求单独执行替换操作的目标部件", + "negated" : false, + "evidenceIds" : [ "o3" ] + } ], + "robotTypes" : [ { + "type" : "biped", + "source" : "explicit", + "reason" : "用户要求的人形机器人匹配biped双足机器人模板", + "evidenceIds" : [ "o1" ] + } ], + "partCategories" : [ { + "category" : "TORSO_0", + "source" : "explicit", + "reason" : "biped模板必需的躯干部件,构成机器人主体", + "evidenceIds" : [ "o1" ] + }, { + "category" : "HEAD_0", + "source" : "explicit", + "reason" : "biped模板包含的头部部件,为用户要求的替换目标", + "evidenceIds" : [ "o1", "o2" ] + }, { + "category" : "WAIST_0", + "source" : "explicit", + "reason" : "biped模板必需的腰部部件,连接躯干与下肢", + "evidenceIds" : [ "o1" ] + }, { + "category" : "ARM_L", + "source" : "explicit", + "reason" : "biped模板包含的左臂部件,为用户要求的单独替换目标", + "evidenceIds" : [ "o1", "o3" ] + }, { + "category" : "ARM_R", + "source" : "explicit", + "reason" : "biped模板包含的右臂部件,构成人形双臂结构", + "evidenceIds" : [ "o1" ] + }, { + "category" : "HAND_L", + "source" : "explicit", + "reason" : "biped模板包含的左手部件,匹配左臂末端", + "evidenceIds" : [ "o1" ] + }, { + "category" : "HAND_R", + "source" : "explicit", + "reason" : "biped模板包含的右手部件,匹配右臂末端", + "evidenceIds" : [ "o1" ] + }, { + "category" : "LEG_L", + "source" : "explicit", + "reason" : "biped模板包含的左足部件,构成人形双足行走结构", + "evidenceIds" : [ "o1" ] + }, { + "category" : "LEG_R", + "source" : "explicit", + "reason" : "biped模板包含的右足部件,构成人形双足行走结构", + "evidenceIds" : [ "o1" ] + }, { + "category" : "FOOT_L", + "source" : "explicit", + "reason" : "biped模板包含的左脚部件,匹配左足末端", + "evidenceIds" : [ "o1" ] + }, { + "category" : "FOOT_R", + "source" : "explicit", + "reason" : "biped模板包含的右脚部件,匹配右足末端", + "evidenceIds" : [ "o1" ] + } ], + "excludedCategories" : [ ], + "constraints" : [ ], + "unmodeled" : [ ], + "questions" : [ ], + "operation" : { + "type" : "replace", + "targets" : [ { + "family" : "HEAD", + "side" : "all", + "instanceId" : "", + "ordinal" : "", + "evidenceIds" : [ "o2" ] + }, { + "family" : "ARM", + "side" : "L", + "instanceId" : "", + "ordinal" : "", + "evidenceIds" : [ "o3" ] + } ] + } +} \ No newline at end of file diff --git a/cadworld-api/src/test/resources/fixtures/head-replacement-model-output.json b/cadworld-api/src/test/resources/fixtures/head-replacement-model-output.json new file mode 100644 index 0000000..4c81f0a --- /dev/null +++ b/cadworld-api/src/test/resources/fixtures/head-replacement-model-output.json @@ -0,0 +1,182 @@ +{ + "summary": "用户需求为生成具有类人形态的双足人形机器人,在现有方案基础上更换头部部件,未明确其余具体性能、材料、尺寸等参数。", + "intentItems": [ + { + "id": "item-001", + "dimension": "form", + "subject": "整机", + "requirement": "具有类人人形形态", + "priority": "must", + "source": "explicit", + "evidenceIds": [ + "obs-001" + ] + } + ], + "images": [], + "observations": [ + { + "id": "obs-001", + "messageId": "m1", + "imageId": "", + "kind": "user_text", + "content": "给我一个人形机器人", + "clarity": "clear", + "region": [] + }, + { + "id": "obs-002", + "messageId": "m2", + "imageId": "", + "kind": "user_text", + "content": "换个头", + "clarity": "clear", + "region": [] + } + ], + "keywords": [ + { + "term": "人形机器人", + "source": "explicit", + "reason": "用户明确请求生成具有类人形态的机器人", + "negated": false, + "evidenceIds": [ + "obs-001" + ] + } + ], + "robotTypes": [ + { + "type": "biped", + "source": "inferred", + "reason": "类人人形机器人形态对应目录中的双足机器人模板", + "evidenceIds": [ + "obs-001" + ] + } + ], + "partCategories": [ + { + "category": "TORSO_0", + "source": "inferred", + "reason": "双足人形机器人基础构成部件,为整机躯干", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "HEAD_0", + "source": "inferred", + "reason": "双足人形机器人基础构成部件,本轮用户要求更换该部件", + "evidenceIds": [ + "obs-001", + "obs-002" + ] + }, + { + "category": "WAIST_0", + "source": "inferred", + "reason": "双足人形机器人基础构成部件,为连接躯干的腰部结构", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "ARM_L", + "source": "inferred", + "reason": "双足人形机器人默认配置左臂部件", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "ARM_R", + "source": "inferred", + "reason": "双足人形机器人默认配置右臂部件", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "HAND_L", + "source": "inferred", + "reason": "双足人形机器人默认配置左手部件", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "HAND_R", + "source": "inferred", + "reason": "双足人形机器人默认配置右手部件", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "LEG_L", + "source": "inferred", + "reason": "双足人形机器人默认配置左足部件", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "LEG_R", + "source": "inferred", + "reason": "双足人形机器人默认配置右足部件", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "FOOT_L", + "source": "inferred", + "reason": "双足人形机器人默认配置左脚部件", + "evidenceIds": [ + "obs-001" + ] + }, + { + "category": "FOOT_R", + "source": "inferred", + "reason": "双足人形机器人默认配置右脚部件", + "evidenceIds": [ + "obs-001" + ] + } + ], + "excludedCategories": [], + "constraints": [], + "unmodeled": [ + { + "text": "未明确指定人形机器人的具体自由度、运动性能、载荷、尺寸、材料、外观细节、应用场景及执行任务等参数", + "reason": "用户仅提出人形整机形态要求,未提供可对应到目录组件的具体可投影约束信息", + "evidenceIds": [ + "obs-001" + ] + }, + { + "text": "未明确指定更换后头部组件的具体形态、自由度、尺寸、材料、功能等参数", + "reason": "用户仅提出更换头部的操作要求,未提供新头部部件的具体可投影约束信息", + "evidenceIds": [ + "obs-002" + ] + } + ], + "questions": [], + "operation": { + "type": "replace", + "targets": [ + { + "family": "HEAD", + "side": "0", + "instanceId": "", + "ordinal": "", + "evidenceIds": [ + "obs-002" + ] + } + ] + } +} diff --git a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/demand/DemandOperation.java b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/demand/DemandOperation.java index 1a8d1b7..7b85b53 100644 --- a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/demand/DemandOperation.java +++ b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/demand/DemandOperation.java @@ -21,6 +21,12 @@ final class DemandOperation { static void validate(JsonNode raw, DemandMessage latest) { JsonNode operation = raw.path("operation"); + if ("replace".equals(operation.path("type").asText()) && additionWithoutReplacement(latest.text())) { + // 补充部件走完整需求生成,不能排除现有组件或把历史换件再次执行。 + retainCurrentTargets(raw, latest); + ((ObjectNode) operation).put("type", "generate").putArray("targets"); + log.info("需求补充纠正为普通生成 requestId={} messageId={}", RequestIdHolder.get(), latest.id()); + } if ("generate".equals(operation.path("type").asText())) { if (!operation.path("targets").isEmpty()) throw DemandRules.invalid("operation.targets"); if (Pattern.compile("(?:更换|替换|换)(?:一?个|一下|一?条|一?只|一?对|一?组)?(?:左|右|两|双)?(?:臂|头|脑袋|腿|脚|足|躯干|腰|手|尾)") @@ -84,6 +90,17 @@ final class DemandOperation { } } + private static boolean additionWithoutReplacement(String text) { + boolean addition = false; + for (String clause : text.split("[,,。;;!!\\n]")) { + if (clause.matches("(?s).*(?:不要|不想|不用|不需要|禁止|别动|不动|不换|别换|保留|保持).*")) continue; + if (clause.matches("(?is).*(?:换|替代|replace|change).*")) return false; + addition |= Pattern.compile("(?:加上?|补上?|添加|增加|装上|加装|补充)\\s*(?:一?[个只条对组]|两|双)?\\s*(?:左侧|右侧|左|右|中性|通用)?(?:的)?(?:手臂|胳膊|臂|头部|头|脑袋|腿部|腿|足部|足|脚部|脚|躯干|身体|腰部|腰|手部|手|尾巴|尾)") + .matcher(clause).find(); + } + return addition; + } + /** observations 已通过真实历史校验;历史动作不能累计成为本轮的换件范围。 */ private static void retainCurrentTargets(JsonNode raw, DemandMessage latest) { ArrayNode targets = (ArrayNode) raw.path("operation").path("targets"); diff --git a/cadworld-service/src/main/resources/robot-demand/system-prompt.txt b/cadworld-service/src/main/resources/robot-demand/system-prompt.txt index 49e85a9..a4adff5 100644 --- a/cadworld-service/src/main/resources/robot-demand/system-prompt.txt +++ b/cadworld-service/src/main/resources/robot-demand/system-prompt.txt @@ -15,6 +15,7 @@ 10. 后续明确修改覆盖旧值,补充累加;不得把各轮旧值全部 AND 叠加。用户后来补充“单位是N·m”时结合之前用户数值,将两轮证据都引用,不能从助手示例获取数值。用户否定旧需求后,将其从当前有效关键词和约束中移除。 10a. operation 始终输出。普通生成或整体重新生成使用 {"type":"generate","targets":[]}。当轮用户要求在现有组合上换件时使用 type=replace。targets 每项包含 family=TORSO/HEAD/WAIST/ARM/HAND/LEG/FOOT/TAIL、side=all/L/R/0、instanceId、ordinal、evidenceIds;未指定实例和序号时两个字符串为空。腿、足对应 LEG,脚对应 FOOT。未说明左右的“换个腿”使用 family=LEG、side=all,后端替换现有整组实例;“换个左臂”使用 ARM、L,仅替换该侧。指定“第2个左臂”时 ordinal="2";中文序号转换为数字。明确写出现有完整实例编码才填写 instanceId;不猜序号或实例编码,不额外替换手、脚或对侧。operation 是仅执行一次的当轮动作,targets 不累计历史换件目标。先说“换个头”、下一轮说“单独换个左臂”时,下一轮只输出 ARM、L,不再输出 HEAD。每项证据必须是当轮用户真实文字,必须覆盖替换动作和对应部位;每个指定侧分别列项,不将“换左臂和右腿”扩展成整个臂和腿组。没有现有方案时仍如实输出 replace,由后端说明缺少基准。 +10a-1. “加上左手”“补上左手”“添加一个部件”“装上右脚”等是补充/包含部件需求,使用 operation={"type":"generate","targets":[]},按当前有效需求补充 partCategories 和必要的 intentItems;不能因为上下文已有该部位就解释成 replace。已经包含该部件不表示必须更换原件,不虚构“换成另一个”的指令,也不累计历史替换动作。 10b. 服务端提供的 effectiveRequirements 是当前已保存的有效需求,优先于历史里尚未执行或失败的改动。输出在该有效需求上应用当轮修改后的完整需求;历史只提供真实来源证据,不能重新启用失败条件。替换动作只进入 operation,不作为数量、部件包含、硬性能或 unmodeled 条目;“换个头”不改变原构型和数量,不把“个”解析为新增一个头。未提供的参数不是需求,不把“未指定新头部的材质、尺寸、自由度”等补参数说明放进 intentItems、constraints 或 unmodeled。附带的新参数仍进入 constraints/intentItems;针对未指定左右部位的新条件,按上下文实际装配角色分别输出。不得因换单侧而自行要求对侧也换。HEAD/TORSO/WAIST/TAIL 没有左右侧,替换使用 side=all;臂、手、腿、脚未说明侧别也使用 all,不默认仅换 _0 实例。 三、类型与部位 diff --git a/cadworld-service/src/test/java/com/linkerbot/cadworld/service/demand/DemandNormalizerTest.java b/cadworld-service/src/test/java/com/linkerbot/cadworld/service/demand/DemandNormalizerTest.java index 3927c39..767b101 100644 --- a/cadworld-service/src/test/java/com/linkerbot/cadworld/service/demand/DemandNormalizerTest.java +++ b/cadworld-service/src/test/java/com/linkerbot/cadworld/service/demand/DemandNormalizerTest.java @@ -342,6 +342,31 @@ class DemandNormalizerTest { assertThat(normalizer.normalize(raw, history).analysis().path("operation").path("targets")).hasSize(2); } + @ParameterizedTest @ValueSource(strings = {"加上左手", "补上左手", "装上左手", "添加一只左手", "加上左手,右臂不要换"}) + void addingAPartCannotBeMisclassifiedAsAReplacement(String text) { + ObjectNode raw = minimal(text); + raw.putObject("operation").put("type", "replace").putArray("targets").addObject() + .put("family", "HAND").put("side", "L").put("instanceId", "").put("ordinal", "").putArray("evidenceIds").add("e1"); + raw.withArray("partCategories").addObject().put("category", "HAND_L").put("source", "explicit").put("reason", "补充左手") + .putArray("evidenceIds").add("e1"); + DemandResult result = normalizer.normalize(raw, text(text)); + assertThat(result.analysis().path("operation").path("type").asText()).isEqualTo("generate"); + assertThat(result.analysis().path("operation").path("targets")).isEmpty(); + assertThat(result.request().path("requiredParts")).contains(json.getNodeFactory().textNode("HAND_L")); + } + + @Test void addingAPartCannotHideAnotherExplicitReplacementOrInvalidEvidence() { + String text = "换个左臂,加上左手"; + ObjectNode raw = minimal(text); + ObjectNode target = raw.putObject("operation").put("type", "replace").putArray("targets").addObject() + .put("family", "HAND").put("side", "L").put("instanceId", "").put("ordinal", ""); + target.putArray("evidenceIds").add("e1"); + assertThatThrownBy(() -> normalizer.normalize(raw, text(text))).isInstanceOf(BizException.class); + ((ObjectNode) raw.path("observations").get(0)).put("content", "加上左手"); + target.putArray("evidenceIds").add("missing"); + assertThatThrownBy(() -> normalizer.normalize(raw, text("加上左手"))).isInstanceOf(BizException.class); + } + @Test void supportsChineseOrdinalWithoutInventingAnInstanceCode() { String text = "换第二个左臂"; ObjectNode raw = minimal(text);