QuLab 2.10.5__cp312-cp312-macosx_10_13_universal2.whl → 2.10.6__cp312-cp312-macosx_10_13_universal2.whl

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

@@ -129,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
@@ -159,23 +159,27 @@ _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 query_config(key)
+        return self.api[0](key)
 
     def get(self, key: str) -> Any:
         return self.query(key)
 
     def export(self) -> dict[str, dict[str, Any]]:
-        return export_config()
+        return self.api[3]()
 
     def set(self, key: str, value: Any):
-        return update_config({key: value})
+        return self.api[1]({key: value})
 
     def delete(self, key: str):
-        return delete_config(key)
+        return self.api[2](key)
 
     def clear(self):
-        return clear_config()
+        return self.api[4]()
 
     def update(self, parameters: dict[str, Any]):
-        return update_config(parameters)
+        return self.api[1](parameters)

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.5"
+__version__ = "2.10.6"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuLab
-Version: 2.10.5
+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.5.dist-info → qulab-2.10.6.dist-info}/RECORD

@@ -1,10 +1,11 @@
 qulab/__init__.py,sha256=WW0jUmIXEp_8cfLVUtg-C8COIDbZp0X9mIlz3suJkrU,407
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
-qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-312-darwin.so,sha256=VrWNWeevnfBiXyna4lKAzG5_hV1vL7DMNCZrbUKpLgM,126864
+qulab/dicttree.py,sha256=QNClEGRFRFJIgAq9bUyxK4iPbkNRdZDona8UZq9jDfw,14236
+qulab/expression.py,sha256=Mk9-hzmTzDszM0p6J_FlrewzQerOBWhRv5_iFApA768,24978
+qulab/fun.cpython-312-darwin.so,sha256=_1ZPLCeDfMYHJIpUWUPVcwJGpbEiOJr9LtIDJLlawVM,126864
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
 qulab/utils.py,sha256=BdLdlfjpe6m6gSeONYmpAKTTqxDaYHNk4exlz8kZxTg,2982
-qulab/version.py,sha256=SB3sQYH0e-iHrGpjw5MXxU2T-sxkpouM4O_fyPlJPXQ,22
+qulab/version.py,sha256=9LJkGNy79PoPvb-ypqzJeCk2XlpeUgkGouuN08RGMH4,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=F1LATmSC9lOAdnrOTMK7DRjETCEcOmMsocovWRyjWTc,597
 qulab/cli/config.py,sha256=fWeWHiX-Oxodvfv4g0B-UFisJlYcF1Hv6V1fKib2mOM,5447
@@ -12,8 +13,8 @@ qulab/cli/decorators.py,sha256=oImteZVnDPPWdyhJ4kzf2KYGJLON7VsKGBvZadWLQZo,621
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/analyze.py,sha256=4Hau5LrKUdpweh7W94tcG4ahgxucHOevbM0hm57T7zE,5649
 qulab/executor/cli.py,sha256=bmuFPpPhHiRzTjIjhvlp2tQYp0jEwXSETILX8Nu2tLE,14901
-qulab/executor/load.py,sha256=0-EtO4dkP6jB1vsgQlniv-OtPH1AZLjbtuvaWHsgbPs,20335
-qulab/executor/registry.py,sha256=qqj90HVYun-DDI9HPmwyOQI87M2mQ0jyw4vWwPMfYjg,4592
+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=_HEtsUQ5_jSujCw8FBDAK1PRTMRCa4iD4DduHIpjo3c,10569
@@ -28,17 +29,16 @@ qulab/monitor/monitor.py,sha256=7E4bnTsO6qC85fs2ONrccGHfaYKv7SW74mtXzv6QjVc,2305
 qulab/monitor/ploter.py,sha256=CbiIjmohgtwDDTVeGzhXEGVo3XjytMdhLwU9VUkg9vo,3601
 qulab/monitor/qt_compat.py,sha256=OK71_JSO_iyXjRIKHANmaK4Lx4bILUzmXI-mwKg3QeI,788
 qulab/monitor/toolbar.py,sha256=WEag6cxAtEsOLL14XvM7pSE56EA3MO188_JuprNjdBs,7948
-qulab/scan/__init__.py,sha256=ZX4WsvqYxvJeHLgGSrtJoAnVU94gxY7EHKMxYooMERg,130
+qulab/scan/__init__.py,sha256=Z88CzGsvr1VdKbF6aYgQv3j-fsEkKmqvpvX4LlzOM98,87
 qulab/scan/curd.py,sha256=ZcwO5SKO95OcDgpUPDHcK5FW_BrJbUzuBk71UG_pqnM,6888
-qulab/scan/expression.py,sha256=Mk9-hzmTzDszM0p6J_FlrewzQerOBWhRv5_iFApA768,24978
 qulab/scan/models.py,sha256=JFofv-RH0gpS3--M6izXiQg7iGkS9a_em2DwhS5kTTk,17626
 qulab/scan/optimize.py,sha256=VT9TpuqDkG7FdJJkYy60r5Pfrmjvfu5i36Ru6XvIiTI,2561
 qulab/scan/query.py,sha256=-5uHMhXSyGovK1oy_uUbGVEbRFzaMBkP78ZMNfI3jD0,11809
 qulab/scan/record.py,sha256=yIHPANf6nuBXy8Igf-dMtGJ7wuFTLYlBaaAUc0AzwyU,21280
-qulab/scan/scan.py,sha256=iXvbnXLZvHa4v88MlYiZ_LYubEB7ZfbX7OiFTMhl_1o,39479
+qulab/scan/scan.py,sha256=6ksam9jQ5yplt-VxCo9Mntys5NJ_00TCuitDmRSYHoY,39496
 qulab/scan/server.py,sha256=QhUo-TxdTb_PDBd4sDRiI5L1WHmuEOAYEmUiFhjNqc4,16995
 qulab/scan/space.py,sha256=OQLepiNNP5TNYMHXeVFT59lL5n4soPmnMoMy_o9EHt0,6696
-qulab/scan/utils.py,sha256=SzJ_c4cLZJzERZr_CJO1_4juOxjfwCpU2K1mkc1PWGM,6124
+qulab/scan/utils.py,sha256=WFVzwtVebvfYRgMo1ofaWLx90grjMKuoUB8RaK0DMts,6125
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/storage/__main__.py,sha256=3emxxRry8BB0m8hUZvJ_oBqkPy7ksV7flHB_KEDXZuI,1692
 qulab/storage/base_dataset.py,sha256=4aKhqBNdZfdlm_z1Qy5dv0HrvgpvMdy8pbyfua8uE-4,11865
@@ -99,9 +99,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.10.5.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.10.5.dist-info/METADATA,sha256=YoyVkSlWyuWsJ0G71thGPi8_AQDCKCkTPYEbM77BxZw,3753
-qulab-2.10.5.dist-info/WHEEL,sha256=9_3tTSxMJq-dgdzMiScNvtT5eTBVd3l6RgHS7HwTzpA,115
-qulab-2.10.5.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.10.5.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.10.5.dist-info/RECORD,,
+qulab-2.10.6.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.10.6.dist-info/METADATA,sha256=Fmj-XQg6wrotuM0aRpAoSWF7x8JiYNAmRMjFFAsbqJs,3753
+qulab-2.10.6.dist-info/WHEEL,sha256=9_3tTSxMJq-dgdzMiScNvtT5eTBVd3l6RgHS7HwTzpA,115
+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,,