fix: address Gemini code review findings for PR #1

Simplify fetch_catalog_sync to use asyncio.run() instead of ThreadPoolExecutor,
guard empty models in example script, refactor merger fallback/loop logic to
reduce duplication, remove obsolete sync-from-loop test, and add uv.lock.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: vsraccubits

example/fetch_catalog.py

@@ -56,13 +56,22 @@ def main() -> None:
         print(f"... and {len(provider_counts) - 10} more providers")
 
     # ── 4. Inspect a single model ───────────────────────────────────────
-    first_key = next(iter(result.models))
-    model = result.models[first_key]
-    print(f"\nSample model: {first_key}")
-    for field in ("litellm_provider", "max_tokens", "max_input_tokens", "max_output_tokens",
-                  "input_cost_per_token", "output_cost_per_token"):
-        if field in model:
-            print(f"  {field}: {model[field]}")
+    if result.models:
+        first_key = next(iter(result.models))
+        model = result.models[first_key]
+        print(f"\nSample model: {first_key}")
+        for field in (
+            "litellm_provider",
+            "max_tokens",
+            "max_input_tokens",
+            "max_output_tokens",
+            "input_cost_per_token",
+            "output_cost_per_token",
+        ):
+            if field in model:
+                print(f"  {field}: {model[field]}")
+    else:
+        print("\nNo models in catalog.")
 
     # ── 5. Optional JSON dump ────────────────────────────────────────────
     if args.output:

src/bud_model_catalog/client.py

@@ -43,16 +43,8 @@ async def _safe_ai_models() -> FetchResult | None:
         return merge(litellm_result, ai_models_result, self._config)
 
     def fetch_catalog_sync(self) -> CatalogResult:
-        """Sync wrapper — safe to call from both sync and async contexts."""
-        try:
-            loop = asyncio.get_running_loop()
-        except RuntimeError:
-            loop = None
-
-        if loop and loop.is_running():
-            import concurrent.futures
-
-            with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
-                return pool.submit(asyncio.run, self.fetch_catalog()).result()
+        """Sync wrapper for fetch_catalog.
 
+        This is a blocking call. In async code, await fetch_catalog() instead.
+        """
         return asyncio.run(self.fetch_catalog())

src/bud_model_catalog/merger.py

@@ -54,13 +54,12 @@ def merge(
             fallback_models = dict(litellm_models)
             fallback_deprecated = 0
         else:
-            fallback_models = {}
-            fallback_deprecated = 0
-            for key, entry in litellm_models.items():
-                if _is_litellm_deprecated(entry):
-                    fallback_deprecated += 1
-                else:
-                    fallback_models[key] = entry
+            fallback_models = {
+                key: entry
+                for key, entry in litellm_models.items()
+                if not _is_litellm_deprecated(entry)
+            }
+            fallback_deprecated = total_litellm - len(fallback_models)
         return CatalogResult(
             models=fallback_models,
             stats=MergeStats(
@@ -86,40 +85,29 @@ def merge(
     for tz_key, tz_entry in litellm_models.items():
         litellm_provider = tz_entry.get("litellm_provider", "")
 
-        # Check if provider is mapped to ai-models
-        if litellm_provider not in LITELLM_TO_RESEARCH:
-            if not config.include_deprecated and _is_litellm_deprecated(tz_entry):
-                deprecated_removed += 1
-                continue
-            output[tz_key] = tz_entry
-            unmatched += 1
-            continue
-
-        # Extract model name for lookup
-        original_key = tz_entry.get("metadata", {}).get("original_key", "")
-        model_name = extract_model_name(litellm_provider, original_key)
-        research_provider = LITELLM_TO_RESEARCH[litellm_provider]
+        # Try to find a matching ai-models entry
+        research_entry: dict | None = None
+        if litellm_provider in LITELLM_TO_RESEARCH:
+            original_key = tz_entry.get("metadata", {}).get("original_key", "")
+            model_name = extract_model_name(litellm_provider, original_key)
+            research_provider = LITELLM_TO_RESEARCH[litellm_provider]
+            research_entry = research_lookup.get((research_provider, model_name))
+
+        # Determine deprecation status
+        is_deprecated = _is_litellm_deprecated(tz_entry) or (
+            research_entry is not None and research_entry.get("isDeprecated", False)
+        )
 
-        # Look up in ai-models
-        research_key = (research_provider, model_name)
-        research_entry = research_lookup.get(research_key)
+        if is_deprecated and not config.include_deprecated:
+            deprecated_removed += 1
+            continue
 
+        # No match — keep original LiteLLM entry as-is
         if research_entry is None:
-            if not config.include_deprecated and _is_litellm_deprecated(tz_entry):
-                deprecated_removed += 1
-                continue
             output[tz_key] = tz_entry
             unmatched += 1
             continue
 
-        # Check deprecated (ai-models flag OR LiteLLM deprecation_date)
-        is_deprecated = research_entry.get("isDeprecated", False) or _is_litellm_deprecated(
-            tz_entry
-        )
-        if is_deprecated and not config.include_deprecated:
-            deprecated_removed += 1
-            continue
-
         # Overlay cost fields from ai-models
         research_costs = research_entry.get("costs", {})
         updated_entry = dict(tz_entry)

tests/test_client.py

@@ -1,4 +1,3 @@
-import asyncio
 from unittest.mock import AsyncMock
 
 import httpx
@@ -124,23 +123,3 @@ async def test_non_source_fetch_error_in_ai_models_is_caught(config):
     assert len(result.models) > 0
     # ai-models was not available
     assert result.ai_models_fetched_at is None
-
-
-# ---------- BUG-7: fetch_catalog_sync from a running event loop ----------
-
-
-def test_fetch_catalog_sync_from_running_loop(config):
-    """fetch_catalog_sync works when called from within a running event loop (ThreadPoolExecutor path)."""
-    zip_bytes = build_ai_models_zip()
-
-    async def _run_in_thread() -> None:
-        with respx.mock:
-            respx.get(LITELLM_URL).mock(return_value=httpx.Response(200, json=SAMPLE_LITELLM_DATA))
-            respx.get(AI_MODELS_URL).mock(return_value=httpx.Response(200, content=zip_bytes))
-            client = CatalogClient(config)
-            loop = asyncio.get_running_loop()
-            result = await loop.run_in_executor(None, client.fetch_catalog_sync)
-            assert len(result.models) > 0
-            assert result.stats.total_litellm > 0
-
-    asyncio.run(_run_in_thread())