QuLab 2.4.18__cp312-cp312-macosx_10_13_universal2.whl → 2.4.20__cp312-cp312-macosx_10_13_universal2.whl

{QuLab-2.4.18.dist-info → QuLab-2.4.20.dist-info}/METADATA

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

{QuLab-2.4.18.dist-info → QuLab-2.4.20.dist-info}/RECORD

@@ -1,17 +1,17 @@
 qulab/__init__.py,sha256=P-Mx2p4TVmL91SoxoeXcj8Qm0x4xUf5Q_FLk0Yc_gIQ,138
 qulab/__main__.py,sha256=JgErYkiskih8Y6oRwowALtR-rwQhAAdqOYWjQraRIPI,59
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-312-darwin.so,sha256=QNmr2TtOaM4wKSaKxqfCFQRcARQxrgwRPbRhU_XsCRs,126864
-qulab/version.py,sha256=vQo2edKgYGHn5FfacX8TS2Blt-3b9unuA9CvJvhZhfo,22
+qulab/fun.cpython-312-darwin.so,sha256=-Ckd6wlBupwONbFbJNda13b4TSY6HQ0sLwDcbjMOD8A,126864
+qulab/version.py,sha256=0EYwz_vOIrGy7c3cr82zYeYGyK4QxRsY1XkcDC_j6SI,22
 qulab/cli/__init__.py,sha256=tgDIkkeIoasQXAifJZ6NU8jDgpNgb2a-B0C4nF0evrE,559
-qulab/cli/config.py,sha256=QksTYD3-RBYBG8xnKLAh7EXrNOwxr128XXr30ZTFW6A,2983
+qulab/cli/config.py,sha256=Dhl7i_KM3iJ29SVIgiTmzdBsqeSOuJpcz9qcGCBp3Ts,3051
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/cli.py,sha256=owdDSaSuzTPQA5SlNCxX4nHWITU1BF0VZMj7tLqCZhM,5781
-qulab/executor/load.py,sha256=eKysHL5EHKd_YcfHOVwRoaNsD-k0cTuxDY_7Yn5W8hA,11078
+qulab/executor/load.py,sha256=fZNmsOGR_2s1IykVmVwziDKeWCIej-jRJAQzKJRUdaE,11990
 qulab/executor/schedule.py,sha256=bXQzn3e3tCvAVdEBsvh5ecAThP52njyxbsrlrxC9TzA,11922
 qulab/executor/storage.py,sha256=M66Q5_Uc5MMfc_QAuuaaexwAz7wxBPMkeleB5nRpQmI,4621
 qulab/executor/transform.py,sha256=inaOn6eqCs22ZZ0xAQl8s8YCoEACaXSwFNNu7jqdwAk,2148
-qulab/executor/utils.py,sha256=RmnT0wMTAvavM-abgFt2tQN8TaaHuk86-YAiOUQCoBU,3101
+qulab/executor/utils.py,sha256=_9EZkx2rBpsWjhDN5BZ-Lq9MboqmHcI1jtwpRyrzSTY,3101
 qulab/monitor/__init__.py,sha256=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
 qulab/monitor/__main__.py,sha256=w3yUcqq195LzSnXTkQcuC1RSFRhy4oQ_PEBmucXguME,97
 qulab/monitor/config.py,sha256=fQ5JcsMApKc1UwANEnIvbDQZl8uYW0tle92SaYtX9lI,744
@@ -91,9 +91,9 @@ qulab/visualization/plot_seq.py,sha256=UWTS6p9nfX_7B8ehcYo6UnSTUCjkBsNU9jiOeW2ca
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
 qulab/visualization/rot3d.py,sha256=lMrEJlRLwYe6NMBlGkKYpp_V9CTipOAuDy6QW_cQK00,734
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-QuLab-2.4.18.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.4.18.dist-info/METADATA,sha256=SX3AKzWxSqBxr-pLe9B0pVY65i7zCPltEgIkq-yKVWU,3699
-QuLab-2.4.18.dist-info/WHEEL,sha256=iDXcyuxg-66TzzqHGH-kgw_HJdaJE_1RHznrvPNCSNs,115
-QuLab-2.4.18.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.4.18.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.4.18.dist-info/RECORD,,
+QuLab-2.4.20.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.4.20.dist-info/METADATA,sha256=L8c-qIikU3zaAhOUIlynPWdk-KhYfLoQW9L_bjnWaGs,3699
+QuLab-2.4.20.dist-info/WHEEL,sha256=iDXcyuxg-66TzzqHGH-kgw_HJdaJE_1RHznrvPNCSNs,115
+QuLab-2.4.20.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.20.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.20.dist-info/RECORD,,

qulab/cli/config.py

@@ -25,7 +25,7 @@ def _get_config_value(option_name, type_cast=str, command_name=None):
     if env_value := os.getenv(env_var):
         if type_cast is bool:
             return env_value.lower() in ("true", "1", "yes")
-        if "path" in option_name:
+        if "path" in option_name or issubclass(type_cast, Path):
             return os.path.expanduser(env_value)
         return type_cast(env_value)
 
@@ -43,7 +43,7 @@ def _get_config_value(option_name, type_cast=str, command_name=None):
                                       fallback=None):
             if type_cast is bool:
                 return config_value.lower() in ("true", "1", "yes")
-            if "path" in option_name:
+            if "path" in option_name or issubclass(type_cast, Path):
                 return os.path.expanduser(config_value)
             return type_cast(config_value)
 
@@ -66,7 +66,7 @@ def log_options(func):
                   help=f"Enable debug mode")
     @click.option("--log",
                   type=click.Path(),
-                  default=lambda: get_config_value("log"),
+                  default=lambda: get_config_value("log", Path),
                   help=f"Log file path")
     @functools.wraps(func)
     def wrapper(*args, log=None, debug=False, **kwargs):

qulab/executor/load.py

@@ -1,8 +1,11 @@
+import base64
 import hashlib
 import inspect
+import lzma
 import pickle
 import re
 import string
+import textwrap
 import warnings
 from importlib.util import module_from_spec, spec_from_file_location
 from pathlib import Path
@@ -224,8 +227,24 @@ def load_workflow_from_file(file_name: str,
     return module
 
 
+def encode_mapping(mapping):
+    mapping_bytes = lzma.compress(pickle.dumps(mapping))
+    hash_str = hashlib.md5(mapping_bytes).hexdigest()[:8]
+    mappping_code = '\n'.join(
+        textwrap.wrap(base64.b64encode(mapping_bytes).decode(), 100))
+    return hash_str, mappping_code
+
+
+def decode_mapping(hash_str, mappping_code):
+    mapping_bytes = base64.b64decode(mappping_code.replace('\n', ''))
+    if hash_str != hashlib.md5(mapping_bytes).hexdigest()[:8]:
+        raise ValueError("Hash does not match")
+    mapping = pickle.loads(lzma.decompress(mapping_bytes))
+    return mapping
+
+
 def load_workflow_from_template(template_path: str,
-                                mappping: dict[str, str],
+                                mapping: dict[str, str],
                                 base_path: str | Path,
                                 target_path: str | None = None,
                                 package='workflows',
@@ -237,30 +256,36 @@ def load_workflow_from_template(template_path: str,
         content = f.read()
 
     mtime = max(Path(template_path).stat().st_mtime, mtime)
+    hash_str, mapping_code = encode_mapping(mapping)
 
     def replace(text):
         """
-        将给定文本中的所有 _D_("var") 替换为 ${var}。
+        将给定文本中的所有 VAR("var") 替换为 __VAR_{hash_str}["var"]。
         
         Args:
-            text (str): 包含 _D_ 调用的字符串。
+            text (str): 包含 VAR 调用的字符串。
         
         Returns:
             str: 已经替换的新字符串。
         """
-        pattern = re.compile(r'_D_\s*\(\s*(["\'])(\w+)\1\s*\)')
-        replacement = r'${\2}'
+        pattern = re.compile(r'VAR\s*\(\s*(["\'])(\w+)\1\s*\)')
+        replacement = f'__VAR_{hash_str}' + r'["\2"]'
         new_text = re.sub(pattern, replacement, text)
         return new_text
 
     template = string.Template(replace(content))
     keys = template.get_identifiers()
-    missing = set(keys) - set(mappping.keys())
+    missing = set(keys) - set(mapping.keys())
     if missing:
         raise KeyError(f"{template_path}: Missing keys in mapping: {missing}")
-    content = template.substitute(mappping)
+    content = template.substitute(mapping)
 
-    hash_str = hashlib.md5(pickle.dumps(mappping)).hexdigest()[:8]
+    inject_code = [
+        "from qulab.executor.load import decode_mapping",
+        f"__VAR_{hash_str} = decode_mapping(\"{hash_str}\",",
+        f"\"\"\"{mapping_code}\"\"\")"
+    ]
+    content = '\n'.join(inject_code + [content])
     if target_path is None:
         if path.stem == 'template':
             path = path.parent / f'tmp{hash_str}.py'

qulab/executor/utils.py

@@ -34,7 +34,7 @@ def workflow_template(deps: list[str]) -> str:
     return f"""
 from loguru import logger
 
-def _D_(s): pass
+def VAR(s): pass
 
 import numpy as np
 

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.4.18"
+__version__ = "2.4.20"