QuLab 2.3.2__cp311-cp311-macosx_10_9_universal2.whl → 2.3.3__cp311-cp311-macosx_10_9_universal2.whl

{QuLab-2.3.2.dist-info → QuLab-2.3.3.dist-info}/METADATA

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

{QuLab-2.3.2.dist-info → QuLab-2.3.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=aFDKwsfj4iIn_qPA_HgPOb23YQ_AwnE5G_fPkQEbQIs,159616
-qulab/version.py,sha256=wmsQzkE8l2rmrt5-AjUYaTVQ_X-dbo-FDvqay4JDxVk,21
+qulab/fun.cpython-311-darwin.so,sha256=rjrdj1j69--qg_Yc4J2F9YJ94bVxv9Jy3Eix-vaQ8AM,159616
+qulab/version.py,sha256=_TojZ2sN-5aiITSzim-_br5UuW9pwpo2Tx8vnDWpsqE,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
@@ -14,13 +14,13 @@ qulab/monitor/qt_compat.py,sha256=OK71_JSO_iyXjRIKHANmaK4Lx4bILUzmXI-mwKg3QeI,78
 qulab/monitor/toolbar.py,sha256=WEag6cxAtEsOLL14XvM7pSE56EA3MO188_JuprNjdBs,7948
 qulab/scan/__init__.py,sha256=ZX4WsvqYxvJeHLgGSrtJoAnVU94gxY7EHKMxYooMERg,130
 qulab/scan/curd.py,sha256=thq_qfi3qng3Zx-1uhNG64IQhGCuum_LR4MOKnS8cDI,6896
-qulab/scan/expression.py,sha256=s2_sWFm4gKgJ7pGLmuugCU8XifAm9Mc3AT3bdoyFUtM,19459
+qulab/scan/expression.py,sha256=ngWrP1o9CuYJ1gq5YHaV7EfxKIKUX7Gz6KG80E6XThY,20070
 qulab/scan/models.py,sha256=5Jpo25WGMWs0GtLzYLsWO61G3-FFYx5BHhBr2b6rOTE,17681
 qulab/scan/optimize.py,sha256=jYceGazEabuwYqmZE8P6Nnq_KsLyUP0p-p88VbbJLhM,2559
 qulab/scan/query.py,sha256=-5uHMhXSyGovK1oy_uUbGVEbRFzaMBkP78ZMNfI3jD0,11809
-qulab/scan/record.py,sha256=sICMLAWf3IgvJ3JlS0cKQA4mSpLZins7K5qFoAnCSYI,21194
-qulab/scan/scan.py,sha256=KjQyq42xFi9wCjFTu26cXzV5_iii2X0dceqzL1s5w3Q,37834
-qulab/scan/server.py,sha256=ZT-J447xuLSpmbTNm5dNIz8_CXKOow66_bjkFNGh_vI,14274
+qulab/scan/record.py,sha256=yIHPANf6nuBXy8Igf-dMtGJ7wuFTLYlBaaAUc0AzwyU,21280
+qulab/scan/scan.py,sha256=GhRhBLWb5PVFi9qkyXJl0p1XXbpjdnjoSz_wPegf9Vs,38783
+qulab/scan/server.py,sha256=tGQ4bVePqvFACb0L26viA57UBD7LkkZI9q5kQGffapA,19112
 qulab/scan/space.py,sha256=X5anTvw7X0XGN83y0o0C-zhvh6bDEU-kshGgo004pNE,6076
 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.3.2.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-QuLab-2.3.2.dist-info/METADATA,sha256=mLdXTnca-RyYTycpdpxKFyrFe9UPysvw5sBDoGhqcAg,3510
-QuLab-2.3.2.dist-info/WHEEL,sha256=UDBB_KFYXAT_a6Q3uGzMOBYEG2sfuzNdKs9Nu_rq9v4,114
-QuLab-2.3.2.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
-QuLab-2.3.2.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.3.2.dist-info/RECORD,,
+QuLab-2.3.3.dist-info/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+QuLab-2.3.3.dist-info/METADATA,sha256=DcGCVF8ABDW4sJ8mRhZ2N8jWlYXRA3yvHV6sLt_T24o,3510
+QuLab-2.3.3.dist-info/WHEEL,sha256=UDBB_KFYXAT_a6Q3uGzMOBYEG2sfuzNdKs9Nu_rq9v4,114
+QuLab-2.3.3.dist-info/entry_points.txt,sha256=ohBzutEnQimP_BZWiuXdSliu4QAYSHHcN0PZD8c7ZCY,46
+QuLab-2.3.3.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+QuLab-2.3.3.dist-info/RECORD,,

qulab/scan/expression.py

@@ -419,7 +419,7 @@ class Expression():
     def is_const(self, env) -> bool:
         return False
 
-    def value(self, env):
+    def value(self, env=_default_env):
         if self.changed(env):
             self.cache = self.eval(env)
         return self.cache
@@ -612,3 +612,31 @@ class Symbol(Expression):
 
     def __repr__(self) -> str:
         return self.name
+
+
+sin = Symbol('sin')
+cos = Symbol('cos')
+tan = Symbol('tan')
+pi = Symbol('pi')
+e = Symbol('e')
+log = Symbol('log')
+log2 = Symbol('log2')
+log10 = Symbol('log10')
+exp = Symbol('exp')
+sqrt = Symbol('sqrt')
+abs = Symbol('abs')
+sinh = Symbol('sinh')
+cosh = Symbol('cosh')
+tanh = Symbol('tanh')
+arcsin = Symbol('arcsin')
+arccos = Symbol('arccos')
+arctan = Symbol('arctan')
+arctan2 = Symbol('arctan2')
+arcsinh = Symbol('arcsinh')
+arccosh = Symbol('arccosh')
+arctanh = Symbol('arctanh')
+sinc = Symbol('sinc')
+sign = Symbol('sign')
+heaviside = Symbol('heaviside')
+erf = Symbol('erf')
+erfc = Symbol('erfc')

qulab/scan/record.py

@@ -474,7 +474,9 @@ class Record():
                     'method': 'record_keys',
                     'record_id': self.id
                 })
-                return socket.recv_pyobj()
+                keys = socket.recv_pyobj()
+                self._items = {key: None for key in keys}
+                return keys
         else:
             return list(self._items.keys())
 

qulab/scan/scan.py

@@ -1,4 +1,5 @@
 import asyncio
+import contextlib
 import copy
 import inspect
 import itertools
@@ -204,6 +205,19 @@ def _run_function_in_process(buf):
     return func(*args, **kwds)
 
 
+def _dump_description(description):
+    d = {}
+    for key, value in description.items():
+        if key in [
+                'intrinsic_loops', 'app', 'tags', 'loops',
+                'independent_variables', 'axis', 'config', 'entry'
+        ]:
+            d[key] = value
+        else:
+            d[key] = dill.dumps(value)
+    return dill.dumps(description)
+
+
 class Scan():
 
     def __new__(cls, *args, mixin=None, **kwds):
@@ -331,6 +345,9 @@ class Scan():
                 await _unpack(key, variables)
             elif inspect.isawaitable(value) and not self.hiden(key):
                 variables[key] = await value
+
+        if self.record is None:
+            self.record = await self.create_record()
         if self._sock is not None:
             await self._sock.send_pyobj({
                 'task': self.id,
@@ -374,20 +391,33 @@ class Scan():
             return True
 
     async def create_record(self):
-        if self._sock is not None:
-            await self._sock.send_pyobj({
-                'task':
-                self.id,
-                'method':
-                'record_create',
-                'description':
-                dill.dumps(self.description)
-            })
+        if self._sock is None:
+            return Record(None, self.description['database'], self.description)
+
+        if self.config:
+            self.description['config'] = await create_config(
+                self.config, self.description['database'], self._sock)
+        if current_notebook() is None:
+            await create_notebook('untitle', self.description['database'],
+                                  self._sock)
+        cell_id = await save_input_cells(current_notebook(),
+                                         self.description['entry']['scripts'],
+                                         self.description['database'],
+                                         self._sock)
+        self.description['entry']['scripts'] = cell_id
+
+        await self._sock.send_pyobj({
+            'task':
+            self.id,
+            'method':
+            'record_create',
+            'description':
+            _dump_description(self.description)
+        })
 
-            record_id = await self._sock.recv_pyobj()
-            return Record(record_id, self.description['database'],
-                          self.description)
-        return Record(None, self.description['database'], self.description)
+        record_id = await self._sock.recv_pyobj()
+        return Record(record_id, self.description['database'],
+                      self.description)
 
     def get(self, name: str):
         if name in self.description['consts']:
@@ -481,7 +511,7 @@ class Scan():
         elif isinstance(space, OptimizeSpace):
             space.name = name
             space.optimizer.dimensions[name] = space.space
-            if space.suggestion:
+            if space.suggestion is not None:
                 space.optimizer.suggestion[name] = space.suggestion
             self._add_search_space(name, space.optimizer.level, space)
             self.add_depends(space.optimizer.name, [name])
@@ -584,6 +614,26 @@ class Scan():
 
     async def run(self):
         assymbly(self.description)
+
+        @contextlib.asynccontextmanager
+        async def send_msg_and_update_bar(self):
+            send_msg_task = asyncio.create_task(self._send_msg())
+            update_progress_task = asyncio.create_task(self._update_progress())
+            try:
+                yield
+            finally:
+                update_progress_task.cancel()
+                send_msg_task.cancel()
+                while True:
+                    try:
+                        task = self._prm_queue.get_nowait()
+                    except:
+                        break
+                    try:
+                        task.cancel()
+                    except:
+                        pass
+
         if isinstance(
                 self.description['database'],
                 str) and self.description['database'].startswith("tcp://"):
@@ -591,27 +641,15 @@ class Scan():
                                          connect=self.description['database'],
                                          socket=self._sock) as socket:
                 self._sock = socket
-                if self.config:
-                    self.description['config'] = await create_config(
-                        self.config, self.description['database'], self._sock)
-                if current_notebook() is None:
-                    await create_notebook('untitle',
-                                          self.description['database'],
-                                          self._sock)
-                cell_id = await save_input_cells(
-                    current_notebook(), self.description['entry']['scripts'],
-                    self.description['database'], self._sock)
-                self.description['entry']['scripts'] = cell_id
-                await self._run()
+                async with send_msg_and_update_bar(self):
+                    await self._run()
         else:
             if self.config:
                 self.description['config'] = copy.deepcopy(self.config)
-            await self._run()
+            async with send_msg_and_update_bar(self):
+                await self._run()
 
     async def _run(self):
-        send_msg_task = asyncio.create_task(self._send_msg())
-        update_progress_task = asyncio.create_task(self._update_progress())
-
         self._variables = {'self': self, 'config': self.config}
 
         consts = {}
@@ -634,7 +672,6 @@ class Scan():
         await update_variables(self.variables, updates,
                                self.description['setters'])
 
-        self.record = await self.create_record()
         await self.work()
         for level, bar in self._bar.items():
             bar.close()
@@ -648,9 +685,7 @@ class Scan():
             await self.emit(-1, 0, 0, {})
 
         await self._prm_queue.join()
-        update_progress_task.cancel()
         await self._msg_queue.join()
-        send_msg_task.cancel()
         return self.variables
 
     async def done(self):
@@ -776,10 +811,10 @@ class Scan():
                 buf = dill.dumps((awaitable, args, kwds))
                 task = asyncio.get_running_loop().run_in_executor(
                     self._executors, _run_function_in_process, buf)
-                self._prm_queue.put_nowait(task)
-                return Promise(task)
             except:
                 return awaitable(*args, **kwds)
+            self._prm_queue.put_nowait(task)
+            return Promise(task)
         else:
             return awaitable
 

qulab/scan/server.py

@@ -1,6 +1,8 @@
 import asyncio
 import os
 import pickle
+import subprocess
+import sys
 import time
 import uuid
 from pathlib import Path
@@ -59,33 +61,45 @@ def clear_cache():
     if len(record_cache) < CACHE_SIZE:
         return
 
+    logger.debug(f"clear_cache record_cache: {len(record_cache)}")
     for k, (t, _) in zip(sorted(record_cache.items(), key=lambda x: x[1][0]),
                          range(len(record_cache) - CACHE_SIZE)):
         del record_cache[k]
 
+    logger.debug(f"clear_cache buffer_list_cache: {len(buffer_list_cache)}")
     for k, (t,
             _) in zip(sorted(buffer_list_cache.items(), key=lambda x: x[1][0]),
                       range(len(buffer_list_cache) - CACHE_SIZE)):
         del buffer_list_cache[k]
+    logger.debug(f"clear_cache done.")
 
 
 def flush_cache():
+    logger.debug(f"flush_cache: {len(record_cache)}")
     for k, (t, r) in record_cache.items():
         r.flush()
+    logger.debug(f"flush_cache done.")
 
 
 def get_local_record(session: Session, id: int, datapath: Path) -> Record:
+    logger.debug(f"get_local_record: {id}")
     record_in_db = session.get(RecordInDB, id)
     if record_in_db is None:
+        logger.debug(f"record not found: {id=}")
         return None
     record_in_db.atime = utcnow()
 
     if record_in_db.file.endswith('.zip'):
-        return Record.load(datapath / 'objects' / record_in_db.file)
+        logger.debug(f"load record from zip: {record_in_db.file}")
+        record = Record.load(datapath / 'objects' / record_in_db.file)
+        logger.debug(f"load record from zip done.")
+        return record
 
     path = datapath / 'objects' / record_in_db.file
     with open(path, 'rb') as f:
+        logger.debug(f"load record from file: {path}")
         record = dill.load(f)
+        logger.debug(f"load record from file done.")
         record.database = datapath
         record._file = path
     return record
@@ -95,13 +109,16 @@ def get_record(session: Session, id: int, datapath: Path) -> Record:
     if id not in record_cache:
         record = get_local_record(session, id, datapath)
     else:
+        logger.debug(f"get_record from cache: {id=}")
         record = record_cache[id][1]
     clear_cache()
+    logger.debug(f"update lru time for record cache: {id=}")
     record_cache[id] = time.time(), record
     return record
 
 
 def record_create(session: Session, description: dict, datapath: Path) -> int:
+    logger.debug(f"record_create: {description['app']}")
     record = Record(None, datapath, description)
     record_in_db = RecordInDB()
     if 'app' in description:
@@ -111,28 +128,39 @@ def record_create(session: Session, description: dict, datapath: Path) -> int:
     record_in_db.file = '/'.join(record._file.parts[-4:])
     record_in_db.config_id = description['config']
     record._file = datapath / 'objects' / record_in_db.file
+    logger.debug(f"record_create generate random file: {record_in_db.file}")
     session.add(record_in_db)
     try:
         session.commit()
+        logger.debug(f"record_create commited: record.id={record_in_db.id}")
         record.id = record_in_db.id
         clear_cache()
         record_cache[record.id] = time.time(), record
         return record.id
     except:
+        logger.debug(f"record_create rollback")
         session.rollback()
         raise
 
 
 def record_append(session: Session, record_id: int, level: int, step: int,
                   position: int, variables: dict, datapath: Path):
+    logger.debug(f"record_append: {record_id}")
     record = get_record(session, record_id, datapath)
+    logger.debug(f"record_append: {record_id}, {level}, {step}, {position}")
     record.append(level, step, position, variables)
+    logger.debug(f"record_append done.")
     try:
+        logger.debug(f"record_append update SQL database.")
         record_in_db = session.get(RecordInDB, record_id)
+        logger.debug(f"record_append get RecordInDB: {record_in_db}")
         record_in_db.mtime = utcnow()
         record_in_db.atime = utcnow()
+        logger.debug(f"record_append update RecordInDB: {record_in_db}")
         session.commit()
+        logger.debug(f"record_append commited.")
     except:
+        logger.debug(f"record_append rollback.")
         session.rollback()
         raise
 
@@ -150,11 +178,15 @@ async def handle(session: Session, request: Request, datapath: Path):
 
     msg = request.msg
 
+    if request.method not in ['ping']:
+        logger.debug(f"handle: {request.method}")
+
     match request.method:
         case 'ping':
             await reply(request, 'pong')
         case 'bufferlist_iter':
-            if msg['iter_id'] in buffer_list_cache:
+            logger.debug(f"bufferlist_iter: {msg}")
+            if msg['iter_id'] and msg['iter_id'] in buffer_list_cache:
                 it = buffer_list_cache[msg['iter_id']][1]
                 iter_id = msg['iter_id']
             else:
@@ -174,22 +206,30 @@ async def handle(session: Session, request: Request, datapath: Path):
                 except StopIteration:
                     end = True
                     break
+            logger.debug(f"bufferlist_iter: {iter_id}, {end}")
             await reply(request, (iter_id, ret, end))
+            logger.debug(f"reply bufferlist_iter: {iter_id}, {end}")
             buffer_list_cache[iter_id] = time.time(), it
             clear_cache()
         case 'bufferlist_iter_exit':
+            logger.debug(f"bufferlist_iter_exit: {msg}")
             try:
                 it = buffer_list_cache.pop(msg['iter_id'])[1]
                 it.throw(Exception)
             except:
                 pass
             clear_cache()
+            logger.debug(f"end bufferlist_iter_exit: {msg}")
         case 'record_create':
+            logger.debug(f"record_create")
             description = dill.loads(msg['description'])
             await reply(request, record_create(session, description, datapath))
+            logger.debug(f"reply record_create")
         case 'record_append':
+            logger.debug(f"record_append")
             record_append(session, msg['record_id'], msg['level'], msg['step'],
                           msg['position'], msg['variables'], datapath)
+            logger.debug(f"reply record_append")
         case 'record_description':
             record = get_record(session, msg['record_id'], datapath)
             await reply(request, dill.dumps(record))
@@ -295,6 +335,9 @@ async def handle(session: Session, request: Request, datapath: Path):
         case _:
             logger.error(f"Unknown method: {msg['method']}")
 
+    if request.method not in ['ping']:
+        logger.debug(f"finished handle: {request.method}")
+
 
 async def handle_with_timeout(session: Session, request: Request,
                               datapath: Path, timeout: float):
@@ -311,22 +354,41 @@ async def handle_with_timeout(session: Session, request: Request,
 
 async def serv(port,
                datapath,
-               url=None,
+               url='',
                buffer_size=1024 * 1024 * 1024,
-               interval=60):
-    logger.info('Server starting.')
+               interval=60,
+               log='stderr',
+               debug=False):
+    if debug:
+        level = 'DEBUG'
+    else:
+        level = 'INFO'
+
+    if log == 'stderr':
+        pass
+        #logger.add(sys.stderr, level=level)
+    elif log == 'stdout':
+        logger.add(sys.stdout, level=level)
+    else:
+        logger.add(log, level=level)
+
+    logger.debug('Creating socket...')
     async with ZMQContextManager(zmq.ROUTER, bind=f"tcp://*:{port}") as sock:
-        if url is None:
+        logger.info(f'Server started at port {port}.')
+        logger.info(f'Data path: {datapath}.')
+        if not url or url == 'sqlite':
             url = 'sqlite:///' + str(datapath / 'data.db')
         engine = create_engine(url)
         create_tables(engine)
         Session = sessionmaker(engine)
         with Session() as session:
-            logger.info('Server started.')
+            logger.info(f'Database connected: {url}.')
             received = 0
             last_flush_time = time.time()
             while True:
+                logger.debug('Waiting for request...')
                 identity, msg = await sock.recv_multipart()
+                logger.debug('Received request.')
                 received += len(msg)
                 try:
                     req = Request(sock, identity, msg)
@@ -334,7 +396,8 @@ async def serv(port,
                     logger.exception('bad request')
                     continue
                 asyncio.create_task(
-                    handle_with_timeout(session, req, datapath, timeout=60.0))
+                    handle_with_timeout(session, req, datapath,
+                                        timeout=3600.0))
                 if received > buffer_size or time.time(
                 ) - last_flush_time > interval:
                     flush_cache()
@@ -342,46 +405,94 @@ async def serv(port,
                     last_flush_time = time.time()
 
 
-async def watch(port, datapath, url=None, timeout=1, buffer=1024, interval=60):
-    with ZMQContextManager(zmq.DEALER,
-                           connect=f"tcp://127.0.0.1:{port}") as sock:
-        sock.setsockopt(zmq.LINGER, 0)
+async def main(port,
+               datapath,
+               url,
+               timeout=1,
+               buffer=1024,
+               interval=60,
+               log='stderr',
+               no_watch=True,
+               debug=False):
+    if no_watch:
+        logger.info('Server starting...')
+        await serv(port, datapath, url, buffer * 1024 * 1024, interval, log,
+                   debug)
+    else:
+        process = None
+
         while True:
             try:
-                sock.send_pyobj({"method": "ping"})
-                if sock.poll(int(1000 * timeout)):
-                    sock.recv()
-                else:
-                    raise asyncio.TimeoutError()
+                with ZMQContextManager(
+                        zmq.DEALER, connect=f"tcp://127.0.0.1:{port}") as sock:
+                    sock.setsockopt(zmq.LINGER, 0)
+                    sock.send_pyobj({"method": "ping"})
+                    logger.debug('ping.')
+                    if sock.poll(int(1000 * timeout)):
+                        sock.recv()
+                        logger.debug('recv pong.')
+                    else:
+                        logger.debug('timeout.')
+                        raise asyncio.TimeoutError()
             except (zmq.error.ZMQError, asyncio.TimeoutError):
-                return asyncio.create_task(
-                    serv(port, datapath, url, buffer * 1024 * 1024, interval))
+                if process is not None:
+                    logger.debug(
+                        f'killing process... PID={process.pid}, returncode={process.returncode}'
+                    )
+                    process.kill()
+                    logger.debug(
+                        f'killed process. PID={process.pid}, returncode={process.returncode}'
+                    )
+                cmd = [
+                    sys.executable, "-m", "qulab", "server", "--port",
+                    f"{port}", "--datapath", f"{datapath}", "--url", f"{url}",
+                    "--timeout", f"{timeout}", "--buffer", f"{buffer}",
+                    "--interval", f"{interval}", "--log", f"{log}",
+                ]
+                if url:
+                    cmd.extend(['--url', url])
+                if debug:
+                    cmd.append('--debug')
+                cmd.append("--no-watch")
+                logger.debug(f"starting process: {' '.join(cmd)}")
+                process = subprocess.Popen(cmd,
+                                           stdout=subprocess.PIPE,
+                                           stderr=subprocess.PIPE,
+                                           cwd=os.getcwd())
+                logger.debug(
+                    f'process started. PID={process.pid}, returncode={process.returncode}'
+                )
+
+                # Capture and log the output
+                # stdout, stderr = process.communicate(timeout=5)
+                # if stdout:
+                #     logger.info(f'Server stdout: {stdout.decode()}')
+                # if stderr:
+                #     logger.error(f'Server stderr: {stderr.decode()}')
+
+                await asyncio.sleep(5)
             await asyncio.sleep(timeout)
 
 
-async def main(port, datapath, url, timeout=1, buffer=1024, interval=60):
-    task = await watch(port=port,
-                       datapath=datapath,
-                       url=url,
-                       timeout=timeout,
-                       buffer=buffer,
-                       interval=interval)
-    await task
-
-
 @click.command()
 @click.option('--port',
               default=os.getenv('QULAB_RECORD_PORT', 6789),
               help='Port of the server.')
 @click.option('--datapath', default=datapath, help='Path of the data.')
-@click.option('--url', default=None, help='URL of the database.')
+@click.option('--url', default='sqlite', help='URL of the database.')
 @click.option('--timeout', default=1, help='Timeout of ping.')
 @click.option('--buffer', default=1024, help='Buffer size (MB).')
 @click.option('--interval',
               default=60,
               help='Interval of flush cache, in unit of second.')
-def server(port, datapath, url, timeout, buffer, interval):
-    asyncio.run(main(port, Path(datapath), url, timeout, buffer, interval))
+@click.option('--log', default='stderr', help='Log file.')
+@click.option('--no-watch', is_flag=True, help='Watch the server.')
+@click.option('--debug', is_flag=True, help='Debug mode.')
+def server(port, datapath, url, timeout, buffer, interval, log, no_watch,
+           debug):
+    asyncio.run(
+        main(port, Path(datapath), url, timeout, buffer, interval, log,
+             True, debug))
 
 
 if __name__ == "__main__":

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.3.2"
+__version__ = "2.3.3"