QuLab 2.2.6__cp311-cp311-macosx_10_9_universal2.whl → 2.2.8__cp311-cp311-macosx_10_9_universal2.whl

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.2.6
+Version: 2.2.8
 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.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
 qulab/__init__.py,sha256=P-Mx2p4TVmL91SoxoeXcj8Qm0x4xUf5Q_FLk0Yc_gIQ,138
 qulab/__main__.py,sha256=ZC1NKaoxKyy60DaCfB8vYnB1z3RXQ2j8E1sRZ4A8sXE,428
-qulab/fun.cpython-311-darwin.so,sha256=VU-AxnPqaotR3zCtI9i09cvMWyTLX6x32LzM9YIkeZg,159616
-qulab/version.py,sha256=CsrswO-ECCDHSY48Nv5lOOdRgL8EGAixBOHDf7PkRZA,21
+qulab/fun.cpython-311-darwin.so,sha256=EHucjdofGsMX53ufN_AydAAW7OYWofvI5v-bRgRtM9I,159616
+qulab/version.py,sha256=orWdhtLf5L0uyMwYMv-baYndrBUtQQg-ackBu8Y5UJo,21
 qulab/monitor/__init__.py,sha256=nTHelnDpxRS_fl_B38TsN0njgq8eVTEz9IAnN3NbDlM,42
 qulab/monitor/__main__.py,sha256=w3yUcqq195LzSnXTkQcuC1RSFRhy4oQ_PEBmucXguME,97
 qulab/monitor/config.py,sha256=fQ5JcsMApKc1UwANEnIvbDQZl8uYW0tle92SaYtX9lI,744
@@ -14,14 +14,14 @@ qulab/monitor/qt_compat.py,sha256=OK71_JSO_iyXjRIKHANmaK4Lx4bILUzmXI-mwKg3QeI,78
 qulab/monitor/toolbar.py,sha256=WEag6cxAtEsOLL14XvM7pSE56EA3MO188_JuprNjdBs,7948
 qulab/scan/__init__.py,sha256=ZX4WsvqYxvJeHLgGSrtJoAnVU94gxY7EHKMxYooMERg,130
 qulab/scan/curd.py,sha256=thq_qfi3qng3Zx-1uhNG64IQhGCuum_LR4MOKnS8cDI,6896
-qulab/scan/expression.py,sha256=-aTYbjFQNI1mwOcoSBztqhKfGJpu_n4a1QnWro_xnTU,15694
+qulab/scan/expression.py,sha256=JsJ00qK05QVDAgz-husRuov7hKg8nW75rsTwLG8RH7Q,15843
 qulab/scan/models.py,sha256=5Jpo25WGMWs0GtLzYLsWO61G3-FFYx5BHhBr2b6rOTE,17681
 qulab/scan/optimize.py,sha256=vErjRTCtn2MwMF5Xyhs1P4gHF2IFHv_EqxsUvH_4y7k,2287
 qulab/scan/query.py,sha256=-5uHMhXSyGovK1oy_uUbGVEbRFzaMBkP78ZMNfI3jD0,11809
-qulab/scan/record.py,sha256=xgmhtL9l019HYHOHvyzK1vxqagGam51rAM7sj9ZWm5U,21103
-qulab/scan/scan.py,sha256=YPGeuBwxepwmKvz3HE0X5euHqPQGSc9NUGEPEiPRiso,34884
-qulab/scan/server.py,sha256=u6in_8-AfcCA4pGAolNR_2emlewGdc3bN6c0pDygBWY,14158
-qulab/scan/space.py,sha256=jDmFY2FcYe-Qcp16YBhAEdTKibOAsHQUnpDrpcPhvzg,5279
+qulab/scan/record.py,sha256=-FL9JMgfhvkT0q7dhJJXbjXOrOkTIk2J9oPmxP6psuA,21070
+qulab/scan/scan.py,sha256=KRCoq0ezqwIQlOifUAk9hUR-G-ryywUwEwP__rLMdPo,36499
+qulab/scan/server.py,sha256=ZT-J447xuLSpmbTNm5dNIz8_CXKOow66_bjkFNGh_vI,14274
+qulab/scan/space.py,sha256=7Won0i4-5wuFeIACFx2Lq3BAqc_3S4S_nuVaSDTSeZs,5293
 qulab/scan/utils.py,sha256=Pg_tCf3SUKTiPSBqb6Enkgx4bAyQJAkDGe9uYys1xVU,3613
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/storage/__main__.py,sha256=3emxxRry8BB0m8hUZvJ_oBqkPy7ksV7flHB_KEDXZuI,1692
@@ -78,9 +78,9 @@ qulab/visualization/plot_layout.py,sha256=clNw9QjE_kVNpIIx2Ob4YhAz2fucPGMuzkoIrO
 qulab/visualization/plot_seq.py,sha256=lphYF4VhkEdc_wWr1kFBwrx2yujkyFPFaJ3pjr61awI,2693
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-QuLab-2.2.6.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.2.6.dist-info/METADATA,sha256=4vOBx495seNQlHygPaIrLKr2y7C5NtMIhPzwUnnI2r8,3510
-QuLab-2.2.6.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
-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.8.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.2.8.dist-info/METADATA,sha256=0YYD14QsQsGNgqZ-Wo26Y6N3Fd47CbE501cTGU0vah4,3510
+QuLab-2.2.8.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
+QuLab-2.2.8.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.2.8.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.2.8.dist-info/RECORD,,

qulab/scan/expression.py

@@ -284,6 +284,9 @@ class Expression():
         return ObjectMethod(self, '__getitem__', other)
 
     def __getattr__(self, other):
+        if isinstance(other, str):
+            if other.startswith('_') or other in self.__dict__:
+                return super().__getattr__(other)
         if isinstance(other, Expression):
             other = other.eval(_default_env)
         return ObjectMethod(self, '__getattr__', other)

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

@@ -160,9 +160,9 @@ async def handle(session: Session, request: Request, datapath: Path):
             else:
                 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'])
+                bufferlist = record.get(msg['key'], buffer_to_array=False)
+                if msg['slice']:
+                    bufferlist._slice = msg['slice']
                 it = bufferlist.iter()
                 for _, _ in zip(range(msg['start']), it):
                     pass
@@ -328,7 +328,11 @@ async def serv(port,
             while True:
                 identity, msg = await sock.recv_multipart()
                 received += len(msg)
-                req = Request(sock, identity, msg)
+                try:
+                    req = Request(sock, identity, msg)
+                except:
+                    logger.exception('bad request')
+                    continue
                 asyncio.create_task(
                     handle_with_timeout(session, req, datapath, timeout=60.0))
                 if received > buffer_size or time.time(

qulab/scan/space.py

@@ -147,7 +147,7 @@ class Optimizer():
                 high,
                 prior="uniform",
                 base=10,
-                transform=None,
+                transform="normalize",
                 name=None,
                 dtype=np.int64) -> OptimizeSpace:
         return OptimizeSpace(
@@ -158,7 +158,7 @@ class Optimizer():
              high,
              prior="uniform",
              base=10,
-             transform=None,
+             transform="normalize",
              name=None,
              dtype=float) -> OptimizeSpace:
         return OptimizeSpace(

qulab/version.py

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