feat: 配置写死与 baked 模块,Alembic 建表,百度仅 BAIDU_*
- 新增 app/baked/algorithm|pipeline,非部署参数不再走 env;Settings 保留 DB/HTTP/RTSP/海康/百度/MinIO/Demo - 移除 init_db_schema 与 reload 配置;main 仅 check_database;start*.sh 在 uvicorn 前执行 alembic upgrade head - 依赖 psycopg[binary] 供 Alembic 同步 URL;alembic/env 注释与预发清单更新 - 撕段门控消费管线、各视频/语音/归档调用改为 baked - 百度环境变量仅 BAIDU_APP_ID、BAIDU_API_KEY、BAIDU_SECRET_KEY 与 BAIDU_* 超时/ASR;人脸脚本与 baidu_speech 文案同步 - 全量单测与 .env.example 更新;.gitignore 忽略 refs/(本地权重/视频不入库) Made-with: Cursor
This commit is contained in:
@@ -15,7 +15,7 @@ from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||
|
||||
from loguru import logger
|
||||
|
||||
from app.config import settings
|
||||
from app.baked import pipeline as bp
|
||||
from app.services.consumable_vision_algorithm import ClsTop3, _norm_product_name
|
||||
from app.terminal_markdown import print_markdown_stderr
|
||||
|
||||
@@ -32,7 +32,7 @@ _lock = threading.Lock()
|
||||
|
||||
|
||||
def _consumption_tzinfo():
|
||||
raw = (settings.consumption_log_timezone or "").strip()
|
||||
raw = (bp.CONSUMPTION_LOG_TIMEZONE or "").strip()
|
||||
if not raw:
|
||||
lt = datetime.now().astimezone().tzinfo
|
||||
return lt if lt is not None else timezone.utc
|
||||
@@ -166,7 +166,7 @@ def _safe_surgery_path_segment(surgery_id: str) -> str:
|
||||
|
||||
|
||||
def resolved_consumption_log_path(surgery_id: str) -> Path:
|
||||
raw = (settings.consumption_tsv_log_path or "logs/consumption_{surgery_id}.txt").strip()
|
||||
raw = (bp.CONSUMPTION_TSV_LOG_PATH or "logs/consumption_{surgery_id}.txt").strip()
|
||||
safe = _safe_surgery_path_segment(surgery_id)
|
||||
if "{surgery_id}" in raw:
|
||||
raw = raw.replace("{surgery_id}", safe)
|
||||
@@ -184,7 +184,7 @@ def resolved_consumption_log_path(surgery_id: str) -> Path:
|
||||
|
||||
def init_consumption_log_file(surgery_id: str) -> None:
|
||||
"""新手术开始:截断该手术对应文件并写入表头(一次)。"""
|
||||
if not settings.consumption_tsv_log_enabled:
|
||||
if not bp.CONSUMPTION_TSV_LOG_ENABLED:
|
||||
return
|
||||
path = resolved_consumption_log_path(surgery_id)
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
@@ -194,7 +194,7 @@ def init_consumption_log_file(surgery_id: str) -> None:
|
||||
|
||||
|
||||
def append_consumption_tsv_line(surgery_id: str, line: str) -> None:
|
||||
if not settings.consumption_tsv_log_enabled:
|
||||
if not bp.CONSUMPTION_TSV_LOG_ENABLED:
|
||||
return
|
||||
path = resolved_consumption_log_path(surgery_id)
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
@@ -322,9 +322,9 @@ def append_consumption_pending_window(
|
||||
markdown_terminal: bool | None = None,
|
||||
) -> None:
|
||||
"""需医生确认的时间窗:落盘/终端记「待确认」,top2/3 仍保留模型提示;不更新消耗汇总。"""
|
||||
en_tsv = settings.consumption_tsv_log_enabled if tsv_enabled is None else tsv_enabled
|
||||
en_tsv = bp.CONSUMPTION_TSV_LOG_ENABLED if tsv_enabled is None else tsv_enabled
|
||||
en_md = (
|
||||
settings.consumption_log_markdown_terminal
|
||||
bp.CONSUMPTION_LOG_MARKDOWN_TERMINAL
|
||||
if markdown_terminal is None
|
||||
else markdown_terminal
|
||||
)
|
||||
@@ -411,7 +411,7 @@ def replace_pending_line_with_voice_resolution(
|
||||
未找到 ``pending:{confirmation_id}`` 时回退为追加(兼容旧文件或行缺失)。读改写全程持
|
||||
:data:`_lock`,避免与并发的 append 交错。
|
||||
"""
|
||||
en = settings.consumption_tsv_log_enabled if tsv_enabled is None else tsv_enabled
|
||||
en = bp.CONSUMPTION_TSV_LOG_ENABLED if tsv_enabled is None else tsv_enabled
|
||||
if not en:
|
||||
return
|
||||
if not (chosen_label or "").strip() or not (confirmation_id or "").strip():
|
||||
@@ -485,7 +485,7 @@ def append_consumption_log_summary(
|
||||
totals: dict[str, tuple[str, int]],
|
||||
) -> None:
|
||||
"""在明细行之后追加汇总块(表头 + 每物品一行)。"""
|
||||
if not settings.consumption_tsv_log_enabled or not totals:
|
||||
if not bp.CONSUMPTION_TSV_LOG_ENABLED or not totals:
|
||||
return
|
||||
path = resolved_consumption_log_path(surgery_id)
|
||||
if not path.is_file():
|
||||
@@ -505,7 +505,7 @@ def append_consumption_log_summary(
|
||||
def print_consumption_summary_markdown(
|
||||
totals: dict[str, tuple[str, int]],
|
||||
) -> None:
|
||||
if not settings.consumption_log_markdown_terminal or not totals:
|
||||
if not bp.CONSUMPTION_LOG_MARKDOWN_TERMINAL or not totals:
|
||||
return
|
||||
lines = [
|
||||
"## 消耗汇总",
|
||||
@@ -527,11 +527,11 @@ class ConsumptionTsvWriter:
|
||||
行为与模块级函数完全一致;保留模块级函数以维持旧调用点的兼容期。
|
||||
"""
|
||||
|
||||
def __init__(self, app_settings) -> None:
|
||||
self._s = app_settings
|
||||
def __init__(self, app_settings=None) -> None:
|
||||
_ = app_settings
|
||||
|
||||
def init_file(self, surgery_id: str) -> None:
|
||||
if not self._s.consumption_tsv_log_enabled:
|
||||
if not bp.CONSUMPTION_TSV_LOG_ENABLED:
|
||||
return
|
||||
path = resolved_consumption_log_path(surgery_id)
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
@@ -550,9 +550,9 @@ class ConsumptionTsvWriter:
|
||||
wall_start_epoch: float,
|
||||
wall_end_epoch: float,
|
||||
) -> None:
|
||||
if not self._s.consumption_tsv_log_enabled and not self._s.consumption_log_markdown_terminal:
|
||||
if not bp.CONSUMPTION_TSV_LOG_ENABLED and not bp.CONSUMPTION_LOG_MARKDOWN_TERMINAL:
|
||||
return
|
||||
if self._s.consumption_tsv_log_enabled:
|
||||
if bp.CONSUMPTION_TSV_LOG_ENABLED:
|
||||
line = build_tsv_line(
|
||||
name_to_code=name_to_code,
|
||||
best=best,
|
||||
@@ -562,7 +562,7 @@ class ConsumptionTsvWriter:
|
||||
wall_end_epoch=wall_end_epoch,
|
||||
)
|
||||
append_consumption_tsv_line(surgery_id, line)
|
||||
if self._s.consumption_log_markdown_terminal:
|
||||
if bp.CONSUMPTION_LOG_MARKDOWN_TERMINAL:
|
||||
print_markdown_stderr(
|
||||
build_consumption_markdown(
|
||||
name_to_code=name_to_code,
|
||||
@@ -579,7 +579,7 @@ class ConsumptionTsvWriter:
|
||||
surgery_id: str,
|
||||
totals: dict[str, tuple[str, int]],
|
||||
) -> None:
|
||||
if not self._s.consumption_tsv_log_enabled or not totals:
|
||||
if not bp.CONSUMPTION_TSV_LOG_ENABLED or not totals:
|
||||
return
|
||||
path = resolved_consumption_log_path(surgery_id)
|
||||
if not path.is_file():
|
||||
@@ -596,7 +596,7 @@ class ConsumptionTsvWriter:
|
||||
f.write(body)
|
||||
|
||||
def print_summary_markdown(self, totals: dict[str, tuple[str, int]]) -> None:
|
||||
if not self._s.consumption_log_markdown_terminal or not totals:
|
||||
if not bp.CONSUMPTION_LOG_MARKDOWN_TERMINAL or not totals:
|
||||
return
|
||||
lines = [
|
||||
"## 消耗汇总",
|
||||
@@ -622,9 +622,9 @@ def append_consumption_window(
|
||||
wall_start_epoch: float,
|
||||
wall_end_epoch: float,
|
||||
) -> None:
|
||||
if not settings.consumption_tsv_log_enabled and not settings.consumption_log_markdown_terminal:
|
||||
if not bp.CONSUMPTION_TSV_LOG_ENABLED and not bp.CONSUMPTION_LOG_MARKDOWN_TERMINAL:
|
||||
return
|
||||
if settings.consumption_tsv_log_enabled:
|
||||
if bp.CONSUMPTION_TSV_LOG_ENABLED:
|
||||
line = build_tsv_line(
|
||||
name_to_code=name_to_code,
|
||||
best=best,
|
||||
@@ -634,7 +634,7 @@ def append_consumption_window(
|
||||
wall_end_epoch=wall_end_epoch,
|
||||
)
|
||||
append_consumption_tsv_line(surgery_id, line)
|
||||
if settings.consumption_log_markdown_terminal:
|
||||
if bp.CONSUMPTION_LOG_MARKDOWN_TERMINAL:
|
||||
print_markdown_stderr(
|
||||
build_consumption_markdown(
|
||||
name_to_code=name_to_code,
|
||||
|
||||
Reference in New Issue
Block a user