QuLab 2.4.20__cp311-cp311-win_amd64.whl → 2.5.0__cp311-cp311-win_amd64.whl

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

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

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

@@ -1,17 +1,18 @@
-qulab/__init__.py,sha256=vkFybY8YSsQilYdThPRD83-btPAR41sy_WCXiM-6mME,141
-qulab/__main__.py,sha256=g9iBs8xxX6Yik7cmgllQkpBN8C4JNoZVsEOyCCLCyFU,63
+qulab/__init__.py,sha256=pdlicy07Dx39pTEGZ0i41Ox9tuuuKKIdsFIrE13bneg,249
+qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp311-win_amd64.pyd,sha256=R96iJRfL-QZSf9reOnccgip5md-3EdMl21n0JSZs4lY,31744
-qulab/version.py,sha256=0EYwz_vOIrGy7c3cr82zYeYGyK4QxRsY1XkcDC_j6SI,22
-qulab/cli/__init__.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
-qulab/cli/config.py,sha256=Loee8MwKFuDRWXttG8iBY9ZmD5xSCHDFi3ztt2i0S_0,3139
+qulab/fun.cp311-win_amd64.pyd,sha256=Ou3oaF6r91_RUTvb-1Qc5yorMZQpcgdsW36pPtNCiN8,31744
+qulab/version.py,sha256=b9PgnIDmp0TYLJmDYb-w9iqcfWXZk22bBNQQjBVgaf0,21
+qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qulab/cli/commands.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
+qulab/cli/config.py,sha256=tNmH4ggdgrFqcQa2WZKLpidiYTg95_UnT0paDJ4fi4c,3204
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 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/load.py,sha256=4QJI_jWUCrn0MW_ieTAyhUXmujrOU5D9ywSOqzNduu0,11992
+qulab/executor/schedule.py,sha256=u-eM9Cw8GrvWmRFhHQWSXcdKomxp6AqSwnSm3gDwkrM,11920
+qulab/executor/storage.py,sha256=V91y8z62GseJLm2-1k-empbw68pCq93Lk-nUAwtfVfs,6068
 qulab/executor/transform.py,sha256=inaOn6eqCs22ZZ0xAQl8s8YCoEACaXSwFNNu7jqdwAk,2148
-qulab/executor/utils.py,sha256=_9EZkx2rBpsWjhDN5BZ-Lq9MboqmHcI1jtwpRyrzSTY,3101
+qulab/executor/utils.py,sha256=OVBYuAC4Pw8-kT_s0AJUiLAS5QTeV-mXF8zjdQFTwrM,3163
 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 +92,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.20.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.4.20.dist-info/METADATA,sha256=LzlzxYnUG7CckjTxnZ2-2yJY7yfwUFlf5pll5JI_PV4,3804
-QuLab-2.4.20.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
-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-2.5.0.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.5.0.dist-info/METADATA,sha256=dUio4DApvpQRgt7j7w3aYyCqfxDqpbsnTmFuMQirwXw,3803
+QuLab-2.5.0.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
+QuLab-2.5.0.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+QuLab-2.5.0.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.5.0.dist-info/RECORD,,

qulab/__init__.py

@@ -1,3 +1,5 @@
+from .executor.storage import find_result
+from .executor.storage import get_result_by_index as get_result
 from .scan import Scan, get_record, load_record, lookup, lookup_list
 from .version import __version__
 from .visualization import autoplot

qulab/__main__.py

@@ -1,4 +1,4 @@
-from .cli import cli
+from .cli.commands import cli
 
 if __name__ == '__main__':
     cli()

qulab/cli/__init__.py

@@ -1,29 +0,0 @@
-import click
-
-from ..executor.cli import create, get, maintain, run, set
-from ..monitor.__main__ import main as monitor
-from ..scan.server import server
-from ..sys.net.cli import dht
-from ..visualization.__main__ import plot
-
-
-@click.group()
-def cli():
-    pass
-
-
-@cli.command()
-def hello():
-    """Print hello world."""
-    click.echo('hello, world')
-
-
-cli.add_command(monitor)
-cli.add_command(plot)
-cli.add_command(dht)
-cli.add_command(server)
-cli.add_command(maintain)
-cli.add_command(run)
-cli.add_command(create)
-cli.add_command(set)
-cli.add_command(get)

qulab/cli/commands.py

@@ -0,0 +1,29 @@
+import click
+
+from ..executor.cli import create, get, maintain, run, set
+from ..monitor.__main__ import main as monitor
+from ..scan.server import server
+from ..sys.net.cli import dht
+from ..visualization.__main__ import plot
+
+
+@click.group()
+def cli():
+    pass
+
+
+@cli.command()
+def hello():
+    """Print hello world."""
+    click.echo('hello, world')
+
+
+cli.add_command(monitor)
+cli.add_command(plot)
+cli.add_command(dht)
+cli.add_command(server)
+cli.add_command(maintain)
+cli.add_command(run)
+cli.add_command(create)
+cli.add_command(set)
+cli.add_command(get)

qulab/cli/config.py

@@ -62,27 +62,35 @@ def log_options(func):
 
     @click.option("--debug",
                   is_flag=True,
-                  default=lambda: get_config_value("debug", bool) or False,
+                  default=get_config_value("debug", bool),
                   help=f"Enable debug mode")
     @click.option("--log",
                   type=click.Path(),
                   default=lambda: get_config_value("log", Path),
                   help=f"Log file path")
+    @click.option("--quiet",
+                  is_flag=True,
+                  default=get_config_value("quiet", bool),
+                  help=f"Disable log output")
     @functools.wraps(func)
-    def wrapper(*args, log=None, debug=False, **kwargs):
-        if log is None and not debug:
-            logger.remove()
-            logger.add(sys.stderr, level='INFO')
-        elif log is None and debug:
-            logger.remove()
-            logger.add(sys.stderr, level='DEBUG')
-        elif log is not None and not debug:
-            logger.configure(handlers=[dict(sink=log, level='INFO')])
-        elif log is not None and debug:
-            logger.configure(handlers=[
-                dict(sink=log, level='DEBUG'),
-                dict(sink=sys.stderr, level='DEBUG')
-            ])
+    def wrapper(*args, **kwargs):
+        debug = bool(kwargs.pop("debug"))
+        log = kwargs.pop("log")
+        quiet = bool(kwargs.pop("quiet"))
+
+        if debug:
+            log_level = "DEBUG"
+        else:
+            log_level = "INFO"
+
+        handlers = []
+        if log is not None:
+            handlers.append(dict(sink=log, level=log_level))
+        if not quiet or debug:
+            handlers.append(dict(sink=sys.stderr, level=log_level))
+
+        logger.configure(handlers=handlers)
+
         return func(*args, **kwargs)
 
     return wrapper

qulab/executor/load.py

@@ -269,7 +269,7 @@ def load_workflow_from_template(template_path: str,
             str: 已经替换的新字符串。
         """
         pattern = re.compile(r'VAR\s*\(\s*(["\'])(\w+)\1\s*\)')
-        replacement = f'__VAR_{hash_str}' + r'["\2"]'
+        replacement = f'__VAR_{hash_str}' + r'[\1\2\1]'
         new_text = re.sub(pattern, replacement, text)
         return new_text
 

qulab/executor/schedule.py

@@ -7,8 +7,8 @@ from loguru import logger
 
 from . import transform
 from .load import WorkflowType, get_dependents
-from .storage import (Result, find_result, get_head, renew_result,
-                      revoke_result, save_result)
+from .storage import (Result, find_result, renew_result, revoke_result,
+                      save_result)
 
 
 class CalibrationFailedError(Exception):
@@ -120,13 +120,14 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
 
     if hasattr(workflow, 'check') and callable(workflow.check) and hasattr(
             workflow, 'check_analyze') and callable(workflow.check_analyze):
-        logger.debug(f'Checking "{workflow}" with "check" method ...')
+        logger.debug(
+            f'Checking "{workflow.__workflow_id__}" with "check" method ...')
         data = workflow.check()
         result = Result()
         result.data = data
-        save_result(workflow.__workflow_id__, result, state_path)
+        #save_result(workflow.__workflow_id__, result, state_path)
 
-        logger.debug(f'Checked "{workflow}" !')
+        logger.debug(f'Checked "{workflow.__workflow_id__}" !')
         result = call_analyzer(workflow, data, history, check=True, plot=plot)
         if result.in_spec:
             logger.debug(
@@ -149,8 +150,10 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
 
         logger.debug(f'Calibrated "{workflow}" !')
         result = call_analyzer(workflow, data, history, check=False, plot=plot)
-        save_result(workflow.__workflow_id__, result, state_path,
-                    get_head(workflow.__workflow_id__, state_path))
+        save_result(workflow.__workflow_id__,
+                    result,
+                    state_path,
+                    overwrite=True)
 
     return result
 
@@ -167,8 +170,7 @@ def calibrate(workflow: WorkflowType, code_path: str | Path,
     save_result(workflow.__workflow_id__, result, state_path)
     logger.debug(f'Calibrated "{workflow.__workflow_id__}" !')
     result = call_analyzer(workflow, data, history, check=False, plot=plot)
-    save_result(workflow.__workflow_id__, result, state_path,
-                get_head(workflow.__workflow_id__, state_path))
+    save_result(workflow.__workflow_id__, result, state_path, overwrite=True)
     return result
 
 

qulab/executor/storage.py

@@ -1,3 +1,4 @@
+import lzma
 import pickle
 import uuid
 from dataclasses import dataclass, field
@@ -6,6 +7,8 @@ from pathlib import Path
 
 from loguru import logger
 
+from ..cli.config import get_config_value
+
 
 @dataclass
 class Result():
@@ -18,25 +21,16 @@ class Result():
     params: dict = field(default_factory=dict)
     info: dict = field(default_factory=dict)
     data: tuple = field(default_factory=tuple)
-    previous: Path | None = None
-
-
-class Graph:
-
-    def __init__(self):
-        self.nodes = {}
-        self.heads = set()
-        self.roots = set()
+    index: int = -1
+    previous_path: Path | None = None
+    base_path: Path | None = None
 
-    def add_node(self, node: str, deps: list[str]):
-        if node not in self.nodes:
-            self.nodes[node] = deps
-            if not deps:
-                self.heads.add(node)
-            for dep in deps:
-                if dep not in self.nodes:
-                    self.nodes[dep] = []
-                self.roots.discard(dep)
+    @property
+    def previous(self):
+        if self.previous_path is not None and self.base_path is not None:
+            return load_result(self.previous_path, self.base_path)
+        else:
+            return None
 
 
 def random_path(base: Path) -> Path:
@@ -50,27 +44,54 @@ def random_path(base: Path) -> Path:
 def save_result(workflow: str,
                 result: Result,
                 base_path: str | Path,
-                path: Path | None = None):
+                overwrite: bool = False):
     logger.debug(
         f'Saving result for "{workflow}", {result.in_spec=}, {result.bad_data=}, {result.fully_calibrated=}'
     )
     base_path = Path(base_path)
-    if path is None:
-        path = random_path(base_path)
-    (base_path / 'objects' / path).parent.mkdir(parents=True, exist_ok=True)
-    result.previous = get_head(workflow, base_path)
+    if overwrite:
+        buf = lzma.compress(pickle.dumps(result))
+        path = get_head(workflow, base_path)
+        with open(base_path / 'objects' / path, "rb") as f:
+            index = int.from_bytes(f.read(8), 'big')
+        result.index = index
+    else:
+        result.previous_path = get_head(workflow, base_path)
+        buf = lzma.compress(pickle.dumps(result))
+        path = random_path(base_path / 'objects')
+        (base_path / 'objects' / path).parent.mkdir(parents=True,
+                                                    exist_ok=True)
+        result.index = create_index("result",
+                                    base_path,
+                                    context=str(path),
+                                    width=35)
+
     with open(base_path / 'objects' / path, "wb") as f:
-        pickle.dump(result, f)
+        f.write(result.index.to_bytes(8, 'big'))
+        f.write(buf)
     set_head(workflow, path, base_path)
 
 
-def find_result(workflow: str, base_path: str | Path) -> Result | None:
+def load_result(path: str | Path, base_path: str | Path) -> Result | None:
+    base_path = Path(base_path)
+    path = base_path / 'objects' / path
+
+    with open(base_path / 'objects' / path, "rb") as f:
+        index = int.from_bytes(f.read(8), 'big')
+        result = pickle.loads(lzma.decompress(f.read()))
+        result.base_path = base_path
+        result.index = index
+        return result
+
+
+def find_result(
+    workflow: str, base_path: str | Path = get_config_value("data", Path)
+) -> Result | None:
     base_path = Path(base_path)
     path = get_head(workflow, base_path)
     if path is None:
         return None
-    with open(base_path / 'objects' / path, "rb") as f:
-        return pickle.load(f)
+    return load_result(path, base_path)
 
 
 def renew_result(workflow: str, base_path: str | Path):
@@ -115,33 +136,56 @@ def get_head(workflow: str, base_path: str | Path) -> Path | None:
         return None
 
 
-def get_graph(base_path: str | Path) -> dict[str, list[str]]:
+def get_heads(base_path: str | Path) -> Path | None:
     base_path = Path(base_path)
     try:
         with open(base_path / "heads", "rb") as f:
             heads = pickle.load(f)
+        return heads
     except:
-        heads = {}
-    graph = {}
-    for workflow, path in heads.items():
-        graph[workflow] = []
-        while path is not None:
-            with open(base_path / 'objects' / path, "rb") as f:
-                result = pickle.load(f)
-            path = result.previous
-            if path is not None:
-                graph[workflow].append(path)
-    return graph
-
-
-def update_graph(workflow: str, base_path: str | Path):
-    base_path = Path(base_path)
-    graph = get_graph(base_path)
-    for workflow, deps in graph.items():
-        for dep in deps:
-            if dep not in graph:
-                graph[dep] = []
-            if workflow not in graph[dep]:
-                graph[dep].append(workflow)
-    with open(base_path / "graph", "wb") as f:
-        pickle.dump(graph, f)
+        return {}
+
+
+def create_index(name: str,
+                 base_path: str | Path,
+                 context: str,
+                 width: int,
+                 start: int = 0):
+    path = Path(base_path) / "index" / f"{name}.seq"
+    if path.exists():
+        with open(path, "r") as f:
+            index = int(f.read())
+    else:
+        index = start
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with open(path, "w") as f:
+        f.write(str(index + 1))
+
+    path = Path(base_path) / "index" / f"{name}.width"
+    with open(path, "w") as f:
+        f.write(str(width))
+
+    path = Path(base_path) / "index" / f"{name}.idx"
+    with open(path, "a") as f:
+
+        f.write(f"{context.ljust(width)}\n")
+
+    return index
+
+
+def query_index(name: str, base_path: str | Path, index: int):
+    path = Path(base_path) / "index" / f"{name}.width"
+    with open(path, "r") as f:
+        width = int(f.read())
+    path = Path(base_path) / "index" / f"{name}.idx"
+    with open(path, "r") as f:
+        f.seek(index * (width + 1))
+        context = f.read(width)
+    return context.rstrip()
+
+
+def get_result_by_index(
+    index: int, base_path: str | Path = get_config_value("data", Path)
+) -> Result | None:
+    path = query_index("result", base_path, index)
+    return load_result(path, base_path)

qulab/executor/utils.py

@@ -31,10 +31,9 @@ def dependent_tree(node: str, code_path: str | Path) -> dict[str, list[str]]:
 
 
 def workflow_template(deps: list[str]) -> str:
-    return f"""
-from loguru import logger
+    return f"""from loguru import logger
 
-def VAR(s): pass
+def VAR(s): pass  # 没有实际作用，只是用来抑制编辑器的警告。
 
 import numpy as np
 

qulab/version.py

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