voidaccess 1.3.0__tar.gz → 1.4.2__tar.gz

{voidaccess-1.3.0 → voidaccess-1.4.2}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.4
 Name: voidaccess
-Version: 1.3.0
+Version: 1.4.2
 Summary: Dark web OSINT CLI — automated threat intelligence from query to report
 Author: VoidAccess
-License: MIT
+License-Expression: MIT
 Keywords: osint,darkweb,threat-intelligence,tor,cli
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11

{voidaccess-1.3.0 → voidaccess-1.4.2}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "voidaccess"
-version = "1.3.0"
+version = "1.4.2"
 description = "Dark web OSINT CLI — automated threat intelligence from query to report"
 readme = "README.md"
-license = { text = "MIT" }
+license = "MIT"
 requires-python = ">=3.10"
 authors = [{ name = "VoidAccess" }]
 keywords = ["osint", "darkweb", "threat-intelligence", "tor", "cli"]
@@ -15,7 +15,6 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Console",
     "Intended Audience :: Information Technology",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.11",
@@ -51,7 +50,7 @@ dependencies = [
 dev = ["pytest", "pytest-asyncio"]
 
 [project.scripts]
-voidaccess = "cli.main:app"
+voidaccess = "voidaccess_cli.main:app"
 
 [tool.setuptools]
 py-modules = ["config"]
@@ -59,7 +58,7 @@ py-modules = ["config"]
 [tool.setuptools.packages.find]
 where = ["."]
 include = [
-    "cli*",
+    "voidaccess_cli*",
     "db*",
     "sources*",
     "extractor*",

{voidaccess-1.3.0 → voidaccess-1.4.2}/voidaccess.egg-info/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.4
 Name: voidaccess
-Version: 1.3.0
+Version: 1.4.2
 Summary: Dark web OSINT CLI — automated threat intelligence from query to report
 Author: VoidAccess
-License: MIT
+License-Expression: MIT
 Keywords: osint,darkweb,threat-intelligence,tor,cli
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11

{voidaccess-1.3.0 → voidaccess-1.4.2}/voidaccess.egg-info/SOURCES.txt

@@ -20,20 +20,6 @@ api/routes/search.py
 api/routes/settings.py
 auth/__init__.py
 auth/token_blacklist.py
-cli/__init__.py
-cli/browser.py
-cli/config.py
-cli/display.py
-cli/main.py
-cli/tor_detect.py
-cli/adapters/__init__.py
-cli/adapters/sqlite.py
-cli/commands/__init__.py
-cli/commands/configure.py
-cli/commands/enrich.py
-cli/commands/export.py
-cli/commands/investigate.py
-cli/commands/show.py
 crawler/__init__.py
 crawler/dedup.py
 crawler/frontier.py
@@ -173,4 +159,18 @@ voidaccess.egg-info/SOURCES.txt
 voidaccess.egg-info/dependency_links.txt
 voidaccess.egg-info/entry_points.txt
 voidaccess.egg-info/requires.txt
-voidaccess.egg-info/top_level.txt
+voidaccess.egg-info/top_level.txt
+voidaccess_cli/__init__.py
+voidaccess_cli/browser.py
+voidaccess_cli/config.py
+voidaccess_cli/display.py
+voidaccess_cli/main.py
+voidaccess_cli/tor_detect.py
+voidaccess_cli/adapters/__init__.py
+voidaccess_cli/adapters/sqlite.py
+voidaccess_cli/commands/__init__.py
+voidaccess_cli/commands/configure.py
+voidaccess_cli/commands/enrich.py
+voidaccess_cli/commands/export.py
+voidaccess_cli/commands/investigate.py
+voidaccess_cli/commands/show.py

voidaccess-1.4.2/voidaccess.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+voidaccess = voidaccess_cli.main:app

{voidaccess-1.3.0 → voidaccess-1.4.2}/voidaccess.egg-info/top_level.txt

@@ -1,7 +1,6 @@
 analysis
 api
 auth
-cli
 config
 crawler
 db
@@ -17,3 +16,4 @@ sources
 utils
 vector
 voidaccess
+voidaccess_cli

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/__init__.py

@@ -1,3 +1,3 @@
 """voidaccess CLI — dark-web OSINT command-line interface."""
 
-__version__ = "1.3.0"
+__version__ = "1.4.1"

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/commands/configure.py

@@ -15,7 +15,7 @@ from rich.console import Console
 from rich.prompt import Prompt, Confirm
 from rich.table import Table
 
-from cli import config as cli_config
+from voidaccess_cli import config as cli_config
 
 app = typer.Typer(help="Configure the voidaccess CLI.", no_args_is_help=False, invoke_without_command=True)
 console = Console()

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/commands/enrich.py

@@ -30,7 +30,7 @@ def run(
     skip_emails: bool = typer.Option(False, "--skip-emails"),
 ) -> None:
     """Re-enrich entities for an existing investigation."""
-    from cli import config as cli_config
+    from voidaccess_cli import config as cli_config
     cli_config.apply_env()
 
     inv_id = _resolve_investigation_id(target)
@@ -50,7 +50,7 @@ def _resolve_investigation_id(target: str) -> Optional[str]:
         except Exception:
             return None
         return data.get("investigation", {}).get("id") or data.get("id")
-    from cli.adapters import sqlite as sqlite_adapter
+    from voidaccess_cli.adapters import sqlite as sqlite_adapter
     sqlite_adapter.init_db()
     resolved = sqlite_adapter.resolve_investigation_id(target) or target
     row = sqlite_adapter.get_investigation(resolved)
@@ -89,7 +89,7 @@ _TYPE_MAP = {
 
 def _load_extraction_results(investigation_id: str) -> list:
     """Reconstruct ExtractionResult-shaped objects from the DB."""
-    from cli.adapters import sqlite as sqlite_adapter
+    from voidaccess_cli.adapters import sqlite as sqlite_adapter
     rows = sqlite_adapter.get_entities(investigation_id)
     fakes = []
     for r in rows:

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/commands/export.py

@@ -25,7 +25,7 @@ def run(
     output: Optional[Path] = typer.Option(None, "--output", help="Output file"),
 ) -> None:
     """Export an investigation."""
-    from cli import config as cli_config
+    from voidaccess_cli import config as cli_config
     cli_config.apply_env()
 
     fmt = fmt.lower()
@@ -39,7 +39,7 @@ def run(
         raise typer.Exit(code=1)
 
     payload, suffix = _render(fmt, inv_id, data)
-    out_path = output or _default_out_path(target, suffix)
+    out_path = output or _default_out_path(target, suffix, fmt=fmt)
     out_path = Path(out_path).expanduser()
     out_path.parent.mkdir(parents=True, exist_ok=True)
     if isinstance(payload, bytes):
@@ -58,7 +58,7 @@ def _load_target(target: str) -> tuple[Optional[str], Optional[dict]]:
             return None, None
         inv_id = data.get("investigation", {}).get("id") or data.get("id")
         return inv_id, data
-    from cli.adapters import sqlite as sqlite_adapter
+    from voidaccess_cli.adapters import sqlite as sqlite_adapter
     sqlite_adapter.init_db()
     resolved = sqlite_adapter.resolve_investigation_id(target) or target
     data = sqlite_adapter.investigation_to_export_dict(resolved)
@@ -75,7 +75,7 @@ def _render(fmt: str, inv_id: Optional[str], data: dict) -> tuple[str | bytes, s
         return _csv_from_data(data), ".csv"
 
     if fmt == "md":
-        from cli.commands.investigate import _render_markdown  # reuse renderer
+        from voidaccess_cli.commands.investigate import _render_markdown  # reuse renderer
         # Adapt shape: _render_markdown expects flat payload
         flat = _flatten_for_md(data)
         return _render_markdown(flat), ".md"
@@ -150,9 +150,13 @@ def _flatten_for_md(data: dict) -> dict:
     return data
 
 
-def _default_out_path(target: str, suffix: str) -> Path:
+def _default_out_path(target: str, suffix: str, fmt: str = "") -> Path:
     p = Path(target).expanduser()
     if p.exists():
-        return p.with_suffix(suffix)
-    from cli import config as cli_config
+        candidate = p.with_suffix(suffix)
+        # Avoid overwriting input when suffix is the same (e.g. stix/misp .json)
+        if candidate == p and fmt and fmt not in ("json",):
+            return p.parent / f"{p.stem}-{fmt}{suffix}"
+        return candidate
+    from voidaccess_cli import config as cli_config
     return cli_config.get_output_dir() / f"{target}{suffix}"

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/commands/investigate.py

@@ -46,12 +46,31 @@ def run(
     quiet: bool = typer.Option(False, "--quiet", help="No live display; print final summary only"),
 ) -> None:
     """Run an investigation: query → search → scrape → extract → enrich → report."""
-    from cli import config as cli_config
+    from voidaccess_cli import config as cli_config
 
     cli_config.apply_env()
+
+    try:
+        import spacy
+        spacy.load("en_core_web_sm")
+    except Exception:
+        import subprocess, sys
+        from rich.console import Console
+        Console().print("  [dim]→[/dim] Installing spaCy NER model (one-time)...")
+        subprocess.run(
+            [sys.executable, "-m", "spacy", "download", "en_core_web_sm"],
+            capture_output=True,
+        )
+
     if quiet:
         logging.getLogger().setLevel(logging.ERROR)
 
+    from utils.content_safety import is_blocked_query
+    blocked, reason = is_blocked_query(query)
+    if blocked:
+        console.print(f"[red]Query blocked:[/red] {reason}")
+        raise typer.Exit(code=1)
+
     if not cli_config.is_configured() and not no_llm:
         console.print("[yellow]No LLM configured.[/yellow] Run [bold]voidaccess configure[/bold] first, or pass --no-llm.")
         raise typer.Exit(code=2)
@@ -106,10 +125,10 @@ async def _run_investigation(
     fmt: str,
     quiet: bool,
 ) -> None:
-    from cli import config as cli_config
-    from cli.adapters import sqlite as sqlite_adapter
-    from cli.display import InvestigationDisplay
-    from cli.tor_detect import detect_tor, tor_unavailable_message
+    from voidaccess_cli import config as cli_config
+    from voidaccess_cli.adapters import sqlite as sqlite_adapter
+    from voidaccess_cli.display import InvestigationDisplay
+    from voidaccess_cli.tor_detect import detect_tor, tor_unavailable_message
 
     cfg = cli_config.load_config()
     preset = DEPTH_PRESETS[depth]
@@ -382,6 +401,7 @@ async def _run_investigation(
         "query": query,
         "refined_query": refined,
         "model_used": chosen_model if llm is not None else None,
+        "status": "completed" if final_entities or scraped_pages else "completed_no_results",
         "created_at": datetime.now(timezone.utc).isoformat(),
         "summary": summary_text,
         "sources_used": sources_used,
@@ -500,7 +520,7 @@ def _build_cooccurrence_edges(investigation_id: str) -> int:
         from db.session import get_session
     except Exception:
         return 0
-    from cli.adapters.sqlite import save_relationships
+    from voidaccess_cli.adapters.sqlite import save_relationships
 
     edges: list[dict] = []
     inv_uuid = uuid.UUID(investigation_id)

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/commands/show.py

@@ -24,14 +24,18 @@ def run(
     target: Optional[str] = typer.Argument(
         None, help="Investigation id or path to a .json export"
     ),
+    no_tui: bool = typer.Option(False, "--no-tui", help="Print summary table without launching TUI (for scripted use)."),
 ) -> None:
     """Open the entity browser TUI."""
-    from cli import config as cli_config
+    from voidaccess_cli import config as cli_config
     cli_config.apply_env()
 
     data: Optional[dict] = None
 
     if target is None:
+        if no_tui:
+            console.print("[yellow]No target specified.[/yellow]")
+            raise typer.Exit(code=1)
         target = _pick_recent()
         if target is None:
             console.print("[yellow]No investigations found. Run `voidaccess investigate` first.[/yellow]")
@@ -41,7 +45,7 @@ def run(
     if candidate_path.exists() and candidate_path.suffix == ".json":
         data = json.loads(candidate_path.read_text(encoding="utf-8"))
     else:
-        from cli.adapters import sqlite as sqlite_adapter
+        from voidaccess_cli.adapters import sqlite as sqlite_adapter
         sqlite_adapter.init_db()
         resolved = sqlite_adapter.resolve_investigation_id(target) or target
         data = sqlite_adapter.investigation_to_export_dict(resolved)
@@ -49,13 +53,31 @@ def run(
             console.print(f"[red]Unknown investigation:[/red] {target}")
             raise typer.Exit(code=1)
 
-    from cli.browser import EntityBrowserApp
+    if no_tui:
+        _print_summary(data)
+        return
+
+    from voidaccess_cli.browser import EntityBrowserApp
     app = EntityBrowserApp(data=data)
     app.run()
 
 
+def _print_summary(data: dict) -> None:
+    inv = data.get("investigation") or data
+    entities = data.get("entities", [])
+    table = Table(title="Investigation summary")
+    table.add_column("Field", style="bold")
+    table.add_column("Value")
+    table.add_row("Query", str(inv.get("query") or ""))
+    table.add_row("Status", str(inv.get("status") or ""))
+    table.add_row("Entities", str(len(entities)))
+    table.add_row("Created", str(inv.get("created_at") or "")[:19])
+    table.add_row("Summary", (str(inv.get("summary") or "—"))[:120])
+    console.print(table)
+
+
 def _pick_recent() -> Optional[str]:
-    from cli.adapters import sqlite as sqlite_adapter
+    from voidaccess_cli.adapters import sqlite as sqlite_adapter
     sqlite_adapter.init_db()
     rows = sqlite_adapter.list_investigations(limit=20)
     if not rows:

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/config.py

@@ -178,3 +178,9 @@ def apply_env(config: Optional[dict[str, Any]] = None) -> None:
     # Enrichment keys
     for k, v in (cfg.get("enrichment_keys") or {}).items():
         _set_env_if_present(k, v, clear_if_empty=True)
+
+    # Keyless APIs (ThreatFox/URLhaus/MalwareBazaar/abuse.ch) must never
+    # receive an empty auth header — clear any empty env remnant.
+    for key in ("ABUSECH_API_KEY", "VT_API_KEY", "OTX_API_KEY"):
+        if not os.environ.get(key):
+            os.environ.pop(key, None)

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/main.py

@@ -2,7 +2,7 @@
 cli/main.py — typer entry point exposed as the `voidaccess` script.
 
 Defined as the [project.scripts] target in pyproject.toml:
-    voidaccess = "cli.main:app"
+    voidaccess = "voidaccess_cli.main:app"
 """
 
 from __future__ import annotations
@@ -14,6 +14,7 @@ import sys
 # Force UTF-8 on Windows consoles so rich glyphs render reliably
 if sys.platform == "win32":
     os.environ.setdefault("PYTHONIOENCODING", "utf-8")
+    os.environ.setdefault("PYTHONUTF8", "1")
     try:
         sys.stdout.reconfigure(encoding="utf-8")  # type: ignore[attr-defined]
         sys.stderr.reconfigure(encoding="utf-8")  # type: ignore[attr-defined]
@@ -21,14 +22,28 @@ if sys.platform == "win32":
         pass
 
 import typer
+from rich.align import Align
 from rich.console import Console
 from rich.table import Table
 
-from cli import __version__
-from cli import config as cli_config
-from cli.commands import configure, enrich, export, investigate, show
+from voidaccess_cli import __version__
+from voidaccess_cli import config as cli_config
+from voidaccess_cli.commands import configure, enrich, export, investigate, show
 
 console = Console()
+BANNER = """\
+[color(183)]     ░░░░░[color(141)]█[color(183)]░░░░░[/]
+[color(183)]  ░░[color(141)]█████████████[color(183)]░░[/]
+[color(183)] ░[color(141)]█████████████████[color(183)]░[/]
+[color(183)]░[color(141)]███████████████████[color(183)]░[/]
+[color(183)]░[color(141)]███████████████████[color(183)]░[/]
+[color(141)]██████[/]  [bright_white]void[/]  [color(141)]███████[/]
+[color(183)]░[color(141)]███████████████████[color(183)]░[/]
+[color(183)]░[color(141)]███████████████████[color(183)]░[/]
+[color(183)] ░[color(141)]█████████████████[color(183)]░[/]
+[color(183)]  ░░[color(141)]█████████████[color(183)]░░[/]
+[color(183)]     ░░░░░[color(141)]█[color(183)]░░░░░[/]
+[dim white]   dark web osint intelligence[/dim white]"""
 
 app = typer.Typer(
     name="voidaccess",
@@ -63,7 +78,7 @@ def _ensure_first_run() -> None:
 @app.command("status")
 def status() -> None:
     """Show current config, Tor status, and detected API keys."""
-    from cli.tor_detect import detect_tor
+    from voidaccess_cli.tor_detect import detect_tor
     cli_config.apply_env()
     cfg = cli_config.load_config()
 
@@ -112,7 +127,7 @@ def list_investigations(
 ) -> None:
     """List saved investigations."""
     cli_config.apply_env()
-    from cli.adapters import sqlite as sqlite_adapter
+    from voidaccess_cli.adapters import sqlite as sqlite_adapter
     sqlite_adapter.init_db()
     rows = sqlite_adapter.list_investigations(limit=limit)
     if as_json:
@@ -144,10 +159,32 @@ def version() -> None:
     console.print(f"voidaccess {__version__}")
 
 
-@app.callback()
-def _global(ctx: typer.Context) -> None:
-    """Set env vars before sub-commands import voidaccess modules."""
+def show_banner(console: Console) -> None:
+    import shutil
+    if os.environ.get("TERM") == "dumb":
+        return
+    if not sys.stdout.isatty() and "PS1" not in os.environ and os.name != "nt":
+        return
+    console.print()
+    raw_line = "     oooooXooooo     "  # widest line, 21 chars
+    pad = max(0, (console.width - len(raw_line)) // 2)
+    for line in BANNER.split("\n"):
+        console.print(" " * pad + line)
+    console.print()
+
+
+@app.callback(invoke_without_command=True)
+def main(
+    ctx: typer.Context,
+    no_banner: bool = typer.Option(
+        False, "--no-banner",
+        help="Skip banner"
+    ),
+) -> None:
+    """Set env vars and render banner before command execution."""
     cli_config.apply_env()
+    if not no_banner and ctx.invoked_subcommand:
+        show_banner(console)
 
 
 if __name__ == "__main__":

{voidaccess-1.3.0/cli → voidaccess-1.4.2/voidaccess_cli}/tor_detect.py

@@ -17,7 +17,7 @@ import struct
 from dataclasses import dataclass
 from typing import Optional
 
-from cli.config import load_config
+from voidaccess_cli.config import load_config
 
 
 @dataclass

voidaccess-1.3.0/voidaccess.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-voidaccess = cli.main:app