aria-code 0.127.0__tar.gz → 0.128.0__tar.gz

{aria_code-0.127.0/src/aria_code.egg-info → aria_code-0.128.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.127.0
+Version: 0.128.0
 Summary: Open-source AI agent for coding, financial analysis and logistics operations: numbers you can check, client data kept apart, actions a person approves
 License: Apache-2.0
 Project-URL: Homepage, https://github.com/artheras/aria-code
@@ -172,7 +172,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.127.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.127.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.128.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.128.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.127.0 → aria_code-0.128.0}/README.md

@@ -15,7 +15,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.127.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.127.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.128.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.128.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.127.0 → aria_code-0.128.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aria-code"
-version = "0.127.0"
+version = "0.128.0"
 description = "Open-source AI agent for coding, financial analysis and logistics operations: numbers you can check, client data kept apart, actions a person approves"
 readme = "README.md"
 license = { text = "Apache-2.0" }

{aria_code-0.127.0 → aria_code-0.128.0}/src/aria_code/_version.py

@@ -17,4 +17,4 @@ from __future__ import annotations
 
 __all__ = ["__version__"]
 
-__version__ = "0.127.0"
+__version__ = "0.128.0"

aria_code-0.128.0/src/aria_code/runtime/native_index.py

@@ -0,0 +1,66 @@
+"""Project-graph imports from the native ``aria-native index imports``.
+
+Parsing every Python file's imports is most of the time a graph build takes
+(``ast.parse`` and ``ast.walk`` per file). The Rust ``aria-graph`` crate does
+the same resolution in parallel; ``project_graph`` asks it first and keeps the
+Python implementation for everything it does not answer:
+
+* no binary — ``ARIA_NATIVE_BINARY`` or ``aria-native`` on ``PATH`` — or
+  ``ARIA_NATIVE_GRAPH=off``;
+* too few files to be worth a process (``_MIN_FILES``);
+* the binary failing, timing out or answering out of shape;
+* a file its parser rejects (``fallback``), which Python then parses itself.
+
+The two implementations must agree; ``tests/test_native_index.py`` holds them
+to it on this repository and on edge cases.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import shutil
+import subprocess
+from pathlib import Path
+from typing import Optional, Sequence
+
+_MIN_FILES = 32
+_TIMEOUT = 120
+
+
+def native_binary() -> Optional[str]:
+    configured = os.environ.get("ARIA_NATIVE_BINARY", "").strip()
+    if configured:
+        return configured if Path(configured).is_file() else None
+    return shutil.which("aria-native")
+
+
+def enabled() -> bool:
+    return os.environ.get("ARIA_NATIVE_GRAPH", "").strip().lower() not in ("0", "off", "false", "no")
+
+
+def resolve_imports(root: Path, files: Sequence[tuple[str, str]], parse: Sequence[str],
+                    *, minimum: Optional[int] = None) -> Optional[tuple[dict[str, list[str]], list[str]]]:
+    """``(imports by path, paths to parse in Python)``, or None to do it all in Python."""
+    if len(parse) < (_MIN_FILES if minimum is None else minimum) or not enabled():
+        return None
+    binary = native_binary()
+    if not binary:
+        return None
+    request = json.dumps({"root": str(root), "files": [list(f) for f in files], "parse": list(parse)})
+    try:
+        done = subprocess.run([binary, "index", "imports"], input=request, capture_output=True,
+                              text=True, encoding="utf-8", timeout=_TIMEOUT, check=False)
+        if done.returncode != 0:
+            return None
+        data = json.loads(done.stdout)
+    except (OSError, ValueError, subprocess.SubprocessError):
+        return None
+    imports, fallback = data.get("imports"), data.get("fallback")
+    if not isinstance(imports, dict) or not isinstance(fallback, list):
+        return None
+    wanted = set(parse)
+    if not set(imports) | set(fallback) >= wanted:   # every file answered one way or the other
+        return None
+    return ({path: list(found) for path, found in imports.items() if path in wanted},
+            [path for path in fallback if path in wanted])

{aria_code-0.127.0 → aria_code-0.128.0}/src/aria_code/runtime/project_graph.py

@@ -42,6 +42,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Iterable, Optional, Sequence
 
+from . import native_index
 from .repo_map import RepoMap
 
 GRAPH_VERSION = 1
@@ -141,13 +142,21 @@ class ProjectGraph:
         repo = RepoMap(self.root).build()
         prior = previous.files if previous is not None else {}
         modules = _module_index(repo.files)
+        stale = [path for path, entry in repo.files.items()
+                 if not ((cached := prior.get(path))
+                         and cached.get("mtime") == entry.mtime and cached.get("size") == entry.size)]
+        native = native_index.resolve_imports(
+            self.root, [(path, entry.language) for path, entry in repo.files.items()], stale)
+        resolved, python_side = native if native is not None else ({}, stale)
+        for path in python_side:
+            entry = repo.files[path]
+            resolved[path] = _imports(self.root, path, entry.language, modules, repo.files)
         files: dict[str, dict] = {}
         for path, entry in repo.files.items():
-            cached = prior.get(path)
-            if cached and cached.get("mtime") == entry.mtime and cached.get("size") == entry.size:
-                imports = cached.get("imports") or []
+            if path in resolved:
+                imports = resolved[path]
             else:
-                imports = _imports(self.root, path, entry.language, modules, repo.files)
+                imports = prior[path].get("imports") or []
             files[path] = {
                 "mtime": entry.mtime, "size": entry.size, "language": entry.language,
                 "imports": sorted(set(imports) - {path}),

{aria_code-0.127.0 → aria_code-0.128.0/src/aria_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aria-code
-Version: 0.127.0
+Version: 0.128.0
 Summary: Open-source AI agent for coding, financial analysis and logistics operations: numbers you can check, client data kept apart, actions a person approves
 License: Apache-2.0
 Project-URL: Homepage, https://github.com/artheras/aria-code
@@ -172,7 +172,7 @@ Numbers you can check, client data kept apart, actions a person approves.</p>
 <p align="center">
   <a href="https://www.npmjs.com/package/@artheras/aria-code"><img src="https://img.shields.io/npm/v/@artheras/aria-code/latest?style=flat-square&logo=npm&label=npm" alt="npm version"></a>
   <!-- Release automation pins PyPI: the default endpoint still selects legacy 4.x. -->
-  <a href="https://pypi.org/project/aria-code/0.127.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.127.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
+  <a href="https://pypi.org/project/aria-code/0.128.0/"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpypi.org%2Fpypi%2Faria-code%2F0.128.0%2Fjson&amp;query=%24.info.version&amp;prefix=v&amp;style=flat-square&amp;logo=pypi&amp;label=PyPI&amp;color=blue&amp;cacheSeconds=300" alt="PyPI version"></a>
   <a href="https://github.com/artheras/aria-code/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/artheras/aria-code/ci.yml?branch=main&style=flat-square&logo=githubactions&label=CI" alt="CI status"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache%202.0-64748b?style=flat-square" alt="Apache License 2.0"></a>
 </p>

{aria_code-0.127.0 → aria_code-0.128.0}/src/aria_code.egg-info/SOURCES.txt

@@ -457,6 +457,7 @@ src/aria_code/runtime/delivery.py
 src/aria_code/runtime/events.py
 src/aria_code/runtime/gateway.py
 src/aria_code/runtime/lsp.py
+src/aria_code/runtime/native_index.py
 src/aria_code/runtime/orchestrator.py
 src/aria_code/runtime/processes.py
 src/aria_code/runtime/project_graph.py
@@ -682,6 +683,7 @@ tests/test_model_selection_state.py
 tests/test_narrow_chinese_output.py
 tests/test_native_binary_entrypoints.py
 tests/test_native_bridge.py
+tests/test_native_index.py
 tests/test_native_installer.py
 tests/test_natural_language_routing.py
 tests/test_new_modules.py

aria_code-0.128.0/tests/test_native_index.py

@@ -0,0 +1,139 @@
+"""The native import resolver must agree with the Python one, edge for edge."""
+
+from __future__ import annotations
+
+import textwrap
+from pathlib import Path
+
+import pytest
+
+from aria_code.runtime import native_index
+from aria_code.runtime import project_graph as pg
+
+REPO = Path(__file__).resolve().parents[1]
+needs_binary = pytest.mark.skipif(native_index.native_binary() is None,
+                                  reason="aria-native not built (set ARIA_NATIVE_BINARY)")
+
+
+def _build(root: Path, monkeypatch, native: bool) -> dict[str, list[str]]:
+    monkeypatch.setenv("ARIA_NATIVE_GRAPH", "on" if native else "off")
+    monkeypatch.setattr(native_index, "_MIN_FILES", 0)
+    if native:
+        calls = []
+        real = native_index.resolve_imports
+
+        def spy(*args, **kwargs):
+            result = real(*args, **kwargs)
+            calls.append(result)
+            return result
+
+        monkeypatch.setattr(native_index, "resolve_imports", spy)
+    graph = pg.ProjectGraph(root).build()
+    if native:
+        assert calls and calls[0] is not None, "the native resolver was not used"
+    return {path: info["imports"] for path, info in graph.files.items()}
+
+
+def _write(root: Path, files: dict[str, str | bytes]) -> Path:
+    for rel, content in files.items():
+        path = root / rel
+        path.parent.mkdir(parents=True, exist_ok=True)
+        if isinstance(content, bytes):
+            path.write_bytes(content)
+        else:
+            path.write_text(textwrap.dedent(content), encoding="utf-8")
+    return root
+
+
+EDGE_CASES = {
+    "app/__init__.py": "",
+    "app/core.py": """
+        from . import models
+        from .models import User
+        from .. import toplevel
+        from ...beyond import nothing
+        import app.helpers as h
+
+        def lazy():
+            from app.services import billing
+            return billing
+
+        class Loader:
+            try:
+                import yaml
+                from app import util
+            except ImportError:
+                from .compat import util
+            finally:
+                pass
+
+        match 1:
+            case 1:
+                import app.cases
+    """,
+    "app/models.py": "class User: ...\n",
+    "app/helpers.py": "",
+    "app/compat.py": "",
+    "app/cases.py": "",
+    "app/services/__init__.py": "",
+    "app/services/billing.py": "from ..models import User\nfrom . import *\n",
+    "toplevel.py": "",
+    # Two files answer to `util`: the importer's own directory wins, a tie resolves to nothing.
+    "app/util.py": "",
+    "lib/util.py": "",
+    "lib/user.py": "import util\n",
+    "other/user.py": "import util\n",
+    "bom.py": b"\xef\xbb\xbfimport app.models\n",
+    "broken.py": "def oops(:\n    import app.models\n",
+    "web/index.ts": "import { a } from './a'\nexport * from './lib'\nconst c = require('../shared/c')\nimport('./lazy')\n",
+    "web/a.tsx": "",
+    "web/lib/index.js": "",
+    "web/lazy.mjs": "",
+    "shared/c.js": "import x from 'react'\n",
+}
+
+
+@needs_binary
+def test_edge_cases_resolve_the_same_way(tmp_path, monkeypatch):
+    root = _write(tmp_path, EDGE_CASES)
+    python = _build(root, monkeypatch, native=False)
+    native = _build(root, monkeypatch, native=True)
+    assert native == python
+    # And the answers are the ones the Python implementation is known to give.
+    assert python["app/core.py"] == sorted({
+        "app/models.py", "toplevel.py", "app/helpers.py",
+        "app/services/billing.py", "app/util.py", "app/compat.py", "app/cases.py"})
+    assert python["lib/user.py"] == ["lib/util.py"]
+    assert python["other/user.py"] == []
+    assert python["bom.py"] == [] and python["broken.py"] == []
+    assert python["web/index.ts"] == ["shared/c.js", "web/a.tsx", "web/lazy.mjs", "web/lib/index.js"]
+
+
+@needs_binary
+@pytest.mark.timeout(300)  # two full builds of this repository; slow on Windows runners
+def test_this_repository_resolves_the_same_way(monkeypatch):
+    assert _build(REPO, monkeypatch, native=True) == _build(REPO, monkeypatch, native=False)
+
+
+def test_python_is_used_when_native_is_off_or_missing(tmp_path, monkeypatch):
+    files = [("a.py", "python")]
+    monkeypatch.setenv("ARIA_NATIVE_GRAPH", "off")
+    assert native_index.resolve_imports(tmp_path, files, ["a.py"], minimum=0) is None
+    monkeypatch.setenv("ARIA_NATIVE_GRAPH", "on")
+    monkeypatch.setenv("ARIA_NATIVE_BINARY", str(tmp_path / "missing"))
+    assert native_index.resolve_imports(tmp_path, files, ["a.py"], minimum=0) is None
+
+
+def test_small_batches_stay_in_python(tmp_path, monkeypatch):
+    monkeypatch.setenv("ARIA_NATIVE_BINARY", str(tmp_path / "never-called"))
+    (tmp_path / "never-called").write_text("")
+    assert native_index.resolve_imports(tmp_path, [("a.py", "python")], ["a.py"]) is None
+
+
+@needs_binary
+def test_a_rejected_file_is_handed_back_to_python(tmp_path, monkeypatch):
+    root = _write(tmp_path, {"a.py": "def oops(:\n", "b.py": "import a\n"})
+    monkeypatch.setenv("ARIA_NATIVE_GRAPH", "on")
+    imports, fallback = native_index.resolve_imports(
+        root, [("a.py", "python"), ("b.py", "python")], ["a.py", "b.py"], minimum=0)
+    assert fallback == ["a.py"] and imports == {"b.py": ["a.py"]}