shopping-cli 3.2.1__tar.gz → 3.2.4__tar.gz

{shopping_cli-3.2.1/shopping_cli.egg-info → shopping_cli-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shopping-cli
-Version: 3.2.1
+Version: 3.2.4
 Summary: Standalone local-commerce AI consultation marketplace runtime
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -310,6 +310,20 @@ printf 'longjing gift delivery today\n/summary\n/quit\n' | \
 
 Default database path: `~/.local/share/shopping-cli/shopping-cli.sqlite`.
 
+For a single-merchant deployment, import commands can read the database and
+merchant identity from the environment instead of repeating tenant flags:
+
+```bash
+export SHOPPING_DB_PATH="$HOME/.local/share/shopping-cli/shopping-cli.sqlite"
+export SHOPPING_MERCHANT_ID="your-merchant-id"
+
+shopping-cli import-csv-excel --file products.csv
+```
+
+`KIWI_MERCHANT_ID` is accepted as a compatibility alias for
+`SHOPPING_MERCHANT_ID`. Explicit `--db` and `--merchant` arguments take
+precedence over environment variables.
+
 ## Channel Ingress
 
 External channel adapters can ingest buyer messages through a stable local entry point before real WhatsApp, Telegram, Slack, or OpenClaw/Hermes gateway bridges are attached:

{shopping_cli-3.2.1 → shopping_cli-3.2.4}/README.md

@@ -87,6 +87,20 @@ printf 'longjing gift delivery today\n/summary\n/quit\n' | \
 
 Default database path: `~/.local/share/shopping-cli/shopping-cli.sqlite`.
 
+For a single-merchant deployment, import commands can read the database and
+merchant identity from the environment instead of repeating tenant flags:
+
+```bash
+export SHOPPING_DB_PATH="$HOME/.local/share/shopping-cli/shopping-cli.sqlite"
+export SHOPPING_MERCHANT_ID="your-merchant-id"
+
+shopping-cli import-csv-excel --file products.csv
+```
+
+`KIWI_MERCHANT_ID` is accepted as a compatibility alias for
+`SHOPPING_MERCHANT_ID`. Explicit `--db` and `--merchant` arguments take
+precedence over environment variables.
+
 ## Channel Ingress
 
 External channel adapters can ingest buyer messages through a stable local entry point before real WhatsApp, Telegram, Slack, or OpenClaw/Hermes gateway bridges are attached:

{shopping_cli-3.2.1 → shopping_cli-3.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "shopping-cli"
-version = "3.2.1"
+version = "3.2.4"
 description = "Standalone local-commerce AI consultation marketplace runtime"
 readme = "README.md"
 requires-python = ">=3.11"

{shopping_cli-3.2.1 → shopping_cli-3.2.4}/shopping_cli/__init__.py

@@ -1,3 +1,3 @@
 """Standalone shopping-cli consultation runtime."""
 
-VERSION = "3.2.1"
+VERSION = "3.2.4"

{shopping_cli-3.2.1 → shopping_cli-3.2.4}/shopping_cli/cli.py

@@ -866,8 +866,10 @@ def build_parser() -> argparse.ArgumentParser:
     import_csv = subparsers.add_parser(
         "import-csv-excel", help="Import product facts from CSV / Excel (.xlsx) into the local store"
     )
-    import_csv.add_argument("--file", required=True, help="Path to .csv / .tsv / .xlsx file")
-    import_csv.add_argument("--merchant", default="", dest="merchant", help="Owning merchant id (required, FK guard)")
+    import_csv.add_argument("--file", default="", help="Path to .csv / .tsv / .xlsx file (required unless --template)")
+    import_csv.add_argument("--template", default="", dest="template", help="写一份 CSV 模板到该路径后退出（不导入）")
+    import_csv.add_argument("--merchant", default="", dest="merchant", help="Owning merchant id (or SHOPPING_MERCHANT_ID / KIWI_MERCHANT_ID)")
+    import_csv.add_argument("--default-merchant", default="", dest="default_merchant", help=argparse.SUPPRESS)
     import_csv.add_argument("--allowed-merchant", default="", dest="allowed_merchant", help="Tenant boundary: only rows of this merchant are written")
     import_csv.add_argument("--format", choices=["text", "json"], default="text")
     import_csv.set_defaults(func=cmd_import_csv_excel)

{shopping_cli-3.2.1 → shopping_cli-3.2.4}/shopping_cli/cli_adapter_commands.py

@@ -7,17 +7,25 @@
 from __future__ import annotations
 
 import argparse
+import os
 
 from shopping_cli.cli_common import db_path_from_args, emit
 from shopping_cli.data_sources import csv_excel_source  # noqa: F401  # 导入即注册适配器
 from shopping_cli.data_sources.adapter import (
-    AdapterError,
     SyncContext,
     registered_adapters,
     run,
 )
 from shopping_cli.db.session import db_session
 
+# CSV/Excel 导入模板（与 examples/products-template.csv 一致）。必填列 sku/title/
+# price/stock；可选 currency（缺省 CNY）/ category / description / merchant_id。
+PRODUCTS_TEMPLATE_CSV = (
+    "sku,title,price,stock,currency,category,description\n"
+    "VQ-001,智能保温杯 500ml,129.00,50,CNY,kitchenware,316 不锈钢内胆真空保温\n"
+    "VQ-002,桌面无线充电器 15W,89.00,120,CNY,electronics,兼容 QC3.0\n"
+)
+
 
 def cmd_adapters_list(args: argparse.Namespace) -> None:
     """列出已注册适配器（Adapter SDK 注册表）。"""
@@ -28,9 +36,26 @@ def cmd_adapters_list(args: argparse.Namespace) -> None:
 
 
 def cmd_import_csv_excel(args: argparse.Namespace) -> None:
-    """运行 CSV/Excel 适配器导入本地 products 表。"""
+    """运行 CSV/Excel 适配器导入本地 products 表；--template 只生成模板不导入。"""
+    template_path = str(getattr(args, "template", "") or "").strip()
+    if template_path:
+        with open(template_path, "w", encoding="utf-8", newline="") as fh:
+            fh.write(PRODUCTS_TEMPLATE_CSV)
+        emit(
+            {"ok": True, "message": f"CSV 模板已写入 {template_path}（填好 sku/title/price/stock 后再导入）"},
+            getattr(args, "format", "text"),
+        )
+        return
+    file_path = str(args.file or "").strip()
+    if not file_path:
+        raise SystemExit("--file <path> 必填（或先用 --template <path> 生成模板）")
     db_path = db_path_from_args(args)
-    merchant_id = str(args.merchant or "").strip() or str(args.default_merchant or "").strip()
+    merchant_id = (
+        str(args.merchant or "").strip()
+        or str(getattr(args, "default_merchant", "")).strip()
+        or str(os.environ.get("SHOPPING_MERCHANT_ID") or "").strip()
+        or str(os.environ.get("KIWI_MERCHANT_ID") or "").strip()
+    )
     if not merchant_id:
         raise SystemExit("--merchant is required (FK 归属防护)")
     with db_session(db_path) as conn:

{shopping_cli-3.2.1 → shopping_cli-3.2.4}/shopping_cli/cli_common.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import argparse
 import json
 import math
+import os
 from pathlib import Path
 from typing import Any
 
@@ -132,4 +133,12 @@ def tcp_port(value: str) -> int:
 
 
 def db_path_from_args(args: argparse.Namespace) -> Path:
-    return Path(getattr(args, "agent_db", None) or args.db or args.data or DEFAULT_DB_PATH).expanduser()
+    configured = (
+        getattr(args, "agent_db", None)
+        or getattr(args, "db", None)
+        or getattr(args, "data", None)
+        or os.environ.get("SHOPPING_DB_PATH")
+        or os.environ.get("SHOPPING_DB")
+        or DEFAULT_DB_PATH
+    )
+    return Path(configured).expanduser()

{shopping_cli-3.2.1 → shopping_cli-3.2.4}/shopping_cli/listings/projection.py

@@ -1,12 +1,10 @@
 """PublicListingProjection（shopping-cli v0.3 §14/§16；DoD #1-#3）。
 
 public-only 白名单投影：把 products 行压缩为可公开的 discovery projection。
-**绝不输出** cost / floor price / 私密库存 / credentials / 客户特定条款
-（v0.3 §16 不得输出清单；DoD #2 有回归测试锁定）。
-
-availability_hint / price_range_hint 必须携带 provenance 并注明只是
-discovery hint（v0.3 §14）——权威值以本地 products 行为准（v3.0 起
-发布面已随 kiwi-catalog 子系统迁移至独立服务）。
+**绝不输出** cost / floor price / 私密库存 / credentials / 客户特定条款 / 价格 /
+促销 / 底价（v0.3 §16 不得输出清单；DoD #2 有回归测试锁定）。商品 listing 只携带
+名称 + 分类/标签/区域等发现元数据，价格与供应事实以本地 products 行为准
+（v3.0 起发布面已随 kiwi-catalog 子系统迁移至独立服务）。
 """
 
 from __future__ import annotations
@@ -27,11 +25,6 @@ def _now_iso() -> str:
     return datetime.now(timezone.utc).isoformat()
 
 
-def _hint_price_range(price: float, currency: str) -> str:
-    """price_range_hint：粗粒度公开价格提示（不是报价）。"""
-    return f"{currency} {price:.0f}"
-
-
 def _product_row(conn: sqlite3.Connection, sku: str) -> dict[str, Any]:
     row = conn.execute(
         "select * from products where sku = ?", (str(sku).strip(),)
@@ -74,12 +67,6 @@ def project_product_listing(
         "category": str(row.get("category") or ""),
         "regions": [],
         "tags": json.loads(row.get("tags_json") or "[]"),
-        "commercial_hints": {
-            "price_range_hint": _hint_price_range(float(row["price"]), str(row.get("currency") or "CNY")),
-            "availability_hint": "in_stock" if int(row.get("stock", 0)) > 0 else "out_of_stock",
-            "moq": 1,
-            "supports_bulk_quote": True,
-        },
     }
     # 每商品成交入口（KTH destination_ref）：商家自行维护，publish 时同步进
     # catalog listing 的 handoff_destination_ref。审查 S-M3：私有字段，缺省
@@ -90,14 +77,14 @@ def project_product_listing(
     if description:
         projection["summary"] = description
 
-    # provenance 标注：availability/price 是 discovery hint，不是权威事实（v0.3 §14）。
-    # 只存在于 projection（Merchant Kiwi 可见）（wire commercial_hints 七键白名单，v0.4 §4.1）。
+    # provenance 标注：只存在于 projection（Merchant Kiwi 可见），发布前由
+    # strip_provenance 剥离；商品不再携带价格/库存 hint（名称-only，v0.3 §16）。
     projection["_provenance"] = {
         "authority": authority,
         "source_revision": projection["source_revision"],
         "observed_at": str(row.get("observed_at") or now),
         "fresh_until": str(row.get("fresh_until") or ""),
-        "note": "discovery hint only; authoritative value in the local product record",
+        "note": "name-only discovery projection; authoritative facts in the local product record",
     }
     return projection
 

{shopping_cli-3.2.1 → shopping_cli-3.2.4/shopping_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shopping-cli
-Version: 3.2.1
+Version: 3.2.4
 Summary: Standalone local-commerce AI consultation marketplace runtime
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -310,6 +310,20 @@ printf 'longjing gift delivery today\n/summary\n/quit\n' | \
 
 Default database path: `~/.local/share/shopping-cli/shopping-cli.sqlite`.
 
+For a single-merchant deployment, import commands can read the database and
+merchant identity from the environment instead of repeating tenant flags:
+
+```bash
+export SHOPPING_DB_PATH="$HOME/.local/share/shopping-cli/shopping-cli.sqlite"
+export SHOPPING_MERCHANT_ID="your-merchant-id"
+
+shopping-cli import-csv-excel --file products.csv
+```
+
+`KIWI_MERCHANT_ID` is accepted as a compatibility alias for
+`SHOPPING_MERCHANT_ID`. Explicit `--db` and `--merchant` arguments take
+precedence over environment variables.
+
 ## Channel Ingress
 
 External channel adapters can ingest buyer messages through a stable local entry point before real WhatsApp, Telegram, Slack, or OpenClaw/Hermes gateway bridges are attached: