QuLab 2.2.5__cp310-cp310-win_amd64.whl → 2.2.7__cp310-cp310-win_amd64.whl

{QuLab-2.2.5.dist-info → QuLab-2.2.7.dist-info}/METADATA

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

{QuLab-2.2.5.dist-info → QuLab-2.2.7.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.cp310-win_amd64.pyd,sha256=d4aqvLqQ5WVKcuN66HtihBH0jArVgGq8j5CYYQ1YLls,31744
-qulab/version.py,sha256=zyH0HuxKprjHeDzaU3CDFspw9f0RqC0qcLriAPqWD_M,21
+qulab/fun.cp310-win_amd64.pyd,sha256=HhDHwlovmbtFML-GZmXElJ4iouH5WffpId7e6GRBf1s,31744
+qulab/version.py,sha256=I501tBgxLlOMpveUyk065aIcjgpxqCi7zjY3gqoar7c,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
@@ -17,10 +17,10 @@ qulab/scan/curd.py,sha256=yaTglGiS6mlk0GqDHi_w8T02XGBMvDZtXSdML7zDywk,7117
 qulab/scan/expression.py,sha256=vwUM9E0OFQal4bljlUtLR3NJu4zGRyuWYrdyZSs3QTU,16199
 qulab/scan/models.py,sha256=ZvXkJEt5Yz3Sjx0JKzYka-q2Uo-w_iVzHgH8A6DbjF0,18236
 qulab/scan/optimize.py,sha256=MlT4y422CnP961IR384UKryyZh8riNvrPSd2z_MXLEg,2356
-qulab/scan/query.py,sha256=z94Ofbii4HZ4ZyZ7nos9-y37bH8-Xg4mA3QsF_aWx-c,11907
-qulab/scan/record.py,sha256=crlNIm1ki6td2Z284D78M276aso7KhMnr4qjCCOj1Kk,21644
-qulab/scan/scan.py,sha256=CNX2Z6vWMax9SqBWWYLghkz6TwIaLNnKypeyS7UCTfA,35773
-qulab/scan/server.py,sha256=ZWTnlK_YMfPTCoq6GnGpsZzSFGyoO4qF7aEGW9wCwhM,14542
+qulab/scan/query.py,sha256=RM8bG4Tcx_PaNk8tv9HdlTZ1dGuuSr3sZVkYVq2BtfQ,12183
+qulab/scan/record.py,sha256=aBpUllhKsBRhPOwZwsp3rcw2HB-3ne9yLYHLBeXXM-M,21669
+qulab/scan/scan.py,sha256=hYTEEa4frIN6HraNleoytnCZjZ0c_XWOI1DSLchkpuE,37589
+qulab/scan/server.py,sha256=GTV9wzlFTmG6YUj_8WwR4e6uvaq9AgdearLh3i3YAfw,14569
 qulab/scan/space.py,sha256=fWsY99HDauk89f5ygqnJYBoeNFGTUkAGFssrw-YMHok,5453
 qulab/scan/utils.py,sha256=30qnYvyFyctwcWxOCUpCNxXgGysA7xdIDzYbjwxGUzA,3744
 qulab/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -70,7 +70,7 @@ qulab/sys/rpc/server.py,sha256=W3bPwe8um1IeR_3HLx-ad6iCcbeuUQcSg11Ze4w6DJg,742
 qulab/sys/rpc/socket.py,sha256=W3bPwe8um1IeR_3HLx-ad6iCcbeuUQcSg11Ze4w6DJg,742
 qulab/sys/rpc/utils.py,sha256=BurIcqh8CS-Hsk1dYP6IiefK4qHivaEqD9_rBY083SA,619
 qulab/sys/rpc/worker.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qulab/sys/rpc/zmq_socket.py,sha256=SHMCp5oawYglfawuvDDTJJrQtxFpErlBtvoEwd61OO0,8362
+qulab/sys/rpc/zmq_socket.py,sha256=aoIm-C-IdJjm9_PQXckvbqTxc9kCeJrT4PyYytoDIHo,8492
 qulab/visualization/__init__.py,sha256=Bkt9AK5c45d6HFLlT-f8cIppywXziHtJqhDtVxOoKKo,6317
 qulab/visualization/__main__.py,sha256=WduINFl21B-XMsi2rg2cVhIyU11hKKX3zOsjc56QLiQ,1710
 qulab/visualization/_autoplot.py,sha256=JFLR3e71bryPaUkOCWFzD9C4Nk-ulqIdBb1YN4QnZic,14562
@@ -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.2.5.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.2.5.dist-info/METADATA,sha256=BspoYai-nQ5IQpf_AqvzYlKLZ3QZwUfDbw9Cz_73yME,3609
-QuLab-2.2.5.dist-info/WHEEL,sha256=lO6CqtLHCAi38X3Es1a4R1lAjZFvN010IMRCFo2S7Mc,102
-QuLab-2.2.5.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
-QuLab-2.2.5.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.2.5.dist-info/RECORD,,
+QuLab-2.2.7.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+QuLab-2.2.7.dist-info/METADATA,sha256=uMz3KTAANhe7RMJa0Y-Q0LXISTG98aYohmRRA05bSK4,3609
+QuLab-2.2.7.dist-info/WHEEL,sha256=lO6CqtLHCAi38X3Es1a4R1lAjZFvN010IMRCFo2S7Mc,102
+QuLab-2.2.7.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.2.7.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.2.7.dist-info/RECORD,,

qulab/scan/query.py

@@ -16,9 +16,13 @@ from .scan import default_server
 from .server import get_local_record
 
 
-def get_record(id, database=default_server) -> Record:
+def get_record(id,
+               database=default_server,
+               socket=None,
+               session=None) -> Record:
     if isinstance(database, str) and database.startswith('tcp://'):
-        with ZMQContextManager(zmq.DEALER, connect=database) as socket:
+        with ZMQContextManager(zmq.DEALER, connect=database,
+                               socket=socket) as socket:
             socket.send_pyobj({
                 'method': 'record_description',
                 'record_id': id
@@ -29,12 +33,16 @@ def get_record(id, database=default_server) -> Record:
             d.id = id
             d.database = database
             d._file = None
+            d._sock = socket
             return d
     else:
-        db_file = Path(database) / 'data.db'
-        engine = create_engine(f'sqlite:///{db_file}')
-        Session = sessionmaker(bind=engine)
-        with Session() as session:
+        if session is None:
+            db_file = Path(database) / 'data.db'
+            engine = create_engine(f'sqlite:///{db_file}')
+            Session = sessionmaker(bind=engine)
+            with Session() as session:
+                return get_local_record(session, id, database)
+        else:
             return get_local_record(session, id, database)
 
 

qulab/scan/record.py

@@ -56,6 +56,7 @@ class BufferList():
         self._slice = slice
         self._lock = Lock()
         self._data_id = None
+        self._sock = None
 
     def __repr__(self):
         return f"<BufferList: shape={self.shape}, lu={self.lu}, rd={self.rd}, slice={self._slice}>"
@@ -82,6 +83,7 @@ class BufferList():
         self._slice = None
         self._lock = Lock()
         self._data_id = None
+        self._sock = None
 
     @property
     def shape(self):
@@ -156,7 +158,9 @@ class BufferList():
                         yield pos, value
         else:
             server, record_id, key = self._data_id
-            with ZMQContextManager(zmq.DEALER, connect=server) as socket:
+            with ZMQContextManager(zmq.DEALER,
+                                   connect=server,
+                                   socket=self._sock) as socket:
                 iter_id = b''
                 start = 0
                 try:
@@ -200,7 +204,7 @@ class BufferList():
             d.append(value)
         return p, d
 
-    def array(self):
+    def toarray(self):
         pos, data = self.items()
         if self._slice:
             pos = np.asarray(pos)
@@ -294,7 +298,7 @@ class BufferList():
     def __getitem__(self, slice_tuple: slice | EllipsisType
                     | tuple[slice | int | EllipsisType, ...]):
         self._slice, contract, reversed = self._full_slice(slice_tuple)
-        ret = self.array()
+        ret = self.toarray()
         slices = []
         for i, s in enumerate(self._slice):
             if i in contract:
@@ -319,6 +323,7 @@ class Record():
         self._pos = []
         self._last_vars = set()
         self._file = None
+        self._sock = None
 
         for name, value in self.description['intrinsic_loops'].items():
             self._items[name] = value
@@ -348,6 +353,7 @@ class Record():
         self._last_vars = set()
         self.database = None
         self._file = None
+        self._sock = None
 
     @property
     def axis(self):
@@ -361,7 +367,8 @@ class Record():
             return cls(config_id)
         if self.is_remote_record():
             with ZMQContextManager(zmq.DEALER,
-                                   connect=self.database) as socket:
+                                   connect=self.database,
+                                   socket=self._sock) as socket:
                 socket.send_pyobj({
                     'method': 'config_get',
                     'config_id': config_id
@@ -375,6 +382,31 @@ class Record():
             session.commit()
             return cls(config)
 
+    def scripts(self, session=None):
+        scripts = self.description['entry']['scripts']
+        if isinstance(scripts, list):
+            return scripts
+        else:
+            cell_id = scripts
+
+        if self.is_remote_record():
+            with ZMQContextManager(zmq.DEALER,
+                                   connect=self.database,
+                                   socket=self._sock) as socket:
+                socket.send_pyobj({
+                    'method': 'notebook_history',
+                    'cell_id': cell_id
+                })
+                return socket.recv_pyobj()
+        elif self.is_local_record():
+            from .models import Cell
+            assert session is not None, "session is required for local record"
+            cell = session.get(Cell, cell_id)
+            return [
+                cell.input.text
+                for cell in cell.notebook.cells[1:cell.index + 2]
+            ]
+
     def is_local_record(self):
         return not self.is_cache_record() and not self.is_remote_record()
 
@@ -389,15 +421,13 @@ class Record():
         self.flush()
 
     def __getitem__(self, key):
-        ret = self.get(key, buffer_to_array=True)
-        if isinstance(ret, Space):
-            ret = ret.toarray()
-        return ret
+        return self.get(key, buffer_to_array=True)
 
-    def get(self, key, default=_not_given, buffer_to_array=False, slice=None):
+    def get(self, key, default=_not_given, buffer_to_array=False):
         if self.is_remote_record():
             with ZMQContextManager(zmq.DEALER,
-                                   connect=self.database) as socket:
+                                   connect=self.database,
+                                   socket=self._sock) as socket:
                 socket.send_pyobj({
                     'method': 'record_getitem',
                     'record_id': self.id,
@@ -405,25 +435,14 @@ class Record():
                 })
                 ret = socket.recv_pyobj()
                 if isinstance(ret, BufferList):
-                    if buffer_to_array:
-                        socket.send_pyobj({
-                            'method': 'bufferlist_slice',
-                            'record_id': self.id,
-                            'key': key,
-                            'slice': slice
-                        })
-                        lst = socket.recv_pyobj()
-                        ret._list = lst
-                        ret._slice = slice
-                        return ret.array()
-                    else:
-                        ret._data_id = self.database, self.id, key
-                        return ret
-                elif isinstance(ret, Space):
+                    ret._data_id = self.database, self.id, key
+                    ret._sock = socket
                     if buffer_to_array:
                         return ret.toarray()
                     else:
                         return ret
+                elif isinstance(ret, Space) and buffer_to_array:
+                    return ret.toarray()
                 else:
                     return ret
         else:
@@ -434,9 +453,8 @@ 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.array()
+                    return d.toarray()
                 else:
                     return d
             elif isinstance(d, Space):
@@ -450,7 +468,8 @@ class Record():
     def keys(self):
         if self.is_remote_record():
             with ZMQContextManager(zmq.DEALER,
-                                   connect=self.database) as socket:
+                                   connect=self.database,
+                                   socket=self._sock) as socket:
                 socket.send_pyobj({
                     'method': 'record_keys',
                     'record_id': self.id
@@ -517,7 +536,8 @@ class Record():
     def delete(self):
         if self.is_remote_record():
             with ZMQContextManager(zmq.DEALER,
-                                   connect=self.database) as socket:
+                                   connect=self.database,
+                                   socket=self._sock) as socket:
                 socket.send_pyobj({
                     'method': 'record_delete',
                     'record_id': self.id
@@ -553,35 +573,14 @@ class Record():
             with z.open('config.pkl', 'w') as f:
                 f.write(dill.dumps(self.config()))
 
-    def scripts(self, session=None):
-        scripts = self.description['entry']['scripts']
-        if isinstance(scripts, list):
-            return scripts
-        else:
-            cell_id = scripts
-
-        if self.is_remote_record():
-            with ZMQContextManager(zmq.DEALER,
-                                   connect=self.database) as socket:
-                socket.send_pyobj({
-                    'method': 'notebook_history',
-                    'cell_id': cell_id
-                })
-                return socket.recv_pyobj()
-        elif self.is_local_record():
-            from .models import Cell
-            assert session is not None, "session is required for local record"
-            cell = session.get(Cell, cell_id)
-            return [
-                cell.input.text
-                for cell in cell.notebook.cells[1:cell.index + 2]
-            ]
-
     @classmethod
     def load(cls, file: str):
         with zipfile.ZipFile(file, 'r') as z:
             with z.open('record.pkl', 'r') as f:
                 description, items = dill.load(f)
+            with z.open('config.pkl', 'r') as f:
+                config = dill.load(f)
+            description['config'] = config
             record = cls(None, None, description)
             for key, value in items.items():
                 if isinstance(value, BufferList):

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
 
@@ -555,9 +563,9 @@ class Scan():
         if isinstance(
                 self.description['database'],
                 str) and self.description['database'].startswith("tcp://"):
-            async with ZMQContextManager(
-                    zmq.DEALER,
-                    connect=self.description['database']) as socket:
+            async with ZMQContextManager(zmq.DEALER,
+                                         connect=self.description['database'],
+                                         socket=self._sock) as socket:
                 self._sock = socket
                 await self._run()
         else:
@@ -624,7 +632,9 @@ class Scan():
 
     async def submit(self, server=default_executor):
         assymbly(self.description)
-        async with ZMQContextManager(zmq.DEALER, connect=server) as socket:
+        async with ZMQContextManager(zmq.DEALER,
+                                     connect=server,
+                                     socket=self._sock) as socket:
             await socket.send_pyobj({
                 'method': 'task_submit',
                 'description': dill.dumps(self.description)
@@ -901,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
@@ -972,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():
@@ -1024,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
@@ -1033,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

@@ -161,8 +161,9 @@ async def handle(session: Session, request: Request, datapath: Path):
                 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'])
+                                        buffer_to_array=False)
+                if msg['slice']:
+                    bufferlist._slice = msg['slice']
                 it = bufferlist.iter()
                 for _, _ in zip(range(msg['start']), it):
                     pass

qulab/sys/rpc/zmq_socket.py

@@ -130,7 +130,12 @@ class ZMQContextManager:
         self.auth = None
         self.context = None
         self.socket = None
-        self._external_socket = socket
+        self._external_socket = None
+        try:
+            if not socket.closed:
+                self._external_socket = socket
+        except:
+            pass
 
     def _create_socket(self, asyncio=False) -> zmq.Socket:
         """

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.2.5"
+__version__ = "2.2.7"