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

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

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

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

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

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

@@ -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.dist-info → qulab-2.10.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
 qulab/__init__.py,sha256=WW0jUmIXEp_8cfLVUtg-C8COIDbZp0X9mIlz3suJkrU,407
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 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/expression.py,sha256=ZnTepyvhG2DUdOvCCny8jbeNCsvYi6G4xjdr05HxLuE,25751
+qulab/fun.cpython-312-darwin.so,sha256=MTRGta9a8wIB7DI8pin_rPUNAF9c7rJNPAJCBMUxmRg,126864
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
 qulab/utils.py,sha256=BdLdlfjpe6m6gSeONYmpAKTTqxDaYHNk4exlz8kZxTg,2982
-qulab/version.py,sha256=9LJkGNy79PoPvb-ypqzJeCk2XlpeUgkGouuN08RGMH4,22
+qulab/version.py,sha256=v1ULYkz4y1F6VU70svKTuocAXtwJT06U9uYHUyHkGVA,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
@@ -33,12 +33,12 @@ qulab/scan/__init__.py,sha256=Z88CzGsvr1VdKbF6aYgQv3j-fsEkKmqvpvX4LlzOM98,87
 qulab/scan/curd.py,sha256=ZcwO5SKO95OcDgpUPDHcK5FW_BrJbUzuBk71UG_pqnM,6888
 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/query.py,sha256=SM4N3YfUpWnocl_7WNj00ff8uNzRQINMK0RNfPoDcoc,12254
 qulab/scan/record.py,sha256=yIHPANf6nuBXy8Igf-dMtGJ7wuFTLYlBaaAUc0AzwyU,21280
-qulab/scan/scan.py,sha256=6ksam9jQ5yplt-VxCo9Mntys5NJ_00TCuitDmRSYHoY,39496
-qulab/scan/server.py,sha256=QhUo-TxdTb_PDBd4sDRiI5L1WHmuEOAYEmUiFhjNqc4,16995
+qulab/scan/scan.py,sha256=m4EomeknN7MmNH-6M1mSmGHgz5QdkTkvHIkH6v66Bo4,39473
+qulab/scan/server.py,sha256=Y1W3DysWBFQxR7-GoP95gvsf2SxRPY40GnONbmkQCu4,17188
 qulab/scan/space.py,sha256=OQLepiNNP5TNYMHXeVFT59lL5n4soPmnMoMy_o9EHt0,6696
-qulab/scan/utils.py,sha256=WFVzwtVebvfYRgMo1ofaWLx90grjMKuoUB8RaK0DMts,6125
+qulab/scan/utils.py,sha256=38-rxQmMfKn1QVeScvyyGCk01dE2eE9ffPssdgtSCZA,6289
 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
@@ -87,7 +87,7 @@ qulab/sys/rpc/server.py,sha256=e3R0gwOHpLEkSp7Tb43FMSDvqSG-pjrkskdISKQRseE,713
 qulab/sys/rpc/socket.py,sha256=e3R0gwOHpLEkSp7Tb43FMSDvqSG-pjrkskdISKQRseE,713
 qulab/sys/rpc/utils.py,sha256=6YGFOkY7o09lkA_I1FIP9_1Up3k2F1KOkftvu0_8lxo,594
 qulab/sys/rpc/worker.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qulab/sys/rpc/zmq_socket.py,sha256=2uc9MjCRUwWm6iPmi2VGnOYNf9yWFSUzEVYrx0jZvPU,8272
+qulab/sys/rpc/zmq_socket.py,sha256=fyElXf0mghlKX7ZZKFoJgs043emfu1L7jr8DTzmEW20,8587
 qulab/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/tools/connection_helper.py,sha256=o1t6UpJQPyj4mWY66axgQkgsqUzdkhEGBJo44x9U1iE,946
 qulab/visualization/__init__.py,sha256=26cuHt3QIJXUb3VaMxlJx3IQTOUVJFKlYBZr7WMP53M,6129
@@ -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.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,,
+qulab-2.10.8.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.10.8.dist-info/METADATA,sha256=qzJEbCW1HnzQss2hCBqLu2WHj0O9T0BkqkVeBlNbguo,3753
+qulab-2.10.8.dist-info/WHEEL,sha256=Inq8GN4B3FxqLqMouJgNCh3_KlBp46ucqLBYqKIagAU,115
+qulab-2.10.8.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.10.8.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.10.8.dist-info/RECORD,,

{qulab-2.10.6.dist-info → qulab-2.10.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-macosx_10_13_universal2