makea-cli 0.2.14__tar.gz → 0.2.15__tar.gz

{makea_cli-0.2.14 → makea_cli-0.2.15}/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## 0.2.15
+
+**Behaviour change: `admin get currency-conversion` returns different
+numbers.** This is not only a bug fix. Anyone who reconciled figures with
+this command should expect them to move, by up to several percent per
+currency. The same call on 2026-10-16:
+
+| GBP per | 0.2.14 | 0.2.15 | 1,000 converted, 0.2.14 → 0.2.15 |
+|---|---|---|---|
+| CNY | 0.12 | 0.113 | 120.00 → 113.00 (−5.8%) |
+| USD | 0.76 | 0.752 | 760.00 → 752.00 |
+| EUR | 0.85 | 0.848 | 850.00 → 848.00 |
+
+What changed:
+
+- Rates now come from the platform (`GET /admin/fx/rates`, backend
+  2026-10-16) instead of the CLI fetching the free FX source itself. They are
+  rounded **up to 3 decimals**, as the platform rounds them; 0.2.14 rounded
+  up to 2, which overstated cheap currencies such as CNY most.
+- With one `--from` and `--amount`, `converted` is the platform's own
+  conversion, rounded **up** to the cent; 0.2.14 rounded to the nearest cent.
+- So the numbers now match the platform's prices and revenue metrics, which
+  the 0.2.14 ones did not.
+- Output keys are unchanged except `rounding` (now `"up"`, was
+  `"ceil_2dp"`), plus new `rate_decimals` and `unavailable`. A currency with
+  no rate still fails the command. Needs an admin login, like every `admin`
+  command.
+
 ## 0.2.14
 
 - `admin update tracking-status`: help text no longer describes it as "the

{makea_cli-0.2.14 → makea_cli-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: makea-cli
-Version: 0.2.14
+Version: 0.2.15
 Summary: Makea admin CLI (browser login + Makea admin HTTP API)
 Requires-Python: >=3.10
 Requires-Dist: click<9,>=8.1
@@ -100,7 +100,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 | `makea-cli admin generate pricing-groups` | write（ask） | `POST /admin/production_orders/{id}/details/update` | Lay a production order's variants into pricing groups along one axis (--by style \| colour \| variant \| all) with th… | `production-groups-generate` |
 | `makea-cli admin get active-users` | read | `POST /admin/analytics/query` | Distinct active users per day over the last N days (DAU series). | `analytics-active-users` |
 | `makea-cli admin get analytics-query` | read | `POST /admin/analytics/query` | Run an arbitrary HogQL query (escape hatch). Example: analytics-query "SELECT count() FROM events" | `analytics-query` |
-| `makea-cli admin get currency-conversion` | read | `currency-api` | avoids repeated lookups. | `convert-currency` |
+| `makea-cli admin get currency-conversion` | read | `GET /admin/fx/rates` | the platform's own exchange rates and rounding (rate table for several --from; one --from with --amount converts it). | `convert-currency` |
 | `makea-cli admin get feature-usage` | read | `POST /admin/analytics/query` | How many distinct users used a feature recently, plus event volume. Matches $pageview path and feature_time_spent eve… | `analytics-feature-usage` |
 | `makea-cli admin get library-schema` | read | `GET /admin/library_components/schema` | the tech-pack library taxonomy: sections and their library-role field keys (run this before create/update). | `library-schema` |
 | `makea-cli admin get production-pricing` | read | `GET /admin/production_orders/{id}/details` | show a production order's price tiers, MOQ, sizes/colours, pricing groups and cart coverage. | `production-pricing-show` |

{makea_cli-0.2.14 → makea_cli-0.2.15}/README.md

@@ -88,7 +88,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 | `makea-cli admin generate pricing-groups` | write（ask） | `POST /admin/production_orders/{id}/details/update` | Lay a production order's variants into pricing groups along one axis (--by style \| colour \| variant \| all) with th… | `production-groups-generate` |
 | `makea-cli admin get active-users` | read | `POST /admin/analytics/query` | Distinct active users per day over the last N days (DAU series). | `analytics-active-users` |
 | `makea-cli admin get analytics-query` | read | `POST /admin/analytics/query` | Run an arbitrary HogQL query (escape hatch). Example: analytics-query "SELECT count() FROM events" | `analytics-query` |
-| `makea-cli admin get currency-conversion` | read | `currency-api` | avoids repeated lookups. | `convert-currency` |
+| `makea-cli admin get currency-conversion` | read | `GET /admin/fx/rates` | the platform's own exchange rates and rounding (rate table for several --from; one --from with --amount converts it). | `convert-currency` |
 | `makea-cli admin get feature-usage` | read | `POST /admin/analytics/query` | How many distinct users used a feature recently, plus event volume. Matches $pageview path and feature_time_spent eve… | `analytics-feature-usage` |
 | `makea-cli admin get library-schema` | read | `GET /admin/library_components/schema` | the tech-pack library taxonomy: sections and their library-role field keys (run this before create/update). | `library-schema` |
 | `makea-cli admin get production-pricing` | read | `GET /admin/production_orders/{id}/details` | show a production order's price tiers, MOQ, sizes/colours, pricing groups and cart coverage. | `production-pricing-show` |

makea_cli-0.2.15/makea_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.15"

{makea_cli-0.2.14 → makea_cli-0.2.15}/makea_cli/api_client.py

@@ -844,6 +844,18 @@ def get_cumulative_payment_and_platform_revenue(
     )
 
 
+def get_fx_rates(*, to: str, sources: list[str], amount: float | None = None) -> Any:
+    """
+    GET /admin/fx/rates — the platform's own exchange rates (rounded up to its
+    RATE_DECIMALS), and with one source and an amount, that amount converted the
+    way the platform converts it.
+    """
+    params: dict[str, Any] = {"to": to, "from": ",".join(sources)}
+    if amount is not None:
+        params["amount"] = amount
+    return get_json("/admin/fx/rates", params=params)
+
+
 def extract_ai_tech_specifications(product_reference_id: str, *, timeout: float = 300.0) -> Any:
     """
     GET /admin/products/{id}/extract-tech-specifications — synchronous AI extraction;

{makea_cli-0.2.14 → makea_cli-0.2.15}/makea_cli/commands/metrics/cmd.py

@@ -1,8 +1,5 @@
 from __future__ import annotations
 
-import math
-
-import httpx
 import typer
 from rich.console import Console
 
@@ -16,38 +13,6 @@ console = Console()
 _GRANULARITIES = ("day", "week", "month")
 _ORDER_TYPES = ("all", "sampling", "production")
 
-# Same free FX source the backend uses (FreeCurrencyService), so converted
-# amounts match the platform's revenue metrics.
-_FX_PRIMARY = (
-    "https://cdn.jsdelivr.net/npm/@fawazahmed0/currency-api@latest/v1/currencies/{base}.json"
-)
-_FX_FALLBACK = "https://latest.currency-api.pages.dev/v1/currencies/{base}.json"
-
-
-def _fx_rate(base: str, target: str) -> float:
-    """Exchange rate base -> target, rounded UP to 2dp exactly like the backend
-    (math.ceil(raw * 100) / 100) so totals reconcile with revenue metrics."""
-    base, target = base.lower(), target.lower()
-    if base == target:
-        return 1.0
-    last_err: Exception | None = None
-    for url in (_FX_PRIMARY.format(base=base), _FX_FALLBACK.format(base=base)):
-        try:
-            with httpx.Client(timeout=10) as client:
-                resp = client.get(url)
-                resp.raise_for_status()
-                data = resp.json()
-            raw = data.get(base, {}).get(target)
-            if raw is not None:
-                return math.ceil(float(raw) * 100) / 100
-        except Exception as e:  # noqa: BLE001 - try fallback URL
-            last_err = e
-            continue
-    raise RuntimeError(
-        f"FX rate {base.upper()}->{target.upper()} unavailable"
-        + (f": {last_err}" if last_err else "")
-    )
-
 
 def register(app: typer.Typer) -> None:
     @command(
@@ -141,13 +106,13 @@ def register(app: typer.Typer) -> None:
         "get",
         "currency-conversion",
         legacy="convert-currency",
-        api="GET currency-api",
-        external="currency-api",
+        api="GET /admin/fx/rates",
         help=(
-            "Convert money between currencies using the same free FX source and "
-            "rounding as the platform's revenue metrics. Pass several source "
-            "currencies via --from (comma-separated) to get a full rate table in "
-            "one call, then convert locally — avoids repeated lookups."
+            "GET /admin/fx/rates — convert money between currencies at the "
+            "platform's own rates and rounding, so totals reconcile with its "
+            "prices and revenue metrics. Pass several source currencies via --from "
+            "(comma-separated) to get a full rate table in one call, then convert "
+            "locally — avoids repeated lookups."
         ),
     )
     def convert_currency(
@@ -165,17 +130,20 @@ def register(app: typer.Typer) -> None:
             help="Optional amount to convert (only meaningful with a single --from).",
         ),
     ) -> None:
-        """Return source->target rates (rounded like the backend), and optionally a
-        converted amount.
+        """Return source->target rates, and optionally a converted amount, as the
+        platform computes them.
 
         Use it to collapse a mixed-currency set into one currency: collect the
         distinct currencies, call once with --from a,b,c to get every rate, then
-        multiply locally. Rates use math.ceil(raw * 100) / 100, matching the
-        platform's FreeCurrencyService, so totals reconcile with revenue metrics.
-
-        Output JSON: {"to", "rates": {CUR: rate, ...}, "rounding", "source"} plus
-        {"from", "rate", "amount", "converted"} when a single --from and --amount
-        are given.
+        multiply locally. The rates are the platform's (FreeCurrencyService,
+        rounded up to ``rate_decimals``) and come from the backend rather than
+        being fetched and rounded here, so they cannot drift from it.
+
+        Output JSON: {"to", "rates": {CUR: rate, ...}, "rate_decimals",
+        "rounding", "source", "unavailable"} plus {"from", "rate", "amount",
+        "converted"} when a single --from and --amount are given; "converted" is
+        the platform's own conversion, rounding included. A currency with no
+        rate fails the command rather than coming back null.
         """
         sources = [s.strip() for s in from_.split(",") if s.strip()]
         if not sources:
@@ -183,22 +151,16 @@ def register(app: typer.Typer) -> None:
             raise typer.Exit(1)
 
         def _do() -> dict:
-            rates = {s.upper(): _fx_rate(s, to) for s in sources}
-            out: dict = {
-                "to": to.upper(),
-                "rates": rates,
-                "rounding": "ceil_2dp",
-                "source": "fawazahmed0/currency-api",
-            }
-            if amount is not None and len(sources) == 1:
-                rate = rates[sources[0].upper()]
-                out.update(
-                    {
-                        "from": sources[0].upper(),
-                        "rate": rate,
-                        "amount": amount,
-                        "converted": round(amount * rate, 2),
-                    }
+            payload = api_client.get_fx_rates(
+                to=to,
+                sources=sources,
+                amount=amount if len(sources) == 1 else None,
+            )
+            out = (payload or {}).get("result") or {}
+            if out.get("unavailable"):
+                raise RuntimeError(
+                    "FX rate unavailable: "
+                    + ", ".join(f"{s}->{to.upper()}" for s in out["unavailable"])
                 )
             return out
 

{makea_cli-0.2.14 → makea_cli-0.2.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "makea-cli"
-version = "0.2.14"
+version = "0.2.15"
 description = "Makea admin CLI (browser login + Makea admin HTTP API)"
 readme = "README.md"
 requires-python = ">=3.10"

{makea_cli-0.2.14 → makea_cli-0.2.15}/tests/golden_manifest.json

@@ -980,8 +980,8 @@
       "verb": "get",
       "noun": "currency-conversion",
       "access": "read",
-      "api": "GET currency-api",
-      "external": "currency-api",
+      "api": "GET /admin/fx/rates",
+      "external": null,
       "side_effects": [],
       "approval": "auto",
       "reversible": null,
@@ -990,7 +990,7 @@
       "legacy": [
         "convert-currency"
       ],
-      "help": "Convert money between currencies using the same free FX source and rounding as the platform's revenue metrics. Pass several source currencies via --from (comma-separated) to get a full rate table in one call, then convert locally — avoids repeated lookups.",
+      "help": "GET /admin/fx/rates — convert money between currencies at the platform's own rates and rounding, so totals reconcile with its prices and revenue metrics. Pass several source currencies via --from (comma-separated) to get a full rate table in one call, then convert locally — avoids repeated lookups.",
       "function": "makea_cli.commands.metrics.cmd.register.<locals>.convert_currency",
       "flags": [
         {

makea_cli-0.2.15/tests/test_currency_conversion.py

@@ -0,0 +1,106 @@
+"""`admin get currency-conversion` reads the platform's rates from the backend.
+
+It used to fetch the free FX source itself and round rates to 2 decimals and
+amounts to the nearest cent, while the platform rounds rates up to 3 decimals
+and amounts up to the cent -- so its totals drifted from the platform's. It
+now asks GET /admin/fx/rates and returns what that says.
+
+Run with ``.venv/bin/python -m unittest tests.test_currency_conversion``.
+"""
+
+import json
+import unittest
+from unittest import mock
+
+import httpx
+from click.testing import CliRunner
+
+from makea_cli import api_client, identity, output
+from makea_cli.main import build_cli
+
+RESULT = {
+    "to": "GBP",
+    "rates": {"USD": 0.752, "CNY": 0.113},
+    "unavailable": [],
+    "rate_decimals": 3,
+    "rounding": "up",
+    "source": "platform (FreeCurrencyService)",
+}
+
+
+class ApiClientTest(unittest.TestCase):
+    def test_rates(self):
+        with mock.patch.object(api_client, "get_json", return_value={}) as get:
+            api_client.get_fx_rates(to="gbp", sources=["usd", "cny"])
+        get.assert_called_once_with("/admin/fx/rates", params={"to": "gbp", "from": "usd,cny"})
+
+    def test_amount(self):
+        with mock.patch.object(api_client, "get_json", return_value={}) as get:
+            api_client.get_fx_rates(to="gbp", sources=["cny"], amount=250)
+        get.assert_called_once_with(
+            "/admin/fx/rates", params={"to": "gbp", "from": "cny", "amount": 250}
+        )
+
+
+class CommandTest(unittest.TestCase):
+    def setUp(self):
+        self.cli = build_cli()
+        self.runner = CliRunner()
+        output.state.force_json = True
+
+    def tearDown(self):
+        output.state.force_json = False
+
+    def _run(self, args, payload):
+        with (
+            mock.patch.object(identity, "current_persona", return_value="admin"),
+            mock.patch.object(api_client, "get_fx_rates", return_value=payload) as get,
+            # Nothing is fetched from an FX source directly any more.
+            mock.patch.object(httpx, "Client", side_effect=AssertionError("no network")),
+        ):
+            result = self.runner.invoke(self.cli, ["admin", "get", "currency-conversion", *args])
+        return result, get
+
+    def test_rate_table_is_the_platforms(self):
+        result, get = self._run(
+            ["--to", "gbp", "--from", "usd,cny"], {"success": True, "result": RESULT}
+        )
+        self.assertEqual(result.exit_code, 0, result.output)
+        get.assert_called_once_with(to="gbp", sources=["usd", "cny"], amount=None)
+        self.assertEqual(json.loads(result.output), RESULT)
+
+    def test_single_amount_is_converted_by_the_platform(self):
+        converted = {
+            **RESULT,
+            "rates": {"CNY": 0.113},
+            "from": "CNY",
+            "rate": 0.113,
+            "amount": 250.0,
+            "converted": 28.25,
+        }
+        result, get = self._run(
+            ["--to", "gbp", "--from", "cny", "--amount", "250"],
+            {"success": True, "result": converted},
+        )
+        self.assertEqual(result.exit_code, 0, result.output)
+        get.assert_called_once_with(to="gbp", sources=["cny"], amount=250.0)
+        self.assertEqual(json.loads(result.output)["converted"], 28.25)
+
+    def test_amount_with_several_currencies_is_not_sent(self):
+        _, get = self._run(
+            ["--to", "gbp", "--from", "usd,cny", "--amount", "250"],
+            {"success": True, "result": RESULT},
+        )
+        get.assert_called_once_with(to="gbp", sources=["usd", "cny"], amount=None)
+
+    def test_a_missing_rate_fails_rather_than_returning_null(self):
+        missing = {**RESULT, "rates": {"XYZ": None}, "unavailable": ["XYZ"]}
+        result, _ = self._run(
+            ["--to", "gbp", "--from", "xyz"], {"success": True, "result": missing}
+        )
+        self.assertEqual(result.exit_code, 1, result.output)
+        self.assertIn("XYZ->GBP", result.output)
+
+
+if __name__ == "__main__":
+    unittest.main()

makea_cli-0.2.14/makea_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.14"