arthexis 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

core/views.py

@@ -11,13 +11,15 @@ from django.contrib.sites.models import Site
 from django.http import Http404, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render, resolve_url
 from django.utils import timezone
+from django.utils.text import slugify
 from django.utils.translation import gettext as _
 from django.urls import NoReverseMatch, reverse
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_GET, require_POST
 from django.utils.http import url_has_allowed_host_and_scheme
 from pathlib import Path
-from urllib.parse import urlsplit, urlunsplit
+from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
+import errno
 import subprocess
 
 from utils import revision
@@ -38,7 +40,7 @@ def odoo_products(request):
         products = profile.execute(
             "product.product",
             "search_read",
-            [],
+            [[]],
             {"fields": ["name"], "limit": 50},
         )
     except Exception:
@@ -81,6 +83,126 @@ def _clean_repo() -> None:
     subprocess.run(["git", "clean", "-fd"], check=False)
 
 
+def _format_path(path: Path) -> str:
+    try:
+        return str(path.resolve().relative_to(Path.cwd()))
+    except ValueError:
+        return str(path)
+
+
+def _next_patch_version(version: str) -> str:
+    from packaging.version import InvalidVersion, Version
+
+    try:
+        parsed = Version(version)
+    except InvalidVersion:
+        parts = version.split(".")
+        for index in range(len(parts) - 1, -1, -1):
+            segment = parts[index]
+            if segment.isdigit():
+                parts[index] = str(int(segment) + 1)
+                return ".".join(parts)
+        return version
+    return f"{parsed.major}.{parsed.minor}.{parsed.micro + 1}"
+
+
+def _write_todo_fixture(todo: Todo) -> Path:
+    safe_request = todo.request.replace(".", " ")
+    slug = slugify(safe_request).replace("-", "_")
+    if not slug:
+        slug = "todo"
+    path = TODO_FIXTURE_DIR / f"todos__{slug}.json"
+    path.parent.mkdir(parents=True, exist_ok=True)
+    data = [
+        {
+            "model": "core.todo",
+            "fields": {
+                "request": todo.request,
+                "url": todo.url,
+                "request_details": todo.request_details,
+            },
+        }
+    ]
+    path.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8")
+    return path
+
+
+def _should_use_python_changelog(exc: OSError) -> bool:
+    winerror = getattr(exc, "winerror", None)
+    if winerror in {193}:
+        return True
+    return exc.errno in {errno.ENOEXEC, errno.EACCES, errno.ENOENT}
+
+
+def _generate_changelog_with_python(log_path: Path) -> None:
+    _append_log(log_path, "Falling back to Python changelog generator")
+    describe = subprocess.run(
+        ["git", "describe", "--tags", "--abbrev=0"],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    start_tag = describe.stdout.strip() if describe.returncode == 0 else ""
+    range_spec = f"{start_tag}..HEAD" if start_tag else "HEAD"
+    log_proc = subprocess.run(
+        ["git", "log", range_spec, "--no-merges", "--pretty=format:- %h %s"],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    entries = [line for line in log_proc.stdout.splitlines() if line]
+    changelog_path = Path("CHANGELOG.rst")
+    previous_lines: list[str] = []
+    if changelog_path.exists():
+        previous_lines = changelog_path.read_text(encoding="utf-8").splitlines()
+        if len(previous_lines) > 6:
+            previous_lines = previous_lines[6:]
+        else:
+            previous_lines = []
+    lines = [
+        "Changelog",
+        "=========",
+        "",
+        "Unreleased",
+        "----------",
+        "",
+    ]
+    if entries:
+        lines.extend(entries)
+    if previous_lines:
+        lines.append("")
+        lines.extend(previous_lines)
+    content = "\n".join(lines)
+    if not content.endswith("\n"):
+        content += "\n"
+    changelog_path.write_text(content, encoding="utf-8")
+    _append_log(log_path, "Regenerated CHANGELOG.rst using Python fallback")
+
+
+def _ensure_release_todo(release) -> tuple[Todo, Path]:
+    target_version = _next_patch_version(release.version)
+    request = f"Create release {release.package.name} {target_version}"
+    try:
+        url = reverse("admin:core_packagerelease_changelist")
+    except NoReverseMatch:
+        url = ""
+    todo, _ = Todo.all_objects.update_or_create(
+        request__iexact=request,
+        defaults={
+            "request": request,
+            "url": url,
+            "request_details": "",
+            "is_seed_data": True,
+            "is_deleted": False,
+            "is_user_data": False,
+            "done_on": None,
+            "on_done_condition": "",
+        },
+    )
+    fixture_path = _write_todo_fixture(todo)
+    return todo, fixture_path
+
+
 def _sync_release_with_revision(release: PackageRelease) -> tuple[bool, str]:
     """Ensure ``release`` matches the repository revision and version.
 
@@ -125,7 +247,22 @@ def _sync_release_with_revision(release: PackageRelease) -> tuple[bool, str]:
         release.save(update_fields=list(updated_fields))
         PackageRelease.dump_fixture()
 
-    return bool(updated_fields), previous_version
+    package_updated = False
+    if release.package_id and not release.package.is_active:
+        release.package.is_active = True
+        release.package.save(update_fields=["is_active"])
+        package_updated = True
+
+    version_updated = False
+    if release.version:
+        current = ""
+        if version_path.exists():
+            current = version_path.read_text(encoding="utf-8").strip()
+        if current != release.version:
+            version_path.write_text(f"{release.version}\n", encoding="utf-8")
+            version_updated = True
+
+    return bool(updated_fields or version_updated or package_updated), previous_version
 
 
 def _changelog_notes(version: str) -> str:
@@ -215,12 +352,12 @@ def _step_check_todos(release, ctx, log_path: Path) -> None:
             check=False,
         )
     ctx.pop("todos", None)
-    ctx.pop("todos_ack", None)
+    ctx["todos_ack"] = True
 
 
 def _step_check_version(release, ctx, log_path: Path) -> None:
     from . import release as release_utils
-    from packaging.version import Version
+    from packaging.version import InvalidVersion, Version
 
     if not release_utils._git_clean():
         proc = subprocess.run(
@@ -266,6 +403,7 @@ def _step_check_version(release, ctx, log_path: Path) -> None:
         )
         subprocess.run(["git", "add", *fixture_files], check=True)
         subprocess.run(["git", "commit", "-m", "chore: update fixtures"], check=True)
+        _append_log(log_path, "Fixture changes committed")
 
     version_path = Path("VERSION")
     if version_path.exists():
@@ -279,32 +417,91 @@ def _step_check_version(release, ctx, log_path: Path) -> None:
     if release_utils.network_available():
         try:
             resp = requests.get(f"https://pypi.org/pypi/{release.package.name}/json")
-            if resp.ok and release.version in resp.json().get("releases", {}):
-                raise Exception(f"Version {release.version} already on PyPI")
+            if resp.ok:
+                data = resp.json()
+                releases = data.get("releases", {})
+                try:
+                    target_version = Version(release.version)
+                except InvalidVersion:
+                    target_version = None
+
+                for candidate, files in releases.items():
+                    same_version = candidate == release.version
+                    if target_version is not None and not same_version:
+                        try:
+                            same_version = Version(candidate) == target_version
+                        except InvalidVersion:
+                            same_version = False
+                    if not same_version:
+                        continue
+
+                    has_available_files = any(
+                        isinstance(file_data, dict)
+                        and not file_data.get("yanked", False)
+                        for file_data in files or []
+                    )
+                    if has_available_files:
+                        raise Exception(
+                            f"Version {release.version} already on PyPI"
+                        )
         except Exception as exc:
             # network errors should be logged but not crash
             if "already on PyPI" in str(exc):
                 raise
             _append_log(log_path, f"PyPI check failed: {exc}")
+        else:
+            _append_log(
+                log_path,
+                f"Version {release.version} not published on PyPI",
+            )
     else:
         _append_log(log_path, "Network unavailable, skipping PyPI check")
 
 
 def _step_handle_migrations(release, ctx, log_path: Path) -> None:
     _append_log(log_path, "Freeze, squash and approve migrations")
+    _append_log(log_path, "Migration review acknowledged (manual step)")
 
 
 def _step_changelog_docs(release, ctx, log_path: Path) -> None:
     _append_log(log_path, "Compose CHANGELOG and documentation")
+    _append_log(log_path, "CHANGELOG and documentation review recorded")
 
 
 def _step_pre_release_actions(release, ctx, log_path: Path) -> None:
     _append_log(log_path, "Execute pre-release actions")
+    try:
+        subprocess.run(["scripts/generate-changelog.sh"], check=True)
+    except OSError as exc:
+        if _should_use_python_changelog(exc):
+            _append_log(
+                log_path,
+                f"scripts/generate-changelog.sh failed: {exc}",
+            )
+            _generate_changelog_with_python(log_path)
+        else:  # pragma: no cover - unexpected OSError
+            raise
+    else:
+        _append_log(
+            log_path, "Regenerated CHANGELOG.rst using scripts/generate-changelog.sh"
+        )
+    subprocess.run(["git", "add", "CHANGELOG.rst"], check=True)
+    _append_log(log_path, "Staged CHANGELOG.rst for commit")
     version_path = Path("VERSION")
     version_path.write_text(f"{release.version}\n", encoding="utf-8")
+    _append_log(log_path, f"Updated VERSION file to {release.version}")
     subprocess.run(["git", "add", "VERSION"], check=True)
+    _append_log(log_path, "Staged VERSION for commit")
     diff = subprocess.run(
-        ["git", "diff", "--cached", "--quiet", "--", "VERSION"],
+        [
+            "git",
+            "diff",
+            "--cached",
+            "--quiet",
+            "--",
+            "CHANGELOG.rst",
+            "VERSION",
+        ],
         check=False,
     )
     if diff.returncode != 0:
@@ -312,13 +509,40 @@ def _step_pre_release_actions(release, ctx, log_path: Path) -> None:
             ["git", "commit", "-m", f"pre-release commit {release.version}"],
             check=True,
         )
+        _append_log(log_path, f"Committed VERSION update for {release.version}")
     else:
-        _append_log(log_path, "No changes detected for VERSION; skipping commit")
+        _append_log(
+            log_path, "No changes detected for VERSION or CHANGELOG; skipping commit"
+        )
+        subprocess.run(["git", "reset", "HEAD", "CHANGELOG.rst"], check=False)
+        _append_log(log_path, "Unstaged CHANGELOG.rst")
         subprocess.run(["git", "reset", "HEAD", "VERSION"], check=False)
+        _append_log(log_path, "Unstaged VERSION file")
+    todo, fixture_path = _ensure_release_todo(release)
+    fixture_display = _format_path(fixture_path)
+    _append_log(log_path, f"Added TODO: {todo.request}")
+    _append_log(log_path, f"Wrote TODO fixture {fixture_display}")
+    subprocess.run(["git", "add", str(fixture_path)], check=True)
+    _append_log(log_path, f"Staged TODO fixture {fixture_display}")
+    fixture_diff = subprocess.run(
+        ["git", "diff", "--cached", "--quiet", "--", str(fixture_path)],
+        check=False,
+    )
+    if fixture_diff.returncode != 0:
+        commit_message = f"chore: add release TODO for {release.package.name}"
+        subprocess.run(["git", "commit", "-m", commit_message], check=True)
+        _append_log(log_path, f"Committed TODO fixture {fixture_display}")
+    else:
+        _append_log(
+            log_path,
+            f"No changes detected for TODO fixture {fixture_display}; skipping commit",
+        )
+    _append_log(log_path, "Pre-release actions complete")
 
 
 def _step_run_tests(release, ctx, log_path: Path) -> None:
     _append_log(log_path, "Complete test suite with --all flag")
+    _append_log(log_path, "Test suite completion acknowledged")
 
 
 def _step_promote_build(release, ctx, log_path: Path) -> None:
@@ -328,15 +552,22 @@ def _step_promote_build(release, ctx, log_path: Path) -> None:
     try:
         try:
             subprocess.run(["git", "fetch", "origin", "main"], check=True)
+            _append_log(log_path, "Fetched latest changes from origin/main")
             subprocess.run(["git", "rebase", "origin/main"], check=True)
+            _append_log(log_path, "Rebased current branch onto origin/main")
         except subprocess.CalledProcessError as exc:
             subprocess.run(["git", "rebase", "--abort"], check=False)
+            _append_log(log_path, "Rebase onto origin/main failed; aborted rebase")
             raise Exception("Rebase onto main failed") from exc
         release_utils.promote(
             package=release.to_package(),
             version=release.version,
             creds=release.to_credentials(),
         )
+        _append_log(
+            log_path,
+            f"Generated release artifacts for v{release.version}",
+        )
         from glob import glob
 
         paths = ["VERSION", *glob("core/fixtures/releases__*.json")]
@@ -347,6 +578,7 @@ def _step_promote_build(release, ctx, log_path: Path) -> None:
         )
         if diff.stdout.strip():
             subprocess.run(["git", "add", *paths], check=True)
+            _append_log(log_path, "Staged release metadata updates")
             subprocess.run(
                 [
                     "git",
@@ -356,8 +588,14 @@ def _step_promote_build(release, ctx, log_path: Path) -> None:
                 ],
                 check=True,
             )
+            _append_log(
+                log_path,
+                f"Committed release metadata for v{release.version}",
+            )
         subprocess.run(["git", "push"], check=True)
+        _append_log(log_path, "Pushed release changes to origin")
         PackageRelease.dump_fixture()
+        _append_log(log_path, "Updated release fixtures")
     except Exception:
         _clean_repo()
         raise
@@ -415,8 +653,10 @@ def _step_publish(release, ctx, log_path: Path) -> None:
     release.pypi_url = (
         f"https://pypi.org/project/{release.package.name}/{release.version}/"
     )
-    release.save(update_fields=["pypi_url"])
+    release.release_on = timezone.now()
+    release.save(update_fields=["pypi_url", "release_on"])
     PackageRelease.dump_fixture()
+    _append_log(log_path, f"Recorded PyPI URL: {release.pypi_url}")
     _append_log(log_path, "Upload complete")
 
 
@@ -644,6 +884,8 @@ def release_progress(request, pk: int, action: str):
                 f"{release.package.name}-{previous_version}*.log"
             ):
                 log_file.unlink()
+        if not release.is_current:
+            raise Http404("Release is not current")
 
     if request.GET.get("restart"):
         count = 0
@@ -656,7 +898,8 @@ def release_progress(request, pk: int, action: str):
         restart_path.write_text(str(count + 1), encoding="utf-8")
         _clean_repo()
         release.pypi_url = ""
-        release.save(update_fields=["pypi_url"])
+        release.release_on = None
+        release.save(update_fields=["pypi_url", "release_on"])
         request.session.pop(session_key, None)
         if lock_path.exists():
             lock_path.unlink()
@@ -946,20 +1189,121 @@ def release_progress(request, pk: int, action: str):
     return render(request, "core/release_progress.html", context)
 
 
-def _todo_iframe_url(request, todo: Todo) -> str:
-    """Return a safe iframe URL for ``todo`` scoped to the current host."""
+def _dedupe_preserve_order(values):
+    seen = set()
+    result = []
+    for value in values:
+        if value in seen:
+            continue
+        seen.add(value)
+        result.append(value)
+    return result
+
+
+def _parse_todo_auth_directives(query: str):
+    directives = {
+        "require_logout": False,
+        "users": [],
+        "permissions": [],
+        "notes": [],
+    }
+    if not query:
+        return "", directives
+
+    remaining = []
+    for key, value in parse_qsl(query, keep_blank_values=True):
+        if key != "_todo_auth":
+            remaining.append((key, value))
+            continue
+        token = (value or "").strip()
+        if not token:
+            continue
+        kind, _, payload = token.partition(":")
+        kind = kind.strip().lower()
+        payload = payload.strip()
+        if kind in {"logout", "anonymous", "anon"}:
+            directives["require_logout"] = True
+        elif kind in {"user", "username"} and payload:
+            directives["users"].append(payload)
+        elif kind in {"perm", "permission"} and payload:
+            directives["permissions"].append(payload)
+        else:
+            directives["notes"].append(token)
+
+    sanitized_query = urlencode(remaining, doseq=True)
+    return sanitized_query, directives
+
+
+def _todo_iframe_url(request, todo: Todo):
+    """Return a safe iframe URL and auth context for ``todo``."""
 
     fallback = reverse("admin:core_todo_change", args=[todo.pk])
     raw_url = (todo.url or "").strip()
+
+    auth_context = {
+        "require_logout": False,
+        "users": [],
+        "permissions": [],
+        "notes": [],
+    }
+
+    def _final_context(target_url: str):
+        return {
+            "target_url": target_url or fallback,
+            "require_logout": auth_context["require_logout"],
+            "users": _dedupe_preserve_order(auth_context["users"]),
+            "permissions": _dedupe_preserve_order(auth_context["permissions"]),
+            "notes": _dedupe_preserve_order(auth_context["notes"]),
+            "has_requirements": bool(
+                auth_context["require_logout"]
+                or auth_context["users"]
+                or auth_context["permissions"]
+                or auth_context["notes"]
+            ),
+        }
+
     if not raw_url:
-        return fallback
+        return fallback, _final_context(fallback)
+
+    focus_path = reverse("todo-focus", args=[todo.pk])
+    focus_norm = focus_path.strip("/").lower()
+
+    def _is_focus_target(target: str) -> bool:
+        if not target:
+            return False
+        parsed_target = urlsplit(target)
+        path = parsed_target.path
+        if not path and not parsed_target.scheme and not parsed_target.netloc:
+            path = target.split("?", 1)[0].split("#", 1)[0]
+        normalized = path.strip("/").lower()
+        return normalized == focus_norm if normalized else False
+
+    if _is_focus_target(raw_url):
+        return fallback, _final_context(fallback)
 
     parsed = urlsplit(raw_url)
+
+    def _merge_directives(parsed_result):
+        sanitized_query, directives = _parse_todo_auth_directives(parsed_result.query)
+        if directives["require_logout"]:
+            auth_context["require_logout"] = True
+        auth_context["users"].extend(directives["users"])
+        auth_context["permissions"].extend(directives["permissions"])
+        auth_context["notes"].extend(directives["notes"])
+        return parsed_result._replace(query=sanitized_query)
+
     if not parsed.scheme and not parsed.netloc:
-        return raw_url
+        sanitized = _merge_directives(parsed)
+        path = sanitized.path or "/"
+        if not path.startswith("/"):
+            path = f"/{path}"
+        relative_url = urlunsplit(("", "", path, sanitized.query, sanitized.fragment))
+        if _is_focus_target(relative_url):
+            return fallback, _final_context(fallback)
+        return relative_url or fallback, _final_context(relative_url)
 
     if parsed.scheme and parsed.scheme.lower() not in {"http", "https"}:
-        return fallback
+        return fallback, _final_context(fallback)
 
     request_host = request.get_host().strip().lower()
     host_without_port = request_host.split(":", 1)[0]
@@ -993,12 +1337,16 @@ def _todo_iframe_url(request, todo: Todo) -> str:
     hostname = (parsed.hostname or "").strip().lower()
     netloc = parsed.netloc.strip().lower()
     if hostname in allowed_hosts or netloc in allowed_hosts:
-        path = parsed.path or "/"
+        sanitized = _merge_directives(parsed)
+        path = sanitized.path or "/"
         if not path.startswith("/"):
             path = f"/{path}"
-        return urlunsplit(("", "", path, parsed.query, parsed.fragment)) or fallback
+        relative_url = urlunsplit(("", "", path, sanitized.query, sanitized.fragment))
+        if _is_focus_target(relative_url):
+            return fallback, _final_context(fallback)
+        return relative_url or fallback, _final_context(relative_url)
 
-    return fallback
+    return fallback, _final_context(fallback)
 
 
 @staff_member_required
@@ -1007,10 +1355,13 @@ def todo_focus(request, pk: int):
     if todo.done_on:
         return redirect(_get_return_url(request))
 
-    iframe_url = _todo_iframe_url(request, todo)
+    iframe_url, focus_auth = _todo_iframe_url(request, todo)
+    focus_target_url = focus_auth.get("target_url", iframe_url) if focus_auth else iframe_url
     context = {
         "todo": todo,
         "iframe_url": iframe_url,
+        "focus_target_url": focus_target_url,
+        "focus_auth": focus_auth,
         "next_url": _get_return_url(request),
         "done_url": reverse("todo-done", args=[todo.pk]),
     }