QuLab 2.2.6__cp310-cp310-win_amd64.whl → 2.2.7__cp310-cp310-win_amd64.whl

{QuLab-2.2.6.dist-info → QuLab-2.2.7.dist-info}/METADATA

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

{QuLab-2.2.6.dist-info → QuLab-2.2.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 qulab/__init__.py,sha256=vkFybY8YSsQilYdThPRD83-btPAR41sy_WCXiM-6mME,141
 qulab/__main__.py,sha256=V7iokU7awstgjCeiF_hoOdFyrqJwC_4QetiLe7cWvOQ,454
-qulab/fun.cp310-win_amd64.pyd,sha256=R50QTjA_NNs2c1bpEvHA3wn92yzgudCE3Vork5hncxA,31744
-qulab/version.py,sha256=CsrswO-ECCDHSY48Nv5lOOdRgL8EGAixBOHDf7PkRZA,21
+qulab/fun.cp310-win_amd64.pyd,sha256=HhDHwlovmbtFML-GZmXElJ4iouH5WffpId7e6GRBf1s,31744
+qulab/version.py,sha256=I501tBgxLlOMpveUyk065aIcjgpxqCi7zjY3gqoar7c,21
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
 qulab/monitor/__main__.py,sha256=k2H1H5Zf9LLXTDLISJkbikLH-z0f1e5i5i6wXXYPOrE,105
 qulab/monitor/config.py,sha256=y_5StMkdrbZO1ziyKBrvIkB7Jclp9RCPK1QbsOhCxnY,785
@@ -18,9 +18,9 @@ qulab/scan/expression.py,sha256=vwUM9E0OFQal4bljlUtLR3NJu4zGRyuWYrdyZSs3QTU,1619
 qulab/scan/models.py,sha256=ZvXkJEt5Yz3Sjx0JKzYka-q2Uo-w_iVzHgH8A6DbjF0,18236
 qulab/scan/optimize.py,sha256=MlT4y422CnP961IR384UKryyZh8riNvrPSd2z_MXLEg,2356
 qulab/scan/query.py,sha256=RM8bG4Tcx_PaNk8tv9HdlTZ1dGuuSr3sZVkYVq2BtfQ,12183
-qulab/scan/record.py,sha256=wqIAXcRx-TNtlDuYBj-OEm277EWFL3Sl8x4WkhWTNIA,21703
-qulab/scan/scan.py,sha256=TByI8LHSCcfaEUav9bH9qFWYBPyrjB9oOuvvT4hYuvc,35928
-qulab/scan/server.py,sha256=ZWTnlK_YMfPTCoq6GnGpsZzSFGyoO4qF7aEGW9wCwhM,14542
+qulab/scan/record.py,sha256=aBpUllhKsBRhPOwZwsp3rcw2HB-3ne9yLYHLBeXXM-M,21669
+qulab/scan/scan.py,sha256=hYTEEa4frIN6HraNleoytnCZjZ0c_XWOI1DSLchkpuE,37589
+qulab/scan/server.py,sha256=GTV9wzlFTmG6YUj_8WwR4e6uvaq9AgdearLh3i3YAfw,14569
 qulab/scan/space.py,sha256=fWsY99HDauk89f5ygqnJYBoeNFGTUkAGFssrw-YMHok,5453
 qulab/scan/utils.py,sha256=30qnYvyFyctwcWxOCUpCNxXgGysA7xdIDzYbjwxGUzA,3744
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -78,9 +78,9 @@ qulab/visualization/plot_layout.py,sha256=yAnMONOms7_szCdng-8wPpUMPis5UnbaNNzV4K
 qulab/visualization/plot_seq.py,sha256=h9D0Yl_yO64IwlvBgzMu9EBKr9gg6y8QE55gu2PfTns,2783
 qulab/visualization/qdat.py,sha256=HubXFu4nfcA7iUzghJGle1C86G6221hicLR0b-GqhKQ,5887
 qulab/visualization/widgets.py,sha256=HcYwdhDtLreJiYaZuN3LfofjJmZcLwjMfP5aasebgDo,3266
-QuLab-2.2.6.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.2.6.dist-info/METADATA,sha256=pQVHj7boWPB5vS2J5mDJjspwUM-EZIJP24mWz5prhmg,3609
-QuLab-2.2.6.dist-info/WHEEL,sha256=lO6CqtLHCAi38X3Es1a4R1lAjZFvN010IMRCFo2S7Mc,102
-QuLab-2.2.6.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
-QuLab-2.2.6.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.2.6.dist-info/RECORD,,
+QuLab-2.2.7.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.2.7.dist-info/METADATA,sha256=uMz3KTAANhe7RMJa0Y-Q0LXISTG98aYohmRRA05bSK4,3609
+QuLab-2.2.7.dist-info/WHEEL,sha256=lO6CqtLHCAi38X3Es1a4R1lAjZFvN010IMRCFo2S7Mc,102
+QuLab-2.2.7.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.2.7.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.2.7.dist-info/RECORD,,

qulab/scan/record.py

@@ -453,7 +453,6 @@ class Record():
             if isinstance(d, BufferList):
                 if isinstance(d.file, str):
                     d.file = self._file.parent.parent.parent.parent / d.file
-                d._slice = slice
                 if buffer_to_array:
                     return d.toarray()
                 else:

qulab/scan/scan.py

@@ -310,7 +310,10 @@ class Scan():
             self._main_task.cancel()
         except:
             pass
-        self._executors.shutdown()
+        try:
+            self._executors.shutdown()
+        except:
+            pass
 
     @property
     def current_level(self):
@@ -323,7 +326,7 @@ class Scan():
     async def _emit(self, current_level, step, position, variables: dict[str,
                                                                          Any]):
         for key, value in list(variables.items()):
-            if key.startswith('*'):
+            if key.startswith('*') or ',' in key:
                 await _unpack(key, variables)
             elif inspect.isawaitable(value) and not self.hiden(key):
                 variables[key] = await value
@@ -356,8 +359,8 @@ class Scan():
         self._hide_pattern_re = re.compile('|'.join(self.description['hiden']))
 
     def hiden(self, name: str) -> bool:
-        return bool(
-            self._hide_pattern_re.match(name)) and not name.startswith('*')
+        return bool(self._hide_pattern_re.match(name)) or name.startswith(
+            '*') or ',' in name
 
     async def _filter(self, variables: dict[str, Any], level: int = 0):
         try:
@@ -444,6 +447,11 @@ class Scan():
             except:
                 pass
             self.description['consts'][name] = value
+
+        if ',' in name:
+            for key in name.split(','):
+                if not key.startswith('*'):
+                    self.add_depends(key, [name])
         if setter:
             self.description['setters'][name] = setter
 
@@ -903,7 +911,10 @@ def assymbly(description):
                         axis[name] = tuple(sorted(d))
                     else:
                         axis[name] = tuple(sorted(set(axis[name]) | d))
-    description['axis'] = axis
+    description['axis'] = {
+        k: tuple([x for x in v if x >= 0])
+        for k, v in axis.items()
+    }
     description['independent_variables'] = independent_variables
 
     return description
@@ -974,7 +985,7 @@ async def _iter_level(variables,
 
         if opts:
             for key in list(variables.keys()):
-                if key.startswith('*'):
+                if key.startswith('*') or ',' in key:
                     await _unpack(key, variables)
 
         for name, opt in opts.items():
@@ -1026,7 +1037,8 @@ async def _unpack(key, variables):
     if inspect.isawaitable(x):
         x = await x
     if key.startswith('**'):
-        assert isinstance(x, dict), f"Should promise a dict for `**` symbol."
+        assert isinstance(
+            x, dict), f"Should promise a dict for `**` symbol. {key}"
         if "{key}" in key:
             for k, v in x.items():
                 variables[key[2:].format(key=k)] = v
@@ -1035,10 +1047,44 @@ async def _unpack(key, variables):
     elif key.startswith('*'):
         assert isinstance(
             x, (list, tuple,
-                np.ndarray)), f"Should promise a list for `*` symbol."
+                np.ndarray)), f"Should promise a list for `*` symbol. {key}"
         for i, v in enumerate(x):
             k = key[1:].format(i=i)
             variables[k] = v
+    elif ',' in key:
+        keys1, keys2 = [], []
+        args = None
+        for k in key.split(','):
+            if k.startswith('*'):
+                if args is None:
+                    args = k
+                else:
+                    raise ValueError(f'Only one `*` symbol is allowed. {key}')
+            elif args is None:
+                keys1.append(k)
+            else:
+                keys2.append(k)
+        assert isinstance(
+            x,
+            (list, tuple,
+             np.ndarray)), f"Should promise a list for multiple symbols. {key}"
+        if args is None:
+            assert len(keys1) == len(
+                x), f"Length of keys and values should be equal. {key}"
+            for k, v in zip(keys1, x):
+                variables[k] = v
+        else:
+            assert len(keys1) + len(keys2) <= len(
+                x), f"Too many values for unpacking. {key}"
+            for k, v in zip(keys1, x[:len(keys1)]):
+                variables[k] = v
+            end = -len(keys2) if keys2 else None
+            for i, v in enumerate(x[len(keys1):end]):
+                k = args[1:].format(i=i)
+                variables[k] = v
+            if keys2:
+                for k, v in zip(keys2, x[end:]):
+                    variables[k] = v
     else:
         return
     del variables[key]

qulab/scan/server.py

@@ -161,8 +161,9 @@ async def handle(session: Session, request: Request, datapath: Path):
                 iter_id = uuid.uuid3(namespace, str(time.time_ns())).bytes
                 record = get_record(session, msg['record_id'], datapath)
                 bufferlist = record.get(msg['key'],
-                                        buffer_to_array=False,
-                                        slice=msg['slice'])
+                                        buffer_to_array=False)
+                if msg['slice']:
+                    bufferlist._slice = msg['slice']
                 it = bufferlist.iter()
                 for _, _ in zip(range(msg['start']), it):
                     pass

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.2.6"
+__version__ = "2.2.7"