2b-agent 0.2.2__tar.gz → 0.2.3__tar.gz

{2b_agent-0.2.2 → 2b_agent-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: 2b-agent
-Version: 0.2.2
+Version: 0.2.3
 Summary: A local-first coding agent that keeps small local models focused instead of hallucinating.
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -157,10 +157,11 @@ Already have Ollama and some models? It skips what you already have — it lists
 models, offers to just use them (pulling nothing), and marks anything in the menu you've already
 got. Your existing setup is left untouched.
 
-Prefer to do it by hand? If you already have `uv`:
+Prefer to do it by hand? Install the published package from
+[PyPI](https://pypi.org/project/2b-agent/):
 
 ```bash
-uv tool install git+https://github.com/dea6cat/2b-agent
+pip install 2b-agent                              # latest release from PyPI
 ollama pull qwen3.5:9b        # my default — a good balance on an 18 GB machine
 ```
 
@@ -188,17 +189,23 @@ Then just type what you want done. Type `/` to see the commands.
 
 ### Updating
 
-2B installs as a `uv` tool, so updating is one command:
+One command, whatever you installed with — it detects the method and runs the right upgrade:
 
 ```bash
-2b --update                        # or: uv tool upgrade 2b-agent
+2b --update
 ```
 
-Re-running the installer (`curl … | sh`) does the same. 2B also checks for a newer
-release in the background (at most once a day, never blocking startup) and prints a
-one-line notice next launch when one is available — set `TWOB_NO_UPDATE_CHECK=1` to
-turn that off. Releases are tagged `vMAJOR.MINOR.PATCH`; pin one for reproducibility
-with `uv tool install git+https://github.com/dea6cat/2b-agent@v0.2.0`.
+That resolves to `uv tool upgrade 2b-agent` (the `curl … | sh` installer / `uv`),
+`pipx upgrade 2b-agent` (pipx), or `pip install -U 2b-agent` (pip). You can of course
+run the matching command yourself — e.g. **if you installed with pip**:
+
+```bash
+pip install -U 2b-agent
+```
+
+2B also checks for a newer release in the background (at most once a day, never blocking
+startup) and prints a one-line notice on the next launch when one is available — set
+`TWOB_NO_UPDATE_CHECK=1` to turn that off. Releases are tagged `vMAJOR.MINOR.PATCH`.
 
 ### Providers
 

{2b_agent-0.2.2 → 2b_agent-0.2.3}/README.md

@@ -143,10 +143,11 @@ Already have Ollama and some models? It skips what you already have — it lists
 models, offers to just use them (pulling nothing), and marks anything in the menu you've already
 got. Your existing setup is left untouched.
 
-Prefer to do it by hand? If you already have `uv`:
+Prefer to do it by hand? Install the published package from
+[PyPI](https://pypi.org/project/2b-agent/):
 
 ```bash
-uv tool install git+https://github.com/dea6cat/2b-agent
+pip install 2b-agent                              # latest release from PyPI
 ollama pull qwen3.5:9b        # my default — a good balance on an 18 GB machine
 ```
 
@@ -174,17 +175,23 @@ Then just type what you want done. Type `/` to see the commands.
 
 ### Updating
 
-2B installs as a `uv` tool, so updating is one command:
+One command, whatever you installed with — it detects the method and runs the right upgrade:
 
 ```bash
-2b --update                        # or: uv tool upgrade 2b-agent
+2b --update
 ```
 
-Re-running the installer (`curl … | sh`) does the same. 2B also checks for a newer
-release in the background (at most once a day, never blocking startup) and prints a
-one-line notice next launch when one is available — set `TWOB_NO_UPDATE_CHECK=1` to
-turn that off. Releases are tagged `vMAJOR.MINOR.PATCH`; pin one for reproducibility
-with `uv tool install git+https://github.com/dea6cat/2b-agent@v0.2.0`.
+That resolves to `uv tool upgrade 2b-agent` (the `curl … | sh` installer / `uv`),
+`pipx upgrade 2b-agent` (pipx), or `pip install -U 2b-agent` (pip). You can of course
+run the matching command yourself — e.g. **if you installed with pip**:
+
+```bash
+pip install -U 2b-agent
+```
+
+2B also checks for a newer release in the background (at most once a day, never blocking
+startup) and prints a one-line notice on the next launch when one is available — set
+`TWOB_NO_UPDATE_CHECK=1` to turn that off. Releases are tagged `vMAJOR.MINOR.PATCH`.
 
 ### Providers
 

{2b_agent-0.2.2 → 2b_agent-0.2.3}/src/two_b/__init__.py

@@ -5,4 +5,4 @@ host keeps the model's world simple — a small, native tool schema over the
 provider's own wire format, with all orchestration complexity kept host-side.
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"

{2b_agent-0.2.2 → 2b_agent-0.2.3}/src/two_b/update.py

@@ -15,6 +15,7 @@ import json
 import os
 import shutil
 import subprocess
+import sys
 import threading
 import time
 import urllib.request
@@ -99,15 +100,43 @@ def notice(now: float | None = None) -> str | None:
     return msg
 
 
+def _kind_from(paths: str) -> str:
+    """Classify an install from where its files live: uv tool, pipx, or plain pip."""
+    p = paths.replace(os.sep, "/").lower()
+    if "/uv/tools/" in p:
+        return "uv"
+    if "/pipx/" in p:
+        return "pipx"
+    return "pip"
+
+
+def _install_kind() -> str:
+    """How this 2b-agent was installed, inferred from its run location."""
+    return _kind_from(sys.prefix + "|" + os.path.abspath(__file__))
+
+
 def run_upgrade(emit) -> int:
-    """`2b --update`: upgrade the installed tool via uv. Returns uv's exit code (1 if uv
-    is unavailable). Lets uv's own progress print to the terminal."""
-    if not shutil.which("uv"):
-        emit(f"uv not found — update with your installer, e.g. 'uv tool upgrade {PKG}'.")
-        return 1
-    emit(f"Updating {PKG} via uv…")
+    """`2b --update`: upgrade using whatever installed it — `uv tool upgrade` (installer/
+    uv), `pipx upgrade` (pipx), or `pip install -U` (pip). Returns the tool's exit code
+    (1 if the needed tool isn't found). Lets the tool's own progress print to the terminal."""
+    kind = _install_kind()
+    if kind == "uv":
+        if not shutil.which("uv"):
+            emit(f"uv not found — run 'uv tool upgrade {PKG}' once it's on PATH.")
+            return 1
+        emit(f"Updating {PKG} via uv tool…")
+        cmd = ["uv", "tool", "upgrade", PKG]
+    elif kind == "pipx":
+        if not shutil.which("pipx"):
+            emit(f"pipx not found — run 'pipx upgrade {PKG}' once it's on PATH.")
+            return 1
+        emit(f"Updating {PKG} via pipx…")
+        cmd = ["pipx", "upgrade", PKG]
+    else:
+        emit(f"Updating {PKG} via pip…")
+        cmd = [sys.executable, "-m", "pip", "install", "-U", PKG]
     try:
-        return subprocess.run(["uv", "tool", "upgrade", PKG], timeout=300).returncode
+        return subprocess.run(cmd, timeout=600).returncode
     except Exception as e:
         emit(f"update failed: {e}")
         return 1

{2b_agent-0.2.2 → 2b_agent-0.2.3}/tests/test_update.py

@@ -64,28 +64,48 @@ class Notice(unittest.TestCase):
         self.assertIsNone(update.notice(now=self.now))
 
 
+class InstallKind(unittest.TestCase):
+    def test_kind_from_path(self):
+        self.assertEqual(update._kind_from("/home/u/.local/share/uv/tools/2b-agent/lib"), "uv")
+        self.assertEqual(update._kind_from("/home/u/.local/pipx/venvs/2b-agent"), "pipx")
+        self.assertEqual(update._kind_from("/usr/lib/python3.12/site-packages"), "pip")
+
+
 class RunUpgrade(unittest.TestCase):
     def _patch(self, obj, attr, val):
         orig = getattr(obj, attr)
         setattr(obj, attr, val)
         self.addCleanup(setattr, obj, attr, orig)
 
-    def test_uv_absent_returns_1(self):
-        self._patch(update.shutil, "which", lambda n: None)
-        out = []
-        code = update.run_upgrade(out.append)
-        self.assertEqual(code, 1)
-        self.assertIn("uv not found", "\n".join(out))
-
-    def test_uv_present_invokes_upgrade(self):
-        self._patch(update.shutil, "which", lambda n: "/usr/bin/uv")
+    def _capture(self, kind, which_ok=True):
+        self._patch(update, "_install_kind", lambda: kind)
+        self._patch(update.shutil, "which", lambda n: "/usr/bin/" + n if which_ok else None)
         calls = []
         self._patch(update.subprocess, "run",
                     lambda argv, **kw: calls.append(argv) or types.SimpleNamespace(returncode=0))
         code = update.run_upgrade([].append)
+        return code, calls
+
+    def test_uv_install_uses_uv_tool(self):
+        code, calls = self._capture("uv")
         self.assertEqual(code, 0)
         self.assertIn(["uv", "tool", "upgrade", "2b-agent"], calls)
 
+    def test_pipx_install_uses_pipx(self):
+        code, calls = self._capture("pipx")
+        self.assertEqual(code, 0)
+        self.assertIn(["pipx", "upgrade", "2b-agent"], calls)
+
+    def test_pip_install_uses_pip(self):
+        code, calls = self._capture("pip")
+        self.assertEqual(code, 0)
+        self.assertEqual(calls[0][1:], ["-m", "pip", "install", "-U", "2b-agent"])   # sys.executable -m pip …
+
+    def test_uv_absent_returns_1(self):
+        code, calls = self._capture("uv", which_ok=False)
+        self.assertEqual(code, 1)
+        self.assertEqual(calls, [])
+
 
 if __name__ == "__main__":
     unittest.main()