cpp-pd-code-simplify-interface 0.1.13__tar.gz → 0.1.15__tar.gz

{cpp_pd_code_simplify_interface-0.1.13 → cpp_pd_code_simplify_interface-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.13
+Version: 0.1.15
 Summary: Python interface for cpp-pd-code-simplify with runtime C++ compilation.
 License-Expression: MIT
 Author: GGN_2015
@@ -77,6 +77,9 @@ and sets `timed_out` to `True`. Verbose log lines use local wall-clock time in
 phase, verbose logs also include `actual_threads`, the worker count selected by
 the C++ backend for that phase. The backend call runs in a helper process, so
 `Ctrl+C` can terminate active C++ work and its worker threads cleanly.
+Use `show_step_pd=True`, or CLI flag `--show-step-pd`, to print
+`step_pd_code[ROUND]: PD[...]` to stdout after each mid-simplification witness
+is applied and before that round's automatic R1/nugatory cleanup.
 
 Batch use:
 

{cpp_pd_code_simplify_interface-0.1.13 → cpp_pd_code_simplify_interface-0.1.15}/README.md

@@ -57,6 +57,9 @@ and sets `timed_out` to `True`. Verbose log lines use local wall-clock time in
 phase, verbose logs also include `actual_threads`, the worker count selected by
 the C++ backend for that phase. The backend call runs in a helper process, so
 `Ctrl+C` can terminate active C++ work and its worker threads cleanly.
+Use `show_step_pd=True`, or CLI flag `--show-step-pd`, to print
+`step_pd_code[ROUND]: PD[...]` to stdout after each mid-simplification witness
+is applied and before that round's automatic R1/nugatory cleanup.
 
 Batch use:
 

cpp_pd_code_simplify_interface-0.1.15/cpp_pd_code_simplify_interface/__main__.py

@@ -0,0 +1,10 @@
+import json
+
+from .main import main
+
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        print(json.dumps({"error": "interrupted by Ctrl+C"}, indent=2))
+        raise SystemExit(130)

cpp_pd_code_simplify_interface-0.1.15/cpp_pd_code_simplify_interface/_worker.py

@@ -0,0 +1,68 @@
+from __future__ import annotations
+
+import json
+import sys
+from pathlib import Path
+from typing import Any
+
+from .main import _run_one_direct
+
+
+def main() -> int:
+    try:
+        request: dict[str, Any] = json.loads(sys.stdin.read())
+        result = _run_one_direct(
+            str(request.get("pd_text", "")),
+            max_paths=int(request.get("max_paths", -1)),
+            ban_heuristic=bool(request.get("ban_heuristic", False)),
+            reduction_round=int(request.get("reduction_round", -1)),
+            max_thread=int(request.get("max_thread", -1)),
+            timeout=int(request.get("timeout", -1)),
+            verbose=bool(request.get("verbose", False)),
+            show_step_pd=bool(request.get("show_step_pd", False)),
+            known_crossingless_components=int(
+                request.get("known_crossingless_components", 0)
+            ),
+            remove_crossings=request.get("remove_crossings") or [],
+        )
+        output = json.dumps({"ok": True, "result": result}, separators=(",", ":"))
+        protocol_output_path = request.get("protocol_output_path")
+        if protocol_output_path:
+            Path(str(protocol_output_path)).write_text(output, encoding="utf-8")
+        else:
+            print(output)
+        return 0
+    except KeyboardInterrupt:
+        output = json.dumps(
+            {"ok": False, "error": "interrupted by Ctrl+C"},
+            separators=(",", ":"),
+        )
+        try:
+            request
+        except NameError:
+            request = {}
+        protocol_output_path = request.get("protocol_output_path")
+        if protocol_output_path:
+            Path(str(protocol_output_path)).write_text(output, encoding="utf-8")
+        else:
+            print(output)
+        return 130
+    except BaseException as exc:  # noqa: BLE001 - return errors through JSON.
+        output = json.dumps(
+            {"ok": False, "error": str(exc)},
+            separators=(",", ":"),
+        )
+        try:
+            request
+        except NameError:
+            request = {}
+        protocol_output_path = request.get("protocol_output_path")
+        if protocol_output_path:
+            Path(str(protocol_output_path)).write_text(output, encoding="utf-8")
+        else:
+            print(output)
+        return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

{cpp_pd_code_simplify_interface-0.1.13 → cpp_pd_code_simplify_interface-0.1.15}/cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp

@@ -59,6 +59,7 @@ struct SimplifierOptions {
     bool require_applicable = false;
     bool verbose = false;
     std::function<void(const std::string&)> progress;
+    std::function<void(int, const PDCode&)> step_pd_output;
     std::function<bool()> should_cancel;
 };
 

{cpp_pd_code_simplify_interface-0.1.13 → cpp_pd_code_simplify_interface-0.1.15}/cpp_pd_code_simplify_interface/data/src/native_interface.cpp

@@ -136,6 +136,7 @@ char* pdcode_simplify_run_json(
     int max_thread,
     int timeout_seconds,
     int verbose,
+    int show_step_pd,
     unsigned long long known_crossingless_components,
     const int* removed_crossings,
     unsigned long long removed_crossing_count) {
@@ -154,6 +155,14 @@ char* pdcode_simplify_run_json(
         options.progress = [](const std::string& message) {
             print_progress_log(message);
         };
+        if (show_step_pd != 0) {
+            options.step_pd_output = [](int round, const pdcode_simplify::PDCode& step_code) {
+                std::cout << "step_pd_code[" << round << "]: "
+                          << pdcode_simplify::format_final_pd_code(step_code)
+                          << '\n';
+                std::cout.flush();
+            };
+        }
 
         const pdcode_simplify::PDCode code = pdcode_simplify::parse_pd_code(text);
         std::size_t crossingless = static_cast<std::size_t>(known_crossingless_components);

{cpp_pd_code_simplify_interface-0.1.13 → cpp_pd_code_simplify_interface-0.1.15}/cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp

@@ -1836,6 +1836,12 @@ void emit_progress(const SimplifierOptions& options, const std::string& message)
     }
 }
 
+void emit_step_pd(const SimplifierOptions& options, int round, const PDCode& code) {
+    if (options.step_pd_output) {
+        options.step_pd_output(round, code);
+    }
+}
+
 std::string search_mode_for_options(const SimplifierOptions& options) {
     if (options.max_paths == -1 && !options.ban_heuristic) {
         return "heuristic";
@@ -2639,6 +2645,7 @@ ReductionResult reduce_pd_code(
             const MidSimplificationApplyResult applied =
                 apply_simplification_witness(output.code, search, output.crossingless_components);
             ++output.mid_simplification_rounds;
+            emit_step_pd(run_options, round, applied.code);
             output.code = applied.code;
             output.crossingless_components = applied.crossingless_components;
             check_timeout(run_options);

{cpp_pd_code_simplify_interface-0.1.13 → cpp_pd_code_simplify_interface-0.1.15}/cpp_pd_code_simplify_interface/main.py

@@ -15,6 +15,7 @@ import shutil
 import struct
 import subprocess
 import sys
+import tempfile
 from importlib import resources
 from typing import Any, Optional, Sequence, Union
 
@@ -89,10 +90,7 @@ def normalize_pd_codes(pd_codes: PdManyInput) -> list[str]:
     return [normalize_pd_code(pd_code) for pd_code in pd_codes]
 
 
-def _label_for_block(text: str, block_start: int, label_prefix: str, index: int) -> str:
-    line_start = text.rfind("\n", 0, block_start)
-    line_start = 0 if line_start == -1 else line_start + 1
-    before_block = text[line_start:block_start]
+def _label_for_line_prefix(before_block: str, label_prefix: str, index: int) -> str:
     if ":" in before_block:
         line_label = before_block.split(":", 1)[0].strip()
         if line_label:
@@ -103,56 +101,62 @@ def _label_for_block(text: str, block_start: int, label_prefix: str, index: int)
 
 
 def _pd_file_jobs(path: str) -> list[tuple[str, str]]:
-    text = pathlib.Path(path).read_text(encoding="utf-8")
     jobs: list[tuple[str, str]] = []
-    position = 0
-    index = 0
-
-    while True:
-        start = text.find("PD[", position)
-        if start == -1:
-            break
-        depth = 0
-        end = -1
-        for cursor in range(start + 2, len(text)):
-            if text[cursor] == "[":
-                depth += 1
-            elif text[cursor] == "]":
-                depth -= 1
-                if depth == 0:
-                    end = cursor
+    fallback_jobs: list[tuple[str, str]] = []
+    current_label: Optional[str] = None
+    current_block: list[str] = []
+    bracket_depth = 0
+
+    with pathlib.Path(path).open("r", encoding="utf-8") as input_file:
+        for line in input_file:
+            cleaned = line.strip()
+            if not jobs and not current_block and cleaned and not cleaned.startswith("#"):
+                label = path
+                payload = cleaned
+                if ":" in cleaned:
+                    line_label, payload = cleaned.split(":", 1)
+                    line_label = line_label.strip()
+                    payload = payload.strip()
+                    if line_label:
+                        label = f"{path}:{line_label}"
+                elif fallback_jobs:
+                    label = f"{path}#{len(fallback_jobs) + 1}"
+                fallback_jobs.append((label, payload))
+
+            cursor = 0
+            while cursor < len(line):
+                if current_block:
+                    char = line[cursor]
+                    current_block.append(char)
+                    if char == "[":
+                        bracket_depth += 1
+                    elif char == "]":
+                        bracket_depth -= 1
+                        if bracket_depth == 0:
+                            jobs.append((current_label or f"{path}#{len(jobs) + 1}", "".join(current_block)))
+                            current_label = None
+                            current_block = []
+                    cursor += 1
+                    continue
+
+                start = line.find("PD[", cursor)
+                if start == -1:
                     break
-        if end == -1:
-            jobs.append((f"{path}#{index + 1}", text[start:].strip()))
-            break
-        jobs.append((
-            _label_for_block(text, start, path, index),
-            text[start : end + 1],
-        ))
-        index += 1
-        position = end + 1
+                current_label = _label_for_line_prefix(line[:start], path, len(jobs))
+                current_block = ["PD["]
+                bracket_depth = 1
+                cursor = start + 3
 
     if jobs:
+        if current_block:
+            jobs.append((f"{path}#{len(jobs) + 1}", "".join(current_block).strip()))
         if len(jobs) == 1:
             jobs[0] = (path, jobs[0][1])
         return jobs
 
-    for line in text.splitlines():
-        cleaned = line.strip()
-        if not cleaned or cleaned.startswith("#"):
-            continue
-        label = path
-        payload = cleaned
-        if ":" in cleaned:
-            line_label, payload = cleaned.split(":", 1)
-            line_label = line_label.strip()
-            payload = payload.strip()
-            if line_label:
-                label = f"{path}:{line_label}"
-        elif jobs:
-            label = f"{path}#{len(jobs) + 1}"
-        jobs.append((label, payload))
-    return jobs
+    if current_block:
+        fallback_jobs.append((f"{path}#{len(fallback_jobs) + 1}", "".join(current_block).strip()))
+    return fallback_jobs
 
 
 @contextlib.contextmanager
@@ -763,6 +767,7 @@ def _load_library() -> ctypes.CDLL:
         ctypes.c_int,
         ctypes.c_int,
         ctypes.c_int,
+        ctypes.c_int,
         ctypes.c_ulonglong,
         ctypes.POINTER(ctypes.c_int),
         ctypes.c_ulonglong,
@@ -784,6 +789,7 @@ def _run_one_direct(
     max_thread: int = -1,
     timeout: int = -1,
     verbose: bool = False,
+    show_step_pd: bool = False,
     known_crossingless_components: int = 0,
     remove_crossings: Optional[Sequence[int]] = None,
 ) -> dict[str, Any]:
@@ -807,6 +813,7 @@ def _run_one_direct(
         int(max_thread),
         int(timeout),
         1 if verbose else 0,
+        1 if show_step_pd else 0,
         int(known_crossingless_components),
         removed_array,
         int(removed_count),
@@ -847,6 +854,7 @@ def _run_one(
     max_thread: int = -1,
     timeout: int = -1,
     verbose: bool = False,
+    show_step_pd: bool = False,
     known_crossingless_components: int = 0,
     remove_crossings: Optional[Sequence[int]] = None,
 ) -> dict[str, Any]:
@@ -865,43 +873,62 @@ def _run_one(
         "max_thread": int(max_thread),
         "timeout": int(timeout),
         "verbose": bool(verbose),
+        "show_step_pd": bool(show_step_pd),
         "known_crossingless_components": int(known_crossingless_components),
         "remove_crossings": [int(value) for value in remove_crossings or []],
     }
+    protocol_output_path: Optional[pathlib.Path] = None
+    if show_step_pd:
+        fd, protocol_name = tempfile.mkstemp(
+            prefix="cpp-pd-code-simplify-interface-",
+            suffix=".json",
+        )
+        os.close(fd)
+        protocol_output_path = pathlib.Path(protocol_name)
+        request["protocol_output_path"] = str(protocol_output_path)
     env = os.environ.copy()
     project_root = str(pathlib.Path(__file__).resolve().parents[1])
     env["PYTHONPATH"] = project_root + os.pathsep + env.get("PYTHONPATH", "")
-    proc = subprocess.Popen(
-        [
-            sys.executable,
-            "-m",
-            "cpp_pd_code_simplify_interface._worker",
-        ],
-        cwd=str(pathlib.Path.cwd()),
-        text=True,
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE,
-        stderr=None if verbose else subprocess.PIPE,
-        env=env,
-    )
     try:
-        stdout, stderr = proc.communicate(json.dumps(request))
-    except KeyboardInterrupt:
-        _terminate_process(proc)
-        raise
-
-    if proc.returncode != 0:
-        detail = (stderr or "").strip()
-        raise PdCodeSimplifyInterfaceError(
-            f"C++ interface worker failed with exit code {proc.returncode}"
-            + (f": {detail}" if detail else "")
+        proc = subprocess.Popen(
+            [
+                sys.executable,
+                "-m",
+                "cpp_pd_code_simplify_interface._worker",
+            ],
+            cwd=str(pathlib.Path.cwd()),
+            text=True,
+            stdin=subprocess.PIPE,
+            stdout=None if show_step_pd else subprocess.PIPE,
+            stderr=None if verbose else subprocess.PIPE,
+            env=env,
         )
-    try:
-        envelope = json.loads(stdout)
-    except json.JSONDecodeError as exc:
-        raise PdCodeSimplifyInterfaceError(
-            f"invalid interface worker JSON output: {stdout!r}"
-        ) from exc
+        try:
+            stdout, stderr = proc.communicate(json.dumps(request))
+        except KeyboardInterrupt:
+            _terminate_process(proc)
+            raise
+
+        if proc.returncode != 0:
+            detail = (stderr or "").strip()
+            raise PdCodeSimplifyInterfaceError(
+                f"C++ interface worker failed with exit code {proc.returncode}"
+                + (f": {detail}" if detail else "")
+            )
+        if protocol_output_path is not None:
+            stdout = protocol_output_path.read_text(encoding="utf-8")
+        try:
+            envelope = json.loads(stdout or "")
+        except json.JSONDecodeError as exc:
+            raise PdCodeSimplifyInterfaceError(
+                f"invalid interface worker JSON output: {stdout!r}"
+            ) from exc
+    finally:
+        if protocol_output_path is not None:
+            try:
+                protocol_output_path.unlink()
+            except FileNotFoundError:
+                pass
     if not isinstance(envelope, dict):
         raise PdCodeSimplifyInterfaceError(
             f"invalid interface worker response type: {type(envelope)!r}"
@@ -923,6 +950,7 @@ def simplify(
     max_thread: int = -1,
     timeout: int = -1,
     verbose: bool = False,
+    show_step_pd: bool = False,
     known_crossingless_components: int = 0,
     remove_crossings: Optional[Sequence[int]] = None,
 ) -> dict[str, Any]:
@@ -936,6 +964,7 @@ def simplify(
         max_thread=max_thread,
         timeout=timeout,
         verbose=verbose,
+        show_step_pd=show_step_pd,
         known_crossingless_components=known_crossingless_components,
         remove_crossings=remove_crossings,
     )
@@ -950,6 +979,7 @@ def simplify_many(
     max_thread: int = -1,
     timeout: int = -1,
     verbose: bool = False,
+    show_step_pd: bool = False,
     known_crossingless_components: int = 0,
     remove_crossings: Optional[Sequence[int]] = None,
 ) -> list[dict[str, Any]]:
@@ -964,6 +994,7 @@ def simplify_many(
             max_thread=max_thread,
             timeout=timeout,
             verbose=verbose,
+            show_step_pd=show_step_pd,
             known_crossingless_components=known_crossingless_components,
             remove_crossings=remove_crossings,
         )
@@ -982,6 +1013,7 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
     parser.add_argument("--max-thread", type=int, default=-1)
     parser.add_argument("--timeout", type=int, default=-1)
     parser.add_argument("--verbose", action="store_true")
+    parser.add_argument("--show-step-pd", action="store_true")
     parser.add_argument("--known-crossingless-components", type=int, default=0)
     parser.add_argument("--remove-crossings", help="comma-separated zero-based crossing indices")
     args = parser.parse_args(argv)
@@ -1004,7 +1036,14 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
 
     exit_code = 0
     if args.pd_file:
-        jobs = _pd_file_jobs(args.pd_file)
+        try:
+            jobs = _pd_file_jobs(args.pd_file)
+        except KeyboardInterrupt:
+            print(json.dumps({"error": "interrupted by Ctrl+C"}, indent=2))
+            return 130
+        except Exception as exc:
+            print(json.dumps({"error": str(exc)}, indent=2))
+            return 2
         batch_payload = []
         show_labels = len(jobs) > 1
         for label, line in jobs:
@@ -1017,6 +1056,7 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
                     max_thread=args.max_thread,
                     timeout=args.timeout,
                     verbose=args.verbose,
+                    show_step_pd=args.show_step_pd,
                     known_crossingless_components=args.known_crossingless_components,
                     remove_crossings=remove_crossings,
                 )
@@ -1049,6 +1089,7 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
                 max_thread=args.max_thread,
                 timeout=args.timeout,
                 verbose=args.verbose,
+                show_step_pd=args.show_step_pd,
                 known_crossingless_components=args.known_crossingless_components,
                 remove_crossings=remove_crossings,
             )

{cpp_pd_code_simplify_interface-0.1.13 → cpp_pd_code_simplify_interface-0.1.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cpp-pd-code-simplify-interface"
-version = "0.1.13"
+version = "0.1.15"
 description = "Python interface for cpp-pd-code-simplify with runtime C++ compilation."
 authors = [
     {name = "GGN_2015", email = "neko@jlulug.org"}

cpp_pd_code_simplify_interface-0.1.13/cpp_pd_code_simplify_interface/__main__.py

@@ -1,4 +0,0 @@
-from .main import main
-
-if __name__ == "__main__":
-    raise SystemExit(main())

cpp_pd_code_simplify_interface-0.1.13/cpp_pd_code_simplify_interface/_worker.py

@@ -1,47 +0,0 @@
-from __future__ import annotations
-
-import json
-import sys
-from typing import Any
-
-from .main import _run_one_direct
-
-
-def main() -> int:
-    try:
-        request: dict[str, Any] = json.loads(sys.stdin.read())
-        result = _run_one_direct(
-            str(request.get("pd_text", "")),
-            max_paths=int(request.get("max_paths", -1)),
-            ban_heuristic=bool(request.get("ban_heuristic", False)),
-            reduction_round=int(request.get("reduction_round", -1)),
-            max_thread=int(request.get("max_thread", -1)),
-            timeout=int(request.get("timeout", -1)),
-            verbose=bool(request.get("verbose", False)),
-            known_crossingless_components=int(
-                request.get("known_crossingless_components", 0)
-            ),
-            remove_crossings=request.get("remove_crossings") or [],
-        )
-        print(json.dumps({"ok": True, "result": result}, separators=(",", ":")))
-        return 0
-    except KeyboardInterrupt:
-        print(
-            json.dumps(
-                {"ok": False, "error": "interrupted by Ctrl+C"},
-                separators=(",", ":"),
-            )
-        )
-        return 130
-    except BaseException as exc:  # noqa: BLE001 - return errors through JSON.
-        print(
-            json.dumps(
-                {"ok": False, "error": str(exc)},
-                separators=(",", ":"),
-            )
-        )
-        return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())