QuLab 2.1.4__cp311-cp311-win_amd64.whl → 2.2.0__cp311-cp311-win_amd64.whl

{QuLab-2.1.4.dist-info → QuLab-2.2.0.dist-info}/METADATA

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

{QuLab-2.1.4.dist-info → QuLab-2.2.0.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.cp311-win_amd64.pyd,sha256=DejsYo6DVNrnZP6HToBN86HY5ICqbUqWNxGnC0q5t8A,31232
-qulab/version.py,sha256=HVJYMyJeujBoXcNkL2sXW9oxWN275q3pivrlKw3Hm3s,21
+qulab/fun.cp311-win_amd64.pyd,sha256=mZjoEtvfAnmQ2U5lxwg5eWrIqY2P3hqMCr9L9Sf8w3o,31744
+qulab/version.py,sha256=j8DDNpniPNhmwry5zUQczzr9Gj6bGU3sUUeXfGl_kKE,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
@@ -19,9 +19,9 @@ qulab/scan/models.py,sha256=ZvXkJEt5Yz3Sjx0JKzYka-q2Uo-w_iVzHgH8A6DbjF0,18236
 qulab/scan/optimize.py,sha256=MlT4y422CnP961IR384UKryyZh8riNvrPSd2z_MXLEg,2356
 qulab/scan/query.py,sha256=WZeTiEtycP4raqzIUEP6tNg-OMaQYfRCxcdyYP5Swyg,11819
 qulab/scan/record.py,sha256=K8h8psiT_xgHZem9HRwzEgmr9lE0dGYHjlfK11sHldw,19111
-qulab/scan/scan.py,sha256=hBl9BjKfH-PoofhtpaD-O6s37wxy88hBN59GUXAcAuo,34877
+qulab/scan/scan.py,sha256=ndH4heBDf_tuOA33G-0reIZVsUuzpCoJDsXk-xXeRVQ,35811
 qulab/scan/server.py,sha256=e7AqFmaN9924VYrbvyKwPrVBzqPcnXbT8YwexAN_ZjQ,11911
-qulab/scan/space.py,sha256=OPceWIIrb2KDDQaSxD3Vkzkf9NDSuqWuQoDnKiWqtAo,5381
+qulab/scan/space.py,sha256=PBa7Z6KnS690x79WS2YU3PTA_s5K6MCJ6JmS93vs2s4,5381
 qulab/scan/utils.py,sha256=30qnYvyFyctwcWxOCUpCNxXgGysA7xdIDzYbjwxGUzA,3744
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/storage/__main__.py,sha256=6-EjN0waX1yfcMPJXqpIr9UlrIEsSCFApm5G-ZeaPMQ,1742
@@ -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.1.4.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.1.4.dist-info/METADATA,sha256=viS-wETLJCqd-ugZW2Ac_Z_pl1_BGi8KbBXhrlxj2qs,3609
-QuLab-2.1.4.dist-info/WHEEL,sha256=nSybvzWlmdJnHiUQSY-d7V1ycwEVUTqXiTvr2eshg44,102
-QuLab-2.1.4.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
-QuLab-2.1.4.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.1.4.dist-info/RECORD,,
+QuLab-2.2.0.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.2.0.dist-info/METADATA,sha256=vLSXtsZtAzrGYscJu107F0XhgtNJWzTXzT0Y0DHITKw,3609
+QuLab-2.2.0.dist-info/WHEEL,sha256=nSybvzWlmdJnHiUQSY-d7V1ycwEVUTqXiTvr2eshg44,102
+QuLab-2.2.0.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.2.0.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.2.0.dist-info/RECORD,,

qulab/scan/scan.py

@@ -332,7 +332,17 @@ class Scan():
     async def _emit(self, current_level, step, position, variables: dict[str,
                                                                          Any]):
         for key, value in list(variables.items()):
-            if inspect.isawaitable(value) and not self.hiden(key):
+            if key.startswith('**'):
+                if isinstance(value, dict):
+                    variables.update(value)
+                    del variables[key]
+                elif inspect.isawaitable(value):
+                    d = await value
+                    assert isinstance(
+                        d, dict), f"Should promise a dict for `**` symbol."
+                    variables.update(d)
+                    del variables[key]
+            elif inspect.isawaitable(value) and not self.hiden(key):
                 variables[key] = await value
         if self._sock is not None:
             await self._sock.send_pyobj({
@@ -362,7 +372,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))
+        return bool(
+            self._hide_pattern_re.match(name)) and not name.startswith('**')
 
     async def _filter(self, variables: dict[str, Any], level: int = 0):
         try:
@@ -971,9 +982,21 @@ async def _iter_level(variables,
 
         variables.update(await call_many_functions(order, getters, variables))
 
+        if opts:
+            for key in list(variables.keys()):
+                if key.startswith('**'):
+                    d = variables[key]
+                    if inspect.isawaitable(d):
+                        d = await d
+                    assert isinstance(
+                        d, dict), f"Should promise a dict for `**` symbol."
+                    variables.update(d)
+                    del variables[key]
+
         for name, opt in opts.items():
             opt_cfg = optimizers[name]
             args = [variables[n] for n in opt_cfg.dimensions.keys()]
+
             if name not in variables:
                 raise ValueError(f'{name} not in variables.')
             fun = variables[name]

qulab/scan/space.py

@@ -23,11 +23,11 @@ class Space():
         return len(self.toarray())
 
     @classmethod
-    def fromarray(cls, array):
-        if isinstance(array, Space):
-            return array
-        if isinstance(array, (list, tuple)):
-            array = np.array(array)
+    def fromarray(cls, space):
+        if isinstance(space, Space):
+            return space
+        if isinstance(space, (list, tuple)):
+            array = np.array(space)
         try:
             a = np.linspace(array[0], array[-1], len(array), dtype=array.dtype)
             if np.allclose(a, array):
@@ -81,7 +81,7 @@ class Space():
                            dtype=array.dtype)
         except:
             pass
-        return array
+        return space
 
     def toarray(self):
         return getattr(np, self.function)(*self.args, **self.kwds)

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.1.4"
+__version__ = "2.2.0"