licos-platform-cli 0.3.2__tar.gz → 0.3.3__tar.gz

{licos_platform_cli-0.3.2 → licos_platform_cli-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: licos-platform-cli
-Version: 0.3.2
+Version: 0.3.3
 Summary: LICOS platform CLI
 Requires-Python: >=3.10
 Requires-Dist: licos-platform-sdk>=0.4.2

{licos_platform_cli-0.3.2 → licos_platform_cli-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "licos-platform-cli"
-version = "0.3.2"
+version = "0.3.3"
 description = "LICOS platform CLI"
 requires-python = ">=3.10"
 dependencies = [

{licos_platform_cli-0.3.2 → licos_platform_cli-0.3.3}/src/licos_platform_cli/help_commands.py

@@ -647,7 +647,34 @@ UNS_HELP = {
             ],
             "example": "licos-platform uns directory-create --parent-path project:/ --node-json '{\"name\":\"一号产线\",\"code\":\"LINE_1\"}'",
         },
-        "finalize": {
+        "connection-update": {
+            "description": "生成并规划一个当前项目托管采集连接的增量修改，不直接执行写入。",
+            "parameters": [
+                {"name": "--selector-json", "required": True, "description": "精确的 name、protocol 选择器。"},
+                {"name": "--set-json", "required": True, "description": "name、credentialRef 或 configPatch。"},
+                {"name": "--output", "required": False, "description": "在项目目录内保存生成的 UNSChangeSet。"},
+            ],
+            "example": "licos-platform uns connection-update --selector-json '{\"name\":\"一号PLC\",\"protocol\":\"modbus-tcp\"}' --set-json '{\"configPatch\":{\"host\":\"10.0.0.2\"}}' --output UNS.change.json",
+        },
+        "collection-task-update": {
+            "description": "生成并规划一个当前项目托管采集任务的增量修改，不直接执行写入。",
+            "parameters": [
+                {"name": "--selector-json", "required": True, "description": "精确的 name、protocol、connectionName 选择器。"},
+                {"name": "--set-json", "required": True, "description": "name、pollIntervalMs、enabled 或 configPatch。"},
+                {"name": "--output", "required": False, "description": "在项目目录内保存生成的 UNSChangeSet。"},
+            ],
+            "example": "licos-platform uns collection-task-update --selector-json '{\"name\":\"温度采集\",\"protocol\":\"modbus-tcp\",\"connectionName\":\"一号PLC\"}' --set-json '{\"pollIntervalMs\":2000}' --output UNS.change.json",
+        },
+        "point-config-update": {
+            "description": "生成并规划一个当前项目托管采集点位配置的增量修改，不改变点位编码和所属任务。",
+            "parameters": [
+                {"name": "--selector-json", "required": True, "description": "精确的 tagCode、taskName、protocol 选择器。"},
+                {"name": "--set-json", "required": True, "description": "点位通用字段或协议 addressPatch。"},
+                {"name": "--output", "required": False, "description": "在项目目录内保存生成的 UNSChangeSet。"},
+            ],
+            "example": "licos-platform uns point-config-update --selector-json '{\"tagCode\":\"TEMP_01\",\"taskName\":\"温度采集\",\"protocol\":\"modbus-tcp\"}' --set-json '{\"addressPatch\":{\"address\":\"40002\"}}' --output UNS.change.json",
+        },
+        "finalize": {
             "description": "Validate and atomically install a candidate as project-root UNS.json, revalidate it, and return a read-only plan.",
             "parameters": [{"name": "--file", "required": True, "description": "Candidate JSON file inside LICOS_PROJECT_PATH."}],
             "example": "licos-platform uns finalize --file .UNS.json.candidate",

{licos_platform_cli-0.3.2 → licos_platform_cli-0.3.3}/src/licos_platform_cli/uns_commands.py

@@ -77,6 +77,35 @@ def _change_set(operation: dict[str, Any]) -> dict[str, Any]:
     }
 
 
+def _plan_generated_change(operation: dict[str, Any], output: str | None) -> Any:
+    document = _change_set(operation)
+    if output is None:
+        return uns.plan_changes(document)
+    output_path = _write_change_set(output, document)
+    return {
+        "changeSetFile": str(output_path),
+        "plan": uns.plan_changes(document),
+    }
+
+
+def _write_change_set(path: str, document: dict[str, Any]) -> Path:
+    project_root = Path(os.environ.get("LICOS_PROJECT_PATH", "/workspace/projects")).resolve()
+    output = Path(path).resolve()
+    if not output.is_relative_to(project_root):
+        raise argparse.ArgumentTypeError("change-set output must be inside LICOS_PROJECT_PATH")
+    output.parent.mkdir(parents=True, exist_ok=True)
+    payload = (json.dumps(document, ensure_ascii=False, indent=2) + "\n").encode("utf-8")
+    with tempfile.NamedTemporaryFile(
+        mode="wb", prefix=".UNS.change.", suffix=".tmp", dir=output.parent, delete=False
+    ) as staging:
+        staging.write(payload)
+        staging.flush()
+        os.fsync(staging.fileno())
+        staging_path = Path(staging.name)
+    os.replace(staging_path, output)
+    return output
+
+
 def _locator(path: str | None, node_code: str | None, label: str) -> dict[str, str]:
     if bool(path) == bool(node_code):
         raise argparse.ArgumentTypeError(f"provide exactly one {label} path or node code")
@@ -210,6 +239,30 @@ def _cmd_directory_create(args: argparse.Namespace) -> Any:
         "parent": _locator(args.parent_path, args.parent_node_code, "parent"),
         "node": _json_object(args.node_json, "directory node"),
     }))
+
+
+def _cmd_connection_update(args: argparse.Namespace) -> Any:
+    return _plan_generated_change({
+        "op": "connectionUpdate",
+        "selector": _json_object(args.selector_json, "connection selector"),
+        "set": _json_object(args.set_json, "connection update"),
+    }, args.output)
+
+
+def _cmd_collection_task_update(args: argparse.Namespace) -> Any:
+    return _plan_generated_change({
+        "op": "collectionTaskUpdate",
+        "selector": _json_object(args.selector_json, "collection task selector"),
+        "set": _json_object(args.set_json, "collection task update"),
+    }, args.output)
+
+
+def _cmd_point_config_update(args: argparse.Namespace) -> Any:
+    return _plan_generated_change({
+        "op": "collectionPointUpdate",
+        "selector": _json_object(args.selector_json, "collection point selector"),
+        "set": _json_object(args.set_json, "collection point update"),
+    }, args.output)
 
 
 def _cmd_data_query(args: argparse.Namespace) -> Any:
@@ -484,8 +537,32 @@ def add_uns_parser(subparsers: argparse._SubParsersAction[argparse.ArgumentParse
     directory_parent.add_argument("--parent-node-code")
     directory_create.add_argument("--node-json", required=True)
     _set_handler(directory_create, _cmd_directory_create)
-
-    finalize = commands.add_parser(
+
+    connection_update = commands.add_parser(
+        "connection-update", help="Plan updating one project-managed collection connection"
+    )
+    connection_update.add_argument("--selector-json", required=True)
+    connection_update.add_argument("--set-json", required=True)
+    connection_update.add_argument("--output")
+    _set_handler(connection_update, _cmd_connection_update)
+
+    task_update = commands.add_parser(
+        "collection-task-update", help="Plan updating one project-managed collection task"
+    )
+    task_update.add_argument("--selector-json", required=True)
+    task_update.add_argument("--set-json", required=True)
+    task_update.add_argument("--output")
+    _set_handler(task_update, _cmd_collection_task_update)
+
+    point_config_update = commands.add_parser(
+        "point-config-update", help="Plan updating one project-managed collection point configuration"
+    )
+    point_config_update.add_argument("--selector-json", required=True)
+    point_config_update.add_argument("--set-json", required=True)
+    point_config_update.add_argument("--output")
+    _set_handler(point_config_update, _cmd_point_config_update)
+
+    finalize = commands.add_parser(
         "finalize", help="Validate and atomically install a candidate as project UNS.json, then create a plan"
     )
     finalize.add_argument("--file", required=True)

{licos_platform_cli-0.3.2 → licos_platform_cli-0.3.3}/tests/test_cli.py

@@ -345,6 +345,59 @@ class PlatformCliTests(unittest.TestCase):
         self.assertEqual(operation["target"], {"nodeCode": "TEMP_1"})
         self.assertEqual(operation["selector"]["tagCode"], "T1")
         self.assertNotIn("fieldMappings", operation)
+
+    def test_uns_collection_update_commands_build_strict_changesets(self) -> None:
+        cases = [
+            (
+                "connection-update",
+                '{"name":"PLC","protocol":"modbus-tcp"}',
+                '{"configPatch":{"host":"10.0.0.2"}}',
+                "connectionUpdate",
+            ),
+            (
+                "collection-task-update",
+                '{"name":"采集任务","protocol":"modbus-tcp","connectionName":"PLC"}',
+                '{"pollIntervalMs":2000}',
+                "collectionTaskUpdate",
+            ),
+            (
+                "point-config-update",
+                '{"tagCode":"T1","taskName":"采集任务","protocol":"modbus-tcp"}',
+                '{"addressPatch":{"address":"40002"}}',
+                "collectionPointUpdate",
+            ),
+        ]
+        for command, selector, update, expected_op in cases:
+            with self.subTest(command=command):
+                with mock.patch.object(uns_commands.uns, "plan_changes", return_value={}) as plan_changes:
+                    code, _stdout, stderr = run_cli(
+                        "uns", command, "--selector-json", selector, "--set-json", update
+                    )
+
+                self.assertEqual(code, 0)
+                self.assertEqual(stderr, "")
+                operation = plan_changes.call_args.args[0]["operations"][0]
+                self.assertEqual(operation["op"], expected_op)
+
+    def test_uns_collection_update_can_persist_the_exact_planned_changeset(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp:
+            output = Path(tmp) / "UNS.change.json"
+            with mock.patch.dict(os.environ, {"LICOS_PROJECT_PATH": tmp}, clear=False):
+                with mock.patch.object(
+                    uns_commands.uns, "plan_changes", return_value={"planHash": "plan-hash"}
+                ) as plan_changes:
+                    code, stdout, stderr = run_cli(
+                        "uns", "connection-update",
+                        "--selector-json", '{"name":"PLC","protocol":"modbus-tcp"}',
+                        "--set-json", '{"configPatch":{"host":"10.0.0.2"}}',
+                        "--output", str(output),
+                    )
+
+            self.assertEqual(code, 0)
+            self.assertEqual(stderr, "")
+            saved = json.loads(output.read_text(encoding="utf-8"))
+            self.assertEqual(saved, plan_changes.call_args.args[0])
+            self.assertEqual(json.loads(stdout)["plan"]["planHash"], "plan-hash")
 
     def test_uns_finalize_atomically_replaces_target_after_validation(self) -> None:
         document = {"schemaVersion": "1.0", "resources": {}, "uns": {"nodes": []}}