licos-dev-cli 0.4.2__tar.gz → 0.4.3__tar.gz

{licos_dev_cli-0.4.2 → licos_dev_cli-0.4.3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: licos-dev-cli
-Version: 0.4.2
+Version: 0.4.3
 Summary: LICOS Dev CLI - generate files and call model capabilities
 Requires-Python: >=3.10
 Requires-Dist: click>=8.1
-Requires-Dist: licos-dev-sdk>=0.4.2
+Requires-Dist: licos-dev-sdk>=0.4.3

{licos_dev_cli-0.4.2 → licos_dev_cli-0.4.3}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "hatchling.build"
 
 [project]
 name = "licos-dev-cli"
-version = "0.4.2"
+version = "0.4.3"
 description = "LICOS Dev CLI - generate files and call model capabilities"
 requires-python = ">=3.10"
 dependencies = [
-    "licos-dev-sdk>=0.4.2",
+    "licos-dev-sdk>=0.4.3",
     "click>=8.1",
 ]
 

{licos_dev_cli-0.4.2 → licos_dev_cli-0.4.3}/src/licos_dev_cli/docx_commands.py

@@ -55,7 +55,7 @@ def text_input(value, path, name):
 
 @click.command("docx-structure")
 @click.option("--file", "source", required=True, type=click.Path(exists=True, dir_okay=False))
-@click.option("--scope", type=click.Choice(["blocks", "paragraphs"]), default="blocks", show_default=True)
+@click.option("--scope", type=click.Choice(["blocks", "paragraphs", "tables"]), default="blocks", show_default=True)
 @click.option("--offset", type=click.IntRange(min=1), default=1, show_default=True)
 @click.option("--limit", type=click.IntRange(1, 200), default=20, show_default=True)
 @click.option("--max-chars", type=click.IntRange(1, 8000), default=200, show_default=True)
@@ -141,7 +141,8 @@ def docx_table_set(text, text_file, **arguments):
 @click.command("docx-table-insert-rows")
 @edit_options
 @click.option("--table", required=True, type=click.IntRange(min=1))
-@click.option("--before", required=True, type=click.IntRange(min=1), help="One-based insertion position; row_count+1 appends.")
+@click.option("--before", type=click.IntRange(min=1), help="Insert before this one-based row. Choose --before or --append.")
+@click.option("--append", is_flag=True, help="Append after the last row; no row count calculation needed.")
 @click.option("--template-row", required=True, type=click.IntRange(min=1), help="Existing styled row; must not intersect a vertical merge.")
 @click.option("--input", "input_path", required=True, type=click.Path(exists=True, dir_okay=False), help="Two-dimensional JSON array of scalar values. Fill a merged cell once; count is inferred.")
 @sdk_errors
@@ -153,17 +154,29 @@ def docx_table_insert_rows(input_path, **arguments):
 
 @click.command("docx-verify")
 @click.option("--file", "source", required=True, type=click.Path(exists=True, dir_okay=False))
+@click.option("--original", type=click.Path(exists=True, dir_okay=False), help="Compare non-body package parts (headers, footers, styles, images) and section settings with the original.")
 @click.option("--input", "input_path", type=click.Path(exists=True, dir_okay=False), help="JSON array of target/text assertions and optional mode (equals, contains, absent).")
+@target_options
+@click.option("--text", default=None, help="Expected text at one target; use this or --text-file instead of --input.")
+@click.option("--text-file", type=click.Path(exists=True, dir_okay=False), help="UTF-8 expected text; preserves whitespace and line breaks.")
+@click.option("--mode", type=click.Choice(["equals", "contains", "absent"]), help="Single-target comparison; defaults to equals.")
 @sdk_errors
-def docx_verify(source, input_path):
-    """Verify exact positions. Without assertions only structure is checked, not content.
+def docx_verify(source, original, input_path, paragraph, block, table, row, column, text, text_file, mode):
+    """Verify exact positions and optional original parts. No assertions means no content verification.
 
     Example: [{"target":{"table":1,"row":1,"column":1},"text":"Supplier: A"}]
 
-    Exits 2 if an assertion fails. Does not certify rendered page layout.
+    Exits 2 if an assertion or original comparison fails. Does not certify rendered page layout.
     """
     from licos_dev_sdk import verify_docx
-    report = verify_docx(source, expectations=json.loads(Path(input_path).read_text(encoding="utf-8")) if input_path else None)
+    position = target(paragraph, block, table, row, column)
+    single = bool(position) or text is not None or text_file is not None or mode is not None
+    if input_path is not None and single:
+        raise click.UsageError("use --input or a single target with --text/--text-file, not both")
+    expectations = json.loads(Path(input_path).read_text(encoding="utf-8")) if input_path else None
+    if single:
+        expectations = [{"target": position, "text": text_input(text, text_file, "text"), "mode": mode or "equals"}]
+    report = verify_docx(source, original=original, expectations=expectations)
     result(report)
     if not report["verified"]:
         raise click.exceptions.Exit(2)

{licos_dev_cli-0.4.2 → licos_dev_cli-0.4.3}/src/licos_dev_cli/main.py

@@ -14,6 +14,7 @@ from .common import _read_input, _read_json, _json_option, _echo_json, _path_to_
 # ── CLI Group ────────────────────────────────────────────────────────────────
 
 @click.group()
+@click.version_option(package_name="licos-dev-cli")
 def cli():
     """LICOS Dev - file generation and model CLI for AI agents."""
     pass

{licos_dev_cli-0.4.2 → licos_dev_cli-0.4.3}/tests/test_docx_commands.py

@@ -81,3 +81,46 @@ def test_command_help_is_focused_and_preserves_constraints():
         assert len(help_text.output.encode("utf-8")) < 5000
     help_text = runner.invoke(cli, ["docx-table-insert-rows", "--help"]).output
     assert "--revision" in help_text and "--template-row" in help_text and "--count" not in help_text
+
+
+def test_append_and_verify_with_original_and_text_file(source, tmp_path):
+    rows = tmp_path / "rows.json"
+    rows.write_text('[["pump",2]]', encoding="utf-8")
+    output = tmp_path / "rows.docx"
+    read = invoke("docx-structure", "--file", source, "--scope", "tables")
+    assert read["items"][0]["row_count"] == 1
+    invoke("docx-table-insert-rows", "--source", source, "--output", output, "--revision", read["revision"],
+           "--table", 1, "--append", "--template-row", 1, "--input", rows)
+    assert invoke("docx-verify", "--file", output, "--original", source, "--table", 1, "--row", 2, "--column", 1, "--text", "pump")["verified"]
+    replacement = tmp_path / "text.txt"
+    text = "  中文🙂\t空格\n" * 100 + "  "
+    replacement.write_text(text, encoding="utf-8")
+    invoke("docx-replace", "--source", output, "--output", output, "--overwrite",
+           "--revision", invoke("docx-structure", "--file", output)["revision"],
+           "--block", 1, "--search", "账号：123", "--replace-file", replacement)
+    verified = invoke("docx-verify", "--file", output, "--original", source, "--block", 1, "--text-file", replacement)
+    assert verified["content_verified"] and verified["preservation_verified"]
+
+
+@pytest.mark.parametrize("arguments", [
+    ["--block", "1"], ["--text", "x"], ["--mode", "contains"],
+    ["--block", "1", "--text", "x", "--input", "checks.json"],
+    ["--block", "1", "--text", "x", "--text-file", "text.txt"],
+])
+def test_invalid_verification_options_are_reported(source, tmp_path, monkeypatch, arguments):
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / "checks.json").write_text("[]", encoding="utf-8")
+    (tmp_path / "text.txt").write_text("x", encoding="utf-8")
+    result = CliRunner().invoke(cli, ["docx-verify", "--file", str(source), *arguments])
+    assert result.exit_code != 0
+    assert "Error:" in result.output
+
+
+def test_original_comparison_failure_exits_two(source, tmp_path):
+    changed = tmp_path / "changed.docx"
+    doc = Document(source)
+    doc.sections[0].footer.paragraphs[0].text = "changed footer"
+    doc.save(changed)
+    failure = CliRunner().invoke(cli, ["docx-verify", "--file", str(changed), "--original", str(source)])
+    assert failure.exit_code == 2
+    assert not json.loads(failure.output)["preservation_verified"]