QuLab 2.10.4__tar.gz → 2.10.6__tar.gz

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

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

@@ -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 → 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
@@ -23,10 +24,10 @@ qulab/executor/__init__.py
 qulab/executor/analyze.py
 qulab/executor/cli.py
 qulab/executor/load.py
+qulab/executor/registry.py
 qulab/executor/schedule.py
 qulab/executor/storage.py
 qulab/executor/template.py
-qulab/executor/transform.py
 qulab/executor/utils.py
 qulab/monitor/__init__.py
 qulab/monitor/__main__.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.4 → qulab-2.10.6}/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-2.10.4 → 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.4 → qulab-2.10.6}/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-2.10.4 → 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.4/qulab/executor/transform.py → qulab-2.10.6/qulab/executor/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-2.10.4 → qulab-2.10.6}/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-2.10.4 → 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.4 → 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.4 → 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.4 → 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.4/qulab/version.py

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