makea-cli 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

makea_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.2"
+__version__ = "0.2.4"

makea_cli/api_client.py

@@ -12,6 +12,7 @@ import httpx
 from contextvars import ContextVar
 from dataclasses import dataclass
 
+from makea_cli import broker
 from makea_cli.auth_pkce import ensure_fresh_id_token
 from makea_cli.config import api_base_url
 from makea_cli.errors import ApiError, AuthError, UnknownOutcomeError
@@ -53,8 +54,20 @@ def _token() -> str:
         raise AuthError(str(e)) from e
 
 
+def _auth_headers() -> dict[str, str]:
+    """Who this request is from.
+
+    Under a token broker the token is a delegation the backend reads from the
+    impersonation header; there is no bearer at all, so a command that did not
+    come through the host's gate has nothing to send.
+    """
+    if broker.broker_path():
+        return {"x-impersonation-token": broker.brokered_token() or ""}
+    return {"Authorization": f"Bearer {_token()}"}
+
+
 def _headers() -> dict[str, str]:
-    headers = {"Authorization": f"Bearer {_token()}", "Accept": "application/json"}
+    headers = {**_auth_headers(), "Accept": "application/json"}
     if state.idempotency_key:
         headers["Idempotency-Key"] = state.idempotency_key
     return headers
@@ -254,7 +267,7 @@ def post_multipart_with_files(
 def _download(path: str, params: dict[str, Any], *, timeout: float) -> tuple[bytes, str | None]:
     """GET a file (or follow the redirect to its presigned URL); returns (bytes, filename)."""
     url = f"{api_base_url()}{path}"
-    headers = {"Authorization": f"Bearer {_token()}", "Accept": "*/*"}
+    headers = {**_auth_headers(), "Accept": "*/*"}
     try:
         with httpx.Client(timeout=timeout, follow_redirects=True) as client:
             r = client.get(url, headers=headers, params=params)
@@ -1185,6 +1198,21 @@ def designer_send_rfq(body: dict[str, Any]) -> Any:
     return post_json("/designer/product/send_rfq", body)
 
 
+def designer_confirm_tech_spec(product_id: str) -> Any:
+    """POST /designer/products/{id}/technical-specifications/confirm — confirm the tech pack."""
+    return post_json(f"/designer/products/{product_id}/technical-specifications/confirm", {})
+
+
+def designer_award_quotes(body: dict[str, Any]) -> Any:
+    """POST /designer/quotes/group_pay_prepare — DRAFT sampling orders for chosen quotes."""
+    return post_json("/designer/quotes/group_pay_prepare", body)
+
+
+def designer_create_checkout(body: dict[str, Any]) -> Any:
+    """POST /designer/payments/basket/create-session — a Stripe checkout for charges."""
+    return post_json("/designer/payments/basket/create-session", body)
+
+
 def designer_list_collections() -> Any:
     """GET /designer/collections — the brand's collections."""
     return get_json("/designer/collections")

makea_cli/broker.py

@@ -0,0 +1,83 @@
+"""Token broker client: how the CLI acts for someone without holding their token.
+
+A host that runs the CLI on a user's behalf (the Beeboo agent runner) does not
+put that user's token in the environment, where any process in the sandbox
+could read it. It runs a broker on a unix socket and names it in
+``MAKEA_TOKEN_BROKER``. Before a command runs, the host's gate has already
+looked at the exact command line and left a one-time ticket for it; the CLI
+sends its own argv and gets back a token that is good for this invocation.
+
+A process that did not come through the gate (``python -c``, ``curl``, a CLI
+call wrapped in a script) has no ticket and gets nothing. That is the whole
+point, so there is deliberately no fallback to a cached login in this mode.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import socket
+import sys
+
+from makea_cli.errors import AuthError
+
+BROKER_ENV = "MAKEA_TOKEN_BROKER"
+
+# A broker lives on the same box; anything slower than this is a broker that
+# is not there.
+_TIMEOUT_SECONDS = 10.0
+
+# One invocation spends one ticket. Every request the command makes reuses the
+# token the ticket bought.
+_cached: dict[str, str] | None = None
+
+
+def broker_path() -> str | None:
+    path = (os.environ.get(BROKER_ENV) or "").strip()
+    return path or None
+
+
+def invocation_argv() -> list[str]:
+    """This process's command line, as the gate saw it (without the program name)."""
+    return list(sys.argv[1:])
+
+
+def exchange(path: str, argv: list[str]) -> dict[str, str]:
+    """Trade this command line for ``{"token", "persona"}``, or raise AuthError."""
+    request = json.dumps({"argv": argv}).encode("utf-8") + b"\n"
+    try:
+        with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
+            sock.settimeout(_TIMEOUT_SECONDS)
+            sock.connect(path)
+            sock.sendall(request)
+            chunks = []
+            while True:
+                chunk = sock.recv(65536)
+                if not chunk:
+                    break
+                chunks.append(chunk)
+                if chunk.endswith(b"\n"):
+                    break
+    except OSError as e:
+        raise AuthError(f"token broker unavailable ({e.__class__.__name__})") from e
+    try:
+        reply = json.loads(b"".join(chunks).decode("utf-8") or "{}")
+    except (UnicodeDecodeError, json.JSONDecodeError) as e:
+        raise AuthError("token broker sent an unreadable reply") from e
+    if not reply.get("ok") or not reply.get("token"):
+        raise AuthError(
+            str(reply.get("error") or "the token broker refused this command"),
+            detail={"broker": True},
+        )
+    return {"token": str(reply["token"]), "persona": str(reply.get("persona") or "")}
+
+
+def brokered_token() -> str | None:
+    """The token for this invocation when a broker is configured, else None."""
+    global _cached
+    path = broker_path()
+    if not path:
+        return None
+    if _cached is None:
+        _cached = exchange(path, invocation_argv())
+    return _cached["token"]

makea_cli/commands/brand/cmd.py

@@ -817,3 +817,100 @@ def register(app: typer.Typer) -> None:
         if makea_sourcing:
             body["makea_sourcing"] = True
         print_json_or_exit(console, lambda: api_client.designer_send_rfq(body))
+
+    # --- the sampling journey: confirm the pack, award a quote, pay -------------
+
+    @command(
+        app,
+        "designer",
+        "submit",
+        "tech-pack",
+        api="POST /designer/products/{product_id}/technical-specifications/confirm",
+        side_effects=[
+            "locks the tech pack as the version suppliers quote against",
+            "opens the product for sourcing",
+        ],
+        approval="ask",
+        help=(
+            "POST /designer/products/{id}/technical-specifications/confirm — confirm the "
+            "tech pack, the step before anyone is asked to quote."
+        ),
+    )
+    def submit_tech_pack(
+        product_id: str = typer.Argument(..., help="Product id."),
+    ) -> None:
+        """Confirm a product's tech pack."""
+        print_json_or_exit(console, lambda: api_client.designer_confirm_tech_spec(product_id))
+
+    @command(
+        app,
+        "designer",
+        "create",
+        "quote-award",
+        api="POST /designer/quotes/group_pay_prepare",
+        side_effects=[
+            "creates (or reuses) a DRAFT sampling order on each chosen quote",
+            "nothing is charged until that order is paid",
+        ],
+        approval="ask",
+        help=(
+            "POST /designer/quotes/group_pay_prepare — choose the supplier quote to sample "
+            "with. --quote is the supplier link id from `designer list supplier-link`; "
+            "repeat --option for the quote's optional extras. Prints the sampling_order_ids "
+            "to pay with `designer create checkout --key sampling:<id>`."
+        ),
+    )
+    def create_quote_award(
+        product_id: str = typer.Argument(..., help="Product id."),
+        quote: str = typer.Option(..., "--quote", help="Supplier link id of the chosen quote."),
+        option: list[str] = typer.Option(
+            [], "--option", help="Optional extra on the quote to include (repeat)."
+        ),
+        no_base_sampling: bool = typer.Option(
+            False, "--no-base-sampling", help="Leave the quote's base sample out."
+        ),
+        notes: str | None = typer.Option(None, "--notes", help="Note for the supplier."),
+    ) -> None:
+        """Award a quote: the sampling order that pays for it."""
+        selection: dict[str, Any] = {"product_id": product_id, "link_id": quote}
+        if option:
+            selection["selected_option_ids"] = list(option)
+        if no_base_sampling:
+            selection["include_base_sampling"] = False
+        if notes:
+            selection["notes"] = notes
+        print_json_or_exit(
+            console, lambda: api_client.designer_award_quotes({"selections": [selection]})
+        )
+
+    @command(
+        app,
+        "designer",
+        "create",
+        "checkout",
+        api="POST /designer/payments/basket/create-session",
+        side_effects=[
+            "records the brand's acceptance of the sampling/production terms",
+            "creates a Stripe checkout session; nothing is charged until it is paid there",
+        ],
+        approval="ask",
+        help=(
+            "POST /designer/payments/basket/create-session — a Stripe checkout link for one "
+            "or more charges. --key repeats: sampling:<sampling_order_id>, "
+            "production:<production_order_id>:deposit|final, shipping:<id>, misc:<id> "
+            "(the `key` of each payable in `designer list payment`). Prints checkout_url."
+        ),
+    )
+    def create_checkout(
+        key: list[str] = typer.Option(..., "--key", help="Charge key to pay (repeat)."),
+        accept_terms: bool = typer.Option(
+            False,
+            "--accept-terms",
+            help="The brand accepts the sampling/production terms for these charges.",
+        ),
+    ) -> None:
+        """Create a Stripe checkout link for charges."""
+        body: dict[str, Any] = {"keys": list(key)}
+        if accept_terms:
+            body["terms_accepted"] = True
+        print_json_or_exit(console, lambda: api_client.designer_create_checkout(body))

makea_cli/commands/supplier/cmd.py

@@ -688,7 +688,8 @@ def register(app: typer.Typer) -> None:
         Read one quote request in full.
         """
         print_json_or_exit(
-            console, lambda: api_client.get_quote_request(quote_request_id=quote_request_id)
+            console,
+            lambda: api_client.get_quote_request(quote_request_id=quote_request_id),
         )
 
     @command(
@@ -988,9 +989,18 @@ def register(app: typer.Typer) -> None:
             help=(
                 "ip_schedule: who owns each asset the job creates (optional, JSON object). "
                 "Omit when the factory did not state it — makea must not invent an answer "
-                "on its behalf. If supplied it has to be COMPLETE (every one of the 12 "
-                "assets answered, plus production location and subcontractors on a "
-                "PRODUCTION link) or the API returns 400 listing what is missing."
+                "on its behalf. If supplied it has to be COMPLETE or the API returns 400 "
+                "listing what is missing. Schema v2: "
+                '{"schema_version":"2","background_ip_used":false,"assets":['
+                '{"asset_type":"production_files","applicable":true,'
+                '"transfer":"transfers_to_client","delivery":"on_full_payment"},'
+                '{"asset_type":"physical_tooling","applicable":false}]} '
+                "-- both asset types answered (applicable false, the default, is a valid "
+                "answer; production_files includes the tech pack and BOM), "
+                "background_ip_used true needs background_ip_declaration, and a "
+                "PRODUCTION link also needs production_location and subcontractors_declared. "
+                "To hide it from the customer afterwards, update the quote with "
+                "--ip-schedule-hidden."
             ),
         ),
         resample_request_id: str | None = typer.Option(
@@ -1250,6 +1260,14 @@ def register(app: typer.Typer) -> None:
                 "the factory could not have submitted itself."
             ),
         ),
+        ip_schedule_hidden: bool | None = typer.Option(
+            None,
+            "--ip-schedule-hidden/--ip-schedule-visible",
+            help=(
+                "ip_schedule_hidden_from_customer: hide this quote's IP Schedule from "
+                "the customer, or show it again. Visible unless set."
+            ),
+        ),
         available_sizes_json: str | None = typer.Option(
             None,
             "--available-sizes-json",
@@ -1350,6 +1368,8 @@ def register(app: typer.Typer) -> None:
             )
         if ip_schedule_json is not None:
             override["ip_schedule"] = _parse_json_option(ip_schedule_json, "--ip-schedule-json")
+        if ip_schedule_hidden is not None:
+            override["ip_schedule_hidden_from_customer"] = ip_schedule_hidden
         if refundable_terms_json is not None:
             override["refundable_terms"] = _parse_json_option(
                 refundable_terms_json, "--refundable-terms-json"

{makea_cli-0.2.2.dist-info → makea_cli-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: makea-cli
-Version: 0.2.2
+Version: 0.2.4
 Summary: Makea admin CLI (browser login + Makea admin HTTP API)
 Requires-Python: >=3.10
 Requires-Dist: click<9,>=8.1
@@ -144,9 +144,11 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 
 | 命令 | 读/写 | 后端 | 说明 | 旧名 |
 |---|---|---|---|---|
+| `makea-cli designer create checkout` | write（ask） | `POST /designer/payments/basket/create-session` | a Stripe checkout link for one or more charges. --key repeats: sampling:<sampling_order_id>, production:<production_o… | — |
 | `makea-cli designer create collection` | write（auto） | `POST /designer/collections/create` | create or update a designer collection. | `designer-create-collection` |
 | `makea-cli designer create note` | write（ask） | `POST /designer/products/{product_id}/notes` | post a message into a product's conversation. | — |
 | `makea-cli designer create product` | write（ask） | `POST /designer/product/create_or_update_product` | payload must match manufacture/specifications (all frontend fields; categories/subcategories + collection_id in --hel… | `designer-upsert-product` |
+| `makea-cli designer create quote-award` | write（ask） | `POST /designer/quotes/group_pay_prepare` | choose the supplier quote to sample with. --quote is the supplier link id from `designer list supplier-link`; repeat … | — |
 | `makea-cli designer create rfq` | write（ask） | `POST /designer/product/send_rfq` | ask the chosen suppliers to quote on a product. --supplier repeats; --makea-sourcing also asks Makea to source. | — |
 | `makea-cli designer create sampling-order` | write（ask） | `POST /designer/sampling_orders` | order samples. --file is the full order payload (product_order_id, items, fees …); run --dry-run first and read the b… | — |
 | `makea-cli designer delete sampling-order` | write（never） | `DELETE /designer/sampling_orders/{sampling_order_id}` | delete a DRAFT sample order. The backend refuses any other status. Graded `never`. | — |
@@ -173,6 +175,7 @@ exit code：`0` 成功 · `2` 用法错 · `3` 未登录或身份与 persona 不
 | `makea-cli designer set product-collection` | write（auto） | `POST /designer/products/{id}/link-to-collection` | assign product to a collection. | `designer-link-product-to-collection` |
 | `makea-cli designer submit production-order` | write（ask） | `POST /designer/production_orders/{production_order_id}/submit` | submit a 大货 order. This is the commitment, so --dry-run and confirm with the user first. | — |
 | `makea-cli designer submit sampling-order` | write（ask） | `POST /designer/sampling_orders/{sampling_order_id}/confirm` | confirm a sample order so the supplier starts. Run --dry-run first and read it back to the user. | — |
+| `makea-cli designer submit tech-pack` | write（ask） | `POST /designer/products/{product_id}/technical-specifications/confirm` | confirm the tech pack, the step before anyone is asked to quote. | — |
 | `makea-cli designer update action` | write（auto） | `POST /designer/actions/{action_id}/{acknowledge\|snooze\|dismiss}` | respond to one of the pending actions from `designer list action`. An action is closed by the fact it asks for, not b… | — |
 | `makea-cli designer update note` | write（ask） | `POST /designer/products/{product_id}/notes/{note_id}/{accept\|reject}` | decide on a task the assistant proposed on a product. | — |
 | `makea-cli designer update product` | write（auto） | `POST /designer/product/update_basic_info` | patch fields on a product. --cover-image / --back-image take a document id and are what the assistant's set_product_i… | — |

{makea_cli-0.2.2.dist-info → makea_cli-0.2.4.dist-info}/RECORD

@@ -1,7 +1,8 @@
-makea_cli/__init__.py,sha256=m6kyaNpwBcP1XYcqrelX2oS3PJuOnElOcRdBa9pEb8c,22
+makea_cli/__init__.py,sha256=SBl2EPFW-ltPvQ7vbVWItyAsz3aKYIpjO7vcfr84GkU,22
 makea_cli/__main__.py,sha256=AkQjxWfKE3w9iD1d6I-2Zqvv2t9cct0oYyFF0UiA-Z0,144
-makea_cli/api_client.py,sha256=cvs7ntOqVb8mDGiCOmyHwPo2EvwDTYqlchm5pXbG15w,48435
+makea_cli/api_client.py,sha256=rm_0M09oNte-4U_E81k2L9JeHd0NfampHOoH0Ub5-A4,49562
 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/errors.py,sha256=_2qKjvkU8YWeBcUd04Yn62lKkZoqQY52kH8klNMyxhM,2780
 makea_cli/identity.py,sha256=pfYT-asaY1ZTzoAzfqI-v4Eyz1RtxqR2YgvxRGx_lxg,2758
@@ -16,7 +17,7 @@ makea_cli/commands/analytics/cmd.py,sha256=_I5fBlomTalAxRpB-jculS01AbjEC5cVG3lAN
 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
-makea_cli/commands/brand/cmd.py,sha256=9Gx2agSJP6LyDZYOGyYr3mAfqPFJRiuno41DmucKZqI,31040
+makea_cli/commands/brand/cmd.py,sha256=WLX3zixuUbQCT6gMT2hMg5qlRgyNJDWYDi15dTsQ99g,35050
 makea_cli/commands/designer/__init__.py,sha256=Tc3Ju4-BKX2euBljhlrEd-Ksirk6JSPNixq4x0IbQYI,77
 makea_cli/commands/designer/cmd.py,sha256=4oOJ5tWYojUs8FBj3QRmgpwbicpsU1XqswoNlJpLLS8,23615
 makea_cli/commands/directory/__init__.py,sha256=rQHBc0JOFXynlzrBm_YfqoRuNsS-JOl-OOvPjgDbnIA,78
@@ -39,8 +40,8 @@ makea_cli/commands/production/__init__.py,sha256=Whn5ziwVMt4jzcokiFWLhWIpRLYC-ld
 makea_cli/commands/production/cmd.py,sha256=s6fVAGzOvokF6Va5WKGEA2vw2x2hDQ3PrsF01EyZA-Q,38283
 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=CrG1m0U5-dvdJi4vk9-JRSYY_moPfV_Ud6jRTf-G5Z8,56947
-makea_cli-0.2.2.dist-info/METADATA,sha256=jW5EW6HvLmvM2Zrr1Afg6kJTZgXq-0P9Wz0qPKcJGyQ,29877
-makea_cli-0.2.2.dist-info/WHEEL,sha256=THafob7ofN-NsuMN7Mg4qZyHaQI7KkD-QlcQatYhXPo,87
-makea_cli-0.2.2.dist-info/entry_points.txt,sha256=4x-lbVa1jBbNlkNq7L-rYyfRh2spZmc3BLIzP-Dl-Qk,50
-makea_cli-0.2.2.dist-info/RECORD,,
+makea_cli/commands/supplier/cmd.py,sha256=crRCy9WfhkryHMIL3iufoiT90_SG3-mKChAtdhd06uc,58076
+makea_cli-0.2.4.dist-info/METADATA,sha256=YNBpGwq6K0GXZF9xNELy1AOgvJykyKD2w7VcuE1ryHs,30554
+makea_cli-0.2.4.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+makea_cli-0.2.4.dist-info/entry_points.txt,sha256=4x-lbVa1jBbNlkNq7L-rYyfRh2spZmc3BLIzP-Dl-Qk,50
+makea_cli-0.2.4.dist-info/RECORD,,

{makea_cli-0.2.2.dist-info → makea_cli-0.2.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.3
+Generator: hatchling 1.32.4
 Root-Is-Purelib: true
 Tag: py3-none-any