makea-cli 0.1.16__tar.gz → 0.1.18__tar.gz

{makea_cli-0.1.16 → makea_cli-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makea-cli
-Version: 0.1.16
+Version: 0.1.18
 Summary: Makea admin CLI (browser login + Makea admin HTTP API)
 Requires-Python: >=3.10
 Requires-Dist: httpx>=0.27
@@ -77,6 +77,7 @@ makea-cli auth --logout
 - `makea-cli auth` — 浏览器登录并保存令牌  
 - `makea-cli auth --logout` — 清除本机令牌  
 - `makea-cli list-users` — 列出用户（需管理员权限）  
+- `makea-cli create-user <email> --user-type "<type>" [--password ...] [--name ...] [--company-name ...] [--username ...]` — 注册用户并直接确认 Cognito 账号（POST `/admin/users/create`，不发验证码邮件，创建后即可用该密码登录）  
 - `makea-cli list-suppliers` — 列出供应商（需管理员权限）  
 - `makea-cli create-quote-request -s <supplier_id> -p <product_reference_id> [--quote-type SAMPLING|PRODUCTION] [--message ...] [--due-date YYYY-MM-DD]` — 创建并发送 quote request（POST `/admin/supplier/create_quote_request`）  
 - `makea-cli get-quote-requests-by-supplier-id <supplier_id> [--status <status>] [-n <limit>]` — 直连后端按 supplier_id 查询 quote requests  

{makea_cli-0.1.16 → makea_cli-0.1.18}/README.md

@@ -66,6 +66,7 @@ makea-cli auth --logout
 - `makea-cli auth` — 浏览器登录并保存令牌  
 - `makea-cli auth --logout` — 清除本机令牌  
 - `makea-cli list-users` — 列出用户（需管理员权限）  
+- `makea-cli create-user <email> --user-type "<type>" [--password ...] [--name ...] [--company-name ...] [--username ...]` — 注册用户并直接确认 Cognito 账号（POST `/admin/users/create`，不发验证码邮件，创建后即可用该密码登录）  
 - `makea-cli list-suppliers` — 列出供应商（需管理员权限）  
 - `makea-cli create-quote-request -s <supplier_id> -p <product_reference_id> [--quote-type SAMPLING|PRODUCTION] [--message ...] [--due-date YYYY-MM-DD]` — 创建并发送 quote request（POST `/admin/supplier/create_quote_request`）  
 - `makea-cli get-quote-requests-by-supplier-id <supplier_id> [--status <status>] [-n <limit>]` — 直连后端按 supplier_id 查询 quote requests  

makea_cli-0.1.18/makea_cli/__init__.py

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

{makea_cli-0.1.16 → makea_cli-0.1.18}/makea_cli/api_client.py

@@ -79,6 +79,35 @@ def put_json(path: str, body: Any, *, timeout: float = 60.0) -> Any:
     return r.json()
 
 
+def patch_json(path: str, body: Any, *, timeout: float = 60.0) -> Any:
+    """PATCH JSON body (same error handling as ``post_json``)."""
+    url = f"{api_base_url()}{path}"
+    headers = {**_headers(), "Content-Type": "application/json"}
+    with httpx.Client(timeout=timeout) as client:
+        r = client.patch(url, headers=headers, json=body)
+    if r.status_code >= 400:
+        try:
+            detail = r.json()
+        except json.JSONDecodeError:
+            detail = r.text
+        raise RuntimeError(f"HTTP {r.status_code}: {detail}")
+    return r.json()
+
+
+def delete_json(path: str, *, params: dict[str, Any] | None = None, timeout: float = 60.0) -> Any:
+    """DELETE request (same error handling as ``get_json``)."""
+    url = f"{api_base_url()}{path}"
+    with httpx.Client(timeout=timeout) as client:
+        r = client.delete(url, headers=_headers(), params=params)
+    if r.status_code >= 400:
+        try:
+            detail = r.json()
+        except json.JSONDecodeError:
+            detail = r.text
+        raise RuntimeError(f"HTTP {r.status_code}: {detail}")
+    return r.json()
+
+
 def send_admin_raw_email(body: dict[str, Any]) -> Any:
     """
     POST /admin/email/send — queue HTML email (from must be @makea.co).
@@ -179,6 +208,11 @@ def get_all_users(*, limit: int | None, offset: int) -> Any:
     return get_json("/admin/users", params=params)
 
 
+def create_user(body: dict[str, Any], *, timeout: float = 60.0) -> Any:
+    """POST /admin/users/create — admin registers a confirmed Cognito user + DDB profile."""
+    return post_json("/admin/users/create", body, timeout=timeout)
+
+
 def update_user_profile(*, user_id: str, body: dict[str, Any]) -> Any:
     """PUT /admin/user-profiles/{user_id}/update — admin updates DDB profile + Cognito userType."""
     return put_json(f"/admin/user-profiles/{user_id}/update", body)
@@ -816,3 +850,48 @@ def update_product_technical_specifications(
         {"technical_specifications": json.dumps(technical_specifications)},
         timeout=timeout,
     )
+
+
+# ── Tech-pack library (reusable library components), admin-side ──────────
+def admin_library_component_schema(*, timeout: float = 60.0) -> Any:
+    """GET /admin/library_components/schema — the library taxonomy (sections +
+    library-role field descriptors). Static; no target user."""
+    return get_json("/admin/library_components/schema", timeout=timeout)
+
+
+def admin_list_library_components(
+    user_id: str, *, section: str | None = None, timeout: float = 60.0
+) -> Any:
+    """GET /admin/designer/{user_id}/library_components — list a designer's
+    tech-pack library (org-fanned). Optional ``section`` scopes to one type."""
+    params = {"section": section} if section else None
+    return get_json(f"/admin/designer/{user_id}/library_components", params=params, timeout=timeout)
+
+
+def admin_create_library_component(
+    user_id: str, body: dict[str, Any], *, timeout: float = 60.0
+) -> Any:
+    """POST /admin/designer/{user_id}/library_components — {section, name?,
+    values, documents?}."""
+    return post_json(f"/admin/designer/{user_id}/library_components", body, timeout=timeout)
+
+
+def admin_update_library_component(
+    user_id: str, component_id: str, body: dict[str, Any], *, timeout: float = 60.0
+) -> Any:
+    """PATCH /admin/designer/{user_id}/library_components/{component_id} —
+    {name?, values?, documents?}."""
+    return patch_json(
+        f"/admin/designer/{user_id}/library_components/{component_id}",
+        body,
+        timeout=timeout,
+    )
+
+
+def admin_delete_library_component(
+    user_id: str, component_id: str, *, timeout: float = 60.0
+) -> Any:
+    """DELETE /admin/designer/{user_id}/library_components/{component_id}."""
+    return delete_json(
+        f"/admin/designer/{user_id}/library_components/{component_id}", timeout=timeout
+    )

{makea_cli-0.1.16 → makea_cli-0.1.18}/makea_cli/commands/__init__.py

@@ -8,6 +8,7 @@ from makea_cli.commands.designer.cmd import register as register_designer
 from makea_cli.commands.directory.cmd import register as register_directory
 from makea_cli.commands.document.cmd import register as register_document
 from makea_cli.commands.email.cmd import register as register_email
+from makea_cli.commands.library.cmd import register as register_library
 from makea_cli.commands.metrics.cmd import register as register_metrics
 from makea_cli.commands.orders.cmd import register as register_orders
 from makea_cli.commands.product.cmd import register as register_product
@@ -25,3 +26,4 @@ def register_all(app: typer.Typer) -> None:
     register_metrics(app)
     register_analytics(app)
     register_email(app)
+    register_library(app)

{makea_cli-0.1.16 → makea_cli-0.1.18}/makea_cli/commands/directory/cmd.py

@@ -47,6 +47,87 @@ def register(app: typer.Typer) -> None:
         """
         print_json_or_exit(console, lambda: api_client.get_all_users(limit=limit, offset=offset))
 
+    @app.command(
+        "create-user",
+        help=(
+            "POST /admin/users/create — register a user and confirm the Cognito "
+            "account in one step (no verification email). Allowed --user-type values: "
+            '"Fashion brands", "Other brands", "Supply Chain Consultant/Freelancer", '
+            '"Supplier", "ADMIN".'
+        ),
+    )
+    def create_user(
+        email: str = typer.Argument(
+            ...,
+            help="Email address; also the Cognito username unless --username is given.",
+        ),
+        user_type: str = typer.Option(
+            ...,
+            "--user-type",
+            help=(
+                "Cognito custom:userType for the new account. One of: "
+                '"Fashion brands", "Other brands", "Supply Chain Consultant/Freelancer", '
+                '"Supplier", "ADMIN" (case- and punctuation-sensitive).'
+            ),
+        ),
+        password: str = typer.Option(
+            ...,
+            "--password",
+            prompt=True,
+            hide_input=True,
+            confirmation_prompt=True,
+            help=(
+                "Initial password; set as permanent, so the user signs in with it "
+                "directly. Must satisfy the Cognito pool policy. Prompted when omitted."
+            ),
+        ),
+        name: str | None = typer.Option(
+            None,
+            "--name",
+            help="Optional display name (Cognito ``name`` + profile user_name).",
+        ),
+        company_name: str | None = typer.Option(
+            None,
+            "--company-name",
+            help="Optional company name written to the DDB profile row.",
+        ),
+        username: str | None = typer.Option(
+            None,
+            "--username",
+            help="Optional Cognito username when it should differ from the email.",
+        ),
+    ) -> None:
+        """
+        Admin: create a ready-to-use account (Cognito + DynamoDB profile).
+
+        The account is created with email_verified true and the password made
+        permanent, so it lands in CONFIRMED and the user can sign in immediately.
+        Cognito sends no invitation or verification email — pass the password on
+        yourself.
+
+        Output: JSON with success, user_id (Cognito sub), username, user_type,
+        status and profile_created.
+        """
+        if user_type not in _ALLOWED_USER_TYPES:
+            console.print(
+                f"[red]--user-type must be exactly one of {list(_ALLOWED_USER_TYPES)}.[/red]"
+            )
+            raise typer.Exit(1)
+
+        body: dict[str, object] = {
+            "email": email,
+            "password": password,
+            "user_type": user_type,
+        }
+        if name is not None:
+            body["user_name"] = name
+        if company_name is not None:
+            body["company_name"] = company_name
+        if username is not None:
+            body["username"] = username
+
+        print_json_or_exit(console, lambda: api_client.create_user(body))
+
     @app.command(
         "update-user-profile",
         help=(

makea_cli-0.1.18/makea_cli/commands/library/cmd.py

@@ -0,0 +1,281 @@
+"""Admin commands for a designer's tech-pack library (reusable library components).
+
+A *library component* is a designer's saved, reusable spec for one tech-pack
+section — the ``role='library'`` field values of a fabric / colour / trim …
+(name, composition, construction, certifications, pricing). Designers fill them
+into tech packs ("use from library") and capture them back ("save to library");
+the library is shared across their org the same way products are.
+
+These commands are the admin side: they take the target designer's ``user_id``
+explicitly (Cognito sub) and curate that designer/org's library on their behalf.
+Require an admin Makea login (makea-cli auth).
+
+Workflow: run ``library-schema`` first to learn the valid ``section`` ids and the
+``values`` keys (and which are required) before ``library-create`` / ``library-update``.
+"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import Any
+
+import typer
+from rich.console import Console
+
+from makea_cli import api_client
+from makea_cli.commands._util import print_json_or_exit
+
+console = Console()
+
+
+_LIBRARY_EPILOG = """
+The tech-pack library holds reusable per-section specs (fabrics, colours, trims …)
+keyed to a designer and shared across their org.
+
+Taxonomy first
+  Run ``makea-cli library-schema`` to list the sections that support a library
+  (e.g. MAIN_FABRIC) and, per section, the ``values`` keys, their labels/types,
+  and which are required ("essential") before a component can be saved. The
+  server ignores any ``values`` key that is not a library-role field for the
+  section, so use exactly the keys the schema reports.
+
+Creating / updating
+  ``values`` is an object of ``{"<field key>": <value>}`` — e.g.
+  ``{"main_fabric.library.name": "Pique Knit", "main_fabric.library.composition": "100% Cotton"}``.
+  On update, a provided value replaces; an empty string / null clears that field.
+  A component's display name defaults to its ``*.library.name`` value when ``name``
+  is omitted.
+
+Org scope
+  Reads (``library-list``) fan across the target designer's whole org and tag each
+  component with ``owner_user_id``. Creates land under the USER_ID you pass;
+  update/delete work on any component in that user's org.
+""".strip()
+
+
+def _load_values(values: str | None, values_file: Path | None) -> dict[str, Any]:
+    """Resolve the ``values`` map from an inline JSON string or a JSON file."""
+    if values is not None and values_file is not None:
+        raise ValueError("Pass only one of --values / --values-file.")
+    raw: str | None = None
+    if values_file is not None:
+        raw = values_file.read_text(encoding="utf-8")
+    elif values is not None:
+        raw = values
+    if raw is None:
+        return {}
+    parsed = json.loads(raw)
+    if not isinstance(parsed, dict):
+        raise ValueError("values must be a JSON object of {field key: value}.")
+    return parsed
+
+
+def register(app: typer.Typer) -> None:
+    @app.command(
+        "library-schema",
+        help=(
+            "GET /admin/library_components/schema — the tech-pack library taxonomy: "
+            "sections and their library-role field keys (run this before create/update)."
+        ),
+        epilog=_LIBRARY_EPILOG,
+    )
+    def library_schema(
+        timeout: float = typer.Option(
+            60.0,
+            "--timeout",
+            "-t",
+            help="HTTP timeout in seconds.",
+            min=10.0,
+            max=300.0,
+        ),
+    ) -> None:
+        """Print the library taxonomy (sections + fields). Admin token required."""
+        print_json_or_exit(
+            console,
+            lambda: api_client.admin_library_component_schema(timeout=timeout),
+        )
+
+    @app.command(
+        "library-list",
+        help=(
+            "GET /admin/designer/{user_id}/library_components — list a designer's "
+            "tech-pack library (org-fanned). Optional --section scopes to one type."
+        ),
+        epilog=_LIBRARY_EPILOG,
+    )
+    def library_list(
+        user_id: str = typer.Argument(..., help="Target designer Cognito user_id (sub)."),
+        section: str | None = typer.Option(
+            None,
+            "--section",
+            "-s",
+            help="Scope to one section id (e.g. MAIN_FABRIC); see library-schema.",
+        ),
+        timeout: float = typer.Option(
+            60.0,
+            "--timeout",
+            "-t",
+            help="HTTP timeout in seconds.",
+            min=10.0,
+            max=300.0,
+        ),
+    ) -> None:
+        """List the target designer's library components across their org."""
+        print_json_or_exit(
+            console,
+            lambda: api_client.admin_list_library_components(
+                user_id, section=section, timeout=timeout
+            ),
+        )
+
+    @app.command(
+        "library-create",
+        help=(
+            "POST /admin/designer/{user_id}/library_components — save a reusable "
+            "component under a designer. Provide --section and --values (see library-schema)."
+        ),
+        epilog=_LIBRARY_EPILOG,
+    )
+    def library_create(
+        user_id: str = typer.Argument(..., help="Target designer Cognito user_id (sub)."),
+        section: str = typer.Option(
+            ...,
+            "--section",
+            "-s",
+            help="Section id the component belongs to (e.g. MAIN_FABRIC).",
+        ),
+        name: str | None = typer.Option(
+            None,
+            "--name",
+            "-n",
+            help="Optional display name (defaults to the *.library.name value).",
+        ),
+        values: str | None = typer.Option(
+            None,
+            "--values",
+            help='Inline JSON object of {field key: value}, e.g. \'{"main_fabric.library.name":"Pique Knit"}\'.',
+        ),
+        values_file: Path | None = typer.Option(
+            None,
+            "--values-file",
+            "-f",
+            exists=True,
+            dir_okay=False,
+            readable=True,
+            help="Path to a UTF-8 JSON file holding the values object (instead of --values).",
+        ),
+        timeout: float = typer.Option(
+            60.0,
+            "--timeout",
+            "-t",
+            help="HTTP timeout in seconds.",
+            min=10.0,
+            max=300.0,
+        ),
+    ) -> None:
+        """Create a library component under the target designer."""
+        try:
+            body: dict[str, Any] = {
+                "section": section,
+                "values": _load_values(values, values_file),
+            }
+            if name is not None:
+                body["name"] = name
+        except (OSError, json.JSONDecodeError, ValueError) as e:
+            console.print(f"[red]Invalid input: {e}[/red]")
+            raise typer.Exit(1) from e
+
+        print_json_or_exit(
+            console,
+            lambda: api_client.admin_create_library_component(user_id, body, timeout=timeout),
+        )
+
+    @app.command(
+        "library-update",
+        help=(
+            "PATCH /admin/designer/{user_id}/library_components/{component_id} — update "
+            "a component's name and/or values (empty value clears a field)."
+        ),
+        epilog=_LIBRARY_EPILOG,
+    )
+    def library_update(
+        user_id: str = typer.Argument(..., help="Target designer Cognito user_id (sub)."),
+        component_id: str = typer.Argument(..., help="Library component UUID."),
+        name: str | None = typer.Option(None, "--name", "-n", help="New display name."),
+        values: str | None = typer.Option(
+            None,
+            "--values",
+            help='Inline JSON object of {field key: value} to merge; "" or null clears a field.',
+        ),
+        values_file: Path | None = typer.Option(
+            None,
+            "--values-file",
+            "-f",
+            exists=True,
+            dir_okay=False,
+            readable=True,
+            help="Path to a UTF-8 JSON file holding the values object (instead of --values).",
+        ),
+        timeout: float = typer.Option(
+            60.0,
+            "--timeout",
+            "-t",
+            help="HTTP timeout in seconds.",
+            min=10.0,
+            max=300.0,
+        ),
+    ) -> None:
+        """Update a library component's name and/or values."""
+        try:
+            body: dict[str, Any] = {}
+            if name is not None:
+                body["name"] = name
+            if values is not None or values_file is not None:
+                body["values"] = _load_values(values, values_file)
+            if not body:
+                raise ValueError("Nothing to update: pass --name and/or --values.")
+        except (OSError, json.JSONDecodeError, ValueError) as e:
+            console.print(f"[red]Invalid input: {e}[/red]")
+            raise typer.Exit(1) from e
+
+        print_json_or_exit(
+            console,
+            lambda: api_client.admin_update_library_component(
+                user_id, component_id, body, timeout=timeout
+            ),
+        )
+
+    @app.command(
+        "library-delete",
+        help=(
+            "DELETE /admin/designer/{user_id}/library_components/{component_id} — remove "
+            "a component from the designer's org library."
+        ),
+        epilog=_LIBRARY_EPILOG,
+    )
+    def library_delete(
+        user_id: str = typer.Argument(..., help="Target designer Cognito user_id (sub)."),
+        component_id: str = typer.Argument(..., help="Library component UUID."),
+        yes: bool = typer.Option(False, "--yes", "-y", help="Skip the confirmation prompt."),
+        timeout: float = typer.Option(
+            60.0,
+            "--timeout",
+            "-t",
+            help="HTTP timeout in seconds.",
+            min=10.0,
+            max=300.0,
+        ),
+    ) -> None:
+        """Delete a library component from the target designer's org library."""
+        if not yes:
+            typer.confirm(
+                f"Delete library component {component_id} from {user_id}'s org library?",
+                abort=True,
+            )
+        print_json_or_exit(
+            console,
+            lambda: api_client.admin_delete_library_component(
+                user_id, component_id, timeout=timeout
+            ),
+        )

{makea_cli-0.1.16 → makea_cli-0.1.18}/makea_cli/commands/supplier/cmd.py

@@ -211,8 +211,7 @@ def register(app: typer.Typer) -> None:
         resolved_id = supplier_id or raw.get("supplier_id") or body["supplier"].get("supplier_id")
         if not resolved_id:
             console.print(
-                "[red]supplier_id is required: pass --supplier-id or include it in the "
-                "JSON.[/red]"
+                "[red]supplier_id is required: pass --supplier-id or include it in the JSON.[/red]"
             )
             raise typer.Exit(1)
         body["supplier_id"] = resolved_id

{makea_cli-0.1.16 → makea_cli-0.1.18}/pyproject.toml

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

makea_cli-0.1.16/makea_cli/__init__.py

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