diffnc 0.0.2__tar.gz → 0.0.3__tar.gz

{diffnc-0.0.2 → diffnc-0.0.3}/.github/workflows/publish.yml

@@ -14,10 +14,10 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Install uv
-        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           python-version: "3.12"
 

{diffnc-0.0.2 → diffnc-0.0.3}/.github/workflows/test.yml

@@ -20,10 +20,10 @@ jobs:
         python-version: ["3.11", "3.12", "3.13", "3.14"]
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Install uv
-        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
         with:
           python-version: ${{ matrix.python-version }}
           enable-cache: true

{diffnc-0.0.2 → diffnc-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffnc
-Version: 0.0.2
+Version: 0.0.3
 Summary: Structural diff library for network device configurations
 Author-email: minefuto <46558834+minefuto@users.noreply.github.com>
 License: MIT License

{diffnc-0.0.2 → diffnc-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "diffnc"
-version = "0.0.2"
+version = "0.0.3"
 description = "Structural diff library for network device configurations"
 readme = "README.md"
 authors = [

{diffnc-0.0.2 → diffnc-0.0.3}/src/diffnc/detect.py

@@ -117,20 +117,30 @@ def _has_eos_marker(lines: list[str]) -> bool:
     return False
 
 
-def detect_vendor(text: str) -> str:
-    """Return the vendor name for *text*.
-
-    Raises:
-        ParseError: if no supported vendor can be confidently identified.
-    """
-
+def _significant_lines(text: str) -> list[str]:
     significant: list[str] = []
     for raw in text.splitlines():
         s = raw.strip()
         if not s or s.startswith("!") or s.startswith("#") or s.startswith("/*"):
             continue
         significant.append(s)
+    return significant
+
+
+def is_empty_config(text: str) -> bool:
+    """True if *text* has no significant (non-comment) lines."""
+
+    return not _significant_lines(text)
+
+
+def detect_vendor(text: str) -> str:
+    """Return the vendor name for *text*.
+
+    Raises:
+        ParseError: if no supported vendor can be confidently identified.
+    """
 
+    significant = _significant_lines(text)
     if not significant:
         raise ParseError("configuration is empty or comment-only")
 

{diffnc-0.0.2 → diffnc-0.0.3}/src/diffnc/diff.py

@@ -22,12 +22,13 @@ from dataclasses import dataclass
 from difflib import SequenceMatcher
 
 from diffnc import vendors as _vendors
-from diffnc.detect import detect_vendor
+from diffnc.detect import detect_vendor, is_empty_config
 from diffnc.errors import VendorMismatchError
 from diffnc.ir import ConfigNode, ConfigTree
 from diffnc.vendors.base import VendorParser, is_order_sensitive_for, render_subtree
 
 _SIMILARITY_CUTOFF = 0.6  # difflib.get_close_matches の既定値に合わせる
+_TOKEN_SHARE_CUTOFF = 0.4  # 先頭コマンド語が一致する場合に適用する緩い二次閾値
 
 
 @dataclass(frozen=True)
@@ -120,11 +121,21 @@ def _prepare(
     text_b = _coerce(b)
 
     if vendor is None:
-        vendor_a = detect_vendor(text_a)
-        vendor_b = detect_vendor(text_b)
-        if vendor_a != vendor_b:
-            raise VendorMismatchError(vendor_a, vendor_b)
-        vendor_name = vendor_a
+        empty_a = is_empty_config(text_a)
+        empty_b = is_empty_config(text_b)
+        if empty_a and empty_b:
+            # Nothing to detect from and nothing to diff: both trees parse empty, so no
+            # vendor-specific behaviour is ever reached and any registered parser will do.
+            vendor_name = "nxos"
+        elif empty_a or empty_b:
+            # An empty side carries no vendor signal; detect from the other side only.
+            vendor_name = detect_vendor(text_b if empty_a else text_a)
+        else:
+            vendor_a = detect_vendor(text_a)
+            vendor_b = detect_vendor(text_b)
+            if vendor_a != vendor_b:
+                raise VendorMismatchError(vendor_a, vendor_b)
+            vendor_name = vendor_a
     else:
         vendor_name = vendor
 
@@ -317,23 +328,36 @@ def _diff_children_unordered(
             yield from _emit_one_side(parser, child_b, depth, "+")
 
 
+def _leading_token(line: str) -> str:
+    """Return the first whitespace-delimited token of *line* (its command word)."""
+
+    parts = line.split(maxsplit=1)
+    return parts[0] if parts else ""
+
+
 def _pair_changed_leaves(
     a_only: list[tuple[int, ConfigNode]],
     b_only: list[tuple[int, ConfigNode]],
 ) -> tuple[dict[int, ConfigNode], set[int]]:
     """Greedily pair A-only / B-only leaves that differ only in value.
 
-    Pairs are chosen highest-similarity first (``difflib`` ratio over the raw lines),
-    each side used at most once, and only above :data:`_SIMILARITY_CUTOFF`. Returns
-    ``(a_child_index -> paired b node, set of paired b child indices)`` so the caller can
-    emit the ``+`` next to its ``-`` and suppress it elsewhere.
+    A pair is a candidate when either the raw-line ``difflib`` ratio clears
+    :data:`_SIMILARITY_CUTOFF`, or the two leaves share the same leading command token
+    and the ratio clears the looser :data:`_TOKEN_SHARE_CUTOFF`. The latter rescues short
+    settings with a large value change (``vlan 1`` → ``vlan 1,100,200,300``) whose char
+    ratio dips below the primary cutoff. Pairs are chosen highest-ratio first and each side
+    is used at most once, so genuine high-ratio matches win before the looser fallbacks.
+
+    Returns ``(a_child_index -> paired b node, set of paired b child indices)`` so the
+    caller can emit the ``+`` next to its ``-`` and suppress it elsewhere.
     """
 
     candidates: list[tuple[float, int, int]] = []
     for ai, (_, a_node) in enumerate(a_only):
         for bi, (_, b_node) in enumerate(b_only):
             ratio = SequenceMatcher(None, a_node.line, b_node.line).ratio()
-            if ratio >= _SIMILARITY_CUTOFF:
+            shares_token = _leading_token(a_node.line) == _leading_token(b_node.line)
+            if ratio >= _SIMILARITY_CUTOFF or (shares_token and ratio >= _TOKEN_SHARE_CUTOFF):
                 candidates.append((ratio, ai, bi))
     candidates.sort(key=lambda t: t[0], reverse=True)
 

{diffnc-0.0.2 → diffnc-0.0.3}/tests/test_diff.py

@@ -252,6 +252,19 @@ def test_nxos_changed_leaves_paired_adjacently() -> None:
     )
 
 
+def test_short_leaf_value_change_paired_by_leading_token() -> None:
+    """A short setting with a big value change pairs via its shared command word.
+
+    ``vlan 1`` vs ``vlan 1,100,200,300`` scores below ``_SIMILARITY_CUTOFF`` on raw chars,
+    but the shared ``vlan`` token rescues the pairing so the ``+`` sits next to its ``-``.
+    """
+
+    a = "vlan 1\nlicense smart transport smart\nlicense smart source-interface mgmt0\n"
+    b = "vlan 1,100,200,300\nlicense smart source-interface mgmt0\n"
+    out = "".join(unified_diff(a, b, lineterm="\n"))
+    assert out == ("-vlan 1\n+vlan 1,100,200,300\n-license smart transport smart\n")
+
+
 def test_junos_leaf_to_section_still_renders_as_replace() -> None:
     """A Junos leaf becoming a populated section must not collapse into a context header."""
 
@@ -262,3 +275,42 @@ def test_junos_leaf_to_section_still_renders_as_replace() -> None:
     assert "+    ge-0/0/0 {\n" in out
     assert "+        unit 0;\n" in out
     assert "+    }\n" in out
+
+
+# ---------------------------------------------------------------------------
+# Empty-side inputs
+# ---------------------------------------------------------------------------
+
+
+def test_ndiff_against_empty_b_marks_all_as_deleted() -> None:
+    a = "set interface ge-0/0/0 unit 0 family inet dhcp"
+    assert list(ndiff(a, "")) == ["- set interface ge-0/0/0 unit 0 family inet dhcp"]
+
+
+def test_unified_against_empty_a_marks_all_as_added() -> None:
+    b = "set interface ge-0/0/0 unit 0 family inet dhcp\nset system host-name r1\n"
+    assert list(unified_diff("", b)) == [
+        "+set interface ge-0/0/0 unit 0 family inet dhcp",
+        "+set system host-name r1",
+    ]
+
+
+def test_comment_only_side_treated_as_empty() -> None:
+    a = "interface Ethernet1/1\n  no shutdown\n"
+    b = "! header comment only\n"
+    out = list(unified_diff(a, b))
+    assert out == ["-interface Ethernet1/1", "-  no shutdown"]
+
+
+def test_empty_side_emits_whole_subtree() -> None:
+    a = "interface Ethernet1/1\n  description uplink\n  no shutdown\n"
+    assert list(ndiff(a, "")) == [
+        "- interface Ethernet1/1",
+        "-   description uplink",
+        "-   no shutdown",
+    ]
+
+
+def test_both_sides_empty_produce_no_output() -> None:
+    assert list(unified_diff("", "")) == []
+    assert list(ndiff("", "! comment\n")) == []

{diffnc-0.0.2 → diffnc-0.0.3}/tests/test_reconcile.py

@@ -279,3 +279,25 @@ def test_iterable_input_is_accepted() -> None:
     b_lines = ["interface eth1", "  description new"]
     out = list(reconcile(a_lines, b_lines, vendor="nxos"))
     assert out == ["interface eth1", "no description old", "description new"]
+
+
+# ---------------------------------------------------------------------------
+# Empty-side inputs
+# ---------------------------------------------------------------------------
+
+
+def test_reconcile_to_empty_deletes_everything() -> None:
+    a = "set interface ge-0/0/0 unit 0 family inet dhcp\n"
+    assert list(reconcile(a, "")) == ["delete interface ge-0/0/0 unit 0 family inet dhcp"]
+
+
+def test_reconcile_from_empty_adds_everything() -> None:
+    b = "set interface ge-0/0/0 unit 0 family inet dhcp\nset system host-name r1\n"
+    assert list(reconcile("", b)) == [
+        "set interface ge-0/0/0 unit 0 family inet dhcp",
+        "set system host-name r1",
+    ]
+
+
+def test_reconcile_both_empty_produces_no_output() -> None:
+    assert list(reconcile("", "! comment only\n")) == []

{diffnc-0.0.2 → diffnc-0.0.3}/uv.lock

@@ -117,7 +117,7 @@ toml = [
 
 [[package]]
 name = "diffnc"
-version = "0.0.2"
+version = "0.0.3"
 source = { editable = "." }
 
 [package.dev-dependencies]