wangdongxu

jira:NYJ-1550 desc:m3u8 images

... ... @@ -8,5 +8,6 @@ uv run embedding-server
window 开发
```bash
$env:ENV="dev";uv run embedding-server
$env:ENV="dev";uv run football-repaly-match-server
```
... ...
... ... @@ -3,7 +3,7 @@ app_version: "1.0.0"
match_by_time_threshold: 30 # 通过时间匹配进球事件的阈值(秒)
kafka_servers: 192.168.0.14:9092
#kafka_servers: 192.168.0.14:9092
kafka_username:
kafka_password:
... ...
import os
from pathlib import Path
from logging import getLogger
from aabd.base.cfg_loader import load_yaml_by_file_with_env
from aabd.base.enhance_dict import EnhanceDict, read_prefixed_env_vars
from pathlib import Path
from logging import getLogger
logger = getLogger(__name__)
cfg_dir = Path(__file__).parent.absolute() / 'cfg'
# 加载基础配置
base_config = load_yaml_by_file_with_env((cfg_dir / 'config.yaml').as_posix())
# 根据 ENV 环境变量加载环境特定配置并合并(如 config.dev.yaml / config.prod.yaml)
env = os.getenv('ENV', 'dev')
env_file = cfg_dir / f'config.{env}.yaml'
if env_file.exists():
env_config = load_yaml_by_file_with_env(env_file.as_posix())
if isinstance(base_config, dict) and isinstance(env_config, dict):
for key, value in env_config.items():
if key in base_config and isinstance(base_config[key], dict) and isinstance(value, dict):
base_config[key].update(value)
else:
base_config[key] = value
logger.info(f"已加载环境配置: {env_file.name}")
settings = EnhanceDict(base_config)
settings.update(read_prefixed_env_vars('FRM_'))
settings = EnhanceDict(load_yaml_by_file_with_env((cfg_dir / 'config.yaml').as_posix()))
settings.update(read_prefixed_env_vars('EMB_'))
logger.info(f'Settings: {settings}')
... ...
... ... @@ -76,16 +76,11 @@ import json
import os
from pathlib import Path
try:
from .llm_image import Video2Frame, frames2content
from ..util.football_replay_match_live import FootballReplayMatchLive
from config import settings
except ImportError:
import sys
sys.path.insert(0, str(Path(__file__).parent.parent))
from core.llm_image import Video2Frame, frames2content
from util.football_replay_match_live import FootballReplayMatchLive
from config import settings
from .llm_image import Video2Frame
from ..util.football_replay_match_live import FootballReplayMatchLive
from ..config import settings
# 从配置中读取参数(配置项需在 config.yaml 或对应环境配置中定义)
... ...