bhtool 0.3.0__tar.gz → 0.3.1__tar.gz

{bhtool-0.3.0 → bhtool-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bhtool
-Version: 0.3.0
+Version: 0.3.1
 Summary: Assorted CLI utilities for Bosco’s workflows (dev, media, macOS, LLM helpers).
 Author-email: Bosco Ho <apposite@gmail.com>
 Requires-Python: >=3.13
@@ -48,7 +48,7 @@ Assorted CLI utilities that are handy in Bosco’s day-to-day work—version bum
 
 ### Movies + LLM
 
-`LLM_SERVICE` selects the backend (`openai`, `groq`, `ollama`, `bedrock`, …). Set it in the process environment or in **`bhtool/.env`** (loaded from the installed package directory). Model defaults come from [microeval](https://pypi.org/project/microeval/)’s config for that service.
+`b movies --service <name>` selects the backend for one run (`openai`, `groq`, `ollama`, `bedrock` — see `b movies --help`). `LLM_SERVICE` sets the default. Set `LLM_SERVICE` in the process environment or in **`bhtool/.env`** (loaded from the installed package directory). Model defaults come from [microeval](https://pypi.org/project/microeval/)’s config for that service.
 
 ---
 

{bhtool-0.3.0 → bhtool-0.3.1}/README.md

@@ -32,7 +32,7 @@ Assorted CLI utilities that are handy in Bosco’s day-to-day work—version bum
 
 ### Movies + LLM
 
-`LLM_SERVICE` selects the backend (`openai`, `groq`, `ollama`, `bedrock`, …). Set it in the process environment or in **`bhtool/.env`** (loaded from the installed package directory). Model defaults come from [microeval](https://pypi.org/project/microeval/)’s config for that service.
+`b movies --service <name>` selects the backend for one run (`openai`, `groq`, `ollama`, `bedrock` — see `b movies --help`). `LLM_SERVICE` sets the default. Set `LLM_SERVICE` in the process environment or in **`bhtool/.env`** (loaded from the installed package directory). Model defaults come from [microeval](https://pypi.org/project/microeval/)’s config for that service.
 
 ---
 

{bhtool-0.3.0 → bhtool-0.3.1}/bhtool/cli.py

@@ -7,6 +7,7 @@ from typing import Literal
 from cyclopts import App
 
 from bhtool.gdoc import app as gdoc_app
+from bhtool.llm_services import LLMService
 
 app = App(name="bhtool", help="boscoh tools")
 app.command(gdoc_app)
@@ -106,17 +107,22 @@ def todict_cmd(json: str | None = None, yaml: str | None = None):
 
 
 @app.command(name="movies")
-def movies_cmd(root_dir: str | None = None, execute: bool = False):
+def movies_cmd(
+    root_dir: str | None = None,
+    execute: bool = False,
+    service: LLMService | None = None,
+):
     """Normalize movie names with an LLM.
 
     :param root_dir: Root directory containing movies (positional); default is current working directory.
     :param execute: If true, perform renames; otherwise dry run (table output).
+    :param service: LLM service for normalization; default from LLM_SERVICE, else openai.
     """
     import bhtool.list_movies as list_movies_mod
 
     if root_dir == "rename":
         root_dir = None
-    list_movies_mod.rename(root_dir=root_dir, execute=execute)
+    list_movies_mod.rename(root_dir=root_dir, execute=execute, service=service)
 
 
 def main() -> None:

{bhtool-0.3.0 → bhtool-0.3.1}/bhtool/list_movies.py

@@ -351,7 +351,9 @@ def _root_dir(movies_dir: str | None = None) -> Path:
     return Path.cwd()
 
 
-def rename(root_dir: str | None = None, execute: bool = False):
+def rename(
+    root_dir: str | None = None, execute: bool = False, service: str | None = None
+):
     console = Console()
     intro = Text.assemble(
         ("LLM-normalize names → ", ""),
@@ -362,7 +364,7 @@ def rename(root_dir: str | None = None, execute: bool = False):
     )
     console.print(_panel_lines(intro, title=_MOVIES_TITLE, border=_MOVIES_BORDER))
     root = _root_dir(root_dir)
-    svc = os.environ.get("LLM_SERVICE", "openai")
+    svc = service or os.environ.get("LLM_SERVICE", "openai")
     mapping = run_normalize_with_llm(root, svc, console=console)
     mapping_path = Path.cwd() / "movie_mapping.json"
     mapping_path.write_text(json.dumps(mapping, indent=2))

bhtool-0.3.1/bhtool/llm_services.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+
+"""LLM service names shared by the CLI and the movies command.
+
+Keep ``LLMService`` in sync with ``microeval.llm.LLM_CLIENTS``. This module has
+no heavy imports, so the CLI can show the choices without importing microeval
+at startup.
+"""
+
+from typing import Literal, get_args
+
+LLMService = Literal["openai", "groq", "ollama", "bedrock"]
+
+LLM_SERVICES = get_args(LLMService)

{bhtool-0.3.0 → bhtool-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bhtool"
-version = "0.3.0"
+version = "0.3.1"
 description = "Assorted CLI utilities for Bosco’s workflows (dev, media, macOS, LLM helpers)."
 readme = "README.md"
 requires-python = ">=3.13"