QuLab 2.10.6__tar.gz → 2.10.8__tar.gz

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

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

{qulab-2.10.6 → qulab-2.10.8}/QuLab.egg-info/PKG-INFO

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

{qulab-2.10.6 → qulab-2.10.8}/QuLab.egg-info/SOURCES.txt

@@ -110,6 +110,7 @@ qulab/visualization/qdat.py
 qulab/visualization/rot3d.py
 qulab/visualization/widgets.py
 src/qulab.h
+tests/test_dicttree.py
 tests/test_expression.py
 tests/test_kad.py
 tests/test_scan.py

{qulab-2.10.6 → qulab-2.10.8}/qulab/expression.py

@@ -4,10 +4,11 @@ import operator
 
 import numpy as np
 from pyparsing import (CaselessKeyword, Combine, Forward, Group, Keyword,
-                       Literal, Optional, ParserElement, ParseResults,
-                       Suppress, Word, alphanums, alphas, delimitedList,
-                       infixNotation, nums, oneOf, opAssoc, pyparsing_common,
-                       restOfLine, srange, stringEnd, stringStart)
+                       Literal, MatchFirst, Optional, ParserElement,
+                       ParseResults, Regex, Suppress, Word, ZeroOrMore,
+                       alphanums, alphas, delimitedList, infixNotation, nums,
+                       oneOf, opAssoc, pyparsing_common, restOfLine, srange,
+                       stringEnd, stringStart)
 from scipy import special
 
 # 启用 Packrat 优化以提高解析效率
@@ -37,7 +38,23 @@ def symbol_parse_action(t):
     return Symbol(t[0])
 
 
-SYMBOL = Word(alphas, alphanums + "_").setParseAction(symbol_parse_action)
+SYMBOL = Word(alphas + "_",
+              alphanums + "_").setParseAction(symbol_parse_action)
+
+
+# 定义查询语法：$a.b.c 或 $a.b 或 $a
+def query_parse_action(t):
+    return Query(t[0])
+
+
+attr_chain = ZeroOrMore(Combine(Literal('.') + SYMBOL))
+dollar_named_chain = Combine(Literal('$') + SYMBOL + attr_chain)
+dollar_dotN_chain = Combine(
+    Literal('$') + Regex(r'\.{1,}') + SYMBOL + attr_chain)
+dollar_simple = Combine(Literal('$') + SYMBOL)
+
+QUERY = MatchFirst([dollar_dotN_chain, dollar_named_chain,
+                    dollar_simple]).setParseAction(lambda s, l, t: Query(t[0]))
 
 #------------------------------------------------------------------------------
 # 定义运算表达式的解析动作转换函数
@@ -97,7 +114,7 @@ expr = Forward()
 #------------------------------------------------------------------------------
 # 构造基元表达式：包括数值、标识符、括号内表达式
 atom = (
-    FLOAT | INT | OCT | HEX | SYMBOL |
+    FLOAT | INT | OCT | HEX | SYMBOL | QUERY |
     (LPAREN + expr + RPAREN)  # 注意：后面我们将使用递归定义 expr
 )
 
@@ -173,6 +190,7 @@ class Env():
         self.consts = {}
         self.variables = {}
         self.refs = {}
+        self.nested = {}
         self.functions = {
             'sin': np.sin,
             'cos': np.cos,
@@ -745,6 +763,15 @@ class Symbol(Expression):
         return self.name
 
 
+class Query(Symbol):
+
+    def derivative(self, x):
+        return 0
+
+    def eval(self, env):
+        return super().eval(env)
+
+
 sin = Symbol('sin')
 cos = Symbol('cos')
 tan = Symbol('tan')
@@ -773,7 +800,7 @@ erf = Symbol('erf')
 erfc = Symbol('erfc')
 
 
-def calc(exp: str | Expression, **kwargs) -> Expression:
+def calc(exp: str | Expression, env: Env = None, **kwargs) -> Expression:
     """
     Calculate the expression.
 
@@ -791,7 +818,8 @@ def calc(exp: str | Expression, **kwargs) -> Expression:
     Expression
         The calculated expression.
     """
-    env = Env()
+    if env is None:
+        env = Env()
     for k, v in kwargs.items():
         env[k] = v
     if isinstance(exp, str):

{qulab-2.10.6 → qulab-2.10.8}/qulab/scan/query.py

@@ -372,3 +372,16 @@ def lookup_list(*, full=False):
         return __query_state.table['body']
     else:
         return [r[0] for r in __query_state.table['body']]
+
+
+def ping(database=default_server, timeout=1, socket=None):
+    with ZMQContextManager(zmq.DEALER,
+                           connect=database,
+                           socket=socket,
+                           timeout=timeout) as socket:
+
+        socket.send_pyobj({'method': 'ping'})
+        try:
+            return socket.recv_pyobj()
+        except zmq.Again:
+            raise TimeoutError(f"No response from server within {timeout} s")

{qulab-2.10.6 → qulab-2.10.8}/qulab/scan/scan.py

@@ -1164,4 +1164,3 @@ def assymbly(description):
     _make_axis(description)
 
     return description
-    return description

{qulab-2.10.6 → qulab-2.10.8}/qulab/scan/server.py

@@ -23,15 +23,16 @@ from .models import Session, create_engine, create_tables, sessionmaker, utcnow
 from .record import BufferList, Record, random_path
 from .utils import dump_dict, load_dict
 
-try:
-    default_record_port = int(os.getenv('QULAB_RECORD_PORT', 6789))
-except:
-    default_record_port = 6789
-
-if os.getenv('QULAB_RECORD_PATH'):
-    datapath = Path(os.getenv('QULAB_RECORD_PATH'))
-else:
-    datapath = Path.home() / 'qulab' / 'data'
+default_record_port = get_config_value('port',
+                                       int,
+                                       command_name='server',
+                                       default=6789)
+
+datapath = get_config_value('data',
+                            Path,
+                            command_name='server',
+                            default=Path.home() / 'qulab' / 'data')
+
 datapath.mkdir(parents=True, exist_ok=True)
 
 namespace = uuid.uuid4()
@@ -376,6 +377,7 @@ async def serv(port,
                url='',
                buffer_size=1024 * 1024 * 1024,
                interval=60):
+    datapath.mkdir(parents=True, exist_ok=True)
     logger.debug('Creating socket...')
     async with ZMQContextManager(zmq.ROUTER, bind=f"tcp://*:{port}") as sock:
         logger.info(f'Server started at port {port}.')

{qulab-2.10.6 → qulab-2.10.8}/qulab/scan/utils.py

@@ -198,8 +198,13 @@ def yapf_reformat(cell_text):
             return '\n'.join(lines)
 
         cell_text = re.sub('^%', '#%#', cell_text, flags=re.M)
-        reformated_text = unwrap(
-            yapf.yapflib.yapf_api.FormatCode(wrap(isort.code(cell_text)))[0])
+        try:
+            reformated_text = yapf.yapflib.yapf_api.FormatCode(
+                isort.code(cell_text))[0]
+        except:
+            reformated_text = unwrap(
+                yapf.yapflib.yapf_api.FormatCode(wrap(
+                    isort.code(cell_text)))[0])
         return re.sub('^#%#', '%', reformated_text, flags=re.M)
     except:
         return cell_text

{qulab-2.10.6 → qulab-2.10.8}/qulab/sys/rpc/zmq_socket.py

@@ -99,7 +99,8 @@ class ZMQContextManager:
                  secret_key: Optional[bytes] = None,
                  public_key: Optional[bytes] = None,
                  server_public_key: Optional[bytes] = None,
-                 socket: Optional[zmq.Socket] = None):
+                 socket: Optional[zmq.Socket] = None,
+                 timeout: Optional[float] = None):
         self.socket_type = socket_type
         if bind is None and connect is None:
             raise ValueError("Either 'bind' or 'connect' must be specified.")
@@ -110,6 +111,7 @@ class ZMQContextManager:
         self.secret_key = secret_key
         self.public_key = public_key
         self.server_public_key = server_public_key
+        self.timeout = timeout
 
         if secret_key_file:
             self.public_key, self.secret_key = zmq.auth.load_certificate(
@@ -150,7 +152,7 @@ class ZMQContextManager:
         if asyncio:
             self.context = zmq.asyncio.Context()
         else:
-            self.context = zmq.Context.instance()
+            self.context = zmq.Context()
 
         self.socket = self.context.socket(self.socket_type)
         self.auth = None
@@ -175,6 +177,11 @@ class ZMQContextManager:
             if self.server_public_key:
                 self.socket.curve_serverkey = self.server_public_key
             self.socket.connect(self.connect)
+        if self.timeout:
+            timeout_ms = int(self.timeout * 1000)
+            self.socket.setsockopt(zmq.RCVTIMEO, timeout_ms)
+            self.socket.setsockopt(zmq.SNDTIMEO, timeout_ms)
+        self.socket.setsockopt(zmq.LINGER, 0)
         return self.socket
 
     def reload_certificates(self):

qulab-2.10.8/qulab/version.py

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

qulab-2.10.8/tests/test_dicttree.py

@@ -0,0 +1,163 @@
+from qulab.dicttree import *
+
+step1 = {'a': {'x': 1, 'y': 2}, 'b': {'x': 3, 'y': 4}}
+step2 = {'a': {'x': 2}, 'b': {'x': 3, 'y': 5}, 'c': {'x': 15}, 'd': 1, 'e': 1}
+step3 = {'a': {'x': 3, 'y': 2, 'p': {'w': 10}}, 'c': {'x': 16}, 'd': 1, 'e': 2}
+step4 = {'a': {'x': 4, 'y': 2}, 'b': {'x': 6, 'y': 4}, 'c': {'x': 17}}
+
+data = {
+    'qubits': {
+        'Q1': {
+            'frequency': 3.5,
+        },
+        'Q2': {
+            'frequency': 3.6,
+        },
+    },
+    'gate': {
+        'pi2': {
+            'Q1': {
+                'freq': '$qubits.Q1.frequency',
+                'amp': 0.5,
+                'duration': '& 1/$.amp',
+            },
+            'Q2': {
+                'freq': '$....qubits.Q2.frequency',
+                'amp': 0.6,
+                'duration': '& sin(1/$.amp)',
+            }
+        }
+    }
+}
+
+
+def test_flattenDict():
+    assert flattenDict({}) == {}
+    assert flattenDict(step1) == {'a.x': 1, 'a.y': 2, 'b.x': 3, 'b.y': 4}
+
+
+def test_foldDict():
+    assert foldDict({}) == {}
+    assert foldDict(flattenDict(step1)) == step1
+
+
+def test_diff():
+    assert diff({}, {}) == {}
+    assert diff(step1, step1) == {}
+    assert diff(step1, {}) == {'a': DELETE, 'b': DELETE}
+
+    d1 = diff({}, step1)
+    assert isinstance(d1['a'], Create) and d1['a'].n == {
+        'x': 1,
+        'y': 2
+    } and d1['a'].replace == False
+    assert isinstance(d1['b'], Create) and d1['b'].n == {
+        'x': 3,
+        'y': 4
+    } and d1['b'].replace == False
+
+
+def test_patch():
+    assert patch(step1, {}) == step1
+    assert patch(step1, diff(step1, {})) == {}
+    assert patch({}, diff({}, step1)) == step1
+
+    test = {
+        'a': 1,
+        'b': 2,
+        'c': {
+            'x': 3
+        },
+        'd': {
+            'y': 4
+        },
+        'e': {
+            'x': 1,
+            'y': 4
+        }
+    }
+    patch(test, {
+        'a': Update(1, 10),
+        'b': DELETE,
+        'c': Create({'z': 12}, replace=True),
+        'd': {
+            'x': Create(5),
+            'y': Update(4, 40)
+        },
+        'e': Create({
+            'x': 2,
+            'z': 13
+        })
+    },
+          in_place=True)
+
+    assert test == {
+        'a': 10,
+        'c': {
+            'z': 12
+        },
+        'd': {
+            'x': 5,
+            'y': 40
+        },
+        'e': {
+            'x': 2,
+            'y': 4,
+            'z': 13
+        }
+    }
+
+    d1 = diff(step1, step2)
+    d2 = diff(step2, step3)
+    d3 = diff(step3, step4)
+
+    assert patch(step1, d1) == step2
+    assert patch(step2, d2) == step3
+    assert patch(step3, d3) == step4
+
+
+def test_merge():
+    d1 = diff(step1, step2)
+    d2 = diff(step2, step3)
+    d3 = diff(step3, step4)
+
+    assert merge(d1, d2, origin=step1) == diff(step1, step3)
+    assert merge(d2, d3, origin=step2) == diff(step2, step4)
+
+    assert patch(step1, merge(d1, d2)) == step3
+    assert patch(step1, merge(merge(d1, d2), d3)) == step4
+    assert patch(step1, merge(d1, merge(d2, d3))) == step4
+
+
+def test_query():
+    assert query_tree('a', step3) == {'x': 3, 'y': 2, 'p': {'w': 10}}
+    assert query_tree('a.p', step3) == {'w': 10}
+    assert query_tree('a.p.w', step3) == 10
+    assert query_tree('a.p.w', step1) == (NOTSET, 'a.p')
+
+
+def test_ref():
+    assert query_tree('gate.pi2.Q1.freq', data) == 3.5
+    assert query_tree('gate.pi2.Q2.freq', data) == 3.6
+
+
+# def test_eval():
+#     assert query_tree('gate.pi2.Q1.duration', data) == 2.0
+#     assert query_tree('gate.pi2.Q2.duration', data) == 0.9954079577517649
+
+
+def test_print():
+    import io
+    buf = io.StringIO()
+
+    d1 = diff(step1, step3)
+    print_diff(d1, file=buf)
+
+    buf.seek(0)
+    assert buf.read() == (
+        "a.x                                      Update: 1 ==> 3\n"
+        "a.p                                      Create: {'w': 10}\n"
+        "c                                        Create: {'x': 16}\n"
+        "d                                        Create: 1\n"
+        "e                                        Create: 2\n"
+        "b                                        Delete\n")

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

@@ -162,10 +162,10 @@ def test_environment():
     env = Env()
     # 在自定义环境中绑定变量
     env["x"] = 10
-    result = calc("x+5", x=env["x"])
+    result = calc("x+5", env)
     assert result == 15, "通过环境变量传值x=10，应得15"
 
     # 绑定新变量并验证其值
     env["y"] = 20
-    result = calc("x+y", x=env["x"], y=env["y"])
+    result = calc("x+y", env)
     assert result == 30, "x+y 应为30，当x=10且y=20"

qulab-2.10.6/qulab/version.py

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