QuLab 2.1.3__tar.gz → 2.2.0__tar.gz

{qulab-2.1.3 → qulab-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.1.3
+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.3 → qulab-2.2.0}/QuLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.1.3
+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.3 → qulab-2.2.0}/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({
@@ -355,15 +365,15 @@ class Scan():
 
     def emit(self, current_level, step, position, variables: dict[str, Any]):
         self._msg_queue.put_nowait(
-            asyncio.create_task(
-                self._emit(current_level, step, position, variables.copy())))
+            self._emit(current_level, step, position, variables.copy()))
 
     def hide(self, name: str):
         self.description['hiden'].append(name)
         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:
@@ -972,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-2.1.3 → qulab-2.2.0}/qulab/scan/server.py

@@ -204,15 +204,18 @@ async def handle(session: Session, request: Request, datapath: Path):
             else:
                 await reply(request, None)
         case 'config_get':
-            config = get_config(session, msg['config_id'], base=datapath)
+            config = get_config(session,
+                                msg['config_id'],
+                                base=datapath / 'objects')
             session.commit()
             await reply(request, config)
         case 'config_update':
             config = create_config(session,
                                    msg['update'],
-                                   base=datapath,
+                                   base=datapath / 'objects',
                                    filename='/'.join(
-                                       random_path(datapath).parts[-4:]))
+                                       random_path(datapath /
+                                                   'objects').parts[-4:]))
             session.commit()
             await reply(request, config.id)
         case 'submit':

{qulab-2.1.3 → qulab-2.2.0}/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-2.2.0/qulab/version.py

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

qulab-2.1.3/qulab/version.py

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