QuLab 2.0.6__cp310-cp310-win_amd64.whl → 2.0.8__cp310-cp310-win_amd64.whl

{QuLab-2.0.6.dist-info → QuLab-2.0.8.dist-info}/METADATA

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

{QuLab-2.0.6.dist-info → QuLab-2.0.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
 qulab/__init__.py,sha256=8zLGg-DfQhnDl2Ky0n-zXpN-8e-g7iR0AcaI4l4Vvpk,32
 qulab/__main__.py,sha256=XN2wrhlmEkTIPq_ZeSaO8rWXfYgD2Czkm9DVFVoCw_U,515
-qulab/fun.cp310-win_amd64.pyd,sha256=mvEXZaWIH3aNiZd7ggJKUUfeKQ1dIMeRhKoOONl7adg,31232
-qulab/version.py,sha256=IoNlI2ogLAGBFo-lP1Eg_QnxTNCxj3o2OCiBaMyJrP8,21
+qulab/fun.cp310-win_amd64.pyd,sha256=1barv1qyRFoNqphdufFTMzafar5r3yRlush7ULt3L_Y,31232
+qulab/version.py,sha256=DfI-RPnMF5c2VXIHTsOnE09mUWlPr23ZlXLyX4lCZxY,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,7 +19,7 @@ qulab/scan/models.py,sha256=TkiVHF_fUZzYHs4MsCTRh391thpf4Ozd3R_LAU0Gxkg,17657
 qulab/scan/optimize.py,sha256=MlT4y422CnP961IR384UKryyZh8riNvrPSd2z_MXLEg,2356
 qulab/scan/query_record.py,sha256=rpw4U3NjLzlv9QMwKdCvEUGHjzPF8u1UpodfLW8aoTY,11853
 qulab/scan/recorder.py,sha256=lbIASqH4-4eTzqX1sG9K1LnUkqvkcRK5ab2OpXSeE-Y,22801
-qulab/scan/scan.py,sha256=3HXIpwoQJJNWRBXCqTsNqzMJsZ_tnygkANOH1UJC7Xs,26847
+qulab/scan/scan.py,sha256=jLYEn5WpAEdyCz-gGKz1My-6YK5xV-WlJ5kSfkINizY,29292
 qulab/scan/server.py,sha256=zDZfG6bOB3EUubfByQMq0BSQ9C6IV_Av0tDinzgpGjQ,2950
 qulab/scan/utils.py,sha256=XM-eKL5Xkm0hihhGS7Kq4g654Ye7n7TcU_f95gxtXq8,2634
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -77,9 +77,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.0.6.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.0.6.dist-info/METADATA,sha256=541-jW-KE_KRTxXVjXDg4Hb4Bn_rFtpb3KeNgEhoM6I,3609
-QuLab-2.0.6.dist-info/WHEEL,sha256=lO6CqtLHCAi38X3Es1a4R1lAjZFvN010IMRCFo2S7Mc,102
-QuLab-2.0.6.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
-QuLab-2.0.6.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.0.6.dist-info/RECORD,,
+QuLab-2.0.8.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.0.8.dist-info/METADATA,sha256=INSqm390STs1Mj_4DDCF6cb3B99R9d-H9Jmk4NelB9Q,3609
+QuLab-2.0.8.dist-info/WHEEL,sha256=lO6CqtLHCAi38X3Es1a4R1lAjZFvN010IMRCFo2S7Mc,102
+QuLab-2.0.8.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.0.8.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.0.8.dist-info/RECORD,,

qulab/scan/scan.py

@@ -185,6 +185,8 @@ class Scan():
             'loops': {},
             'consts': {},
             'functions': {},
+            'getters': {},
+            'setters': {},
             'optimizers': {},
             'namespace': {} if dump_globals else None,
             'actions': {},
@@ -342,7 +344,7 @@ class Scan():
             self.description['filters'][level] = []
         self.description['filters'][level].append(func)
 
-    def set(self, name: str, value):
+    def set(self, name: str, value, setter: Callable | None = None):
         try:
             dill.dumps(value)
         except:
@@ -355,8 +357,14 @@ class Scan():
             self.description['functions'][name] = value
         else:
             self.description['consts'][name] = value
-
-    def search(self, name: str, range, level: int | None = None):
+        if setter:
+            self.description['setters'][name] = setter
+
+    def search(self,
+               name: str,
+               range: Iterable | Expression | Callable | OptimizeSpace,
+               level: int | None = None,
+               setter: Callable | None = None):
         if level is not None:
             assert level >= 0, 'level must be greater than or equal to 0.'
         if isinstance(range, OptimizeSpace):
@@ -370,12 +378,23 @@ class Scan():
             self._add_loop_var(name, level, range)
             if isinstance(range, Expression) or callable(range):
                 self.add_depends(name, range.symbols())
+        if setter:
+            self.description['setters'][name] = setter
+
+    def trace(self,
+              name: str,
+              depends: list[str],
+              getter: Callable | None = None):
+        self.add_depends(name, depends)
+        if getter:
+            self.description['getters'][name] = getter
 
     def minimize(self,
                  name: str,
                  level: int,
                  method=NgOptimizer,
                  maxiter=100,
+                 getter: Callable | None = None,
                  **kwds) -> Optimizer:
         assert level >= 0, 'level must be greater than or equal to 0.'
         opt = Optimizer(self,
@@ -386,6 +405,8 @@ class Scan():
                         minimize=True,
                         **kwds)
         self.description['optimizers'][name] = opt
+        if getter:
+            self.description['getters'][name] = getter
         return opt
 
     def maximize(self,
@@ -393,6 +414,7 @@ class Scan():
                  level: int,
                  method=NgOptimizer,
                  maxiter=100,
+                 getter: Callable | None = None,
                  **kwds) -> Optimizer:
         assert level >= 0, 'level must be greater than or equal to 0.'
         opt = Optimizer(self,
@@ -403,6 +425,8 @@ class Scan():
                         minimize=False,
                         **kwds)
         self.description['optimizers'][name] = opt
+        if getter:
+            self.description['getters'][name] = getter
         return opt
 
     async def _update_progress(self):
@@ -413,12 +437,24 @@ class Scan():
             elif inspect.isawaitable(task):
                 await task
 
-    async def _run(self):
+    async def run(self):
         assymbly(self.description)
+        if isinstance(
+                self.description['database'],
+                str) and self.description['database'].startswith("tcp://"):
+            async with ZMQContextManager(
+                    zmq.DEALER,
+                    connect=self.description['database']) as socket:
+                self._sock = socket
+                await self._run()
+        else:
+            await self._run()
+
+    async def _run(self):
         task = asyncio.create_task(self._update_progress())
         self._task_pool.append(task)
         self._variables = {'self': self}
-        self._variables.update(self.description['consts'])
+        self._variables.update(self.description['consts'].copy())
         for level, total in self.description['total'].items():
             if total == np.inf:
                 total = None
@@ -428,18 +464,13 @@ class Scan():
                 if name in self.description['functions']:
                     self.variables[name] = await call_function(
                         self.description['functions'][name], self.variables)
-        if isinstance(
-                self.description['database'],
-                str) and self.description['database'].startswith("tcp://"):
-            async with ZMQContextManager(
-                    zmq.DEALER,
-                    connect=self.description['database']) as socket:
-                self._sock = socket
-                self.record = await self.create_record()
-                await self.work()
-        else:
-            self.record = await self.create_record()
-            await self.work()
+                if name in self.description['setters']:
+                    coro = self.description['setters'][name](
+                        self.variables[name])
+                    if inspect.isawaitable(coro):
+                        await coro
+        self.record = await self.create_record()
+        await self.work()
         for level, bar in self._bar.items():
             bar.close()
 
@@ -449,10 +480,15 @@ class Scan():
                 evt.set()
             elif inspect.isawaitable(evt):
                 await evt
-        task.cancel()
         if self._single_step:
+            for group in self.description['order'].get(-1, []):
+                for name in group:
+                    if name in self.description['getters']:
+                        self.variables[name] = await call_function(
+                            self.description['getters'][name], self.variables)
             await self.emit(0, 0, 0, self.variables.copy())
             await self.emit(-1, 0, 0, {})
+        task.cancel()
         return self.variables
 
     async def done(self):
@@ -467,7 +503,7 @@ class Scan():
 
     def start(self):
         import asyncio
-        self._main_task = asyncio.create_task(self._run())
+        self._main_task = asyncio.create_task(self.run())
 
     async def submit(self, server='tcp://127.0.0.1:6788'):
         assymbly(self.description)
@@ -505,7 +541,8 @@ class Scan():
                 self.variables,
                 self.description['loops'].get(self.current_level, []),
                 self.description['order'].get(self.current_level, []),
-                self.description['functions'], self.description['optimizers']):
+                self.description['functions'], self.description['optimizers'],
+                self.description['setters'], self.description['getters']):
             self._current_level += 1
             if await self._filter(variables, self.current_level - 1):
                 yield variables
@@ -703,7 +740,10 @@ def assymbly(description):
 
     levels = {}
     passed = set()
-    all_keys = set()
+    all_keys = set(description['consts'].keys())
+    for key in dependents:
+        all_keys.add(key)
+        all_keys.update(dependents[key])
     for level in reversed(description['loops'].keys()):
         tag = f'#__loop_{level}'
         for key, deps in full_depends.items():
@@ -744,12 +784,23 @@ def assymbly(description):
     return description
 
 
+async def _update_variables(variables, updates, setters):
+    for name, value in updates.items():
+        if name in setters:
+            coro = setters[name](value)
+            if inspect.isawaitable(coro):
+                await coro
+        variables[name] = value
+
+
 async def _iter_level(variables,
                       iters: list[tuple[str, Iterable | Expression | Callable
                                         | OptimizeSpace]],
                       order: list[list[str]],
                       functions: dict[str, Callable | Expression],
-                      optimizers: dict[str, Optimizer]):
+                      optimizers: dict[str, Optimizer],
+                      setters: dict[str, Callable] = {},
+                      getters: dict[str, Callable] = {}):
     iters_d = {}
     env = Env()
     env.variables = variables
@@ -772,23 +823,32 @@ async def _iter_level(variables,
         maxiter = min(maxiter, opt_cfg.maxiter)
 
     async for args in async_zip(*iters_d.values(), range(maxiter)):
-        variables.update(dict(zip(iters_d.keys(), args[:-1])))
+        await _update_variables(variables, dict(zip(iters_d.keys(),
+                                                    args[:-1])), setters)
         for name, opt in opts.items():
             args = opt.ask()
             opt_cfg = optimizers[name]
-            variables.update({
+            await _update_variables(variables, {
                 n: v
                 for n, v in zip(opt_cfg.dimensions.keys(), args)
-            })
+            }, setters)
 
         for group in order:
             for name in group:
                 if name in functions:
-                    variables[name] = await call_function(
-                        functions[name], variables)
+                    await _update_variables(variables, {
+                        name:
+                        await call_function(functions[name], variables)
+                    }, setters)
 
         yield variables
 
+        for group in order:
+            for name in group:
+                if name in getters:
+                    variables[name] = await call_function(
+                        getters[name], variables)
+
         for name, opt in opts.items():
             opt_cfg = optimizers[name]
             args = [variables[n] for n in opt_cfg.dimensions.keys()]

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.0.6"
+__version__ = "2.0.8"