aider-vision-core 0.90.1.dev0__tar.gz → 0.90.5.dev0__tar.gz

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-vision-core
-Version: 0.90.1.dev0
+Version: 0.90.5.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

aider_vision_core-0.90.5.dev0/aider_vision_core/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.90.5.dev0'
+__version_tuple__ = version_tuple = (0, 90, 5, 'dev0')
+
+__commit_id__ = commit_id = 'g8ffcb8225'

aider_vision_core-0.90.5.dev0/aider_vision_core/brand.py

@@ -0,0 +1,89 @@
+"""
+Product identity for the aider-vision stack.
+
+Two audiences
+-------------
+* **End user** (bubbled through the Aider Vision app): prefer **Aider Vision**.
+* **Developer / support** (logs, crash reports, GitHub): **Aider Vision Core**.
+
+When the desktop app spawns Core it sets ``AIDER_VISION_LAUNCHER=1``. In that mode,
+user-visible messages use the Vision product name; technical attribution stays on Core.
+"""
+
+from __future__ import annotations
+
+import os
+
+# Technical ids (pip, import path, CLI)
+PRODUCT_CORE = "aider-vision-core"
+PRODUCT_VISION = "aider-vision"
+
+# Human-readable product names
+DISPLAY_VISION = "Aider Vision"
+DISPLAY_CORE = "Aider Vision Core"
+
+# Set by the Aider Vision desktop app when it spawns the Core process
+LAUNCHER_ENV = "AIDER_VISION_LAUNCHER"
+LAUNCHER_VERSION_ENV = "AIDER_VISION_APP_VERSION"
+
+
+def is_launched_by_vision() -> bool:
+    return os.environ.get(LAUNCHER_ENV, "").strip() in ("1", "true", "yes")
+
+
+def user_facing_name() -> str:
+    """Name shown to people using the Aider Vision app."""
+    if is_launched_by_vision():
+        return DISPLAY_VISION
+    return DISPLAY_CORE
+
+
+def support_name() -> str:
+    """Name for engineers, pip, and issue trackers."""
+    return DISPLAY_CORE
+
+
+def version_banner() -> str:
+    """Startup banner in the terminal."""
+    from aider_vision_core import __version__
+
+    if is_launched_by_vision():
+        return f"{DISPLAY_VISION} · agent {DISPLAY_CORE} v{__version__}"
+    return f"{DISPLAY_CORE} ({PRODUCT_CORE}) v{__version__}"
+
+
+def launcher_context_lines() -> list[str]:
+    """Extra lines for crash reports when Core was started by the desktop app."""
+    if not is_launched_by_vision():
+        return []
+    app_ver = os.environ.get(LAUNCHER_VERSION_ENV, "unknown")
+    return [
+        f"User-facing product: {DISPLAY_VISION}",
+        f"Launched by: {DISPLAY_VISION} ({PRODUCT_VISION}) {app_ver}",
+        f"Technical component: {DISPLAY_CORE} ({PRODUCT_CORE})",
+        "",
+    ]
+
+
+def user_facing_prefix() -> str:
+    return f"[{user_facing_name()}]"
+
+
+def support_prefix() -> str:
+    return f"[{support_name()}]"
+
+
+def format_user_error(message: str) -> str:
+    """
+    Format an error that will be shown to the user (e.g. via the Vision app).
+
+    When running inside Vision, do not tell users "Aider Vision Core failed" for
+  generic failures — they are using Aider Vision.
+    """
+    message = message.strip()
+    if not message or not is_launched_by_vision():
+        return message
+    prefix = user_facing_prefix()
+    if message.startswith("["):
+        return message
+    return f"{prefix} {message}"

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/aider_vision_core/coders/base_coder.py

@@ -29,6 +29,7 @@ from typing import List
 from rich.console import Console
 
 from aider_vision_core import __version__, models, prompts, urls, utils
+from aider_vision_core.brand import version_banner
 from aider_vision_core.analytics import Analytics
 from aider_vision_core.commands import Commands
 from aider_vision_core.exceptions import LiteLLMExceptions
@@ -209,7 +210,7 @@ class Coder:
 
     def get_announcements(self):
         lines = []
-        lines.append(f"Aider v{__version__}")
+        lines.append(version_banner())
 
         # Model
         main_model = self.main_model

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/aider_vision_core/io.py

@@ -40,7 +40,7 @@ from .editor import pipe_editor
 from .utils import is_image_file
 
 # Constants
-NOTIFICATION_MESSAGE = "Aider is waiting for your input"
+NOTIFICATION_MESSAGE = "Aider Vision Core is waiting for your input"
 
 
 def ensure_hash_prefix(color):
@@ -987,10 +987,14 @@ class InputOutput:
 
     def tool_error(self, message="", strip=True):
         self.num_error_outputs += 1
-        self._tool_message(message, strip, self.tool_error_color)
+        from aider_vision_core.brand import format_user_error
+
+        self._tool_message(format_user_error(message), strip, self.tool_error_color)
 
     def tool_warning(self, message="", strip=True):
-        self._tool_message(message, strip, self.tool_warning_color)
+        from aider_vision_core.brand import format_user_error
+
+        self._tool_message(format_user_error(message), strip, self.tool_warning_color)
 
     def tool_output(self, *messages, log_only=False, bold=False):
         if messages:

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/aider_vision_core/repomap.py

@@ -1,6 +1,7 @@
 import colorsys
 import math
 import os
+import pickle
 import random
 import shutil
 import sqlite3
@@ -32,15 +33,16 @@ Tag = namedtuple("Tag", "rel_fname fname line name kind".split())
 SQLITE_ERRORS = (sqlite3.OperationalError, sqlite3.DatabaseError, OSError)
 
 
-CACHE_VERSION = 3
+CACHE_VERSION = 5
 if USING_TSL_PACK:
-    CACHE_VERSION = 4
+    CACHE_VERSION = 5
 
 UPDATING_REPO_MAP_MESSAGE = "Updating repo map"
 
 
 class RepoMap:
-    TAGS_CACHE_DIR = f".aider.tags.cache.v{CACHE_VERSION}"
+    # Distinct from upstream `.aider.tags.cache.*` (pickles reference old `aider` module).
+    TAGS_CACHE_DIR = f".aider-vision-core.tags.cache.v{CACHE_VERSION}"
 
     warned_files = set()
 
@@ -230,6 +232,22 @@ class RepoMap:
         except FileNotFoundError:
             self.io.tool_warning(f"File not found error: {fname}")
 
+    def _tags_cache_get(self, cache_key):
+        try:
+            return self.TAGS_CACHE.get(cache_key)  # Issue #1308
+        except SQLITE_ERRORS as e:
+            self.tags_cache_error(e)
+            return self.TAGS_CACHE.get(cache_key)
+        except (ModuleNotFoundError, pickle.UnpicklingError, AttributeError):
+            self._drop_tags_cache_key(cache_key)
+            return None
+
+    def _drop_tags_cache_key(self, cache_key):
+        try:
+            del self.TAGS_CACHE[cache_key]
+        except Exception:
+            pass
+
     def get_tags(self, fname, rel_fname):
         # Check if the file is in the cache and if the modification time has not changed
         file_mtime = self.get_mtime(fname)
@@ -237,11 +255,7 @@ class RepoMap:
             return []
 
         cache_key = fname
-        try:
-            val = self.TAGS_CACHE.get(cache_key)  # Issue #1308
-        except SQLITE_ERRORS as e:
-            self.tags_cache_error(e)
-            val = self.TAGS_CACHE.get(cache_key)
+        val = self._tags_cache_get(cache_key)
 
         if val is not None and val.get("mtime") == file_mtime:
             try:
@@ -249,6 +263,8 @@ class RepoMap:
             except SQLITE_ERRORS as e:
                 self.tags_cache_error(e)
                 return self.TAGS_CACHE[cache_key]["data"]
+            except (ModuleNotFoundError, pickle.UnpicklingError, AttributeError):
+                self._drop_tags_cache_key(cache_key)
 
         # miss!
         data = list(self.get_tags_raw(fname, rel_fname))

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/aider_vision_core/report.py

@@ -7,6 +7,7 @@ import urllib.parse
 import webbrowser
 
 from aider_vision_core import __version__
+from aider_vision_core.brand import DISPLAY_CORE, PRODUCT_CORE, launcher_context_lines
 from aider_vision_core.urls import github_issues
 from aider_vision_core.versioncheck import VERSION_CHECK_FNAME
 
@@ -44,15 +45,23 @@ def report_github_issue(issue_text, title=None, confirm=True):
     :param confirm: Whether to ask for confirmation before opening the browser (default: True)
     :return: None
     """
-    version_info = f"Aider version: {__version__}\n"
+    version_info = f"{DISPLAY_CORE} ({PRODUCT_CORE}) version: {__version__}\n"
     python_version = f"Python version: {sys.version.split()[0]}\n"
     platform_info = f"Platform: {platform.platform()}\n"
     python_info = get_python_info() + "\n"
     os_info = get_os_info() + "\n"
     git_info = get_git_info() + "\n"
+    launcher_info = "\n".join(launcher_context_lines())
 
     system_info = (
-        version_info + python_version + platform_info + python_info + os_info + git_info + "\n"
+        version_info
+        + python_version
+        + platform_info
+        + python_info
+        + os_info
+        + git_info
+        + (launcher_info + "\n" if launcher_info else "")
+        + "\n"
     )
 
     issue_text = system_info + issue_text
@@ -63,10 +72,15 @@ def report_github_issue(issue_text, title=None, confirm=True):
     issue_url = f"{github_issues}?{urllib.parse.urlencode(params)}"
 
     if confirm:
+        from aider_vision_core.brand import is_launched_by_vision, user_facing_name
+
+        product = user_facing_name() if is_launched_by_vision() else DISPLAY_CORE
         print(f"\n# {title}\n")
         print(issue_text.strip())
         print()
-        print("Please consider reporting this bug to help improve aider!")
+        print(f"Please consider reporting this bug to help improve {product}!")
+        if is_launched_by_vision():
+            print(f"(Technical details above refer to {DISPLAY_CORE}.)")
         prompt = "Open a GitHub Issue pre-filled with the above error in your browser? (Y/n) "
         confirmation = input(prompt).strip().lower()
 

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/aider_vision_core/scrape.py

@@ -8,7 +8,9 @@ import pypandoc
 from aider_vision_core import __version__, urls, utils
 from aider_vision_core.dump import dump  # noqa: F401
 
-aider_user_agent = f"Aider/{__version__} +{urls.website}"
+from aider_vision_core.brand import PRODUCT_CORE
+
+aider_user_agent = f"{PRODUCT_CORE}/{__version__} +{urls.website}"
 
 # Playwright is nice because it has a simple way to install dependencies on most
 # platforms.

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/aider_vision_core/versioncheck.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 import packaging.version
 
-import aider
+import aider_vision_core
 from aider_vision_core import utils
 from aider_vision_core.dump import dump  # noqa: F401
 
@@ -14,14 +14,14 @@ VERSION_CHECK_FNAME = Path.home() / ".aider" / "caches" / "versioncheck"
 
 def install_from_main_branch(io):
     """
-    Install the latest version of aider from the main branch of the GitHub repository.
+    Install the latest version of aider-vision-core from the main branch of the GitHub repository.
     """
 
     return utils.check_pip_install_extra(
         io,
         None,
-        "Install the development version of aider from the main branch?",
-        ["git+https://github.com/Aider-AI/aider.git"],
+        "Install the development version of aider-vision-core from the main branch?",
+        ["git+https://github.com/Digital-Defiance/aider-vision-core.git"],
         self_update=True,
     )
 
@@ -55,7 +55,7 @@ def install_upgrade(io, latest_version=None):
     )
 
     if success:
-        io.tool_output("Re-run aider to use new version.")
+        io.tool_output("Re-run aider-vision-core to use new version.")
         sys.exit()
 
     return
@@ -78,7 +78,7 @@ def check_version(io, just_check=False, verbose=False):
         response = requests.get("https://pypi.org/pypi/aider-vision-core/json")
         data = response.json()
         latest_version = data["info"]["version"]
-        current_version = aider.__version__
+        current_version = aider_vision_core.__version__
 
         if just_check or verbose:
             io.tool_output(f"Current version: {current_version}")

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/aider_vision_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-vision-core
-Version: 0.90.1.dev0
+Version: 0.90.5.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

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/aider_vision_core.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ aider_vision_core/_version.py
 aider_vision_core/analytics.py
 aider_vision_core/args.py
 aider_vision_core/args_formatter.py
+aider_vision_core/brand.py
 aider_vision_core/cli_serve.py
 aider_vision_core/commands.py
 aider_vision_core/copypaste.py
@@ -290,6 +291,7 @@ benchmark/swe-bench.txt
 benchmark/swe_bench.py
 benchmark/test_benchmark.py
 docker/Dockerfile
+docs/products.md
 requirements/common-constraints.txt
 requirements/pydub.in
 requirements/python-compat.in

aider_vision_core-0.90.5.dev0/docs/products.md

@@ -0,0 +1,31 @@
+# Aider Vision product split
+
+## Two products
+
+| | **Aider Vision** | **Aider Vision Core** |
+|---|------------------|------------------------|
+| **What users see** | Desktop app window | Agent running in terminal / behind the app |
+| **Repo** | `aider-vision` | `aider-vision-core` |
+| **Install** | App bundle / Tauri build | `pip install aider-vision-core` |
+| **Typical errors** | Won’t start, can’t connect to Core, UI bugs | LLM, git, repo-map, edits, API |
+
+**Aider Vision** is the shell. **Aider Vision Core** is the coding agent (fork of Aider).
+
+## Who to blame (for users)
+
+**In the Aider Vision app**, most errors shown in chat use **`[Aider Vision]`** even when the agent (Core) failed — because that is the product people opened.
+
+| Where | Label |
+|-------|--------|
+| Chat / main errors | **Aider Vision** |
+| Terminal tab (technical log) | **Aider Vision Core** (full detail) |
+| Crash report file / GitHub (developers) | **Aider Vision Core** + “launched by Vision” |
+
+- **Can’t start**, window, settings → **Aider Vision**
+- **Model / git / repo map** → still Core under the hood; users see **Aider Vision** in chat, engineers see Core in the technical log
+
+## For developers
+
+- Core reads `AIDER_VISION_LAUNCHER=1` when the desktop app spawns it (crash reports include both versions).
+- Prefer separate GitHub issues: `Digital-Defiance/aider-vision` vs `Digital-Defiance/aider-vision-core`.
+- Shared branding constants: `aider_vision_core/brand.py` and `aider-vision/src/brand.ts`.

{aider_vision_core-0.90.1.dev0 → aider_vision_core-0.90.5.dev0}/tests/help/test_help.py

@@ -4,7 +4,7 @@ from unittest.mock import MagicMock
 
 from requests.exceptions import ConnectionError, ReadTimeout
 
-import aider
+import aider_vision_core
 from aider_vision_core.coders import Coder
 from aider_vision_core.commands import Commands
 from aider_vision_core.help import Help, fname_to_url
@@ -62,7 +62,7 @@ class TestHelp(unittest.TestCase):
         def run_help_command():
             try:
                 commands.cmd_help("hi")
-            except aider.commands.SwitchCoder:
+            except aider_vision_core.commands.SwitchCoder:
                 pass
             else:
                 # If no exception was raised, fail the test

aider_vision_core-0.90.1.dev0/aider_vision_core/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '0.90.1.dev0'
-__version_tuple__ = version_tuple = (0, 90, 1, 'dev0')
-
-__commit_id__ = commit_id = 'g994947a55'