Merge branch 'develop' into main

Author: drorganvidez

app/modules/hubfile/models.py

@@ -72,9 +72,7 @@ def _public_raw_url(self) -> str:
         """
         from urllib.parse import quote
 
-        raw_url = url_for(
-            "hubfile.raw_uvl", file_id=self.id, filename=self.name, _external=True
-        )
+        raw_url = url_for("hubfile.raw_uvl", file_id=self.id, filename=self.name, _external=True)
         if "localhost" not in raw_url and "127.0.0.1" not in raw_url:
             raw_url = raw_url.replace("http://", "https://", 1)
         # Percent-encode before injecting into another URL's query string,

app/modules/hubfile/routes.py

@@ -245,9 +245,7 @@ def raw_uvl(file_id, filename):
     # as mimetype makes Flask append another "; charset=utf-8", resulting in
     # a duplicated parameter that some CORS-capable fetchers (notably the
     # FactLabel web app) choke on.
-    return send_file(
-        file_path, mimetype="text/plain", as_attachment=False, download_name=selected_file.name
-    )
+    return send_file(file_path, mimetype="text/plain", as_attachment=False, download_name=selected_file.name)
 
 
 @hubfile_bp.route("/hubfiles/<int:file_id>/workbench-content", methods=["GET"])

rosemary/commands/linter.py

@@ -1,30 +1,54 @@
 import os
 import subprocess
+import sys
 
 import click
 
 
-@click.command("linter", help="Runs flake8 linter on the 'app' and 'rosemary' directories.")
+@click.command(
+    "linter",
+    help="Runs flake8 + black --check + isort --check-only on 'app', 'rosemary' and 'core' "
+    "(same checks as .github/workflows/CI_lint.yml).",
+)
 def linter():
 
-    # Define the directories to be checked with flake8
+    # Mirror the CI Python Lint job exactly: flake8, black --check and
+    # isort --check-only, all three pointed at the same three directories.
+    # Running them locally via `rosemary linter` used to only cover flake8,
+    # so PRs kept bouncing off the black/isort steps after being green
+    # locally — fixed by running the full triad here.
     working_dir = os.getenv("WORKING_DIR", "")
     directories = [
         os.path.join(working_dir, "app"),
         os.path.join(working_dir, "rosemary"),
         os.path.join(working_dir, "core"),
     ]
 
-    # Run flake8 in each directory
-    for directory in directories:
-        click.echo(f"Running flake8 on {directory}...")
-        result = subprocess.run(["flake8", directory])
+    checks = [
+        ("flake8", ["flake8", *directories]),
+        ("black --check", ["black", "--check", *directories]),
+        ("isort --check-only", ["isort", "--check-only", *directories]),
+    ]
 
-        # Check if flake8 encountered problems
+    failed = []
+    for label, cmd in checks:
+        click.echo(click.style(f"\n==> {label}", fg="cyan"))
+        result = subprocess.run(cmd)
         if result.returncode != 0:
-            click.echo(click.style(f"flake8 found issues in {directory}.", fg="red"))
+            click.echo(click.style(f"{label} found issues.", fg="red"))
+            failed.append(label)
         else:
-            click.echo(click.style(f"No issues found in {directory}. Congratulations!", fg="green"))
+            click.echo(click.style(f"{label}: clean.", fg="green"))
+
+    if failed:
+        click.echo(
+            click.style(
+                "\nFailed: " + ", ".join(failed) + ". Run `rosemary linter:fix` to auto-format.",
+                fg="red",
+            )
+        )
+        sys.exit(1)
+    click.echo(click.style("\nAll lint checks passed. Congratulations!", fg="green"))
 
 
 @click.command(