ballpython 2.1.0__tar.gz → 2.1.2__tar.gz

{ballpython-2.1.0 → ballpython-2.1.2}/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.4
 Name: ballpython
-Version: 2.1.0
+Version: 2.1.2
 Summary: The Ultimate Static Python Intelligence, Healing, Type Verification, and Security Suite
 Author: Developer
 License-Expression: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: ruff>=0.1.0
-Requires-Dist: rich>=13.0.0
-Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: black>=24.0.0; extra == "dev"

{ballpython-2.1.0 → ballpython-2.1.2}/ballpython.egg-info/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.4
 Name: ballpython
-Version: 2.1.0
+Version: 2.1.2
 Summary: The Ultimate Static Python Intelligence, Healing, Type Verification, and Security Suite
 Author: Developer
 License-Expression: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: ruff>=0.1.0
-Requires-Dist: rich>=13.0.0
-Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: black>=24.0.0; extra == "dev"

{ballpython-2.1.0 → ballpython-2.1.2}/ballpython.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ pycleaner/verifier.py
 pycleaner/frameworks/__init__.py
 pycleaner/frameworks/plugins.py
 tests/test_baseline_and_explain.py
+tests/test_c_to_a_overhaul.py
 tests/test_cache.py
 tests/test_cli.py
 tests/test_cli_prove.py

{ballpython-2.1.0 → ballpython-2.1.2}/ballpython.egg-info/requires.txt

@@ -1,8 +1,4 @@
 ruff>=0.1.0
-rich>=13.0.0
-
-[:python_version < "3.11"]
-tomli>=1.1.0
 
 [dev]
 pytest>=8.0.0

{ballpython-2.1.0 → ballpython-2.1.2}/pycleaner/__init__.py

@@ -18,7 +18,7 @@ from pycleaner.discovery import (
     is_protected_file,
 )
 
-__version__ = "2.0.5"
+__version__ = "2.1.1"
 __all__ = [
     "DEFAULT_IGNORED_DIRS",
     "PROTECTED_FILE_PATTERNS",

{ballpython-2.1.0 → ballpython-2.1.2}/pycleaner/cli.py

@@ -555,7 +555,12 @@ def _create_printer(console: Any) -> Any:
         else:
             import re
 
-            cleaned = re.sub(r"\[/?[a-z ]*\]", "", msg)
+            cleaned = re.sub(
+                r"(?<!\\)\[/?(?:bold|dim|italic|underline|blink|reverse|strike|black|red|green|yellow|blue|magenta|cyan|white)(?: [a-z]+)*\]",
+                "",
+                msg,
+            )
+            cleaned = cleaned.replace("\\[", "[").replace("\\]", "]")
             print(cleaned)
 
     return print_msg
@@ -684,8 +689,13 @@ def main(argv: Sequence[str] | None = None) -> int:
 @dataclass
 class _FixBatchState:
     changed_count: int = 0
+    would_change_count: int = 0
+    actually_written_count: int = 0
+    partially_updated_count: int = 0
+    partially_would_change_count: int = 0
     error_count: int = 0
     diagnostics: list[dict[str, str]] = field(default_factory=list)
+    security_findings: list[Any] = field(default_factory=list)
     proven_count: int = 0
     suggested_count: int = 0
     refused_count: int = 0
@@ -729,6 +739,12 @@ def _report_file_modifications(
         print_msg("  - Lint: fixed errors and pruned unused imports", style="blue")
     if result.format_changed:
         print_msg("  - Format: applied PEP 8 formatting", style="blue")
+    for sf in getattr(result, "security_findings", []):
+        if getattr(sf, "severity", None) in ("CRITICAL", "HIGH"):
+            print_msg(
+                f"  - Unresolved Security [{sf.severity}]: {sf.message} (line {sf.lineno})",
+                style="bold red",
+            )
 
 
 def _accumulate_result(
@@ -741,6 +757,8 @@ def _accumulate_result(
     print_msg, console, is_json = io_ctx
     if result.diagnostics:
         state.diagnostics.extend(result.diagnostics)
+    if getattr(result, "security_findings", None):
+        state.security_findings.extend(result.security_findings)
 
     if result.proof_receipts:
         state.proof_receipts.extend(result.proof_receipts)
@@ -766,12 +784,63 @@ def _accumulate_result(
 
     if result.error:
         state.error_count += 1
+        is_partial = (result.changed or bool(result.syntax_repairs)) and (
+            result.verification_tier != VerificationTier.TIER_C_REFUSED
+        )
+        if is_partial:
+            state.changed_count += 1
+            if opts.apply_changes:
+                state.partially_updated_count += 1
+            else:
+                state.partially_would_change_count += 1
+
+            if not is_json and not opts.in_progress:
+                action = (
+                    "Partially cleaned"
+                    if opts.apply_changes
+                    else "Would partially modify"
+                )
+                print_msg(f"[yellow]{action}:[/yellow] {py_file.name}")
+                for repair in result.syntax_repairs:
+                    print_msg(f"  - Syntax: {repair}", style="cyan")
+                for mod in result.modernize_transforms:
+                    print_msg(f"  - Modernize: {mod}", style="green")
+                for dc in result.dead_code_pruned:
+                    print_msg(f"  - Dead-code: {dc}", style="yellow")
+                for imp in result.resolved_imports:
+                    print_msg(f"  - Import: {imp}", style="magenta")
+                if result.lint_changed:
+                    print_msg(
+                        "  - Lint: fixed errors and pruned unused imports", style="blue"
+                    )
+                if result.format_changed:
+                    print_msg("  - Format: applied PEP 8 formatting", style="blue")
+                for sf in getattr(result, "security_findings", []):
+                    if getattr(sf, "severity", None) in ("CRITICAL", "HIGH"):
+                        print_msg(
+                            f"  - Unresolved Security [{sf.severity}]: {sf.message} (line {sf.lineno})",
+                            style="bold red",
+                        )
+                if opts.show_diff and result.diff:
+                    _render_fix_diff(result.diff, console)
+        else:
+            if not is_json and not opts.in_progress:
+                for sf in getattr(result, "security_findings", []):
+                    if getattr(sf, "severity", None) in ("CRITICAL", "HIGH"):
+                        print_msg(
+                            f"  - Unresolved Security [{sf.severity}]: {sf.message} (line {sf.lineno})",
+                            style="bold red",
+                        )
+
         if not is_json:
             print_msg(f"[red]ERROR in {py_file.name}:[/red] {result.error}")
         return
 
     if result.changed:
         state.changed_count += 1
+        state.would_change_count += 1
+        if opts.apply_changes and not result.error:
+            state.actually_written_count += 1
         if not is_json and not opts.in_progress:
             _report_file_modifications(result, py_file, opts.apply_changes, print_msg)
             if opts.show_diff and result.diff:
@@ -832,7 +901,9 @@ def _run_progress_fix(
         backup=opts.backup,
         in_progress=True,
     )
-    _print_msg, console, _is_json = io_ctx
+    print_msg, console, is_json = io_ctx
+    modified_items: list[tuple[CleanResult, Path]] = []
+
     with Progress(
         SpinnerColumn(),
         TextColumn("[progress.description]{task.description}"),
@@ -847,8 +918,18 @@ def _run_progress_fix(
                 py_file, apply_changes=opts.apply_changes, backup=opts.backup
             )
             _accumulate_result(result, py_file, state, prog_opts, io_ctx)
+            if result.changed or result.error or result.syntax_repairs:
+                modified_items.append((result, py_file))
             progress.advance(task)
 
+    if not is_json and modified_items:
+        print_msg("")
+        for res, py_file in modified_items:
+            if not res.error and res.changed:
+                _report_file_modifications(res, py_file, opts.apply_changes, print_msg)
+                if opts.show_diff and res.diff:
+                    _render_fix_diff(res.diff, console)
+
 
 def _execute_fix_batch(
     pipeline: CleanPipeline,
@@ -952,8 +1033,14 @@ def _compute_fix_exit_code(
         return 1
     if is_prove_cmd:
         return 0 if state.error_count == 0 else 1
+    has_unresolved_security = any(
+        getattr(sf, "severity", None) in ("CRITICAL", "HIGH")
+        for sf in state.security_findings
+    )
+    if has_unresolved_security:
+        return 1
     if not apply_changes and (
-        state.changed_count > 0
+        state.would_change_count > 0
         or state.error_count > 0
         or bool(audit_report.missing_packages)
     ):
@@ -1012,7 +1099,11 @@ def _cmd_fix(
 
     if is_json:
         print(json.dumps(state.diagnostics, indent=2))
-        return 0 if state.error_count == 0 else 1
+        has_sec_issues = any(
+            getattr(sf, "severity", None) in ("CRITICAL", "HIGH")
+            for sf in state.security_findings
+        )
+        return 1 if (state.error_count > 0 or has_sec_issues) else 0
 
     audit_report = _run_fix_audit(
         root_dir,
@@ -1027,10 +1118,64 @@ def _cmd_fix(
         or getattr(audit_report, "fixed_pyproject", False)
     ):
         state.changed_count += 1
+        state.would_change_count += 1
+        state.actually_written_count += 1
+
+    if not opts.apply_changes:
+        if state.partially_would_change_count > 0:
+            err_label = (
+                "1 remaining error"
+                if state.error_count == 1
+                else f"{state.error_count} remaining errors"
+            )
+            if state.would_change_count > 0:
+                print_msg(
+                    f"\n[bold]Summary: {len(py_files)} inspected, {state.would_change_count} would change, {state.partially_would_change_count} would partially change, 0 written, {err_label}.[/bold]"
+                )
+            else:
+                print_msg(
+                    f"\n[bold]Summary: {len(py_files)} inspected, {state.partially_would_change_count} would partially change, 0 written, {err_label}.[/bold]"
+                )
+        else:
+            print_msg(
+                f"\n[bold]Summary: {len(py_files)} inspected, {state.would_change_count} would change, 0 written, {state.error_count} errors.[/bold]"
+            )
+    else:
+        if state.partially_updated_count > 0:
+            err_label = (
+                "1 remaining error"
+                if state.error_count == 1
+                else f"{state.error_count} remaining errors"
+            )
+            if state.actually_written_count > 0:
+                print_msg(
+                    f"\n[bold]Summary: {len(py_files)} inspected, {state.actually_written_count} updated, {state.partially_updated_count} partially updated, {err_label}.[/bold]"
+                )
+            else:
+                print_msg(
+                    f"\n[bold]Summary: {len(py_files)} inspected, {state.partially_updated_count} partially updated, {err_label}.[/bold]"
+                )
+        else:
+            print_msg(
+                f"\n[bold]Summary: {len(py_files)} inspected, {state.actually_written_count} updated, {state.error_count} errors.[/bold]"
+            )
 
-    print_msg(
-        f"\n[bold]Summary: {len(py_files)} inspected, {state.changed_count} updated, {state.error_count} errors.[/bold]"
-    )
+    critical_or_high_findings = [
+        sf
+        for sf in state.security_findings
+        if getattr(sf, "severity", None) in ("CRITICAL", "HIGH")
+    ]
+    if critical_or_high_findings and not is_json:
+        print_msg(
+            f"\n[bold red]Unresolved Security Findings ({len(critical_or_high_findings)} issue(s)):[/bold red]"
+        )
+        for sf in critical_or_high_findings:
+            f_path = getattr(sf, "filepath", getattr(sf, "file", "<unknown>"))
+            print_msg(
+                f"  [bold red]- [{sf.severity}] {f_path}:{sf.lineno}: {sf.message}[/bold red]"
+            )
+            if getattr(sf, "suggestion", None):
+                print_msg(f"    [dim]Suggestion: {sf.suggestion}[/dim]")
 
     if pipeline.verify_proofs:
         total_proven_callables = sum(
@@ -1187,7 +1332,7 @@ def _cmd_baseline(
     fingerprints: list[BaselineFingerprint] = []
 
     detector = DeadCodeDetector()
-    dead_code_report = detector.scan_project(root_dir)
+    dead_code_report = detector.scan_files(py_files)
     for item in dead_code_report.items:
         if item.kind == "unused-import":
             rule = "DC002"
@@ -1206,7 +1351,7 @@ def _cmd_baseline(
         )
 
     scanner = SecurityScanner()
-    sec_report = scanner.scan_project(root_dir)
+    sec_report = scanner.scan_files(py_files)
     for finding in sec_report.findings:
         fingerprints.append(
             BaselineManager.create_fingerprint(
@@ -1219,7 +1364,7 @@ def _cmd_baseline(
         )
 
     analyzer = ComplexityAnalyzer()
-    comp_report = analyzer.analyze_project(root_dir)
+    comp_report = analyzer.analyze_files(py_files)
     thresholds = (
         getattr(args, "max_cyclomatic", config.max_cyclomatic_complexity),
         getattr(args, "max_cognitive", config.max_cognitive_complexity),
@@ -1373,9 +1518,10 @@ def _cmd_cache(
     console: Any,
 ) -> int:
     """Manage and inspect the content-addressable verification and AST cache."""
-    db_path = getattr(args, "db", None) or getattr(
+    raw_db_path = getattr(args, "db", None) or getattr(
         config, "cache_db_path", ".pycleaner/cache.db"
     )
+    db_path: str = str(raw_db_path) if raw_db_path else ".pycleaner/cache.db"
     cache = ContentAddressableCache(db_path=db_path)
 
     if getattr(args, "clear", False):
@@ -1445,7 +1591,18 @@ def _render_audit_cli_output(
 
 def _cmd_audit(args: argparse.Namespace, config: PyCleanerConfig, print_msg) -> int:
     """Dependency audit command."""
-    root_dir = find_project_root(args.paths[0] if args.paths else None)
+    targets = getattr(args, "paths", ["."])
+    target_path = Path(targets[0]).resolve() if targets else Path.cwd()
+    root_dir = find_project_root(target_path)
+    explicit_files = (
+        [
+            Path(p).resolve()
+            for p in targets
+            if Path(p).is_file() and Path(p).suffix == ".py"
+        ]
+        if targets
+        else None
+    )
 
     is_check = getattr(args, "check", False)
     fix_flag = getattr(args, "fix", False) or getattr(args, "fix_deps", False)
@@ -1454,6 +1611,7 @@ def _cmd_audit(args: argparse.Namespace, config: PyCleanerConfig, print_msg) ->
     audit_report = auditor.audit(
         fix=fix_flag and not is_check,
         prune_unused=prune_flag and not is_check,
+        target_files=explicit_files or None,
     )
 
     if getattr(args, "json", False):
@@ -1475,7 +1633,7 @@ def _render_scan_json(report: Any) -> int:
         for f in report.findings
     ]
     print(json.dumps(findings, indent=2))
-    return 1 if report.critical_count > 0 else 0
+    return 1 if (report.critical_count > 0 or report.high_count > 0) else 0
 
 
 def _render_scan_table(report: Any, console: Any, target_base: str) -> None:
@@ -1526,23 +1684,24 @@ def _render_scan_cli_summary(
         f"\n  Total: {report.count} finding(s) - "
         f"[red]{report.critical_count} critical[/red], [red]{report.high_count} high[/red]"
     )
-    return 1 if report.critical_count > 0 else 0
+    return 1 if (report.critical_count > 0 or report.high_count > 0) else 0
 
 
 def _cmd_scan(
     args: argparse.Namespace, config: PyCleanerConfig, print_msg, console
 ) -> int:
     """Security scan command."""
-    root_dir = Path(args.paths[0]).resolve() if args.paths else Path.cwd()
-    if not root_dir.is_dir():
-        root_dir = root_dir.parent
+    targets = getattr(args, "paths", ["."])
+    target_path = Path(targets[0]).resolve() if targets else Path.cwd()
+    root_dir = find_project_root(target_path)
+    py_files = discover_python_files(args.paths, config=config, root=root_dir)
 
     severity = getattr(args, "severity", config.security_severity_threshold)
     scanner = SecurityScanner(
         severity_threshold=severity,
         ignore_rules=set(config.ignore_security_rules),
     )
-    report = scanner.scan_project(root_dir, exclude_patterns=config.exclude)
+    report = scanner.scan_files(py_files)
 
     target_base = args.paths[0] if args.paths else "."
     if getattr(args, "json", False):
@@ -1636,12 +1795,13 @@ def _cmd_complexity(
     args: argparse.Namespace, config: PyCleanerConfig, print_msg, console
 ) -> int:
     """Complexity analysis command."""
-    root_dir = Path(args.paths[0]).resolve() if args.paths else Path.cwd()
-    if not root_dir.is_dir():
-        root_dir = root_dir.parent
+    targets = getattr(args, "paths", ["."])
+    target_path = Path(targets[0]).resolve() if targets else Path.cwd()
+    root_dir = find_project_root(target_path)
+    py_files = discover_python_files(args.paths, config=config, root=root_dir)
 
     analyzer = ComplexityAnalyzer()
-    report = analyzer.analyze_project(root_dir, exclude_patterns=config.exclude)
+    report = analyzer.analyze_files(py_files)
 
     thresholds = (
         getattr(args, "max_cyclomatic", config.max_cyclomatic_complexity),
@@ -1711,17 +1871,20 @@ def _cmd_dead_code(
     args: argparse.Namespace, config: PyCleanerConfig, print_msg, console
 ) -> int:
     """Dead code detection command."""
-    root_dir = Path(args.paths[0]).resolve() if args.paths else Path.cwd()
-    if not root_dir.is_dir():
-        root_dir = root_dir.parent
+    targets = getattr(args, "paths", ["."])
+    target_path = Path(targets[0]).resolve() if targets else Path.cwd()
+    root_dir = find_project_root(target_path)
+    py_files = discover_python_files(args.paths, config=config, root=root_dir)
 
     detector = DeadCodeDetector(
         ignore_decorators=set(config.ignore_decorators),
         ignore_names=set(config.ignore_names),
     )
     if getattr(args, "fix", False):
-        print_msg(f"[bold green]Pruning dead code across {root_dir}...[/bold green]")
-        fix_results = detector.fix_project(root_dir, exclude_patterns=config.exclude)
+        print_msg(
+            f"[bold green]Pruning dead code across {len(py_files)} file(s)...[/bold green]"
+        )
+        fix_results = detector.fix_files(py_files)
         total_pruned = sum(len(res.pruned_items) for res in fix_results.values())
         print_msg(
             f"[green]Successfully fixed {len(fix_results)} file(s), pruned {total_pruned} dead code item(s).[/green]"
@@ -1734,7 +1897,7 @@ def _cmd_dead_code(
             print_msg(f"  [cyan]{rel_p}[/cyan]: {len(res.pruned_items)} pruned")
         return 0
 
-    report = detector.scan_project(root_dir, exclude_patterns=config.exclude)
+    report = detector.scan_files(py_files)
 
     if getattr(args, "json", False):
         return _render_dead_code_json(report.items)
@@ -1814,12 +1977,13 @@ def _cmd_types(
     args: argparse.Namespace, config: PyCleanerConfig, print_msg, console
 ) -> int:
     """Bidirectional type checking and inference with Typeshed stubs."""
-    root_dir = Path(args.paths[0]).resolve() if args.paths else Path.cwd()
-    if not root_dir.is_dir():
-        root_dir = root_dir.parent
+    targets = getattr(args, "paths", ["."])
+    target_path = Path(targets[0]).resolve() if targets else Path.cwd()
+    root_dir = find_project_root(target_path)
+    py_files = discover_python_files(args.paths, config=config, root=root_dir)
 
     checker = TypeChecker(strict=config.strict_types)
-    report = checker.check_project(root_dir, exclude_patterns=config.exclude)
+    report = checker.check_files(py_files)
 
     target_base = args.paths[0] if args.paths else "."
     if getattr(args, "json", False):
@@ -1908,12 +2072,13 @@ def _cmd_taint(
     args: argparse.Namespace, config: PyCleanerConfig, print_msg, console
 ) -> int:
     """Interprocedural SAST dataflow and taint vulnerability analysis."""
-    root_dir = Path(args.paths[0]).resolve() if args.paths else Path.cwd()
-    if not root_dir.is_dir():
-        root_dir = root_dir.parent
+    targets = getattr(args, "paths", ["."])
+    target_path = Path(targets[0]).resolve() if targets else Path.cwd()
+    root_dir = find_project_root(target_path)
+    py_files = discover_python_files(args.paths, config=config, root=root_dir)
 
     engine = TaintEngine()
-    report = engine.scan_path(root_dir, exclude_patterns=config.exclude)
+    report = engine.scan_files(py_files)
 
     target_base = args.paths[0] if args.paths else "."
     if getattr(args, "json", False):
@@ -2118,6 +2283,7 @@ def _cmd_watch(
     except KeyboardInterrupt:
         print_msg("\n[bold]Watch mode stopped.[/bold]")
         return 0
+    return 0
 
 
 def _cmd_hook(args: argparse.Namespace, print_msg) -> int:

{ballpython-2.1.0 → ballpython-2.1.2}/pycleaner/complexity_analyzer.py

@@ -354,17 +354,12 @@ class ComplexityAnalyzer:
         except OSError:
             return None
 
-    def analyze_project(
-        self, root_dir: Path | str, exclude_patterns: Sequence[str] = ()
-    ) -> ComplexityReport:
-        """Analyze complexity across all Python files in a project."""
-        root = Path(root_dir).resolve()
+    def analyze_files(self, target_files: Sequence[Path]) -> ComplexityReport:
+        """Analyze complexity across a specific sequence of Python files without walking directories."""
         all_functions: list[ComplexityMetrics] = []
         files_scanned = 0
 
-        for fpath in collect_project_python_files(
-            root, exclude_patterns=exclude_patterns
-        ):
+        for fpath in target_files:
             try:
                 content = fpath.read_text(encoding="utf-8", errors="replace")
                 metrics = self.analyze_source(content, filename=str(fpath)).functions
@@ -376,6 +371,14 @@ class ComplexityAnalyzer:
         all_functions.sort(key=lambda f: f.cyclomatic, reverse=True)
         return ComplexityReport(functions=all_functions, files_scanned=files_scanned)
 
+    def analyze_project(
+        self, root_dir: Path | str, exclude_patterns: Sequence[str] = ()
+    ) -> ComplexityReport:
+        """Analyze complexity across all Python files in a project."""
+        root = Path(root_dir).resolve()
+        py_files = collect_project_python_files(root, exclude_patterns=exclude_patterns)
+        return self.analyze_files(py_files)
+
     @staticmethod
     def _count_function_args(node: ast.FunctionDef | ast.AsyncFunctionDef) -> int:
         all_args = node.args.posonlyargs + node.args.args + node.args.kwonlyargs