sec-report-kit 0.2.4__tar.gz → 0.2.6__tar.gz

{sec_report_kit-0.2.4 → sec_report_kit-0.2.6}/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project are documented in this file.
 
+## 0.2.6 - 2026-05-17
+
+### Added
+- Consolidated report rendering now supports bounded file pickup with `--modified-until`, enabling date-range selection when combined with `--modified-since`.
+
+### Changed
+- README examples now document both date-range filtering and "from date until today" usage for consolidated report generation.
+
+### Fixed
+- `scripts/render_consolidated_html.bat` no longer forwards the first two positional arguments as unexpected extras on Windows.
+
+## 0.2.5 - 2026-05-17
+
+### Added
+- New CLI command: `srk render consolidated` to build a single HTML report from all supported scanner reports in an input folder.
+- New helper scripts for consolidated rendering:
+  - `scripts/render_consolidated_html.sh`
+  - `scripts/render_consolidated_html.bat`
+
+### Changed
+- `src/sec_report_kit/generate_consolidated_security_report.py` now acts as a wrapper that accepts `--input`, `--output`, and `--target`, and delegates to the consolidated CLI renderer.
+
+### Fixed
+- Unified package version metadata by aligning `src/sec_report_kit/__init__.py` with the project version.
+
 ## 0.2.4 - 2026-05-14
 
 ### Added

{sec_report_kit-0.2.4 → sec_report_kit-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sec-report-kit
-Version: 0.2.4
+Version: 0.2.6
 Summary: Generate HTML security reports from Trivy, pip-audit, Safety, Bandit, and Gitleaks JSON
 Author: Ravi Konduru
 License: MIT
@@ -82,6 +82,14 @@ Render Safety JSON:
 srk render safety --input security_reports/safety.json --output security_reports/report-safety.html --target requirements.txt
 ```
 
+Render a consolidated HTML report from all supported scanner files in a directory:
+
+```bash
+srk render consolidated --input security_reports --output security_reports --target sec-report-kit
+```
+
+This command writes `consolidated-security-report.html` to the output folder.
+
 ## Helper Scripts (bat/sh)
 
 Cross-platform helper scripts are available in `scripts/`.
@@ -232,6 +240,48 @@ scripts\render_trivy_html.bat
 scripts\render_trivy_html.bat security_reports my-image
 ```
 
+Convert all supported scanner reports in a folder to one consolidated HTML report:
+
+```bash
+# Linux/macOS (optional args: <report_dir> <target_name>)
+bash scripts/render_consolidated_html.sh
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit
+
+# Windows (optional args: <report_dir> <target_name>)
+scripts\render_consolidated_html.bat
+scripts\render_consolidated_html.bat security_reports sec-report-kit
+```
+
+You can also restrict which report files are picked up by modification time and cap how many of the newest files are included:
+
+```bash
+# Only files modified today
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since today
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since today
+
+# Since yesterday
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since yesterday
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since yesterday
+
+# Last 7 days
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since last-7-days
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since last-7-days
+
+# Since a fixed date and only the 10 newest matching files
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since 2026-05-01 --limit 10
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since 2026-05-01 --limit 10
+
+# Between two dates
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since 2026-05-01 --modified-until 2026-05-10
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since 2026-05-01 --modified-until 2026-05-10
+
+# From a fixed date until today
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since 2026-05-01
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since 2026-05-01
+```
+
+`--modified-since` accepts ISO dates/datetimes plus `today`, `yesterday`, `last-week`, and `last-7-days`. `--modified-until` accepts ISO dates/datetimes plus `today` and `yesterday`. Use `--modified-since` by itself for "from date until now", or combine both options for a bounded date range. When `--limit` is used, the newest matching files are selected first.
+
 Convert sample Bandit JSON report to HTML:
 
 ```bash

{sec_report_kit-0.2.4 → sec_report_kit-0.2.6}/README.md

@@ -55,6 +55,14 @@ Render Safety JSON:
 srk render safety --input security_reports/safety.json --output security_reports/report-safety.html --target requirements.txt
 ```
 
+Render a consolidated HTML report from all supported scanner files in a directory:
+
+```bash
+srk render consolidated --input security_reports --output security_reports --target sec-report-kit
+```
+
+This command writes `consolidated-security-report.html` to the output folder.
+
 ## Helper Scripts (bat/sh)
 
 Cross-platform helper scripts are available in `scripts/`.
@@ -205,6 +213,48 @@ scripts\render_trivy_html.bat
 scripts\render_trivy_html.bat security_reports my-image
 ```
 
+Convert all supported scanner reports in a folder to one consolidated HTML report:
+
+```bash
+# Linux/macOS (optional args: <report_dir> <target_name>)
+bash scripts/render_consolidated_html.sh
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit
+
+# Windows (optional args: <report_dir> <target_name>)
+scripts\render_consolidated_html.bat
+scripts\render_consolidated_html.bat security_reports sec-report-kit
+```
+
+You can also restrict which report files are picked up by modification time and cap how many of the newest files are included:
+
+```bash
+# Only files modified today
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since today
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since today
+
+# Since yesterday
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since yesterday
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since yesterday
+
+# Last 7 days
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since last-7-days
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since last-7-days
+
+# Since a fixed date and only the 10 newest matching files
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since 2026-05-01 --limit 10
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since 2026-05-01 --limit 10
+
+# Between two dates
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since 2026-05-01 --modified-until 2026-05-10
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since 2026-05-01 --modified-until 2026-05-10
+
+# From a fixed date until today
+bash scripts/render_consolidated_html.sh security_reports sec-report-kit --modified-since 2026-05-01
+scripts\render_consolidated_html.bat security_reports sec-report-kit --modified-since 2026-05-01
+```
+
+`--modified-since` accepts ISO dates/datetimes plus `today`, `yesterday`, `last-week`, and `last-7-days`. `--modified-until` accepts ISO dates/datetimes plus `today` and `yesterday`. Use `--modified-since` by itself for "from date until now", or combine both options for a bounded date range. When `--limit` is used, the newest matching files are selected first.
+
 Convert sample Bandit JSON report to HTML:
 
 ```bash

{sec_report_kit-0.2.4 → sec_report_kit-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sec-report-kit"
-version = "0.2.4"
+version = "0.2.6"
 description = "Generate HTML security reports from Trivy, pip-audit, Safety, Bandit, and Gitleaks JSON"
 readme = "README.md"
 requires-python = ">=3.10"

sec_report_kit-0.2.6/scripts/render_consolidated_html.bat

@@ -0,0 +1,36 @@
+@echo off
+setlocal
+
+set "PYTHON_BIN=python"
+if exist "%~dp0..\.venv\Scripts\python.exe" set "PYTHON_BIN=%~dp0..\.venv\Scripts\python.exe"
+
+set "REPORT_DIR=%~1"
+if "%REPORT_DIR%"=="" set "REPORT_DIR=security_reports"
+
+set "TARGET_NAME=%~2"
+if "%TARGET_NAME%"=="" for %%I in ("%~dp0..") do set "TARGET_NAME=%%~nxI"
+
+if not "%~1"=="" shift
+if not "%~1"=="" shift
+
+set "EXTRA_ARGS="
+:collect_args
+if "%~1"=="" goto after_collect_args
+set "EXTRA_ARGS=%EXTRA_ARGS% "%~1""
+shift
+goto collect_args
+:after_collect_args
+
+if not exist "%REPORT_DIR%" (
+  echo Missing input directory: %REPORT_DIR%
+  exit /b 1
+)
+
+set "OUT_HTML=%REPORT_DIR%\consolidated-security-report.html"
+
+"%PYTHON_BIN%" -m sec_report_kit render consolidated --input "%REPORT_DIR%" --output "%REPORT_DIR%" --target "%TARGET_NAME%" %EXTRA_ARGS%
+if errorlevel 1 exit /b 1
+
+echo HTML report written to %OUT_HTML%
+for %%I in ("%OUT_HTML%") do set "OUT_HTML_ABS=%%~fI"
+start "" "%OUT_HTML_ABS%"

sec_report_kit-0.2.6/scripts/render_consolidated_html.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PYTHON_BIN="${PYTHON_BIN:-python}"
+if [[ -x "$(dirname "$0")/../.venv/bin/python" ]]; then
+  PYTHON_BIN="$(dirname "$0")/../.venv/bin/python"
+fi
+
+REPORT_DIR="${1:-security_reports}"
+ROOT_NAME="$(basename "$(cd "$(dirname "$0")/.." && pwd)")"
+TARGET_NAME="${2:-${ROOT_NAME}}"
+OUT_HTML="${REPORT_DIR}/consolidated-security-report.html"
+
+if [[ $# -gt 0 ]]; then
+  shift
+fi
+if [[ $# -gt 0 ]]; then
+  shift
+fi
+
+open_html() {
+  if command -v xdg-open >/dev/null 2>&1; then
+    xdg-open "$1" >/dev/null 2>&1 &
+    return 0
+  fi
+  if command -v open >/dev/null 2>&1; then
+    open "$1" >/dev/null 2>&1 &
+    return 0
+  fi
+  echo "HTML generated but no supported browser opener was found. Open manually: $1"
+}
+
+if [[ ! -d "${REPORT_DIR}" ]]; then
+  echo "Missing input directory: ${REPORT_DIR}"
+  exit 1
+fi
+
+"${PYTHON_BIN}" -m sec_report_kit render consolidated --input "${REPORT_DIR}" --output "${REPORT_DIR}" --target "${TARGET_NAME}" "$@"
+
+echo "HTML report written to ${OUT_HTML}"
+open_html "${OUT_HTML}"

{sec_report_kit-0.2.4 → sec_report_kit-0.2.6}/src/sec_report_kit/__init__.py

@@ -1,4 +1,4 @@
 """sec_report_kit package."""
 
 __all__ = ["__version__"]
-__version__ = "0.2.2"
+__version__ = "0.2.6"

{sec_report_kit-0.2.4 → sec_report_kit-0.2.6}/src/sec_report_kit/cli.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime as dt
 import json
 from pathlib import Path
 from typing import Any
@@ -18,7 +19,7 @@ from sec_report_kit.parsers.semgrep import parse_semgrep_json
 from sec_report_kit.parsers.tfsec import parse_tfsec_json
 from sec_report_kit.parsers.trivy import parse_trivy_json
 from sec_report_kit.parsers.trufflehog import parse_trufflehog_json
-from sec_report_kit.report.html_renderer import render_html_report
+from sec_report_kit.report.html_renderer import render_consolidated_dashboard_report, render_html_report
 from sec_report_kit.services.summarize import count_by_severity, sort_findings
 
 app = typer.Typer(help="Security report kit CLI")
@@ -28,6 +29,90 @@ app.add_typer(render_app, name="render")
 app.add_typer(mcp_app, name="mcp")
 
 
+def _parse_modified_since(value: str) -> dt.datetime:
+    local_tz = dt.datetime.now().astimezone().tzinfo or dt.timezone.utc
+    now = dt.datetime.now(local_tz)
+    normalized = value.strip().lower()
+
+    if normalized == "today":
+        return now.replace(hour=0, minute=0, second=0, microsecond=0)
+    if normalized == "yesterday":
+        return (now - dt.timedelta(days=1)).replace(hour=0, minute=0, second=0, microsecond=0)
+    if normalized in {"last-week", "last-7-days"}:
+        return now - dt.timedelta(days=7)
+
+    try:
+        parsed = dt.datetime.fromisoformat(value.replace("Z", "+00:00"))
+    except ValueError as exc:
+        raise typer.BadParameter(
+            "Use ISO date/datetime or one of: today, yesterday, last-week, last-7-days"
+        ) from exc
+
+    if parsed.tzinfo is None:
+        return parsed.replace(tzinfo=local_tz)
+    return parsed.astimezone(local_tz)
+
+
+def _parse_modified_until(value: str) -> dt.datetime:
+    local_tz = dt.datetime.now().astimezone().tzinfo or dt.timezone.utc
+    normalized = value.strip().lower()
+
+    if normalized == "today":
+        return dt.datetime.now(local_tz).replace(hour=23, minute=59, second=59, microsecond=999999)
+    if normalized == "yesterday":
+        return (dt.datetime.now(local_tz) - dt.timedelta(days=1)).replace(
+            hour=23,
+            minute=59,
+            second=59,
+            microsecond=999999,
+        )
+
+    parsed = _parse_modified_since(value)
+    if "T" not in value and " " not in value:
+        return parsed.replace(hour=23, minute=59, second=59, microsecond=999999)
+    return parsed
+
+
+def _collect_consolidated_candidates(
+    input_dir: Path,
+    modified_since: str | None,
+    modified_until: str | None,
+    limit: int | None,
+) -> list[Path]:
+    candidates = [
+        path
+        for path in input_dir.iterdir()
+        if path.is_file()
+        and (
+            path.suffix.lower() in {".json", ".sarif", ".ndjson", ".jsonl"}
+            or path.name.lower().endswith(".sarif.json")
+        )
+    ]
+
+    if modified_since:
+        cutoff = _parse_modified_since(modified_since)
+        candidates = [
+            path
+            for path in candidates
+            if dt.datetime.fromtimestamp(path.stat().st_mtime, tz=cutoff.tzinfo) >= cutoff
+        ]
+
+    if modified_until:
+        cutoff = _parse_modified_until(modified_until)
+        candidates = [
+            path
+            for path in candidates
+            if dt.datetime.fromtimestamp(path.stat().st_mtime, tz=cutoff.tzinfo) <= cutoff
+        ]
+
+    candidates.sort(key=lambda path: (-path.stat().st_mtime, path.name.lower()))
+
+    if limit is not None:
+        candidates = candidates[:limit]
+
+    return candidates
+
+
 def _load_json(path: Path) -> Any:
     # Accept both UTF-8 and UTF-8 BOM encoded JSON files.
     raw = path.read_text(encoding="utf-8-sig")
@@ -44,35 +129,38 @@ def _load_json(path: Path) -> Any:
         return items
 
 
+def _parse_findings(payload: Any, parser: str):
+    if parser == "trivy":
+        return parse_trivy_json(payload)
+    if parser == "pip-audit":
+        return parse_pip_audit_json(payload)
+    if parser == "safety":
+        return parse_safety_json(payload)
+    if parser == "bandit":
+        return parse_bandit_json(payload)
+    if parser == "gitleaks":
+        return parse_gitleaks_json(payload)
+    if parser == "semgrep":
+        return parse_semgrep_json(payload)
+    if parser == "codeql":
+        return parse_codeql_json(payload)
+    if parser == "osv-scanner":
+        return parse_osv_scanner_json(payload)
+    if parser == "checkov":
+        return parse_checkov_json(payload)
+    if parser == "tfsec":
+        return parse_tfsec_json(payload)
+    if parser == "trufflehog":
+        return parse_trufflehog_json(payload)
+    raise typer.BadParameter(f"Unsupported parser: {parser}")
+
+
 def _write_report(source_label: str, target_ref: str, input_path: Path, output_path: Path, parser: str) -> None:
     payload = _load_json(input_path)
     if parser == "auto":
         parser = detect_source_type(payload)
         typer.echo(f"[INFO] Detected source type: {parser}")
-    if parser == "trivy":
-        findings = parse_trivy_json(payload)
-    elif parser == "pip-audit":
-        findings = parse_pip_audit_json(payload)
-    elif parser == "safety":
-        findings = parse_safety_json(payload)
-    elif parser == "bandit":
-        findings = parse_bandit_json(payload)
-    elif parser == "gitleaks":
-        findings = parse_gitleaks_json(payload)
-    elif parser == "semgrep":
-        findings = parse_semgrep_json(payload)
-    elif parser == "codeql":
-        findings = parse_codeql_json(payload)
-    elif parser == "osv-scanner":
-        findings = parse_osv_scanner_json(payload)
-    elif parser == "checkov":
-        findings = parse_checkov_json(payload)
-    elif parser == "tfsec":
-        findings = parse_tfsec_json(payload)
-    elif parser == "trufflehog":
-        findings = parse_trufflehog_json(payload)
-    else:
-        raise typer.BadParameter(f"Unsupported parser: {parser}")
+    findings = _parse_findings(payload, parser)
 
     findings = sort_findings(findings)
     counts = count_by_severity(findings)
@@ -205,6 +293,93 @@ def render_trufflehog(
     _write_report("trufflehog", target, input, output, parser="trufflehog")
 
 
+@render_app.command("consolidated")
+def render_consolidated(
+    input: Path = typer.Option(
+        ...,
+        "--input",
+        exists=True,
+        dir_okay=True,
+        file_okay=False,
+        readable=True,
+        help="Folder containing scanner JSON/SARIF report files",
+    ),
+    output: Path = typer.Option(
+        ...,
+        "--output",
+        dir_okay=True,
+        file_okay=False,
+        help="Output folder where consolidated HTML will be written",
+    ),
+    target: str = typer.Option("consolidated-scan", "--target", help="Consolidated target label"),
+    modified_since: str | None = typer.Option(
+        None,
+        "--modified-since",
+        help="Only include files modified on or after this time. Accepts ISO date/datetime or: today, yesterday, last-week, last-7-days",
+    ),
+    modified_until: str | None = typer.Option(
+        None,
+        "--modified-until",
+        help="Only include files modified on or before this time. Accepts ISO date/datetime, today, or yesterday. Combine with --modified-since for a date range.",
+    ),
+    limit: int | None = typer.Option(
+        None,
+        "--limit",
+        min=1,
+        help="Maximum number of most recently modified report files to include after filtering",
+    ),
+) -> None:
+    """Render a consolidated HTML report from all supported report files in a directory."""
+    candidates = _collect_consolidated_candidates(
+        input_dir=input,
+        modified_since=modified_since,
+        modified_until=modified_until,
+        limit=limit,
+    )
+
+    all_findings = []
+    included_files = 0
+    skipped_files = 0
+    for report_file in candidates:
+        try:
+            payload = _load_json(report_file)
+            parser = detect_source_type(payload)
+            findings = _parse_findings(payload, parser)
+            all_findings.extend(findings)
+            included_files += 1
+            typer.echo(f"[INFO] Included {report_file.name} as {parser} ({len(findings)} findings)")
+        except Exception as exc:
+            skipped_files += 1
+            typer.echo(f"[WARN] Skipping {report_file.name}: {exc}")
+
+    all_findings = sort_findings(all_findings)
+    counts = count_by_severity(all_findings)
+    report_html = render_consolidated_dashboard_report(
+        target_ref=target,
+        findings=all_findings,
+        counts=counts,
+        reports_dir=input,
+        output_dir=output,
+    )
+
+    output.mkdir(parents=True, exist_ok=True)
+    output_file = output / "consolidated-security-report.html"
+    output_file.write_text(report_html, encoding="utf-8")
+
+    typer.echo(f"[OK] Report generated: {output_file}")
+    typer.echo(f"[INFO] Input directory: {input}")
+    if modified_since:
+        typer.echo(f"[INFO] Modified since filter: {modified_since}")
+    if modified_until:
+        typer.echo(f"[INFO] Modified until filter: {modified_until}")
+    if limit is not None:
+        typer.echo(f"[INFO] File limit: {limit}")
+    typer.echo(f"[INFO] Files included: {included_files}")
+    typer.echo(f"[INFO] Files skipped: {skipped_files}")
+    typer.echo(f"[INFO] Total findings: {len(all_findings)}")
+    typer.echo(f"[INFO] Severity counts: {counts}")
+
+
 @mcp_app.command("serve")
 def serve_mcp(
     transport: str = typer.Option("stdio", "--transport", help="MCP transport (currently stdio)")

sec_report_kit-0.2.6/src/sec_report_kit/generate_consolidated_security_report.py

@@ -0,0 +1,43 @@
+from __future__ import annotations
+
+import argparse
+from pathlib import Path
+
+from sec_report_kit.cli import render_consolidated
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(
+        description="Generate a consolidated HTML security report from scanner JSON/SARIF files"
+    )
+    parser.add_argument("--input", required=True, help="Input folder containing report files")
+    parser.add_argument("--output", required=True, help="Output folder for generated HTML")
+    parser.add_argument("--target", default="consolidated-scan", help="Target label used in HTML report")
+    parser.add_argument(
+        "--modified-since",
+        help="Only include files modified on or after this time. Accepts ISO date/datetime or: today, yesterday, last-week, last-7-days",
+    )
+    parser.add_argument(
+        "--modified-until",
+        help="Only include files modified on or before this time. Accepts ISO date/datetime, today, or yesterday. Combine with --modified-since for a date range.",
+    )
+    parser.add_argument(
+        "--limit",
+        type=int,
+        help="Maximum number of most recently modified report files to include after filtering",
+    )
+    args = parser.parse_args()
+
+    render_consolidated(
+        input=Path(args.input),
+        output=Path(args.output),
+        target=args.target,
+        modified_since=args.modified_since,
+        modified_until=args.modified_until,
+        limit=args.limit,
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())