QuLab 2.2.5__cp311-cp311-macosx_10_9_universal2.whl → 2.2.6__cp311-cp311-macosx_10_9_universal2.whl

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.2.5
+Version: 2.2.6
 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.6.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=fDm1gF_FkgR7kHHFIJqSK6YfuVFCvLqJHFKgfpDqhoE,159616
-qulab/version.py,sha256=zyH0HuxKprjHeDzaU3CDFspw9f0RqC0qcLriAPqWD_M,21
+qulab/fun.cpython-311-darwin.so,sha256=VU-AxnPqaotR3zCtI9i09cvMWyTLX6x32LzM9YIkeZg,159616
+qulab/version.py,sha256=CsrswO-ECCDHSY48Nv5lOOdRgL8EGAixBOHDf7PkRZA,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,9 +17,9 @@ 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=ppCChKzaTbSLcaNxdgx4CIAsw5rqaSC3flbd2y0kkaU,11541
-qulab/scan/record.py,sha256=JYLvYW98ZKsYvKSvl4GYIep-ih0GZLg5zhH6llE-QC4,21044
-qulab/scan/scan.py,sha256=khiY_H6vx8wmhPGQrANxddU0wBA8tk7y-z4xBkhrxDo,34731
+qulab/scan/query.py,sha256=-5uHMhXSyGovK1oy_uUbGVEbRFzaMBkP78ZMNfI3jD0,11809
+qulab/scan/record.py,sha256=xgmhtL9l019HYHOHvyzK1vxqagGam51rAM7sj9ZWm5U,21103
+qulab/scan/scan.py,sha256=YPGeuBwxepwmKvz3HE0X5euHqPQGSc9NUGEPEiPRiso,34884
 qulab/scan/server.py,sha256=u6in_8-AfcCA4pGAolNR_2emlewGdc3bN6c0pDygBWY,14158
 qulab/scan/space.py,sha256=jDmFY2FcYe-Qcp16YBhAEdTKibOAsHQUnpDrpcPhvzg,5279
 qulab/scan/utils.py,sha256=Pg_tCf3SUKTiPSBqb6Enkgx4bAyQJAkDGe9uYys1xVU,3613
@@ -70,7 +70,7 @@ qulab/sys/rpc/server.py,sha256=e3R0gwOHpLEkSp7Tb43FMSDvqSG-pjrkskdISKQRseE,713
 qulab/sys/rpc/socket.py,sha256=e3R0gwOHpLEkSp7Tb43FMSDvqSG-pjrkskdISKQRseE,713
 qulab/sys/rpc/utils.py,sha256=6YGFOkY7o09lkA_I1FIP9_1Up3k2F1KOkftvu0_8lxo,594
 qulab/sys/rpc/worker.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qulab/sys/rpc/zmq_socket.py,sha256=dx7ROCsLGQ50rGu5b0CSRL2P2aO5fbxOG9pS0T-XXCo,8147
+qulab/sys/rpc/zmq_socket.py,sha256=2uc9MjCRUwWm6iPmi2VGnOYNf9yWFSUzEVYrx0jZvPU,8272
 qulab/visualization/__init__.py,sha256=26cuHt3QIJXUb3VaMxlJx3IQTOUVJFKlYBZr7WMP53M,6129
 qulab/visualization/__main__.py,sha256=9zKK3yZFy0leU40ou6BpRC1Fsetfc1gjjFzIZYIwP6Y,1639
 qulab/visualization/_autoplot.py,sha256=jddg40dX48Wd8G6NLFA_Kf7z1QxdrZBDS99Xx2GLMqs,14099
@@ -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.5.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.2.5.dist-info/METADATA,sha256=-3Q3bdlXLO430nGc2N5by8dnkdN18WcUTqELGjVDNeE,3510
-QuLab-2.2.5.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
-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.6.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.2.6.dist-info/METADATA,sha256=4vOBx495seNQlHygPaIrLKr2y7C5NtMIhPzwUnnI2r8,3510
+QuLab-2.2.6.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
+QuLab-2.2.6.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.2.6.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.2.6.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:
@@ -436,7 +455,7 @@ class Record():
                     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 +469,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 +537,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 +574,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

@@ -555,9 +555,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 +624,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)

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.6"