makea-cli 0.2.8__py3-none-any.whl → 0.2.9__py3-none-any.whl

makea_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.8"
+__version__ = "0.2.9"

makea_cli/commands/analytics/cmd.py

@@ -4,7 +4,8 @@ Behavioural metrics (feature usage, clicks, page/feature time, active users)
 backed by PostHog HogQL. Distinct from the `metrics` group, which reads the
 Makea backend for financial figures.
 
-Requires env: POSTHOG_API_KEY, POSTHOG_PROJECT_ID (see config.py).
+Goes through the Makea backend by default (admin login is enough); a local
+POSTHOG_API_KEY + POSTHOG_PROJECT_ID switches to querying PostHog directly.
 """
 
 from __future__ import annotations
@@ -32,8 +33,7 @@ def register(app: typer.Typer) -> None:
         "get",
         "feature-usage",
         legacy="analytics-feature-usage",
-        api="POSTHOG hogql",
-        external="posthog",
+        api="POST /admin/analytics/query",
         help=(
             "How many distinct users used a feature recently, plus event volume. "
             "Matches $pageview path and feature_time_spent events. "
@@ -82,8 +82,7 @@ def register(app: typer.Typer) -> None:
         "get",
         "top-features",
         legacy="analytics-top-features",
-        api="POSTHOG hogql",
-        external="posthog",
+        api="POST /admin/analytics/query",
         help=(
             "Rank pageview paths by distinct users over the last N days — a quick "
             "map of which features get used most."
@@ -118,8 +117,7 @@ def register(app: typer.Typer) -> None:
         "get",
         "top-clicks",
         legacy="analytics-top-clicks",
-        api="POSTHOG hogql",
-        external="posthog",
+        api="POST /admin/analytics/query",
         help=(
             "Rank autocaptured click targets by count over the last N days — "
             "which buttons/elements get clicked most."
@@ -156,8 +154,7 @@ def register(app: typer.Typer) -> None:
         "get",
         "active-users",
         legacy="analytics-active-users",
-        api="POSTHOG hogql",
-        external="posthog",
+        api="POST /admin/analytics/query",
         help="Distinct active users per day over the last N days (DAU series).",
     )
     def active_users(
@@ -184,8 +181,7 @@ def register(app: typer.Typer) -> None:
         "get",
         "analytics-query",
         legacy="analytics-query",
-        api="POSTHOG hogql",
-        external="posthog",
+        api="POST /admin/analytics/query",
         help=(
             "Run an arbitrary HogQL query (escape hatch). "
             'Example: analytics-query "SELECT count() FROM events"'

makea_cli/config.py

@@ -48,8 +48,9 @@ def redirect_uri() -> str:
 
 # PostHog product-analytics (behavioural metrics: clicks, page/feature time,
 # funnels, retention). Distinct from the financial `metrics` command group,
-# which reads the Makea backend. Configured purely via environment so no key is
-# ever committed:
+# which reads the Makea backend. Optional: without these the analytics commands
+# go through the backend's /admin/analytics/query, which holds the key. Set them
+# only to query PostHog directly:
 #   POSTHOG_API_KEY     personal API key (phx_...), read-only is enough
 #   POSTHOG_PROJECT_ID  numeric project id
 #   POSTHOG_HOST        defaults to the EU cloud query host

makea_cli/posthog_client.py

@@ -1,10 +1,11 @@
 """Minimal PostHog query client (HogQL over the Query API).
 
-This talks to PostHog's cloud directly, not the Makea backend, so it has its
-own auth (a personal API key from env) rather than the Cognito token used by
-api_client.
+Two routes to the same query:
 
-Docs: POST {host}/api/projects/{project_id}/query/ with a HogQLQuery body.
+- By default it goes through the Makea backend (POST /admin/analytics/query),
+  which holds the PostHog key. An admin's `makea-cli login` is all it takes.
+- If POSTHOG_API_KEY and POSTHOG_PROJECT_ID are set locally, it talks to
+  PostHog directly instead (POST {host}/api/projects/{project_id}/query/).
 """
 
 from __future__ import annotations
@@ -14,33 +15,21 @@ from typing import Any
 
 import httpx
 
+from makea_cli import api_client
 from makea_cli.config import posthog_api_key, posthog_host, posthog_project_id
 
 
-class PostHogNotConfigured(RuntimeError):
-    """Raised when the required PostHog env vars are missing."""
-
-
-def _require_config() -> tuple[str, str, str]:
-    key = posthog_api_key()
-    project = posthog_project_id()
-    if not key or not project:
-        raise PostHogNotConfigured(
-            "PostHog is not configured. Set POSTHOG_API_KEY (personal API key, "
-            "phx_...) and POSTHOG_PROJECT_ID, optionally POSTHOG_HOST "
-            "(default https://eu.posthog.com)."
-        )
-    return posthog_host(), project, key
-
-
-def run_hogql(query: str, *, timeout: float = 60.0) -> dict[str, Any]:
+def run_hogql(query: str, *, timeout: float = 90.0) -> dict[str, Any]:
     """Run a HogQL query and return the raw result.
 
     The result has ``columns`` (list of names) and ``results`` (list of rows);
     callers usually want to zip them into dicts for display.
     """
-    host, project, key = _require_config()
-    url = f"{host}/api/projects/{project}/query/"
+    key = posthog_api_key()
+    project = posthog_project_id()
+    if not key or not project:
+        return api_client.post_json("/admin/analytics/query", {"query": query}, timeout=timeout)
+    url = f"{posthog_host()}/api/projects/{project}/query/"
     headers = {
         "Authorization": f"Bearer {key}",
         "Content-Type": "application/json",

{makea_cli-0.2.8.dist-info → makea_cli-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: makea-cli
-Version: 0.2.8
+Version: 0.2.9
 Summary: Makea admin CLI (browser login + Makea admin HTTP API)
 Requires-Python: >=3.10
 Requires-Dist: click<9,>=8.1
@@ -98,18 +98,18 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 | `makea-cli admin download document` | read | `GET /admin/document/download` | save a document file (document id + designer user_id). | `download-document` |
 | `makea-cli admin download product-document` | read | `GET /admin/document/download` | Resolve product via admin list product-order payload, then GET /admin/document/download. | `download-product-document` |
 | `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 | `posthog` | Distinct active users per day over the last N days (DAU series). | `analytics-active-users` |
-| `makea-cli admin get analytics-query` | read | `posthog` | Run an arbitrary HogQL query (escape hatch). Example: analytics-query "SELECT count() FROM events" | `analytics-query` |
+| `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 feature-usage` | read | `posthog` | 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 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 admin get quote-request` | read | `GET /admin/quote_requests/{quote_request_id}` | one quote request in full. | — |
 | `makea-cli admin get revenue-metrics` | read | `GET /admin/business-metrics/cumulative-payment-and-platform-revenue` | platform-wide payment received and platform revenue (service fee + transaction fee) bucketed over a date range. | `get-cumulative-payment-and-platform-revenue` |
 | `makea-cli admin get supplier-profile-schema` | read | `GET /admin/supplier/profile/schema` | supplier profile v2 schema (section/field taxonomy: sections, fields, options, required rules). | `get-supplier-profile-schema` |
 | `makea-cli admin get tech-spec-extraction` | read | `GET /admin/products/{id}/extract-tech-specifications` | AI-generate specs (not saved). | `extract-ai-tech-spec` |
-| `makea-cli admin get top-clicks` | read | `posthog` | which buttons/elements get clicked most. | `analytics-top-clicks` |
-| `makea-cli admin get top-features` | read | `posthog` | a quick map of which features get used most. | `analytics-top-features` |
+| `makea-cli admin get top-clicks` | read | `POST /admin/analytics/query` | which buttons/elements get clicked most. | `analytics-top-clicks` |
+| `makea-cli admin get top-features` | read | `POST /admin/analytics/query` | a quick map of which features get used most. | `analytics-top-features` |
 | `makea-cli admin list library-element` | read | `GET /admin/designer/{user_id}/library_components` | list a designer's tech-pack library (org-fanned). Optional --section scopes to one type. | `library-list` |
 | `makea-cli admin list misc-payment` | read | `GET /admin/products/{id}/misc-payments` | misc payments for one product (admin). | `list-misc-payments-by-product` |
 | `makea-cli admin list product-order` | read | `GET /admin/designer/get_all_product_orders` | designer product (SKU) list. For 大货 use admin list production-order or admin list production-order --product. | `list-product-orders` |

{makea_cli-0.2.8.dist-info → makea_cli-0.2.9.dist-info}/RECORD

@@ -1,19 +1,19 @@
-makea_cli/__init__.py,sha256=G6Dbxq2ws-1ZAXwDD8q0KWueYtso_Y6Uyvtj8sRWsPI,22
+makea_cli/__init__.py,sha256=F8OVhAhMXSkvvXYgZtbPn2SG1AQC3joK4yu-FrHt81Y,22
 makea_cli/__main__.py,sha256=AkQjxWfKE3w9iD1d6I-2Zqvv2t9cct0oYyFF0UiA-Z0,144
 makea_cli/api_client.py,sha256=dzMCH9KzY7NJxoop-WVyqm_JQ3eU3hvFh_ic2Zk-evc,50763
 makea_cli/auth_pkce.py,sha256=iXSyJ7DM3qVuj-3FwPiqM25CxXz9ebFs9FNthZdw3ws,7315
 makea_cli/broker.py,sha256=5O650nAdRuF-u9E1MuVM2jVv796iBdxJGIaJasxHij0,3019
-makea_cli/config.py,sha256=lVPsp-44V9pPyUNbcG-uQNV8srCrBVMZnb0HF38Paks,2906
+makea_cli/config.py,sha256=hz8MnJSkhxcIEZkcpHR005JrDceo1Xmi8qwIUq50cMU,3003
 makea_cli/errors.py,sha256=_2qKjvkU8YWeBcUd04Yn62lKkZoqQY52kH8klNMyxhM,2780
 makea_cli/identity.py,sha256=pfYT-asaY1ZTzoAzfqI-v4Eyz1RtxqR2YgvxRGx_lxg,2758
 makea_cli/main.py,sha256=nuTQ8_P8OSdRbjMHMB4qcKdex124nS-ApCW-zfbqlI0,7169
 makea_cli/output.py,sha256=VWvZe2Ad8zxT4ZQyBhFRc6wkFwbyYzQFPddepANGAbY,6361
-makea_cli/posthog_client.py,sha256=OcqspuG3mX0ZoHzhWBfO2K9ItYwk22L4clqBzWyV7GA,2177
+makea_cli/posthog_client.py,sha256=k0cy9Hq7bhdLlPvC1ZW_esJ70xHDdQzPQUlx-GpVskk,1921
 makea_cli/registry.py,sha256=GYJK_idhwIh1X2ictwFjn8PEMaXT56hFVkoLEVYrVqw,13722
 makea_cli/commands/__init__.py,sha256=sxDNEYDmQTASzH2uvMtqNwKLLbOQBzwPfxc-S1tHf-w,1474
 makea_cli/commands/_util.py,sha256=zSFwWaWpncARlKxgq4WuJlJvNv7XdZ39HfHrNOELHuw,980
 makea_cli/commands/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-makea_cli/commands/analytics/cmd.py,sha256=_I5fBlomTalAxRpB-jculS01AbjEC5cVG3lANJeryjM,6548
+makea_cli/commands/analytics/cmd.py,sha256=KVLUtYSeyYZ8_09jIuIAmePjQqcpQS2mb5PBBzGwQYQ,6562
 makea_cli/commands/auth/__init__.py,sha256=NXoKGfkY2X_hb8GnAyzhoI_qDXfpwKZPqt4HnOrXW3Y,73
 makea_cli/commands/auth/cmd.py,sha256=G9ZeiaJwzUUTptIyynr0V-82wI7eV0qVX0pD6rdPSXg,1321
 makea_cli/commands/brand/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,7 +41,7 @@ makea_cli/commands/production/cmd.py,sha256=s6fVAGzOvokF6Va5WKGEA2vw2x2hDQ3PrsF0
 makea_cli/commands/production/pricing_spec.py,sha256=xGbj7-ps3PcKuU6Oc59A70b62FjF6Awhr5IY3ymZveU,27174
 makea_cli/commands/supplier/__init__.py,sha256=qfQDeQdQ-B7I_uwFVfcp1vXFUTL4fAcNLu3ipsZ7dfs,77
 makea_cli/commands/supplier/cmd.py,sha256=crRCy9WfhkryHMIL3iufoiT90_SG3-mKChAtdhd06uc,58076
-makea_cli-0.2.8.dist-info/METADATA,sha256=OzSfopJ02Nfd_htjbm1nKlEfRbvesQkePfp1C5lDLlo,31660
-makea_cli-0.2.8.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-makea_cli-0.2.8.dist-info/entry_points.txt,sha256=4x-lbVa1jBbNlkNq7L-rYyfRh2spZmc3BLIzP-Dl-Qk,50
-makea_cli-0.2.8.dist-info/RECORD,,
+makea_cli-0.2.9.dist-info/METADATA,sha256=Nnp67EfMAZJ0m9JEn9qhecii3iB4Xg0cEo1lUqVxn8I,31760
+makea_cli-0.2.9.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+makea_cli-0.2.9.dist-info/entry_points.txt,sha256=4x-lbVa1jBbNlkNq7L-rYyfRh2spZmc3BLIzP-Dl-Qk,50
+makea_cli-0.2.9.dist-info/RECORD,,