cmdbox 0.6.4.2__py3-none-any.whl → 0.6.5__py3-none-any.whl

cmdbox/app/app.py

@@ -118,6 +118,13 @@ class CmdBoxApp:
         args = argparse.Namespace(**{k:common.chopdq(v) for k,v in args_dict.items()})
         eargsparsetime = time.perf_counter()
 
+        if args.debug_attach:
+            import debugpy
+            debugpy.listen(("", args.debug_attach_port))
+            self.default_logger.info(f"Waiting for debugger attach on port {args.debug_attach_port}...")
+            debugpy.wait_for_client()
+            self.default_logger.info("Debugger attached.")
+
         ret = dict(success=f"Start command. {args}")
         if args.saveopt:
             if args.useopt is None:

cmdbox/app/client.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from cmdbox.app import filer
+from cmdbox.app import common, filer
 from cmdbox.app.commons import convert, redis_client
 import base64
 import logging
@@ -196,12 +196,13 @@ class Client(object):
                 if download_file.exists():
                     self.logger.warning(f"download_file {download_file} already exists.")
                     return dict(warn=f"download_file {download_file} already exists.")
-                with open(download_file, "wb") as f:
+                def _wd(f):
                     f.write(base64.b64decode(res_json["success"]["data"]))
                     del res_json["success"]["data"]
                     res_json["success"]["download_file"] = str(download_file.absolute())
+                common.save_file(download_file, _wd, mode='wb')
         return res_json
-    
+
     def file_upload(self, svpath:str, upload_file:Path, scope:str="client", client_data:Path=None, mkdir:bool=False, orverwrite:bool=False,
                     retry_count:int=3, retry_interval:int=5, timeout:int=60):
         """

cmdbox/app/common.py

@@ -80,8 +80,9 @@ def load_yml(yml_path:Path) -> dict:
     Returns:
         dict: 読み込んだYAMLファイルの内容
     """
-    with open(yml_path, encoding="utf-8") as f:
+    def _r(f):
         return yaml.safe_load(f)
+    return load_file(yml_path, _r)
 
 def save_yml(yml_path:Path, data:dict) -> None:
     """
@@ -91,8 +92,83 @@ def save_yml(yml_path:Path, data:dict) -> None:
         yml_path (Path): YAMLファイルのパス
         data (dict): 書き込むデータ
     """
-    with open(yml_path, 'w') as f:
+    def _w(f):
         yaml.dump(data, f, default_flow_style=False, sort_keys=False)
+    save_file(yml_path, _w)
+
+def load_file(file_path:Path, func, mode='r', encoding='utf-8') -> None:
+    """
+    ファイルを読み込みます。読み込み時に排他ロックします。
+
+    Args:
+        file_path (Path): ファイルのパス
+        func: 読み込んだデータを処理する関数
+        mode (str, optional): ファイルモード. Defaults to 'r'.
+        encoding (str, optional): エンコーディング. Defaults to 'utf-8'.
+    """
+    lock_file = f'{file_path}.lock'
+    try:
+        with open(lock_file, 'w') as fd:
+            try:
+                if sys.platform == 'win32':
+                    import msvcrt
+                    msvcrt.locking(fd.fileno(), msvcrt.LK_LOCK, 0)
+                else:
+                    import fcntl
+                    fcntl.lockf(fd, fcntl.LOCK_EX)
+                if 'b' in mode:
+                    with open(file_path, mode) as f:
+                        return func(f)
+                else:
+                    with open(file_path, mode, encoding=encoding) as f:
+                        return func(f)
+            finally:
+                if sys.platform == 'win32':
+                    msvcrt.locking(fd.fileno(), msvcrt.LK_UNLCK, 0)
+                else:
+                    fcntl.lockf(fd, fcntl.LOCK_UN)
+    finally:
+        try:
+            os.remove(lock_file)
+        except:
+            pass
+
+def save_file(file_path:Path, func, mode='w', encoding='utf-8') -> None:
+    """
+    ファイルに書き込みます。書き込み時に排他ロックします。
+
+    Args:
+        file_path (Path): ファイルのパス
+        func: 書き込む関数
+        mode (str, optional): ファイルモード. Defaults to 'w'.
+        encoding (str, optional): エンコーディング. Defaults to 'utf-8'.
+    """
+    lock_file = f'{file_path}.lock'
+    try:
+        with open(lock_file, 'w') as fd:
+            try:
+                if sys.platform == 'win32':
+                    import msvcrt
+                    msvcrt.locking(fd.fileno(), msvcrt.LK_LOCK, 0)
+                else:
+                    import fcntl
+                    fcntl.lockf(fd, fcntl.LOCK_EX)
+                if 'b' in mode:
+                    with open(file_path, mode) as f:
+                        func(f)
+                else:
+                    with open(file_path, mode, encoding=encoding) as f:
+                        func(f)
+            finally:
+                if sys.platform == 'win32':
+                    msvcrt.locking(fd.fileno(), msvcrt.LK_UNLCK, 0)
+                else:
+                    fcntl.lockf(fd, fcntl.LOCK_UN)
+    finally:
+        try:
+            os.remove(lock_file)
+        except:
+            pass
 
 class CommonValue:
     _map = dict()
@@ -251,8 +327,7 @@ def load_config(mode:str, debug:bool=False, data=HOME_DIR, webcall:bool=False, v
     if not log_conf_path.exists():
         log_conf_path = Path(version.__file__).parent / f"logconf_{ver.__appid__}.yml"
         log_name = mode
-    with open(log_conf_path) as f:
-        log_config = yaml.safe_load(f)
+    log_config = load_yml(log_conf_path)
     std_key = None
     set_common_value('webcall', webcall)
     for k, h in log_config['handlers'].items():
@@ -343,8 +418,9 @@ def saveopt(opt:dict, opt_path:Path, webmode:bool=False) -> None:
                 k = r['opt']
                 d = r['default'] if 'default' in r else None
                 opt[k] = d if k not in lopts else lopts.get(k, d)
-    with open(opt_path, 'w') as f:
+    def _w(f):
         json.dump(opt, f, indent=4, default=default_json_enc)
+    save_file(opt_path, _w)
 
 def saveuser(user_data:dict, user_path:Path) -> None:
     """
@@ -552,9 +628,10 @@ def print_format(data:dict, format:bool, tm:float, output_json:str=None, output_
                 pass
     if output_json is not None:
         try:
-            with open(output_json, 'a' if output_json_append else 'w', encoding='utf-8') as f:
+            def _w(f):
                 json.dump(data, f, default=default_json_enc, ensure_ascii=False)
                 print('', file=f)
+            save_file(Path(output_json), _w, mode='a' if output_json_append else 'w')
         except Exception as e:
             pass
     return txt
@@ -584,8 +661,9 @@ def download_file(url:str, save_path:Path) -> Path:
         Path: 保存したファイルのパス
     """
     r = requests.get(url, stream=True)
-    with open(save_path, 'wb') as f:
+    def _w(f):
         f.write(r.content)
+    save_file(Path(save_path), _w)
     return save_path
 
 def cmd(cmd:str, logger:logging.Logger, slise:int=100, newenv:Dict=None) -> Tuple[int, str, str]:

cmdbox/app/commons/convert.py

@@ -99,8 +99,10 @@ def npy2imgfile(npy, output_image_file:Path=None, image_type:str='jpeg') -> byte
     image_type = 'jpeg' if image_type == 'jpg' else image_type
     img_byte = img2byte(image, format=image_type)
     if output_image_file is not None:
-        with open(output_image_file, 'wb') as f:
+        from cmdbox.app import common
+        def _w(f):
             f.write(img_byte)
+        common.save_file(output_image_file, _w, mode='wb')
     return img_byte
 
 def bytes2b64str(img:bytes) -> str:

cmdbox/app/edge.py

@@ -515,9 +515,9 @@ class Edge(object):
                     except Exception as e:
                         raise HTTPException(status_code=500, detail=f'Failed to get token. {e}')
 
-                if not hasattr(self, 'thUvicorn') or not self.thUvicorn.is_alive():
-                    self.thUvicorn = web.ThreadedUvicorn(config=Config(app=fastapi, host='localhost', port=oauth2_port))
-                    self.thUvicorn.start()
+                if not hasattr(self, 'thHttp') or not self.thHttp.is_alive():
+                    self.thHttp = web.ThreadedASGI(config=Config(app=fastapi, host='localhost', port=oauth2_port))
+                    self.thHttp.start()
                     time.sleep(1)
 
                 # OAuth2認証のリクエストを送信
@@ -581,9 +581,9 @@ class Edge(object):
                     except Exception as e:
                         raise HTTPException(status_code=500, detail=f'Failed to get token. {e}')
 
-                if not hasattr(self, 'thUvicorn') or not self.thUvicorn.is_alive():
-                    self.thUvicorn = web.ThreadedUvicorn(config=Config(app=fastapi, host='localhost', port=oauth2_port))
-                    self.thUvicorn.start()
+                if not hasattr(self, 'thHttp') or not self.thHttp.is_alive():
+                    self.thHttp = web.ThreadedASGI(config=Config(app=fastapi, host='localhost', port=oauth2_port))
+                    self.thHttp.start()
                     time.sleep(1)
 
                 # OAuth2認証のリクエストを送信
@@ -652,9 +652,9 @@ class Edge(object):
                     except Exception as e:
                         raise HTTPException(status_code=500, detail=f'Failed to get token. {e}')
 
-                if not hasattr(self, 'thUvicorn') or not self.thUvicorn.is_alive():
-                    self.thUvicorn = web.ThreadedUvicorn(self.logger, Config(app=fastapi, host='localhost', port=oauth2_port), {})
-                    self.thUvicorn.start()
+                if not hasattr(self, 'thHttp') or not self.thHttp.is_alive():
+                    self.thHttp = web.ThreadedASGI(config=Config(app=fastapi, host='localhost', port=oauth2_port))
+                    self.thHttp.start()
                     time.sleep(1)
 
                 # OAuth2認証のリクエストを送信
@@ -734,9 +734,9 @@ class Edge(object):
                     except Exception as e:
                         raise HTTPException(status_code=500, detail=f'Failed to get token. {e}')
 
-                if not hasattr(self, 'thUvicorn') or not self.thUvicorn.is_alive():
-                    self.thUvicorn = web.ThreadedUvicorn(self.logger, Config(app=fastapi, host='localhost', port=saml_port), {})
-                    self.thUvicorn.start()
+                if not hasattr(self, 'thHttp') or not self.thHttp.is_alive():
+                    self.thHttp = web.ThreadedASGI(config=Config(app=fastapi, host='localhost', port=saml_port))
+                    self.thHttp.start()
                     time.sleep(1)
 
                 # SAML認証のリクエストを送信

cmdbox/app/features/cli/{cmdbox_vision_install.py → _cmdbox_vision_install.py}

@@ -185,8 +185,9 @@ class VisionInstall(cmdbox_vision_start.VisionStart):
                         _msg = f"Failed to download SAM2 model: {responce.status_code} {responce.reason}. {mv['url']}"
                         logger.error(_msg, exc_info=True)
                         return dict(warn=_msg)
-                    with open(model_file, mode='wb') as f:
+                    def _wm(f):
                         f.write(responce.content)
+                    common.save_file(model_file, _wm, mode='wb')
                 #===============================================================
                 # SAM2のpythonライブラリのインストール
                 whl_url = f'git+https://github.com/facebookresearch/sam2.git'