QuLab 2.10.5__tar.gz → 2.10.6__tar.gz

{qulab-2.10.5 → qulab-2.10.6}/PKG-INFO

@@ -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 → qulab-2.10.6}/QuLab.egg-info/PKG-INFO

@@ -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 → qulab-2.10.6}/QuLab.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ QuLab.egg-info/top_level.txt
 qulab/__init__.py
 qulab/__main__.py
 qulab/dicttree.py
+qulab/expression.py
 qulab/typing.py
 qulab/utils.py
 qulab/version.py
@@ -40,7 +41,6 @@ qulab/monitor/qt_compat.py
 qulab/monitor/toolbar.py
 qulab/scan/__init__.py
 qulab/scan/curd.py
-qulab/scan/expression.py
 qulab/scan/models.py
 qulab/scan/optimize.py
 qulab/scan/query.py

{qulab-2.10.5 → qulab-2.10.6}/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-2.10.5 → qulab-2.10.6}/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-2.10.5 → qulab-2.10.6}/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-2.10.5 → qulab-2.10.6}/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-2.10.5 → qulab-2.10.6}/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-2.10.5 → qulab-2.10.6}/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-2.10.6/qulab/version.py

@@ -0,0 +1 @@
+__version__ = "2.10.6"

{qulab-2.10.5 → qulab-2.10.6}/tests/test_expression.py

@@ -4,7 +4,7 @@ import operator
 import numpy as np
 import pytest
 
-from qulab.scan.expression import Env, calc
+from qulab.expression import Env, calc
 
 
 # ----------------------------

qulab-2.10.5/qulab/version.py

@@ -1 +0,0 @@
-__version__ = "2.10.5"