aider-vision-core 0.90.7.dev0__tar.gz → 0.90.9.dev0__tar.gz

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-vision-core
-Version: 0.90.7.dev0
+Version: 0.90.9.dev0
 Summary: aider-vision-core: Aider fork with headless API, submodule git, and web integration
 Project-URL: Homepage, https://github.com/Digital-Defiance/aider-vision-core
 Classifier: Development Status :: 4 - Beta
@@ -37,6 +37,7 @@ Requires-Dist: diff-match-patch==20241021
 Requires-Dist: diskcache==5.6.3
 Requires-Dist: distro==1.9.0
 Requires-Dist: fastapi==0.135.1
+Requires-Dist: httptools==0.7.1
 Requires-Dist: fastuuid==0.14.0
 Requires-Dist: filelock==3.25.2
 Requires-Dist: flake8==7.3.0
@@ -117,8 +118,11 @@ Requires-Dist: typer==0.24.1
 Requires-Dist: typing-extensions==4.15.0
 Requires-Dist: typing-inspection==0.4.2
 Requires-Dist: urllib3==2.6.3
+Requires-Dist: uvicorn==0.48.0
+Requires-Dist: uvloop==0.22.1
 Requires-Dist: watchfiles==1.1.1
 Requires-Dist: wcwidth==0.6.0
+Requires-Dist: websockets==16.0
 Requires-Dist: yarl==1.23.0
 Requires-Dist: zipp==3.23.0
 Requires-Dist: tree-sitter==0.23.2; python_version < "3.10"

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/aider_vision_core/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.90.7.dev0'
-__version_tuple__ = version_tuple = (0, 90, 7, 'dev0')
+__version__ = version = '0.90.9.dev0'
+__version_tuple__ = version_tuple = (0, 90, 9, 'dev0')
 
-__commit_id__ = commit_id = 'gd0a7f6a71'
+__commit_id__ = commit_id = 'gdf5587afc'

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/aider_vision_core/event_io.py

@@ -53,6 +53,27 @@ class EventIO(InputOutput):
             self.on_event(event)
         return event
 
+    def emit_progress(
+        self,
+        *,
+        label: str,
+        current: int | None = None,
+        total: int | None = None,
+        message: str | None = None,
+        fraction: float | None = None,
+    ) -> dict[str, Any]:
+        from aider_vision_core.gui_progress import emit_progress
+
+        emit_progress(
+            self,
+            label=label,
+            current=current,
+            total=total,
+            message=message,
+            fraction=fraction,
+        )
+        return self.events[-1] if self.events else {"type": "progress", "label": label}
+
     def drain_events(self) -> list[dict[str, Any]]:
         events = self.events
         self.events = []

aider_vision_core-0.90.9.dev0/aider_vision_core/gui_progress.py

@@ -0,0 +1,92 @@
+"""
+Progress reporting for Aider Vision (headless / GUI).
+
+Replaces terminal tqdm bars with structured ``progress`` events on EventIO.
+"""
+
+from __future__ import annotations
+
+import os
+from typing import Any, Callable, Iterable, Iterator, TypeVar
+
+T = TypeVar("T")
+
+
+def headless_enabled() -> bool:
+    return os.environ.get("AIDER_VISION_HEADLESS") == "1"
+
+
+def emit_progress(
+    io: Any,
+    *,
+    label: str,
+    current: int | None = None,
+    total: int | None = None,
+    message: str | None = None,
+    fraction: float | None = None,
+) -> None:
+    if io is None:
+        return
+    emit = getattr(io, "emit", None)
+    if not callable(emit):
+        return
+    if fraction is None and current is not None and total:
+        fraction = max(0.0, min(1.0, current / total))
+    payload: dict[str, Any] = {"label": label}
+    if current is not None:
+        payload["current"] = current
+    if total is not None:
+        payload["total"] = total
+    if fraction is not None:
+        payload["fraction"] = fraction
+    if message is not None:
+        payload["message"] = message
+    elif current is not None and total is not None:
+        payload["message"] = f"{current}/{total}"
+    emit("progress", **payload)
+
+
+def should_use_gui_progress(io: Any) -> bool:
+    if io is None:
+        return headless_enabled()
+    if headless_enabled():
+        return True
+    return callable(getattr(io, "emit", None))
+
+
+def progress_iter(
+    iterable: Iterable[T],
+    *,
+    desc: str = "Working",
+    io: Any = None,
+    total: int | None = None,
+    min_items_for_bar: int = 100,
+) -> Iterator[T]:
+    """
+    Iterate with tqdm in the CLI, or ``progress`` events for Vision / EventIO.
+    """
+    if total is None:
+        try:
+            total = len(iterable)  # type: ignore[arg-type]
+        except TypeError:
+            total = None
+
+    use_gui = should_use_gui_progress(io)
+
+    if use_gui and io is not None:
+        throttle = max(1, (total or 1) // 80)
+        for i, item in enumerate(iterable, start=1):
+            if total is None or i == 1 or i >= total or i % throttle == 0:
+                emit_progress(io, label=desc, current=i, total=total)
+            yield item
+        if total is not None:
+            emit_progress(io, label=desc, current=total, total=total)
+        return
+
+    if not use_gui and total is not None and total > min_items_for_bar:
+        from tqdm import tqdm
+
+        yield from tqdm(iterable, desc=desc, total=total)
+        return
+
+    yield from iterable

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/aider_vision_core/repomap.py

@@ -15,10 +15,10 @@ from diskcache import Cache
 from grep_ast import TreeContext, filename_to_lang
 from pygments.lexers import guess_lexer_for_filename
 from pygments.token import Token
-from tqdm import tqdm
 from tree_sitter import Query
 
 from aider_vision_core.dump import dump
+from aider_vision_core.gui_progress import progress_iter
 from aider_vision_core.special import filter_important_files
 from aider_vision_core.waiting import Spinner
 
@@ -289,7 +289,7 @@ class RepoMap:
             return
 
         query_scm = get_scm_fname(lang)
-        if not query_scm.exists():
+        if not query_scm or not query_scm.exists():
             return
         query_scm = query_scm.read_text()
 
@@ -392,12 +392,15 @@ class RepoMap:
             self.io.tool_output(
                 "Initial repo scan can be slow in larger repos, but only happens once."
             )
-            fnames = tqdm(fnames, desc="Scanning repo")
+            fname_source = progress_iter(
+                fnames, desc="Scanning repo", io=self.io, total=len(fnames)
+            )
             showing_bar = True
         else:
+            fname_source = fnames
             showing_bar = False
 
-        for fname in fnames:
+        for fname in fname_source:
             if self.verbose:
                 self.io.tool_output(f"Processing {fname}")
             if progress and not showing_bar:
@@ -643,7 +646,7 @@ class RepoMap:
         if not mentioned_idents:
             mentioned_idents = set()
 
-        spin = Spinner(UPDATING_REPO_MAP_MESSAGE)
+        spin = Spinner(UPDATING_REPO_MAP_MESSAGE, io=self.io)
 
         ranked_tags = self.get_ranked_tags(
             chat_fnames,
@@ -803,30 +806,30 @@ def get_random_color():
 
 
 def get_scm_fname(lang):
-    # Load the tags queries
+    # Load tags queries from the aider_vision_core package root (not this submodule).
+    pkg = __package__.split(".")[0] if __package__ else "aider_vision_core"
     if USING_TSL_PACK:
         subdir = "tree-sitter-language-pack"
         try:
-            path = resources.files(__package__).joinpath(
+            path = resources.files(pkg).joinpath(
                 "queries",
                 subdir,
                 f"{lang}-tags.scm",
             )
             if path.exists():
                 return path
-        except KeyError:
+        except (KeyError, ModuleNotFoundError, TypeError):
             pass
 
-    # Fall back to tree-sitter-languages
     subdir = "tree-sitter-languages"
     try:
-        return resources.files(__package__).joinpath(
+        return resources.files(pkg).joinpath(
             "queries",
             subdir,
             f"{lang}-tags.scm",
         )
-    except KeyError:
-        return
+    except (KeyError, ModuleNotFoundError, TypeError):
+        return None
 
 
 def get_supported_languages_md():

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/aider_vision_core/session.py

@@ -119,6 +119,8 @@ class Session:
                 return
 
             for chunk in self.coder.send_message(user_msg):
+                for event in self.io.drain_events():
+                    yield event
                 if chunk:
                     assistant_text.append(chunk)
                     event = self.io.emit("token", text=chunk)

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/aider_vision_core/waiting.py

@@ -35,8 +35,9 @@ class Spinner:
 
     last_frame_idx = 0  # Class variable to store the last frame index
 
-    def __init__(self, text: str, width: int = 7):
+    def __init__(self, text: str, width: int = 7, io=None):
         self.text = text
+        self.io = io
         self.start_time = time.time()
         self.last_update = 0.0
         self.visible = False
@@ -111,6 +112,12 @@ class Spinner:
         if text is not None:
             self.text = text
 
+        if _headless() and self.io is not None:
+            from aider_vision_core.gui_progress import emit_progress
+
+            emit_progress(self.io, label=self.text, message=text or self.text, fraction=None)
+            return
+
         if not self.is_tty:
             return
 

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/aider_vision_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-vision-core
-Version: 0.90.7.dev0
+Version: 0.90.9.dev0
 Summary: aider-vision-core: Aider fork with headless API, submodule git, and web integration
 Project-URL: Homepage, https://github.com/Digital-Defiance/aider-vision-core
 Classifier: Development Status :: 4 - Beta
@@ -37,6 +37,7 @@ Requires-Dist: diff-match-patch==20241021
 Requires-Dist: diskcache==5.6.3
 Requires-Dist: distro==1.9.0
 Requires-Dist: fastapi==0.135.1
+Requires-Dist: httptools==0.7.1
 Requires-Dist: fastuuid==0.14.0
 Requires-Dist: filelock==3.25.2
 Requires-Dist: flake8==7.3.0
@@ -117,8 +118,11 @@ Requires-Dist: typer==0.24.1
 Requires-Dist: typing-extensions==4.15.0
 Requires-Dist: typing-inspection==0.4.2
 Requires-Dist: urllib3==2.6.3
+Requires-Dist: uvicorn==0.48.0
+Requires-Dist: uvloop==0.22.1
 Requires-Dist: watchfiles==1.1.1
 Requires-Dist: wcwidth==0.6.0
+Requires-Dist: websockets==16.0
 Requires-Dist: yarl==1.23.0
 Requires-Dist: zipp==3.23.0
 Requires-Dist: tree-sitter==0.23.2; python_version < "3.10"

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/aider_vision_core.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ aider_vision_core/format_settings.py
 aider_vision_core/git_undo.py
 aider_vision_core/git_workspace.py
 aider_vision_core/gui.py
+aider_vision_core/gui_progress.py
 aider_vision_core/headless_stdio.py
 aider_vision_core/help.py
 aider_vision_core/help_pats.py

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/aider_vision_core.egg-info/requires.txt

@@ -17,6 +17,7 @@ diff-match-patch==20241021
 diskcache==5.6.3
 distro==1.9.0
 fastapi==0.135.1
+httptools==0.7.1
 fastuuid==0.14.0
 filelock==3.25.2
 flake8==7.3.0
@@ -97,8 +98,11 @@ typer==0.24.1
 typing-extensions==4.15.0
 typing-inspection==0.4.2
 urllib3==2.6.3
+uvicorn==0.48.0
+uvloop==0.22.1
 watchfiles==1.1.1
 wcwidth==0.6.0
+websockets==16.0
 yarl==1.23.0
 zipp==3.23.0
 

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/requirements/requirements.in

@@ -47,4 +47,5 @@ importlib-metadata<8.0.0
 # The proper dependency is litellm[proxy], but it installs
 # mcp which is a pywin32 dependency that fails on linux CI.
 fastapi
+uvicorn[standard]
 orjson

{aider_vision_core-0.90.7.dev0 → aider_vision_core-0.90.9.dev0}/requirements.txt

@@ -88,6 +88,10 @@ fastapi==0.135.1
     # via
     #   -c requirements/common-constraints.txt
     #   -r requirements/requirements.in
+httptools==0.7.1
+    # via
+    #   -r requirements/requirements.in
+    #   uvicorn
 fastuuid==0.14.0
     # via
     #   -c requirements/common-constraints.txt
@@ -455,6 +459,13 @@ urllib3==2.6.3
     # via
     #   -c requirements/common-constraints.txt
     #   requests
+uvicorn==0.48.0
+    # via
+    #   -r requirements/requirements.in
+uvloop==0.22.1
+    # via
+    #   -r requirements/requirements.in
+    #   uvicorn
 watchfiles==1.1.1
     # via
     #   -c requirements/common-constraints.txt
@@ -463,6 +474,10 @@ wcwidth==0.6.0
     # via
     #   -c requirements/common-constraints.txt
     #   prompt-toolkit
+websockets==16.0
+    # via
+    #   -r requirements/requirements.in
+    #   uvicorn
 yarl==1.23.0
     # via
     #   -c requirements/common-constraints.txt