添加 委外批次进数据库、委外批次入飞书
This commit is contained in:
+69
-5
@@ -2,7 +2,10 @@ from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import sys
|
||||
import logging
|
||||
import re
|
||||
import time
|
||||
from typing import Any
|
||||
|
||||
from .feishu import FeishuClient
|
||||
from .postgres import query_postgres
|
||||
@@ -10,6 +13,36 @@ from .service import run_feishu_summary, run_sync_brand
|
||||
from .settings import build_app_config
|
||||
|
||||
|
||||
logger = logging.getLogger("inventory_sync.cli")
|
||||
SENSITIVE_PATTERN = re.compile(r"(?i)(password|passwd|secret|token|authorization)\s*[:=]\s*([^\s,;]+)")
|
||||
|
||||
LOG_FIELD_LABELS = {
|
||||
"action": "动作",
|
||||
"elapsed_ms": "耗时毫秒",
|
||||
"env_path": "环境文件",
|
||||
"error": "错误",
|
||||
"fallback": "兜底方式",
|
||||
"row_count": "行数",
|
||||
"source_row_count": "源数据行数",
|
||||
"table_count": "表数量",
|
||||
"target_count": "目标数量",
|
||||
}
|
||||
|
||||
|
||||
def sanitize_value(value: Any) -> Any:
|
||||
if isinstance(value, str):
|
||||
return SENSITIVE_PATTERN.sub(r"\1=***", value)
|
||||
return value
|
||||
|
||||
|
||||
def log_event(level: int, event: str, **fields: Any) -> None:
|
||||
safe_event = sanitize_value(event)
|
||||
details = " ".join(
|
||||
f"{LOG_FIELD_LABELS.get(key, key)}={sanitize_value(value)!r}" for key, value in fields.items()
|
||||
)
|
||||
logger.log(level, "事件=%s%s", safe_event, f" {details}" if details else "")
|
||||
|
||||
|
||||
def parse_args() -> argparse.Namespace:
|
||||
parser = argparse.ArgumentParser(description="Feishu Base and PostgreSQL helper")
|
||||
parser.add_argument(
|
||||
@@ -22,28 +55,59 @@ def parse_args() -> argparse.Namespace:
|
||||
|
||||
|
||||
def main() -> int:
|
||||
started_at = time.monotonic()
|
||||
try:
|
||||
args = parse_args()
|
||||
log_event(logging.INFO, "飞书同步动作开始", action=args.action)
|
||||
config = build_app_config()
|
||||
if config.env_path:
|
||||
print(f"已加载环境变量文件: {config.env_path}", file=sys.stderr)
|
||||
log_event(logging.INFO, "已加载环境变量文件", env_path=config.env_path)
|
||||
else:
|
||||
print("WARNING: 未找到 .env 文件,将仅使用当前 shell 环境变量", file=sys.stderr)
|
||||
log_event(logging.WARNING, "未找到环境变量文件", fallback="当前Shell环境变量")
|
||||
|
||||
client = FeishuClient(config)
|
||||
result: dict[str, object] = {}
|
||||
|
||||
if args.action in {"feishu", "all"}:
|
||||
log_event(logging.INFO, "开始读取飞书Base信息")
|
||||
result["feishu"] = run_feishu_summary(client)
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"飞书Base信息读取完成",
|
||||
table_count=result["feishu"].get("table_count") if isinstance(result["feishu"], dict) else None,
|
||||
)
|
||||
if args.action in {"postgres", "all"}:
|
||||
log_event(logging.INFO, "开始查询PostgreSQL")
|
||||
result["postgres"] = query_postgres(config)
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"PostgreSQL查询完成",
|
||||
row_count=result["postgres"].get("row_count") if isinstance(result["postgres"], dict) else None,
|
||||
)
|
||||
if args.action in {"sync-brand", "all"}:
|
||||
log_event(logging.INFO, "开始同步品牌数据")
|
||||
postgres_result = result.get("postgres")
|
||||
result["sync_brand"] = run_sync_brand(config, client, postgres_result if isinstance(postgres_result, dict) else None)
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"品牌数据同步完成",
|
||||
target_count=result["sync_brand"].get("target_count") if isinstance(result["sync_brand"], dict) else None,
|
||||
source_row_count=result["sync_brand"].get("source_row_count") if isinstance(result["sync_brand"], dict) else None,
|
||||
)
|
||||
|
||||
print(json.dumps(result, ensure_ascii=False, indent=2))
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"飞书同步动作完成",
|
||||
action=args.action,
|
||||
elapsed_ms=int((time.monotonic() - started_at) * 1000),
|
||||
)
|
||||
return 0
|
||||
except Exception as exc: # noqa: BLE001
|
||||
print(f"执行失败: {exc}", file=sys.stderr)
|
||||
log_event(
|
||||
logging.ERROR,
|
||||
"飞书同步动作失败",
|
||||
error=exc,
|
||||
elapsed_ms=int((time.monotonic() - started_at) * 1000),
|
||||
)
|
||||
return 1
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import re
|
||||
from typing import Any
|
||||
|
||||
from .feishu import FeishuApiError, FeishuClient
|
||||
@@ -8,6 +10,38 @@ from .settings import AppConfig
|
||||
from .specs import BRAND_SYNC_TARGETS, FIELD_SPECS, PRIMARY_FIELD_NAME, PRIMARY_FIELD_SOURCE, BrandSyncTarget
|
||||
|
||||
|
||||
logger = logging.getLogger("inventory_sync.service")
|
||||
SENSITIVE_PATTERN = re.compile(r"(?i)(password|passwd|secret|token|authorization)\s*[:=]\s*([^\s,;]+)")
|
||||
|
||||
LOG_FIELD_LABELS = {
|
||||
"advanced_permission_enabled": "高级权限已开启",
|
||||
"brand_name": "品牌",
|
||||
"created_records": "新增记录数",
|
||||
"deleted_records": "删除记录数",
|
||||
"existing_records": "已有记录数",
|
||||
"rows": "行数",
|
||||
"selected_table_id": "选中表ID",
|
||||
"source_rows": "源数据行数",
|
||||
"table_count": "表数量",
|
||||
"table_name": "表名",
|
||||
"target_count": "目标数量",
|
||||
}
|
||||
|
||||
|
||||
def sanitize_value(value: Any) -> Any:
|
||||
if isinstance(value, str):
|
||||
return SENSITIVE_PATTERN.sub(r"\1=***", value)
|
||||
return value
|
||||
|
||||
|
||||
def log_event(level: int, event: str, **fields: Any) -> None:
|
||||
safe_event = sanitize_value(event)
|
||||
details = " ".join(
|
||||
f"{LOG_FIELD_LABELS.get(key, key)}={sanitize_value(value)!r}" for key, value in fields.items()
|
||||
)
|
||||
logger.log(level, "事件=%s%s", safe_event, f" {details}" if details else "")
|
||||
|
||||
|
||||
def build_feishu_record(row: dict[str, Any]) -> dict[str, Any]:
|
||||
if PRIMARY_FIELD_SOURCE not in row:
|
||||
raise KeyError(f"映射缺少主字段来源列: {PRIMARY_FIELD_SOURCE}")
|
||||
@@ -30,10 +64,19 @@ def build_feishu_record(row: dict[str, Any]) -> dict[str, Any]:
|
||||
|
||||
|
||||
def run_feishu_summary(client: FeishuClient) -> dict[str, Any]:
|
||||
log_event(logging.INFO, "开始获取飞书租户访问令牌")
|
||||
access_token = client.get_tenant_access_token()
|
||||
log_event(logging.INFO, "飞书租户访问令牌获取完成")
|
||||
base_info = client.parse_base_info(client.build_base_url(), access_token)
|
||||
log_event(logging.INFO, "飞书Base信息解析完成", selected_table_id=base_info["selected_table_id"])
|
||||
advanced_permission_enabled = client.enable_advanced_permission(access_token, base_info["app_token"] or "")
|
||||
tables = client.list_tables(access_token, base_info["app_token"] or "")
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"飞书Base表列表读取完成",
|
||||
table_count=len(tables),
|
||||
advanced_permission_enabled=advanced_permission_enabled,
|
||||
)
|
||||
return {
|
||||
"base_url": base_info["base_url"],
|
||||
"app_token": base_info["app_token"],
|
||||
@@ -61,6 +104,13 @@ def sync_brand_target(
|
||||
target: BrandSyncTarget,
|
||||
postgres_rows: list[dict[str, Any]] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"开始同步目标飞书表",
|
||||
brand_name=target.brand_name,
|
||||
table_name=target.table_name,
|
||||
source_rows=len(postgres_rows or []),
|
||||
)
|
||||
target_table = next(
|
||||
(table for table in tables if table.get("name") == target.table_name),
|
||||
None,
|
||||
@@ -75,6 +125,13 @@ def sync_brand_target(
|
||||
available_fields = client.ensure_target_fields(access_token, app_token, table_id)
|
||||
existing_records = client.list_records(access_token, app_token, table_id)
|
||||
existing_record_ids = [record.get("record_id") for record in existing_records if record.get("record_id")]
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"目标飞书表已有记录读取完成",
|
||||
brand_name=target.brand_name,
|
||||
table_name=target.table_name,
|
||||
existing_records=len(existing_record_ids),
|
||||
)
|
||||
deleted_count = client.batch_delete_records(access_token, app_token, table_id, existing_record_ids) if existing_record_ids else 0
|
||||
created_count = client.batch_create_records(
|
||||
access_token,
|
||||
@@ -82,6 +139,14 @@ def sync_brand_target(
|
||||
table_id,
|
||||
[build_feishu_record(row) for row in target_rows],
|
||||
) if target_rows else 0
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"目标飞书表同步完成",
|
||||
brand_name=target.brand_name,
|
||||
table_name=target.table_name,
|
||||
deleted_records=deleted_count,
|
||||
created_records=created_count,
|
||||
)
|
||||
|
||||
return {
|
||||
"brand_name": target.brand_name,
|
||||
@@ -97,11 +162,13 @@ def sync_brand_target(
|
||||
|
||||
|
||||
def run_sync_brand(config: AppConfig, client: FeishuClient, postgres_result: dict[str, Any] | None = None) -> dict[str, Any]:
|
||||
log_event(logging.INFO, "开始准备品牌同步", target_count=len(BRAND_SYNC_TARGETS))
|
||||
access_token = client.get_tenant_access_token()
|
||||
base_info = client.parse_base_info(client.build_base_url(), access_token)
|
||||
app_token = base_info["app_token"] or ""
|
||||
client.enable_advanced_permission(access_token, app_token)
|
||||
tables = client.list_tables(access_token, app_token)
|
||||
log_event(logging.INFO, "品牌同步准备完成", table_count=len(tables))
|
||||
|
||||
results = []
|
||||
source_row_count = 0
|
||||
@@ -111,6 +178,13 @@ def run_sync_brand(config: AppConfig, client: FeishuClient, postgres_result: dic
|
||||
else:
|
||||
postgres_payload = query_postgres(config, target=target)
|
||||
postgres_rows = postgres_payload["rows"]
|
||||
log_event(
|
||||
logging.INFO,
|
||||
"目标品牌PostgreSQL数据已准备",
|
||||
brand_name=target.brand_name,
|
||||
table_name=target.table_name,
|
||||
rows=len(postgres_rows or []),
|
||||
)
|
||||
source_row_count += len(postgres_rows or [])
|
||||
results.append(sync_brand_target(client, access_token, app_token, tables, target, postgres_rows))
|
||||
|
||||
|
||||
@@ -61,16 +61,20 @@ shop_stock_latest AS (
|
||||
SELECT
|
||||
t."统一规格编码",
|
||||
t."店铺主键",
|
||||
t."可发库存"
|
||||
SUM(t."可发库存") AS "可发库存"
|
||||
FROM (
|
||||
SELECT
|
||||
f."统一规格编码",
|
||||
f."店铺主键",
|
||||
f."仓库主键",
|
||||
f."快照时间",
|
||||
f."可发库存",
|
||||
f."状态",
|
||||
ROW_NUMBER() OVER (
|
||||
PARTITION BY f."统一规格编码", f."店铺主键"
|
||||
PARTITION BY
|
||||
f."统一规格编码",
|
||||
f."店铺主键",
|
||||
f."仓库主键"
|
||||
ORDER BY f."快照时间" DESC
|
||||
) AS rn
|
||||
FROM analytics_layer.fact_shop_stock_snapshot f
|
||||
@@ -79,6 +83,9 @@ shop_stock_latest AS (
|
||||
) t
|
||||
WHERE t.rn = 1
|
||||
AND t."状态" <> '已失效'
|
||||
GROUP BY
|
||||
t."统一规格编码",
|
||||
t."店铺主键"
|
||||
),
|
||||
|
||||
sales_summary AS (
|
||||
|
||||
Reference in New Issue
Block a user