code-puppy-core-plugins 0.0.85__tar.gz → 0.0.87__tar.gz

{code_puppy_core_plugins-0.0.85 → code_puppy_core_plugins-0.0.87}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: code-puppy-core-plugins
-Version: 0.0.85
+Version: 0.0.87
 Summary: Official plugin bundle for Code Puppy
 Project-URL: Repository, https://github.com/mpfaffenberger/code_puppy_core_plugins
 Project-URL: Homepage, https://github.com/mpfaffenberger/code_puppy_core_plugins

{code_puppy_core_plugins-0.0.85 → code_puppy_core_plugins-0.0.87}/code_puppy_core_plugins/grok_oauth/register_callbacks.py

@@ -103,7 +103,7 @@ def _create_grok_oauth_model(model_name: str, model_config: Dict, config: Dict)
     from pydantic_ai.models.openai import OpenAIResponsesModel
     from pydantic_ai.providers.openai import OpenAIProvider
 
-    from code_puppy.http_utils import create_async_client
+    from code_puppy.httpx2_utils import create_async_client
 
     access_token = get_valid_access_token()
     if not access_token:

{code_puppy_core_plugins-0.0.85 → code_puppy_core_plugins-0.0.87}/code_puppy_core_plugins/jev_grep/tool.py

@@ -2,12 +2,8 @@
 
 from __future__ import annotations
 
-from pathlib import Path
-
 from pydantic_ai import RunContext
 
-from code_puppy.i18n import add_catalog_dir, t
-from code_puppy.messaging import emit_info
 from code_puppy.tools.common import resolve_path
 
 from .config import (
@@ -22,8 +18,6 @@ from .config import (
 from .judge import build_jev_model
 from .search import DEFAULT_CANDIDATES, SemanticGrepOutput, semantic_search
 
-add_catalog_dir(Path(__file__).parent / "locales")
-
 TOOL_NAME = "smart_grep"
 
 
@@ -71,16 +65,6 @@ async def run_smart_grep(
         return SemanticGrepOutput(
             error=f"smart_grep failed: {type(err).__name__}: {err}"
         )
-    emit_info(
-        t(
-            "smart_grep.summary",
-            query=query,
-            directory=directory,
-            matches=len(result.matches),
-            evaluated=result.coverage.evaluated,
-            snippets=result.coverage.snippets,
-        )
-    )
     return result
 
 

code_puppy_core_plugins-0.0.87/code_puppy_core_plugins/meta_oauth/locales/en-US.json

@@ -0,0 +1,12 @@
+{
+  "plugin.meta-oauth.plan.tier": "Muse Code plan: {tier}",
+  "plugin.meta-oauth.plan.active": "Subscription: active",
+  "plugin.meta-oauth.plan.inactive": "Subscription: inactive",
+  "plugin.meta-oauth.plan.usage": "{window} usage at login: {used}%",
+  "plugin.meta-oauth.plan.usage_reset": "{window} usage at login: {used}% (resets {reset})",
+  "plugin.meta-oauth.plan.window": "Rolling window",
+  "plugin.meta-oauth.plan.window_hours": "{hours}h window",
+  "plugin.meta-oauth.plan.window_minutes": "{minutes}m window",
+  "plugin.meta-oauth.plan.weekly": "Weekly",
+  "plugin.meta-oauth.plan.upgrade": "A plan upgrade is available at https://accountscenter.meta.com/muse_code/"
+}

{code_puppy_core_plugins-0.0.85 → code_puppy_core_plugins-0.0.87}/code_puppy_core_plugins/meta_oauth/oauth_flow.py

@@ -11,6 +11,7 @@ from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warni
 from code_puppy.tools.common import should_suppress_browser
 
 from .config import META_OAUTH_CONFIG
+from .plan import describe_plan
 from .utils import (
     discover_models,
     load_credentials,
@@ -106,4 +107,6 @@ def run_oauth_flow() -> bool:
         return False
 
     emit_success(t("oauth.meta.auth.success"))
+    for line in describe_plan(credentials):
+        emit_info(line)
     return True

code_puppy_core_plugins-0.0.87/code_puppy_core_plugins/meta_oauth/plan.py

@@ -0,0 +1,87 @@
+"""Describe the Muse Code subscription plan carried by a minted Meta key.
+
+Meta's ``/muse-code/key`` response includes plan fields (``subs_tier_name``,
+``is_subs_active``, ``subs_usage``...). They are a snapshot taken at login, so
+usage figures are labelled as such rather than presented as live numbers.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+from datetime import datetime
+
+from code_puppy.i18n import t
+
+
+def _mapping(value: object) -> Mapping[str, object]:
+    return value if isinstance(value, Mapping) else {}
+
+
+def _subscription_active(credentials: Mapping[str, object]) -> bool | None:
+    # The mint response says ``is_subs_active``; the Muse CLI file says ``subs_active``.
+    for key in ("is_subs_active", "subs_active"):
+        value = credentials.get(key)
+        if isinstance(value, bool):
+            return value
+    return None
+
+
+def _format_reset(value: object) -> str:
+    if isinstance(value, bool):
+        return ""
+    if isinstance(value, (int, float)):
+        return datetime.fromtimestamp(value).astimezone().strftime("%Y-%m-%d %H:%M %Z")
+    return str(value) if value else ""
+
+
+def _usage_line(label: str, snapshot: Mapping[str, object]) -> str | None:
+    used = snapshot.get("used_percent")
+    if not isinstance(used, (int, float)) or isinstance(used, bool):
+        return None
+    reset = _format_reset(snapshot.get("resets_at"))
+    if reset:
+        return t(
+            "plugin.meta-oauth.plan.usage_reset",
+            window=label,
+            used=f"{used:g}",
+            reset=reset,
+        )
+    return t("plugin.meta-oauth.plan.usage", window=label, used=f"{used:g}")
+
+
+def _window_label(snapshot: Mapping[str, object]) -> str:
+    minutes = snapshot.get("window_duration_mins")
+    if isinstance(minutes, int) and not isinstance(minutes, bool) and minutes > 0:
+        if minutes % 60 == 0:
+            return t("plugin.meta-oauth.plan.window_hours", hours=minutes // 60)
+        return t("plugin.meta-oauth.plan.window_minutes", minutes=minutes)
+    return t("plugin.meta-oauth.plan.window")
+
+
+def describe_plan(credentials: Mapping[str, object]) -> list[str]:
+    """Return human-readable plan lines; empty when Meta sent no plan data."""
+    active = _subscription_active(credentials)
+    tier = credentials.get("subs_tier_name") or credentials.get("subs_tier_id")
+    lines: list[str] = []
+    if tier:
+        lines.append(t("plugin.meta-oauth.plan.tier", tier=tier))
+    if active is not None:
+        lines.append(
+            t(
+                "plugin.meta-oauth.plan.active"
+                if active
+                else "plugin.meta-oauth.plan.inactive"
+            )
+        )
+
+    usage = _mapping(credentials.get("subs_usage"))
+    window = _mapping(usage.get("window"))
+    candidates = (
+        _usage_line(_window_label(window), window),
+        _usage_line(t("plugin.meta-oauth.plan.weekly"), _mapping(usage.get("weekly"))),
+    )
+    lines.extend(line for line in candidates if line)
+
+    if credentials.get("is_subs_upgrade_available") is True:
+        lines.append(t("plugin.meta-oauth.plan.upgrade"))
+    return lines

{code_puppy_core_plugins-0.0.85 → code_puppy_core_plugins-0.0.87}/code_puppy_core_plugins/meta_oauth/register_callbacks.py

@@ -2,17 +2,21 @@
 
 from __future__ import annotations
 
+from importlib.resources import files
 from typing import Any
 
 from code_puppy.callbacks import register_callback
-from code_puppy.i18n import t
+from code_puppy.i18n import register_plugin_catalog, t
 from code_puppy.messaging import emit_info, emit_success, emit_warning
 from code_puppy.model_switching import set_model_and_reload_agent
 
 from .config import FALLBACK_MODELS, META_OAUTH_CONFIG, get_token_storage_path
 from .oauth_flow import run_oauth_flow
+from .plan import describe_plan
 from .utils import discover_models, load_credentials
 
+register_plugin_catalog(files(__package__).joinpath("locales"))
+
 _PREFIX = str(META_OAUTH_CONFIG["prefix"])
 _DEFAULT_MODEL = f"{_PREFIX}{META_OAUTH_CONFIG['default_model']}"
 _model_cache: dict[str, dict[str, Any]] | None = None
@@ -80,6 +84,8 @@ def _handle_meta_status() -> None:
     emit_info(
         t("oauth.meta.status.source", source=credentials.get("_source", "unknown"))
     )
+    for line in describe_plan(credentials):
+        emit_info(line)
     emit_info(
         t("oauth.meta.status.models", models=", ".join(_meta_model_names(credentials)))
     )
@@ -121,7 +127,7 @@ def _create_meta_oauth_model(
     del config
     from pydantic_ai.models.openai import OpenAIResponsesModel
 
-    from code_puppy.http_utils import create_async_client
+    from code_puppy.httpx2_utils import create_async_client
     from code_puppy.provider_identity import make_openai_provider
 
     credentials = load_credentials()

{code_puppy_core_plugins-0.0.85 → code_puppy_core_plugins-0.0.87}/code_puppy_core_plugins/meta_oauth/utils.py

@@ -6,6 +6,7 @@ import json
 import logging
 import os
 import tempfile
+from collections.abc import Mapping
 from pathlib import Path
 from typing import Any
 from urllib.parse import urlparse
@@ -188,9 +189,14 @@ def poll_device_token(device_code: str) -> tuple[str, dict[str, Any]]:
 
 
 def mint_api_credentials(access_token: str) -> dict[str, Any]:
-    """Exchange a Meta account token for a Model API credential."""
+    """Exchange a Meta account token for a Model API credential.
+
+    The mint endpoint rejects a body-less POST with "Request body is required
+    but was empty or null", so always send an (empty) JSON object.
+    """
     response = requests.post(
         _validate_url(str(META_OAUTH_CONFIG["mint_url"]), "api.meta.ai"),
+        json={},
         headers={
             "Accept": "application/json",
             "Authorization": f"Bearer {access_token}",
@@ -205,8 +211,10 @@ def mint_api_credentials(access_token: str) -> dict[str, Any]:
             _problem(response, f"Meta key mint failed ({response.status_code})")
         )
     payload = response.json()
-    if not isinstance(payload, dict) or not payload.get("api_key"):
-        raise RuntimeError("Meta key mint returned no API key")
+    if not isinstance(payload, dict):
+        raise RuntimeError("Meta key mint returned invalid JSON")
+    if not payload.get("api_key"):
+        raise RuntimeError(_mint_refusal(payload))
     payload["api_base_url"] = validate_api_base_url(
         str(payload.get("base_url") or payload.get("api_base_url") or "")
     )
@@ -214,6 +222,17 @@ def mint_api_credentials(access_token: str) -> dict[str, Any]:
     return payload
 
 
+def _mint_refusal(payload: Mapping[str, object]) -> str:
+    """Explain a key-less mint, e.g. a Muse Code plan that needs payment."""
+    reason = str(
+        payload.get("detail")
+        or payload.get("title")
+        or "Meta key mint returned no API key"
+    )
+    action_url = payload.get("action_url")
+    return f"{reason} ({action_url})" if action_url else reason
+
+
 def discover_models(credentials: dict[str, Any]) -> dict[str, dict[str, Any]]:
     """Fetch Meta's Muse catalogue and convert it to Code Puppy model specs."""
     response = requests.get(

{code_puppy_core_plugins-0.0.85 → code_puppy_core_plugins-0.0.87}/code_puppy_core_plugins/ollama/register_callbacks.py

@@ -37,7 +37,7 @@ import os
 from typing import TYPE_CHECKING, Any
 
 from code_puppy.callbacks import register_callback
-from code_puppy.http_utils import create_async_client
+from code_puppy.httpx2_utils import create_async_client
 from code_puppy.model_factory import get_custom_config
 
 if TYPE_CHECKING:

{code_puppy_core_plugins-0.0.85 → code_puppy_core_plugins-0.0.87}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy-core-plugins"
-version = "0.0.85"
+version = "0.0.87"
 description = "Official plugin bundle for Code Puppy"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"

code_puppy_core_plugins-0.0.85/code_puppy_core_plugins/jev_grep/locales/en-US.json

@@ -1,3 +0,0 @@
-{
-  "smart_grep.summary": "smart_grep '{query}' in {directory}: {matches} matches ({evaluated}/{snippets} snippets judged)"
-}