QuLab 2.9.0__cp311-cp311-win_amd64.whl → 2.9.2__cp311-cp311-win_amd64.whl

qulab/executor/load.py

@@ -357,7 +357,8 @@ def load_workflow_from_template(template_path: str,
         path = target_path
 
     file = base_path / path
-    if not file.exists() or file.stat().st_mtime < mtime:
+    if not file.exists() or (file.stat().st_mtime < mtime
+                             and file.read_text() != content):
         file.parent.mkdir(parents=True, exist_ok=True)
         with open(file, 'w') as f:
             f.write(content)

qulab/executor/template.py

@@ -208,20 +208,25 @@ def inject_mapping(source: str, mapping: dict[str, Any],
                     lines[end_lineno - 1]) - length_of_last_line
         else:
             pattern = re.compile(
-                r'VAR\s*\(\s*'         # VAR(
-                r'(["\'])(\w+)\1'      # 第一个参数（引号包裹的变量名）
-                r'(?:\s*,\s*(.*?))?'   # 可选的其他参数
-                r'\s*\)',              # 闭合括号
-                re.DOTALL              # 允许.匹配换行符
+                r'VAR\s*\(\s*'                # VAR(
+                r'(["\'])(\w+)\1'             # 捕获引号和变量名
+                r'(?:\s*,\s*default\s*=\s*'   # 匹配 default 参数
+                r'([^),]*)'                   # 捕获 default 值（排除逗号和括号）
+                r')?'                         # 可选参数组
+                r'\s*\)',                     # 闭合括号
+                re.DOTALL
             ) # yapf: disable
 
             def replacement(match):
                 quote = match.group(1)
                 var_name = match.group(2)
-                extra_args = match.group(3)
+                default_value = match.group(3)
+
                 base = f'__VAR_{hash_str}'
-                if extra_args is not None:
-                    return f'{base}.get({quote}{var_name}{quote}, {extra_args})'
+                if default_value is not None:
+                    # 清除 default 值前后的空格
+                    clean_value = default_value.strip()
+                    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.9.0"
+__version__ = "2.9.2"

{qulab-2.9.0.dist-info → qulab-2.9.2.dist-info}/METADATA

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

{qulab-2.9.0.dist-info → qulab-2.9.2.dist-info}/RECORD

@@ -1,19 +1,19 @@
 qulab/__init__.py,sha256=RrWRvG8Lw27zMr7XP8s-z43b09-wiwPi0ZtiNWbky-c,328
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp311-win_amd64.pyd,sha256=AyhBmVF2nvZMAeqrdWzrMjnIGK_GXjUba51eClX6rHc,31744
+qulab/fun.cp311-win_amd64.pyd,sha256=yOvjp7lZkjDz6HzD8a1RNO9wkXfpHgTepH3zYPdo9G0,31744
 qulab/typing.py,sha256=PRtwbCHWY2ROKK8GHq4Bo8llXrIGo6xC73DrQf7S9os,71
 qulab/utils.py,sha256=65N2Xj7kqRsQ4epoLNY6tL-i5ts6Wk8YuJYee3Te6zI,3077
-qulab/version.py,sha256=a31Mxt9ZbwomFaywnjMS--InOBZRSD7ltY06SX9P5q0,21
+qulab/version.py,sha256=JvlWgPzoYT0e0o9kpkkX-auu312YIKFUMfS8Fb-i9gM,21
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
 qulab/cli/config.py,sha256=7h3k0K8FYHhI6LVWt8BoDdKrX2ApFDBAUAUuXhHwst4,3799
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/cli.py,sha256=8d-8bRWZ5lmsMtjASsl1zu1rV-syeAESMNVthvIQxlo,10018
-qulab/executor/load.py,sha256=YndvzagvWR8Sg6WHZ-gP-Of0FrFOyh_E_a3VXsjDf1Q,17502
+qulab/executor/load.py,sha256=zWofQqHujDyS6HykKEj3fytazA2qEGmB2ZF3OPScSFY,17566
 qulab/executor/schedule.py,sha256=0BV5LGxhqdIlGwW6-o5_5mljAtdtL1La8EDNBFi8pzU,18585
 qulab/executor/storage.py,sha256=OA_XMDoFDfPZCU89caf9-VZ3D6qaWib8MpJno10KUfc,20770
-qulab/executor/template.py,sha256=KOSOC-MTcHHCudtBVgZwNpK5dstTz_os7bcU1Yx0mAs,10372
+qulab/executor/template.py,sha256=nfzhOEjU0O4U0zgUVv-d3h3a5OQ20cbxaK_bZGcV-5Q,10624
 qulab/executor/transform.py,sha256=BDx0c4nqTHMAOLVqju0Ydd91uxNm6EpVIfssjZse0bI,2284
 qulab/executor/utils.py,sha256=l_b0y2kMwYKyyXeFtoblPYwKNU-wiFQ9PMo9QlWl9wE,6213
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
@@ -97,9 +97,9 @@ qulab/visualization/plot_seq.py,sha256=Uo1-dB1YE9IN_A9tuaOs9ZG3S5dKDQ_l98iD2Wbxp
 qulab/visualization/qdat.py,sha256=HubXFu4nfcA7iUzghJGle1C86G6221hicLR0b-GqhKQ,5887
 qulab/visualization/rot3d.py,sha256=jGHJcqj1lEWBUV-W4GUGONGacqjrYvuFoFCwPse5h1Y,757
 qulab/visualization/widgets.py,sha256=HcYwdhDtLreJiYaZuN3LfofjJmZcLwjMfP5aasebgDo,3266
-qulab-2.9.0.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-qulab-2.9.0.dist-info/METADATA,sha256=5OizsNx2VbjgbNg5S1euXqlf9CrmsKbGW1oSoNFkVrs,3826
-qulab-2.9.0.dist-info/WHEEL,sha256=rROPtCCpa6WzsO6UoQMyzYS0ABSUSpYZiL77TAe_BII,101
-qulab-2.9.0.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.9.0.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.9.0.dist-info/RECORD,,
+qulab-2.9.2.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+qulab-2.9.2.dist-info/METADATA,sha256=sjOdBs5wJgJXyKevGHdGjBiF02rDH362F2aySXx1IjU,3826
+qulab-2.9.2.dist-info/WHEEL,sha256=_ZWIY2n7n6SpiuIFl1-RvcMp4Ty36T57FKf-7NzqZHM,101
+qulab-2.9.2.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.9.2.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.9.2.dist-info/RECORD,,

{qulab-2.9.0.dist-info → qulab-2.9.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-win_amd64