QuLab 2.4.17__cp310-cp310-win_amd64.whl → 2.4.19__cp310-cp310-win_amd64.whl

{QuLab-2.4.17.dist-info → QuLab-2.4.19.dist-info}/METADATA

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

{QuLab-2.4.17.dist-info → QuLab-2.4.19.dist-info}/RECORD

@@ -1,17 +1,17 @@
 qulab/__init__.py,sha256=vkFybY8YSsQilYdThPRD83-btPAR41sy_WCXiM-6mME,141
 qulab/__main__.py,sha256=g9iBs8xxX6Yik7cmgllQkpBN8C4JNoZVsEOyCCLCyFU,63
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp310-win_amd64.pyd,sha256=nMwBqz9itPv-HpOAqfImqNZPqmEsA4zl2gtJoBYw6lc,31232
-qulab/version.py,sha256=7sdjAp5MKcoRwUjjN0nAZGMtB3lz4cfXjSGNTq8NnJ4,22
+qulab/fun.cp310-win_amd64.pyd,sha256=LGAxFzWY-IvGR2blvMvvCJRdEu7tC7Vq7PsOWJ_oQ0E,31232
+qulab/version.py,sha256=FprAMvy2C6tN_5YBOzn2q7pwL66I-_0THetgU5i1QL0,22
 qulab/cli/__init__.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
 qulab/cli/config.py,sha256=gvMObzaVJ-xTJ1GmhP3sATayfDasYlijX1krSGeccNY,3071
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
-qulab/executor/cli.py,sha256=9x7yCvEI41MaALE5Hv9-15Z_IGs2_Kswo3EjCoh_RPE,5595
-qulab/executor/load.py,sha256=eKysHL5EHKd_YcfHOVwRoaNsD-k0cTuxDY_7Yn5W8hA,11078
-qulab/executor/schedule.py,sha256=SfMZys8WdmIvfW5fPM42g-F6XwewTdpC0-puhf5TA54,11721
+qulab/executor/cli.py,sha256=owdDSaSuzTPQA5SlNCxX4nHWITU1BF0VZMj7tLqCZhM,5781
+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=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
 qulab/monitor/__main__.py,sha256=k2H1H5Zf9LLXTDLISJkbikLH-z0f1e5i5i6wXXYPOrE,105
 qulab/monitor/config.py,sha256=y_5StMkdrbZO1ziyKBrvIkB7Jclp9RCPK1QbsOhCxnY,785
@@ -91,9 +91,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.4.17.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.4.17.dist-info/METADATA,sha256=DwgNA--FfjwweGZlKCLdUpvP80VyQQiYE-iisAp0d5E,3804
-QuLab-2.4.17.dist-info/WHEEL,sha256=rzGfZgUcGeKSgIHGYMuqg4xE4VPHxnaldXH6BG0zjVk,101
-QuLab-2.4.17.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.4.17.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.4.17.dist-info/RECORD,,
+QuLab-2.4.19.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.4.19.dist-info/METADATA,sha256=q7WDxNcYfN0kA74z72310B_oUz32WVX1CfP6F4O6lIo,3804
+QuLab-2.4.19.dist-info/WHEEL,sha256=rzGfZgUcGeKSgIHGYMuqg4xE4VPHxnaldXH6BG0zjVk,101
+QuLab-2.4.19.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.4.19.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.4.19.dist-info/RECORD,,

qulab/executor/cli.py

@@ -120,14 +120,15 @@ def get(key, api):
               '-n',
               is_flag=True,
               help='Do not run dependents.')
+@click.option('--update', '-u', is_flag=True)
 @log_options
 @command_option('run')
-def run(workflow, code, data, api, plot, no_dependents):
+def run(workflow, code, data, api, plot, no_dependents, update):
     """
     Run a workflow.
     """
     logger.info(
-        f'[CMD]: run {workflow} --code {code} --data {data} --api {api} --plot {plot} --no-dependents {no_dependents}'
+        f'[CMD]: run {workflow} --code {code} --data {data} --api {api}{" --plot" if plot else ""}{" --no-dependents" if no_dependents else ""}{" --update " if update else ""}'
     )
     if api is not None:
         api = importlib.import_module(api)
@@ -145,15 +146,15 @@ def run(workflow, code, data, api, plot, no_dependents):
     if no_dependents:
         if hasattr(wf, 'entries'):
             for entry in get_entries(wf, code):
-                run_workflow(entry, code, data, plot=plot)
+                run_workflow(entry, code, data, plot=plot, update=update)
         else:
-            run_workflow(wf, code, data, plot=plot)
+            run_workflow(wf, code, data, plot=plot, update=update)
     else:
         if hasattr(wf, 'entries'):
             for entry in get_entries(wf, code):
-                maintain_workflow(entry, code, data, run=True, plot=plot)
+                maintain_workflow(entry, code, data, run=True, plot=plot, update=update)
         else:
-            maintain_workflow(wf, code, data, run=True, plot=plot)
+            maintain_workflow(wf, code, data, run=True, plot=plot, update=update)
 
 
 @click.command()
@@ -166,7 +167,7 @@ def maintain(workflow, code, data, api, plot):
     Maintain a workflow.
     """
     logger.info(
-        f'[CMD]: maintain {workflow} --code {code} --data {data} --api {api} --plot {plot}'
+        f'[CMD]: maintain {workflow} --code {code} --data {data} --api {api}{" --plot" if plot else ""}'
     )
     if api is not None:
         api = importlib.import_module(api)

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/schedule.py

@@ -236,7 +236,8 @@ def maintain(workflow: WorkflowType,
              state_path: str | Path,
              session_id: str | None = None,
              run: bool = False,
-             plot: bool = False):
+             plot: bool = False,
+             update: bool = True):
     if session_id is None:
         session_id = uuid.uuid4().hex
     logger.debug(f'run "{workflow.__workflow_id__}"'
@@ -280,7 +281,8 @@ def maintain(workflow: WorkflowType,
         raise CalibrationFailedError(
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
-    transform.update_parameters(result)
+    if update:
+        transform.update_parameters(result)
     return
 
 
@@ -288,13 +290,19 @@ def maintain(workflow: WorkflowType,
 def run(workflow: WorkflowType,
         code_path: str | Path,
         state_path: str | Path,
-        plot: bool = False):
+        plot: bool = False,
+        update: bool = True):
     session_id = uuid.uuid4().hex
     logger.debug(f'run "{workflow.__workflow_id__}" without dependences.')
-    result = calibrate(workflow, code_path, state_path, plot, session_id=session_id)
+    result = calibrate(workflow,
+                       code_path,
+                       state_path,
+                       plot,
+                       session_id=session_id)
     if result.bad_data or not result.in_spec:
         raise CalibrationFailedError(
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
-    transform.update_parameters(result)
+    if update:
+        transform.update_parameters(result)
     return

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.17"
+__version__ = "2.4.19"