QuLab 2.2.0__cp311-cp311-macosx_10_9_universal2.whl → 2.2.3__cp311-cp311-macosx_10_9_universal2.whl

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

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

{QuLab-2.2.0.dist-info → QuLab-2.2.3.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=yvKT1w1sOwwr1ylDsz3k9IhHcVSSatRjKtRbcwAe_7g,159616
-qulab/version.py,sha256=j8DDNpniPNhmwry5zUQczzr9Gj6bGU3sUUeXfGl_kKE,21
+qulab/fun.cpython-311-darwin.so,sha256=TQ2exCgdoX4CYlnrBv2JljwDa0H8XwjSCSxOE_wckZQ,159616
+qulab/version.py,sha256=Nt4yGCnk6mAxHxAbWGL2m0dPsKn_yhp3_F9LBmkhnvI,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
@@ -17,10 +17,10 @@ qulab/scan/curd.py,sha256=thq_qfi3qng3Zx-1uhNG64IQhGCuum_LR4MOKnS8cDI,6896
 qulab/scan/expression.py,sha256=-aTYbjFQNI1mwOcoSBztqhKfGJpu_n4a1QnWro_xnTU,15694
 qulab/scan/models.py,sha256=5Jpo25WGMWs0GtLzYLsWO61G3-FFYx5BHhBr2b6rOTE,17681
 qulab/scan/optimize.py,sha256=vErjRTCtn2MwMF5Xyhs1P4gHF2IFHv_EqxsUvH_4y7k,2287
-qulab/scan/query.py,sha256=Ct07TGwEedWY8z_Nv_1Y3BHIToli2KG88LB_X5VnZCU,11455
-qulab/scan/record.py,sha256=_s2f6hp1poiyOqp81cBzt7EbNmkUPBt08bmmDQYcXaE,18572
-qulab/scan/scan.py,sha256=Zdeg5RTKVHEyDWd4z_2xRsnxuNDOm1S2McncVk1jKe8,34774
-qulab/scan/server.py,sha256=EiS5hu1YM9e25W2tjekzfJiRkyD9urVLIo1dp3VXiDY,11591
+qulab/scan/query.py,sha256=rDVX5WkKfWcSpLpP55d6FL76xdCFQg7vG_83_IAtgHA,11551
+qulab/scan/record.py,sha256=LDbWPcBzWAmnEAqDv7Oxrwf7a_A29rk_jd9zRqQYOgc,19586
+qulab/scan/scan.py,sha256=dRtXewI8W9Fe5ZQsMz56XU-dopfa-MleEihYS0os7Eg,34422
+qulab/scan/server.py,sha256=EszeCBAHyZDdy-fq3RHPu696Do6qzsXmdamK6nkEIsw,12215
 qulab/scan/space.py,sha256=XEWQnlRYPix65LyiT6KLOK7WG2a11FJJ_M4H_dZ6Z-E,5209
 qulab/scan/utils.py,sha256=Pg_tCf3SUKTiPSBqb6Enkgx4bAyQJAkDGe9uYys1xVU,3613
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.0.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.2.0.dist-info/METADATA,sha256=dGfThQKKaP-VcDG5Nj0mSi3Z0gnytkYWShbUelPUm1M,3510
-QuLab-2.2.0.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
-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-2.2.3.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.2.3.dist-info/METADATA,sha256=I-G824CztR72B1Zk6pxWpLzlm4gKjH5qjGmVQzvJumE,3510
+QuLab-2.2.3.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
+QuLab-2.2.3.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.2.3.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.2.3.dist-info/RECORD,,

qulab/scan/query.py

@@ -12,8 +12,8 @@ from sqlalchemy.orm import sessionmaker
 from qulab.sys.rpc.zmq_socket import ZMQContextManager
 
 from .record import Record
-from .server import get_local_record
 from .scan import default_server
+from .server import get_local_record
 
 
 def get_record(id, database=default_server) -> Record:
@@ -24,6 +24,8 @@ def get_record(id, database=default_server) -> Record:
                 'record_id': id
             })
             d = dill.loads(socket.recv_pyobj())
+            if isinstance(d, None):
+                raise ValueError(f'No record with id {id}')
             d.id = id
             d.database = database
             d._file = None

qulab/scan/record.py

@@ -1,4 +1,6 @@
 import itertools
+import lzma
+import pickle
 import sys
 import uuid
 import zipfile
@@ -12,6 +14,7 @@ import zmq
 
 from qulab.sys.rpc.zmq_socket import ZMQContextManager
 
+from .curd import get_config
 from .space import OptimizeSpace, Space
 
 _not_given = object()
@@ -326,6 +329,28 @@ class Record():
     def axis(self):
         return self.description.get('axis', {})
 
+    def config(self, cls=dict, session=None, datapath=None):
+        config_id = self.description.get('config', None)
+        if config_id is None:
+            return None
+        if isinstance(config_id, dict):
+            return cls(config_id)
+        if self.is_remote_record():
+            with ZMQContextManager(zmq.DEALER,
+                                   connect=self.database) as socket:
+                socket.send_pyobj({
+                    'method': 'config_get',
+                    'config_id': config_id
+                })
+                buf = socket.recv_pyobj()
+                return cls(pickle.loads(lzma.decompress(buf)))
+        else:
+            assert session is not None, "session is required for local record"
+            assert datapath is not None, "datapath is required for local record"
+            config = get_config(session, config_id, base=datapath / 'objects')
+            session.commit()
+            return cls(config)
+
     def is_local_record(self):
         return not self.is_cache_record() and not self.is_remote_record()
 

qulab/scan/scan.py

@@ -145,17 +145,6 @@ async def create_config(config: dict, database=default_server, socket=None):
         return await socket.recv_pyobj()
 
 
-async def get_config(config_id: int, database=default_server, socket=None):
-    async with ZMQContextManager(zmq.DEALER, connect=database,
-                                 socket=socket) as socket:
-        await socket.send_pyobj({
-            'method': 'config_get',
-            'config_id': config_id
-        })
-        buf = await socket.recv_pyobj()
-        return pickle.loads(lzma.decompress(buf))
-
-
 def task_uuid():
     return uuid.uuid3(__process_uuid, str(next(__task_counter)))
 
@@ -332,16 +321,8 @@ 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 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]
+            if key.startswith('*'):
+                await _unpack(key, variables)
             elif inspect.isawaitable(value) and not self.hiden(key):
                 variables[key] = await value
         if self._sock is not None:
@@ -373,7 +354,7 @@ class Scan():
 
     def hiden(self, name: str) -> bool:
         return bool(
-            self._hide_pattern_re.match(name)) and not name.startswith('**')
+            self._hide_pattern_re.match(name)) and not name.startswith('*')
 
     async def _filter(self, variables: dict[str, Any], level: int = 0):
         try:
@@ -984,14 +965,8 @@ async def _iter_level(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]
+                if key.startswith('*'):
+                    await _unpack(key, variables)
 
         for name, opt in opts.items():
             opt_cfg = optimizers[name]
@@ -1035,3 +1010,26 @@ async def call_many_functions(order: list[list[str]],
             results = await asyncio.gather(*coros)
             ret.update(dict(zip(waited, results)))
     return ret
+
+
+async def _unpack(key, variables):
+    x = variables[key]
+    if inspect.isawaitable(x):
+        x = await x
+    if key.startswith('**'):
+        assert isinstance(x, dict), f"Should promise a dict for `**` symbol."
+        if "{key}" in key:
+            for k, v in x.items():
+                variables[key[2:].format(key=k)] = v
+        else:
+            variables.update(x)
+    elif key.startswith('*'):
+        assert isinstance(
+            x, (list, tuple,
+                np.ndarray)), f"Should promise a list for `*` symbol."
+        for i, v in enumerate(x):
+            k = key[1:].format(i=i)
+            variables[k] = v
+    else:
+        return
+    del variables[key]

qulab/scan/server.py

@@ -65,6 +65,8 @@ def flush_cache():
 
 def get_local_record(session: Session, id: int, datapath: Path) -> Record:
     record_in_db = session.get(RecordInDB, id)
+    if record_in_db is None:
+        return None
     record_in_db.atime = utcnow()
 
     if record_in_db.file.endswith('.zip'):
@@ -220,21 +222,33 @@ async def handle(session: Session, request: Request, datapath: Path):
             await reply(request, config.id)
         case 'submit':
             from .scan import Scan
+            finished = [(id, queried) for id, (task, queried) in pool.items()
+                        if not isinstance(task, int) and task.finished()]
+            for id, queried in finished:
+                if not queried:
+                    pool[id] = [pool[id].record.id, False]
+                else:
+                    pool.pop(id)
             description = dill.loads(msg['description'])
             task = Scan()
             task.description = description
             task.start()
-            pool[task.id] = task
+            pool[task.id] = [task, False]
             await reply(request, task.id)
         case 'get_record_id':
-            task = pool.get(msg['id'])
-            for _ in range(10):
-                if task.record:
-                    await reply(request, task.record.id)
-                    break
-                await asyncio.sleep(1)
+            task, queried = pool.get(msg['id'])
+            if isinstance(task, int):
+                await reply(request, task)
+                pool.pop(msg['id'])
             else:
-                await reply(request, None)
+                for _ in range(10):
+                    if task.record:
+                        await reply(request, task.record.id)
+                        pool[msg['id']] = [task, True]
+                        break
+                    await asyncio.sleep(1)
+                else:
+                    await reply(request, None)
         case _:
             logger.error(f"Unknown method: {msg['method']}")
 

qulab/version.py

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