Compare commits
6 Commits
ca14e931f8
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 293c12fdf7 | |||
| 7d67096cb6 | |||
| f1e85468c5 | |||
| 66f0d18947 | |||
| 69f45d77b1 | |||
| 402102cf36 |
+9
-11
@@ -19,15 +19,13 @@ DBN_CONFIG_DIR = CONFIG_DIR / "dbn"
|
||||
|
||||
def get_logger(name: str = "algorithm"):
|
||||
"""
|
||||
获取日志记录器。主进程用 loguru,QGIS 子进程回退到标准 logging。
|
||||
获取日志记录器的便捷函数
|
||||
|
||||
Args:
|
||||
name: 日志名称
|
||||
|
||||
Returns:
|
||||
logging.Logger 实例
|
||||
"""
|
||||
try:
|
||||
from app.utils.logger import get_logger as _get_logger
|
||||
return _get_logger(name, str(LOG_DIR))
|
||||
except ImportError:
|
||||
import logging
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format="%(asctime)s [%(threadName)s] %(levelname)-5s %(name)s - %(message)s",
|
||||
)
|
||||
return logging.getLogger(name)
|
||||
from app.utils.logger import LoggerManager
|
||||
return LoggerManager.get_logger(name, str(LOG_DIR))
|
||||
|
||||
@@ -11,6 +11,7 @@ QGIS 环境检测与子进程配置模块。
|
||||
- get_runner_script(): 获取 qgis_runner.py 的路径
|
||||
"""
|
||||
import os
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
from app.config.paths import get_logger
|
||||
@@ -73,32 +74,29 @@ def get_qgis_python_path(qgis_root: str = None) -> str | None:
|
||||
|
||||
def build_qgis_command(qgis_root: str = None) -> list[str]:
|
||||
"""
|
||||
构建通过静态启动脚本运行 QGIS 子进程的命令列表。
|
||||
|
||||
Windows: 调用 app/script/run_qgis.bat(通过 QGIS_ROOT 环境变量定位)
|
||||
Linux: 直接调用 QGIS Python 解释器
|
||||
构建通过 .bat 包装器启动 QGIS 子进程的命令列表。
|
||||
设置环境变量并启动 QGIS Python 3.12。
|
||||
"""
|
||||
import platform
|
||||
if platform.system() != "Windows":
|
||||
python_path = get_qgis_python_path(qgis_root)
|
||||
if not python_path:
|
||||
raise RuntimeError("未找到 QGIS Python 解释器")
|
||||
return [python_path, get_runner_script()]
|
||||
|
||||
if qgis_root is None:
|
||||
qgis_root = _detect_qgis_root() or "D:/QGIS"
|
||||
|
||||
python_path = get_qgis_python_path(qgis_root)
|
||||
if not python_path:
|
||||
raise RuntimeError("未找到 QGIS Python 3.12 解释器")
|
||||
|
||||
runner_script = get_runner_script()
|
||||
if not os.path.isfile(runner_script):
|
||||
raise RuntimeError(f"QGIS Runner 脚本不存在: {runner_script}")
|
||||
|
||||
if platform.system() == "Windows":
|
||||
script_dir = Path(__file__).parent.parent.parent / "script"
|
||||
bat_path = str(script_dir / "run_qgis.bat")
|
||||
if not os.path.isfile(bat_path):
|
||||
raise RuntimeError(f"QGIS 启动脚本不存在: {bat_path}")
|
||||
# 设置环境变量让 .bat 能找到 QGIS
|
||||
os.environ["QGIS_ROOT"] = qgis_root
|
||||
return ["cmd.exe", "/c", bat_path, runner_script]
|
||||
else:
|
||||
python_path = get_qgis_python_path(qgis_root)
|
||||
if not python_path:
|
||||
raise RuntimeError("未找到 QGIS Python 解释器")
|
||||
return [python_path, runner_script]
|
||||
bat_path = _generate_bat_wrapper(qgis_root, python_path, runner_script)
|
||||
return ["cmd.exe", "/c", bat_path]
|
||||
|
||||
|
||||
def is_qgis_available(qgis_root: str = None) -> bool:
|
||||
@@ -111,6 +109,61 @@ def get_runner_script() -> str:
|
||||
return str(Path(__file__).parent / "qgis_runner.py")
|
||||
|
||||
|
||||
def _generate_bat_wrapper(qgis_root: str, python_path: str, runner_script: str) -> str:
|
||||
"""生成 .bat 包装脚本,设置 QGIS 环境变量并启动 runner"""
|
||||
# 自动检测 QGIS 应用目录(qgis-ltr 或 qgis)
|
||||
qgis_app_dir = os.path.join(qgis_root, "apps", "qgis-ltr")
|
||||
if not os.path.isdir(qgis_app_dir):
|
||||
qgis_app_dir = os.path.join(qgis_root, "apps", "qgis")
|
||||
qgis_app_dir = qgis_app_dir.replace("/", "\\")
|
||||
|
||||
# 自动检测 PROJ 目录
|
||||
proj_data = ""
|
||||
for pd in [
|
||||
os.path.join(qgis_app_dir, "share", "proj"),
|
||||
os.path.join(qgis_root, "share", "proj"),
|
||||
os.path.join(qgis_root, "apps", "gdal", "share", "proj"),
|
||||
]:
|
||||
if os.path.isfile(os.path.join(pd, "proj.db")):
|
||||
proj_data = pd.replace("/", "\\")
|
||||
break
|
||||
|
||||
python_dir = os.path.join(qgis_root, "apps", "Python312").replace("/", "\\")
|
||||
qt5_plugins = os.path.join(qgis_root, "apps", "Qt5", "plugins").replace("/", "\\")
|
||||
qtplugins = os.path.join(qgis_app_dir, "qtplugins").replace("/", "\\")
|
||||
gdal_data = os.path.join(qgis_root, "apps", "gdal", "share", "gdal").replace("/", "\\")
|
||||
qgis_python_dir = os.path.join(qgis_app_dir, "python").replace("/", "\\")
|
||||
qgis_bin = os.path.join(qgis_app_dir, "bin").replace("/", "\\")
|
||||
qt5_bin = os.path.join(qgis_root, "apps", "Qt5", "bin").replace("/", "\\")
|
||||
gdal_lib = os.path.join(qgis_root, "apps", "gdal", "lib").replace("/", "\\")
|
||||
|
||||
proj_line = f'set "PROJ_DATA={proj_data}"' if proj_data else "REM PROJ_DATA not found"
|
||||
|
||||
bat_content = f"""@echo off
|
||||
chcp 65001 >nul
|
||||
set "PYTHONHOME={python_dir}"
|
||||
set "PYTHONPATH={qgis_python_dir}"
|
||||
set "QGIS_PREFIX_PATH={qgis_app_dir}"
|
||||
set "QT_PLUGIN_PATH={qtplugins};{qt5_plugins}"
|
||||
set "GDAL_DATA={gdal_data}"
|
||||
{proj_line}
|
||||
set "PYTHONUTF8=1"
|
||||
set "GDAL_FILENAME_IS_UTF8=YES"
|
||||
set "VSI_CACHE=TRUE"
|
||||
set "VSI_CACHE_SIZE=1000000"
|
||||
set "PATH={qt5_bin};{qgis_bin};{gdal_lib};%PATH%"
|
||||
"{python_path}" "{runner_script}" %*
|
||||
"""
|
||||
|
||||
bat_dir = os.path.join(tempfile.gettempdir(), "qgis_runner")
|
||||
os.makedirs(bat_dir, exist_ok=True)
|
||||
bat_path = os.path.join(bat_dir, "run_qgis.bat")
|
||||
with open(bat_path, "w", encoding="utf-8") as f:
|
||||
f.write(bat_content)
|
||||
logger.debug(f"生成 QGIS 包装脚本: {bat_path}")
|
||||
return bat_path
|
||||
|
||||
|
||||
def _detect_qgis_root() -> str | None:
|
||||
"""
|
||||
自动检测 QGIS 安装根目录。
|
||||
|
||||
@@ -44,7 +44,21 @@ def _setup_python_path():
|
||||
|
||||
def _setup_environment():
|
||||
"""设置 QGIS 运行所需的环境变量"""
|
||||
# 自动检测 QGIS 应用目录(与 run_qgis.bat 保持一致)
|
||||
qgis_app_dir = os.path.join(QGIS_ROOT, "apps", "qgis-ltr")
|
||||
if not os.path.isdir(qgis_app_dir):
|
||||
qgis_app_dir = os.path.join(QGIS_ROOT, "apps", "qgis")
|
||||
|
||||
# ★ 必须在任何 DLL 加载前设置 PROJ_DATA,防止 PostgreSQL 的旧 proj.db 干扰
|
||||
for proj_dir in [
|
||||
os.path.join(qgis_app_dir, "share", "proj"),
|
||||
os.path.join(QGIS_ROOT, "share", "proj"),
|
||||
os.path.join(QGIS_ROOT, "apps", "gdal", "share", "proj"),
|
||||
]:
|
||||
if os.path.isdir(proj_dir):
|
||||
os.environ["PROJ_DATA"] = proj_dir
|
||||
break
|
||||
|
||||
os.environ["QGIS_PREFIX_PATH"] = qgis_app_dir
|
||||
os.environ["PYTHONUTF8"] = "1"
|
||||
os.environ["GDAL_FILENAME_IS_UTF8"] = "YES"
|
||||
|
||||
+24
-14
@@ -1,35 +1,45 @@
|
||||
"""
|
||||
日志工具类
|
||||
使用 loguru 提供增强的日志功能,支持按天分割、自动清理过期日志
|
||||
主进程使用 loguru,QGIS 子进程(无 loguru)回退到标准 logging。
|
||||
"""
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
try:
|
||||
from loguru import logger
|
||||
_HAS_LOGURU = True
|
||||
except ImportError:
|
||||
_HAS_LOGURU = False
|
||||
import logging
|
||||
|
||||
|
||||
class LoggerManager:
|
||||
"""日志管理器 - 基于 loguru"""
|
||||
"""日志管理器"""
|
||||
|
||||
_configured = False
|
||||
|
||||
@classmethod
|
||||
def get_logger(cls, name: str = "algorithm", log_dir: str = "logs"):
|
||||
"""
|
||||
获取日志记录器(loguru 不需要传统意义上的 logger 实例)
|
||||
|
||||
Args:
|
||||
name: 日志名称(用于文件命名)
|
||||
log_dir: 日志目录
|
||||
|
||||
Returns:
|
||||
loguru.logger 实例
|
||||
"""
|
||||
if not _HAS_LOGURU:
|
||||
return cls._get_stdlib_logger(name)
|
||||
if not cls._configured:
|
||||
cls._configure_logger(name, log_dir)
|
||||
cls._configure_loguru(name, log_dir)
|
||||
return logger
|
||||
|
||||
@classmethod
|
||||
def _configure_logger(cls, name: str, log_dir: str):
|
||||
def _get_stdlib_logger(cls, name: str):
|
||||
lg = logging.getLogger(name)
|
||||
if not lg.handlers:
|
||||
lg.setLevel(logging.INFO)
|
||||
h = logging.StreamHandler(sys.stderr)
|
||||
h.setFormatter(logging.Formatter(
|
||||
"%(asctime)s [%(threadName)s] %(levelname)-5s %(name)s - %(message)s"
|
||||
))
|
||||
lg.addHandler(h)
|
||||
return lg
|
||||
|
||||
@classmethod
|
||||
def _configure_loguru(cls, name: str, log_dir: str):
|
||||
"""
|
||||
配置 loguru 日志处理器
|
||||
|
||||
|
||||
Reference in New Issue
Block a user