QuLab 2.10.4__cp312-cp312-win_amd64.whl → 2.10.6__cp312-cp312-win_amd64.whl

qulab/__init__.py

@@ -1,4 +1,5 @@
 from .executor.analyze import manual_analysis
+from .executor.registry import Registry
 from .executor.storage import find_report
 from .executor.storage import get_report_by_index as get_report
 from .executor.template import VAR

qulab/dicttree.py

@@ -297,8 +297,8 @@ def update_tree(result, updates):
     return result
 
 
-def queryref_tree(q, keys, dct, prefix=[], chain=None):
-    q = q[1:]
+def queryref_tree(q: str, keys, dct, prefix=[], chain=None):
+    q = q.removeprefix('$')
     if q.startswith('.'):
         while q.startswith('.'):
             keys.pop()
@@ -340,7 +340,7 @@ class Env():
         self.prefix = prefix
 
     def get(self, name):
-        return queryref_tree(name[1:],
+        return queryref_tree(name,
                              self.keys,
                              self.dct,
                              prefix=self.prefix,
@@ -405,8 +405,9 @@ internal_functions = {
 
 
 def eval_expr(expression, env=None, functions=None):
-    from pyparsing import (Forward, Literal, ParseResults, Suppress, Word,
-                           alphanums, delimitedList, infixNotation, oneOf,
+    from pyparsing import (Combine, Forward, Literal, MatchFirst, ParseResults,
+                           Regex, Suppress, Word, ZeroOrMore, alphanums,
+                           alphas, delimitedList, infixNotation, oneOf,
                            opAssoc, pyparsing_common)
     if functions is None:
         functions = internal_functions
@@ -436,8 +437,19 @@ def eval_expr(expression, env=None, functions=None):
         'e': math.e
     }.get(t[0]))
 
-    variable = Word("$", alphanums +
-                    "._").setParseAction(lambda s, l, t: lookup(t[0]))
+    identifier = Word(alphas + '_', alphanums + '_')
+    dollar = Literal('$')
+    dot_sequence = Regex(r'\.{1,}')
+    attr = Combine(Literal('.') + identifier)
+    attr_chain = ZeroOrMore(attr)
+    dollar_named_chain = Combine(dollar + identifier + attr_chain)
+    dollar_dotN_chain = Combine(dollar + dot_sequence + identifier +
+                                attr_chain)
+    dollar_simple = Combine(dollar + identifier)
+
+    variable = MatchFirst(
+        [dollar_dotN_chain, dollar_named_chain,
+         dollar_simple]).setParseAction(lambda s, l, t: lookup(t[0]))
 
     bracket = Suppress('(') + expr + Suppress(')')
     bracket.setParseAction(lambda s, l, t: t[0])

qulab/executor/cli.py

@@ -12,10 +12,10 @@ from ..cli.config import get_config_value, log_options
 from ..cli.decorators import async_command
 from .load import (WorkflowType, find_unreferenced_workflows, get_entries,
                    load_workflow, make_graph)
+from .registry import Registry, set_config_api
 from .schedule import CalibrationFailedError
 from .schedule import maintain as maintain_workflow
 from .schedule import run as run_workflow
-from .transform import set_config_api
 from .utils import workflow_template
 
 
@@ -95,6 +95,7 @@ def command_option(command_name):
               '-c',
               default=lambda: get_config_value("code", str, 'create'),
               help='The path of the code.')
+@log_options('create')
 def create(workflow, code):
     """
     Create a new workflow file.
@@ -124,12 +125,13 @@ def create(workflow, code):
               '-a',
               default=lambda: get_config_value("api", str, 'set'),
               help='The modlule name of the api.')
+@log_options('set')
 def set(key, value, api):
     """
     Set a config.
     """
     logger.info(f'[CMD]: set {key} {value} --api {api}')
-    from . import transform
+    reg = Registry()
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config, api.delete_config,
@@ -138,7 +140,7 @@ def set(key, value, api):
         value = eval(value)
     except:
         pass
-    transform.update_config({key: value})
+    reg.set(key, value)
 
 
 @click.command()
@@ -147,17 +149,18 @@ def set(key, value, api):
               '-a',
               default=lambda: get_config_value("api", str, 'get'),
               help='The modlule name of the api.')
+@log_options('get')
 def get(key, api):
     """
     Get a config.
     """
     logger.info(f'[CMD]: get {key} --api {api}')
-    from . import transform
+    reg = Registry()
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config, api.delete_config,
                        api.export_config, api.clear_config)
-    click.echo(transform.query_config(key))
+    click.echo(reg.get(key))
 
 
 @click.command()
@@ -176,7 +179,7 @@ def get(key, api):
 @click.option('--veryfy-source-code',
               is_flag=True,
               help='Veryfy the source code.')
-@log_options
+@log_options('run')
 @command_option('run')
 @async_command
 async def run(workflow,
@@ -303,7 +306,7 @@ async def run(workflow,
 @click.option('--veryfy-source-code',
               is_flag=True,
               help='Veryfy the source code.')
-@log_options
+@log_options('maintain')
 @command_option('maintain')
 @async_command
 async def maintain(workflow,
@@ -388,7 +391,7 @@ async def maintain(workflow,
 @click.command()
 @click.argument('report_id')
 @click.option('--plot', '-p', is_flag=True, help='Plot the report.')
-@log_options
+@log_options('reproduce')
 @command_option('reproduce')
 @async_command
 async def reproduce(report_id, code, data, api, plot):
@@ -415,16 +418,17 @@ async def reproduce(report_id, code, data, api, plot):
     code = Path(os.path.expanduser(code))
     data = Path(os.path.expanduser(data))
 
-    from . import transform
     from .load import load_workflow_from_source_code
     from .storage import get_report_by_index
 
+    reg = Registry()
+
     r = get_report_by_index(int(report_id), data)
 
     wf = load_workflow_from_source_code(r.workflow, r.script)
-    cfg = transform.export_config()
-    transform.clear_config()
-    transform.update_config(r.config)
+    cfg = reg.export()
+    reg.clear()
+    reg.update(r.config)
     await run_workflow(wf, code, data, plot=plot, freeze=True)
-    transform.clear_config()
-    transform.update_config(cfg)
+    reg.clear()
+    reg.update(cfg)

qulab/executor/load.py

@@ -1,10 +1,10 @@
 import atexit
 import inspect
-import pickle
 import os
-import time
+import pickle
 import shutil
 import tempfile
+import time
 import warnings
 from importlib.util import module_from_spec, spec_from_file_location
 from pathlib import Path
@@ -13,6 +13,7 @@ from typing import Any
 
 from loguru import logger
 
+from .registry import Registry
 from .storage import Report
 from .template import (TemplateKeyError, TemplateTypeError, decode_mapping,
                        inject_mapping)
@@ -31,17 +32,16 @@ class SetConfigWorkflow():
         return []
 
     def check_state(self, history: Report) -> bool:
-        from . import transform
+        reg = Registry()
         try:
-            return self._equal(history.parameters[self.key],
-                               transform.query_config(self.key))
+            return self._equal(history.parameters[self.key], reg.get(self.key))
         except:
             return False
 
     def calibrate(self):
-        from . import transform
+        reg = Registry()
         try:
-            value = transform.query_config(self.key)
+            value = reg.get(self.key)
         except:
             value = eval(input(f'"{self.key}": '))
         return value

qulab/executor/{transform.py → registry.py}

@@ -1,3 +1,9 @@
+import importlib
+import os
+import sys
+from typing import Any
+
+from ..cli.config import get_config_value
 from .storage import Report, save_item
 
 __current_config_id = None
@@ -123,7 +129,7 @@ def set_config_api(query_method,
         clear_method: The clear method.
             the method should clear the config.
     """
-    global query_config, update_config, delete_config, export_config, clear_config
+    global query_config, update_config, delete_config, export_config, clear_config, _api
 
     query_config = query_method
     update_config = update_method
@@ -132,3 +138,48 @@ def set_config_api(query_method,
     clear_config = clear_method
 
     return query_config, update_config, delete_config, export_config, clear_config
+
+
+def _init():
+    code = get_config_value("code", str, default=None)
+    if code is not None:
+        code = os.path.expanduser(code)
+        if code not in sys.path:
+            sys.path.insert(0, code)
+
+    api = get_config_value('api', str, None)
+    if api is not None:
+        api = importlib.import_module(api)
+        set_config_api(api.query_config, api.update_config, api.delete_config,
+                       api.export_config, api.clear_config)
+
+
+_init()
+
+
+class Registry():
+
+    def __init__(self):
+        self.api = (query_config, update_config, delete_config, export_config,
+                    clear_config)
+
+    def query(self, key: str) -> Any:
+        return self.api[0](key)
+
+    def get(self, key: str) -> Any:
+        return self.query(key)
+
+    def export(self) -> dict[str, dict[str, Any]]:
+        return self.api[3]()
+
+    def set(self, key: str, value: Any):
+        return self.api[1]({key: value})
+
+    def delete(self, key: str):
+        return self.api[2](key)
+
+    def clear(self):
+        return self.api[4]()
+
+    def update(self, parameters: dict[str, Any]):
+        return self.api[1](parameters)

qulab/executor/schedule.py

@@ -8,9 +8,9 @@ from pathlib import Path
 from loguru import logger
 
 from .load import WorkflowType, get_dependents
+from .registry import current_config, obey_the_oracle, update_parameters
 from .storage import (Report, find_report, get_head, get_heads, renew_report,
                       revoke_report, save_item, save_report)
-from .transform import current_config, obey_the_oracle, update_parameters
 
 __session_id = None
 __session_cache = {}

qulab/scan/__init__.py

@@ -1,3 +1,2 @@
-from .expression import Expression, Symbol
 from .query import get_record, load_record, lookup, lookup_list
 from .scan import Scan

qulab/scan/scan.py

@@ -18,8 +18,8 @@ import dill
 import numpy as np
 import zmq
 
+from ..expression import Env, Expression, Symbol
 from ..sys.rpc.zmq_socket import ZMQContextManager
-from .expression import Env, Expression, Symbol
 from .optimize import NgOptimizer
 from .record import Record
 from .server import default_record_port
@@ -509,7 +509,8 @@ class Scan():
 
         if self.config:
             self.description['config'] = await create_config(
-                self._raw_config_copy, self.description['database'], self._sock)
+                self._raw_config_copy, self.description['database'],
+                self._sock)
         if current_notebook() is None:
             await create_notebook('untitle', self.description['database'],
                                   self._sock)

qulab/scan/utils.py

@@ -11,7 +11,7 @@ from typing import Any, Callable
 
 import dill
 
-from .expression import Env, Expression
+from ..expression import Env, Expression
 
 
 class Unpicklable:

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.10.4"
+__version__ = "2.10.6"

{qulab-2.10.4.dist-info → qulab-2.10.6.dist-info}/METADATA

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

{qulab-2.10.4.dist-info → qulab-2.10.6.dist-info}/RECORD

@@ -1,22 +1,23 @@
-qulab/__init__.py,sha256=ulapyzt9DsDgT68EEbzuhniofHb512pNTFc-Sxfrr8Y,375
+qulab/__init__.py,sha256=-tTI2n3lAFU3sRFEu-Z_ihgiHbyyaQeuLDWfLFHlPvc,416
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
-qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp312-win_amd64.pyd,sha256=QddftATgZkwseIwCAYDh_ffwv43VGp5E_uwl0YtHvRo,32256
+qulab/dicttree.py,sha256=hYjVWjNYFmtzMWcIjIH6NJNDzpIW-g4TZbn2EBarpzg,14759
+qulab/expression.py,sha256=pfp3usiHCMHIbSBRqSCSDXA2f0gDDIZ9PMrkxf8yWjY,25777
+qulab/fun.cp312-win_amd64.pyd,sha256=BmkILgRUd9S2hLF4753GuK14tod04lqR0r9X456czqc,32256
 qulab/typing.py,sha256=PRtwbCHWY2ROKK8GHq4Bo8llXrIGo6xC73DrQf7S9os,71
 qulab/utils.py,sha256=65N2Xj7kqRsQ4epoLNY6tL-i5ts6Wk8YuJYee3Te6zI,3077
-qulab/version.py,sha256=K_lsR8oWkx9B0hBjg9Do_K_HlMnbbdWzkT8W_QIxmL8,22
+qulab/version.py,sha256=9LJkGNy79PoPvb-ypqzJeCk2XlpeUgkGouuN08RGMH4,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=ZTs32yQjvwPIsFjXYWNr4KqEvly0NISIqyh--96qCAY,627
 qulab/cli/config.py,sha256=A3UnyaRtiofpokyzYkJnUdwzcsYX7H-xZvBVduIOSdg,5617
 qulab/cli/decorators.py,sha256=mgAZiiaj2vZvsJEg70gxgB9TWkxR1nQSb2m-73RYHr0,649
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/analyze.py,sha256=VoSthE2RTarY6Wj3QFKh4FqReMYL7djSAyuitgHs5K0,5837
-qulab/executor/cli.py,sha256=_npz238lTU5RVJOKbfE4wTPS00RpMci19QcX01MfrE8,14911
-qulab/executor/load.py,sha256=0-EtO4dkP6jB1vsgQlniv-OtPH1AZLjbtuvaWHsgbPs,20335
-qulab/executor/schedule.py,sha256=1YWz2d5YLmnEpXGX1aVroE0SOKdU28WwHGEioxBpTKQ,21411
+qulab/executor/cli.py,sha256=bmuFPpPhHiRzTjIjhvlp2tQYp0jEwXSETILX8Nu2tLE,14901
+qulab/executor/load.py,sha256=C5qepxC9QALMgfG_twxvGts6i0bCsnVg9lS05PXZZRM,20291
+qulab/executor/registry.py,sha256=gym9F5FIDY5eV-cSCZsP99wC4l-6jkx9VMjJMaPOLaQ,4730
+qulab/executor/schedule.py,sha256=7gAJFwj13j1niGjVa1fSzwOS22eNFEN1hdrN3dfTY6A,21410
 qulab/executor/storage.py,sha256=8K73KGLAVgchJdtd4rKHXkr1CQOJORWH-Gi57w8IYsw,21081
 qulab/executor/template.py,sha256=dKQM3IlADdTi9qp0fnOYjyycRNEl7KeSCBZhwbmP8bQ,10828
-qulab/executor/transform.py,sha256=rk4CLIKVjGRaFzi5FVSgadUxAKKVLSopEHZCaAzDwDg,3435
 qulab/executor/utils.py,sha256=3OLRMBJu-1t78BeuZs4fv4jioEXnRNygaPnSoibzfgs,6405
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
 qulab/monitor/__main__.py,sha256=k2H1H5Zf9LLXTDLISJkbikLH-z0f1e5i5i6wXXYPOrE,105
@@ -28,17 +29,16 @@ qulab/monitor/monitor.py,sha256=2AP-hhg1T6-38mieDm5_ONTIXnXYlIrSyOiAOxDKy0I,2398
 qulab/monitor/ploter.py,sha256=dg7W28XTwEbBxHVtdPkFV135OQgoQwTi-NJCZQF-HYU,3724
 qulab/monitor/qt_compat.py,sha256=Eq7zlA4_XstB92NhtAqebtWU_Btw4lcwFO30YxZ-TPE,804
 qulab/monitor/toolbar.py,sha256=HxqG6ywKFyQJM2Q1s7SnhuzjbyeROczAZKwxztD1WJ8,8213
-qulab/scan/__init__.py,sha256=RR_0NQcr8Mi3vpWdypydbijQ1rXA0D3DEidQ7xjNslM,133
+qulab/scan/__init__.py,sha256=ZUwe6GvaaEmelsvAwM6yTWF1DYG8klAFvya6nD_BGI4,89
 qulab/scan/curd.py,sha256=m1MiW7Q_UActxpXor8n6PTck6A6O0_GRWHjVTJ3jBM4,7109
-qulab/scan/expression.py,sha256=pfp3usiHCMHIbSBRqSCSDXA2f0gDDIZ9PMrkxf8yWjY,25777
 qulab/scan/models.py,sha256=LMMWNfty9T1CoO07pN1wloq6Gob7taeOxWTBJFjGXLI,18180
 qulab/scan/optimize.py,sha256=zOR4Wp96bLarTSiPJ-cTAfT-V_MU-YEgB-XqYsBhS30,2637
 qulab/scan/query.py,sha256=RM8bG4Tcx_PaNk8tv9HdlTZ1dGuuSr3sZVkYVq2BtfQ,12183
 qulab/scan/record.py,sha256=MVmxhIzwmOju7eWxJEWsqJZlVgrDeRXGMfNvXImj7Ms,21883
-qulab/scan/scan.py,sha256=p7LZvmjDSnUHeszgILlEXFIspHVPLk9Rt2dVqFtNsaQ,40645
+qulab/scan/scan.py,sha256=IcPckASWJc1qtoBTRApp9l7wjIQKbBP8vXxjn-znyEg,40663
 qulab/scan/server.py,sha256=rNYdf53TysNjT8RvL5LGcO9YRbBrwOWCl1gwd7wBtaE,17443
 qulab/scan/space.py,sha256=t8caa_gKlnhaAIEksJyxINUTecOS7lMWAz1HDKlVcds,6909
-qulab/scan/utils.py,sha256=YXFA19HEakHB5TaPOU9CjQ1Lc3GUJaSIGOtiWjAWsG4,6353
+qulab/scan/utils.py,sha256=MpuNPJZJThFS2dze1ZfQ3_zvtfgG5wBL4Ic9-1xR_5E,6354
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/storage/__main__.py,sha256=6-EjN0waX1yfcMPJXqpIr9UlrIEsSCFApm5G-ZeaPMQ,1742
 qulab/storage/base_dataset.py,sha256=28y3-OZrqJ52p5sbirEpUgjb7hqwLLpd38KU9DCkD24,12217
@@ -99,9 +99,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.10.4.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-qulab-2.10.4.dist-info/METADATA,sha256=JXEKGtdaLzjMsnLhaXVwk6EbxpMuCoW4-eNZr9R23Ys,3860
-qulab-2.10.4.dist-info/WHEEL,sha256=ovhA9_Ei_7ok2fAych90j-feDV4goiAxbO7REePtvw0,101
-qulab-2.10.4.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.10.4.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.10.4.dist-info/RECORD,,
+qulab-2.10.6.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+qulab-2.10.6.dist-info/METADATA,sha256=2uAIz5ZYxwC2THY2cVecR0o46JP_WXkAg2g46CgZHEM,3860
+qulab-2.10.6.dist-info/WHEEL,sha256=ovhA9_Ei_7ok2fAych90j-feDV4goiAxbO7REePtvw0,101
+qulab-2.10.6.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.10.6.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.10.6.dist-info/RECORD,,