QuLab 2.11.14__py3-none-any.whl → 2.11.15__py3-none-any.whl

qulab/cli/config.py

@@ -3,6 +3,7 @@ import functools
 import os
 import sys
 from pathlib import Path
+from typing import Any
 
 import click
 from loguru import logger
@@ -11,6 +12,34 @@ DEFAULT_CONFIG_PATH = Path(os.path.expanduser("~/.qulab.ini"))
 ENV_PREFIX = "QULAB_"
 
 
+def find_config_file() -> Path | None:
+    """
+    查找配置文件
+    """
+    # 环境变量
+    if config_path := os.getenv("QULAB_CONFIG_PATH"):
+        return Path(config_path)
+
+    # 先查找当前目录下的配置文件
+    config_path = Path.cwd() / "qulab.ini"
+    if config_path.exists():
+        return config_path
+
+    # 向上级目录查找，直到找到 uv 项目根目录
+    current_dir = Path.cwd()
+    while not (current_dir / "uv.lock").exists():
+        current_dir = current_dir.parent
+        if current_dir == Path("/"):
+            break
+    config_path = current_dir / "qulab.ini"
+    if config_path.exists():
+        return config_path
+
+    if DEFAULT_CONFIG_PATH.exists():
+        return DEFAULT_CONFIG_PATH
+    return None
+
+
 def _get_config_value(option_name,
                       type_cast=str,
                       command_name=None,
@@ -37,11 +66,9 @@ def _get_config_value(option_name,
     # 先加载默认配置防止段不存在
     config.read_dict({config_section: {}})
 
-    config_path = Path.cwd() / "qulab.ini"
-    if config_path.exists():
+    config_path = find_config_file()
+    if config_path is not None:
         config.read(config_path)
-    elif DEFAULT_CONFIG_PATH.exists():
-        config.read(DEFAULT_CONFIG_PATH)
 
     # 从对应配置段读取
     if config.has_section(config_section):
@@ -57,10 +84,10 @@ def _get_config_value(option_name,
     return default  # 交给 Click 处理默认值
 
 
-def get_config_value(option_name,
-                     type_cast=str,
-                     command_name=None,
-                     default=None):
+def get_config_value(option_name: str,
+                     type_cast: type = str,
+                     command_name: str | None = None,
+                     default: Any = None):
     """
     获取配置值，支持命令专属配置的优先级获取
 

qulab/executor/template.py

@@ -236,6 +236,8 @@ def inject_mapping(source: str, mapping: dict[str, Any],
                 if default_value is not None:
                     # 清除 default 值前后的空格
                     clean_value = default_value.strip()
+                    if var_name not in mapping:
+                        return clean_value
                     return f'{base}.get({quote}{var_name}{quote}, {clean_value})'
                 else:
                     return f'{base}[{quote}{var_name}{quote}]'

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.11.14"
+__version__ = "2.11.15"

{qulab-2.11.14.dist-info → qulab-2.11.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuLab
-Version: 2.11.14
+Version: 2.11.15
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.11.14.dist-info → qulab-2.11.15.dist-info}/RECORD

@@ -2,10 +2,10 @@ qulab/__init__.py,sha256=hmf6R3jiM5NtJY1mSptogYnH5DMTR2dTzlXykqLxQzg,2027
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
 qulab/utils.py,sha256=B_8QdY9OMY7WU-F200v93BDJXJpQcKAHihnOXeEvv_w,3966
-qulab/version.py,sha256=5Q3c9iGWnQwdxCra_28Rw8yKWXG9qH9vmyltpkjlSU4,23
+qulab/version.py,sha256=Xwyp7A0xHh2GDh3MUxhzaH2tfp0EQ4tK8L1vQV9D1ow,23
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=ywKmwbGNBCVASx8OsgrRttaLz9ogwY38ZdKj7I-tdJ4,813
-qulab/cli/config.py,sha256=RIQlCTViDOg_QA0J7Y0jNJ8TEXG7ATmGwbK2Ief0NPY,5591
+qulab/cli/config.py,sha256=Z-lePcDMeeQmwFpdfQHqZuaXTPhWUHN5KrlSqrya73Y,6324
 qulab/cli/decorators.py,sha256=oImteZVnDPPWdyhJ4kzf2KYGJLON7VsKGBvZadWLQZo,621
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/analyze.py,sha256=VYTfiOYJe5gDbtGA4wOkrQhhu55iIrRVByx-gBLUUm4,5672
@@ -14,7 +14,7 @@ qulab/executor/load.py,sha256=eMlzOrrn8GpbP3J3uY5JJ8iO7tL5B1DWP1z2qiGyNhU,20385
 qulab/executor/registry.py,sha256=CPY5PNTbE4Rw13Ucsq1wBk3fgvoSB3_J-iyRFdNNl0g,9044
 qulab/executor/schedule.py,sha256=cDFM_tIMvxHLxb-tBA6fEPF9u-4LcgnQDxbaquZIQKc,21727
 qulab/executor/storage.py,sha256=8K73KGLAVgchJdtd4rKHXkr1CQOJORWH-Gi57w8IYsw,21081
-qulab/executor/template.py,sha256=D8D7_B__R8wh1oOXk7CKZveRqDix4dNeUjefbfN6m9w,10720
+qulab/executor/template.py,sha256=Fxou5lglaCnEhJTKDotFaRrWT4csAZIgmHz9EFbPnYs,10811
 qulab/executor/utils.py,sha256=YSUEYjyYTJTjiJmd-l5GTEnSyD6bqEdNoWhivEAfGZA,7112
 qulab/monitor/__init__.py,sha256=FNYMIUr8ycRM4XmsAGpRK-A-SQsJZlcRWghXcGTgAi0,44
 qulab/monitor/__main__.py,sha256=Txy4d7vgVYUWwiHxX3uwtsi1ewde-MaiSC_K0ePoPiM,1372
@@ -96,9 +96,9 @@ qulab/visualization/plot_seq.py,sha256=UWTS6p9nfX_7B8ehcYo6UnSTUCjkBsNU9jiOeW2ca
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
 qulab/visualization/rot3d.py,sha256=CuLfG1jw1032HNNZxzC0OWtNzKsbj2e2WRYhMWDgvMQ,1321
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-qulab-2.11.14.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.11.14.dist-info/METADATA,sha256=0eTkim6-NQ1gXIZLXyRiaXsW_H29SjC1fkn0_e-Mq18,3945
-qulab-2.11.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qulab-2.11.14.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.11.14.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.11.14.dist-info/RECORD,,
+qulab-2.11.15.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.11.15.dist-info/METADATA,sha256=wwaZbMBIXvh3I9Gc2xzjmwqK10kmhsFaTHVTs11Ypl0,3945
+qulab-2.11.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qulab-2.11.15.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.11.15.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.11.15.dist-info/RECORD,,