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

cmdbox/app/features/cli/excel_base.py

@@ -0,0 +1,301 @@
+from cmdbox.app import common, client, filer, feature
+from cmdbox.app.commons import convert
+from cmdbox.app.options import Options
+from pathlib import Path
+from typing import Dict, Any, Tuple, List, Union
+import argparse
+import logging
+import html
+import re
+
+
+class ExcelBase(feature.ResultEdgeFeature):
+    def get_mode(self) -> Union[str, List[str]]:
+        """
+        この機能のモードを返します
+
+        Returns:
+            Union[str, List[str]]: モード
+        """
+        return 'excel'
+
+    def get_option(self):
+        """
+        この機能のオプションを返します
+
+        Returns:
+            Dict[str, Any]: オプション
+        """
+        return dict(
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=True,
+            description_ja="",
+            description_en="",
+            choice=[
+                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
+                     description_ja="Redisサーバーのサービスホストを指定します。",
+                     description_en="Specify the service host of the Redis server."),
+                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
+                     description_ja="Redisサーバーのサービスポートを指定します。",
+                     description_en="Specify the service port of the Redis server."),
+                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
+                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
+                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
+                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
+                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
+                dict(opt="scope", type=Options.T_STR, default="client", required=True, multi=False, hide=False, choice=["client", "current", "server"],
+                     description_ja="参照先スコープを指定します。指定可能な画像タイプは `client` , `current` , `server` です。",
+                     description_en="Specifies the scope to be referenced. When omitted, 'client' is used.",
+                     choice_show=dict(client=["client_data"]),
+                     test_true={"server":"server",
+                                "client":"client",
+                                "current":"current"}),
+                dict(opt="svpath", type=Options.T_FILE, default="/", required=True, multi=False, hide=False, choice=None,
+                     description_ja="サーバーのデータフォルダ以下のパスを指定します。省略時は `/` を使用します。",
+                     description_en="Specify the directory path to get the list of files.",
+                     test_true={"server":"/"}),
+                dict(opt="client_data", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
+                     description_ja="ローカルを参照させる場合のデータフォルダのパスを指定します。",
+                     description_en="Specify the path of the data folder when local is referenced.",
+                     test_true={"server":None,
+                                "client":common.HOME_DIR / f".{self.ver.__appid__}",
+                                "current":None}),
+                dict(opt="retry_count", type=Options.T_INT, default=3, required=False, multi=False, hide=True, choice=None,
+                     description_ja="Redisサーバーへの再接続回数を指定します。0以下を指定すると永遠に再接続を行います。",
+                     description_en="Specifies the number of reconnections to the Redis server.If less than 0 is specified, reconnection is forever."),
+                dict(opt="retry_interval", type=Options.T_INT, default=5, required=False, multi=False, hide=True, choice=None,
+                     description_ja="Redisサーバーに再接続までの秒数を指定します。",
+                     description_en="Specifies the number of seconds before reconnecting to the Redis server."),
+                dict(opt="timeout", type=Options.T_INT, default="15", required=False, multi=False, hide=True, choice=None,
+                     description_ja="サーバーの応答が返ってくるまでの最大待ち時間を指定。",
+                     description_en="Specify the maximum waiting time until the server responds."),
+                dict(opt="output_json", short="o", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None, fileio="out",
+                     description_ja="処理結果jsonの保存先ファイルを指定。",
+                     description_en="Specify the destination file for saving the processing result json."),
+                dict(opt="output_json_append", short="a", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
+                     description_ja="処理結果jsonファイルを追記保存します。",
+                     description_en="Save the processing result json file by appending."),
+                dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
+                     description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をConsole logに出力します。",
+                     description_en="Available only in GUI mode. Outputs standard output during command execution to Console log."),
+                dict(opt="capture_stdout", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
+                     description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をキャプチャーし、実行結果画面に表示します。",
+                     description_en="Available only in GUI mode. Captures standard output during command execution and displays it on the execution result screen."),
+                dict(opt="capture_maxsize", type=Options.T_INT, default=self.DEFAULT_CAPTURE_MAXSIZE, required=False, multi=False, hide=True, choice=None,
+                     description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力の最大キャプチャーサイズを指定します。",
+                     description_en="Available only in GUI mode. Specifies the maximum capture size of standard output when executing commands."),
+            ]
+        )
+
+    OPENPYXL_TYPE_TO_STRING = {
+        "n": "numeric",
+        "s": "string",
+        "f": "formula",
+        "b": "boolean",
+        "e": "error",
+    }
+
+    def apprun(self, logger:logging.Logger, args:argparse.Namespace, tm:float, pf:List[Dict[str, float]]=[]) -> Tuple[int, Dict[str, Any], Any]:
+        """
+        この機能の実行を行います
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+            tm (float): 実行開始時間
+            pf (List[Dict[str, float]]): 呼出元のパフォーマンス情報
+
+        Returns:
+            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
+        """
+        chk, msg, _ = self.chk_args(args, tm, pf)
+        if chk != self.RESP_SUCCESS:
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_WARN, msg, None
+
+        try:
+            client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
+            if args.scope == "client":
+                if client_data is not None:
+                    f = filer.Filer(client_data, logger)
+                    chk, abspath, msg = f._file_exists(args.svpath)
+                    if not chk:
+                        common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                        return self.RESP_WARN, msg, None
+                    res = self.excel_proc(abspath, args, logger, tm, pf)
+                    if 'success' not in res:
+                        common.print_format(res, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                        return self.RESP_WARN, res, None
+                    common.print_format(res, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                    return self.RESP_SUCCESS, res, None
+                else:
+                    msg = dict(warn=f"client_data is empty.")
+                    common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                    return self.RESP_WARN, msg, None
+            elif args.scope == "current":
+                f = filer.Filer(Path.cwd(), logger)
+                chk, abspath, msg = f._file_exists(args.svpath)
+                if not chk:
+                    common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                    return self.RESP_WARN, msg, None
+                res = self.excel_proc(abspath, args, logger, tm, pf)
+                if 'success' not in res:
+                    common.print_format(res, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                    return self.RESP_WARN, res, None
+                common.print_format(res, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                return self.RESP_SUCCESS, res, None
+            elif args.scope == "server":
+                cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
+                res = cl.redis_cli.send_cmd(self.get_svcmd(), self.get_svparam(args),
+                                                retry_count=args.retry_count, retry_interval=args.retry_interval, timeout=args.timeout)
+                if 'success' not in res:
+                    common.print_format(res, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                    return self.RESP_WARN, res, None
+                common.print_format(res, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+                return self.RESP_SUCCESS, res, None
+            else:
+                logger.warning(f"scope is invalid. {args.scope}")
+                return dict(warn=f"scope is invalid. {args.scope}")
+        except Exception as e:
+            logger.warning(f"Exception occurred. {e}", exc_info=True)
+            return self.RESP_WARN, dict(warn=f"Exception occurred. {e}"), None
+
+    def chk_args(self, args:argparse.Namespace, tm:float, pf:List[Dict[str, float]]=[]) -> Tuple[bool, str, Any]:
+        """
+        引数のチェックを行います
+
+        Args:
+            args (argparse.Namespace): 引数
+
+        Returns:
+            Tuple[bool, str]: チェック結果, メッセージ
+        """
+        if args.svname is None:
+            msg = dict(warn=f"Please specify the --svname option.")
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_WARN, msg, None
+        if args.scope is None:
+            msg = dict(warn=f"Please specify the --scope option.")
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_WARN, msg, None
+        if args.svpath is None:
+            msg = dict(warn=f"Please specify the --svpath option.")
+            common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
+            return self.RESP_WARN, msg, None
+        return self.RESP_SUCCESS, None, None
+
+    def excel_proc(self, abspath:Path, args:argparse.Namespace, logger:logging.Logger, tm:float, pf:List[Dict[str, float]]=[]) -> Dict[str, Any]:
+        """
+        Excel処理のベース
+
+        Args:
+            abspath (Path): Excelファイルの絶対パス
+            args (argparse.Namespace): 引数
+            logger (logging.Logger): ロガー
+            tm (float): 処理時間
+            pf (List[Dict[str, float]]): パフォーマンス情報
+
+        Returns:
+            Dict[str, Any]: 結果
+        """
+        raise NotImplementedError("Excel processing is not implemented.")
+
+    def get_svparam(self, args:argparse.Namespace) -> List[str]:
+        """
+        サーバーに送信するパラメーターを返します
+
+        Args:
+            args (argparse.Namespace): 引数
+
+        Returns:
+            List[str]: サーバーに送信するパラメーター
+        """
+        raise NotImplementedError("Get svparam is not implemented.")
+
+    def format_cell(self, output_cell_format:str, otxt:str, val:str, logger:logging.Logger) -> str:
+        """
+        テキストをフォーマットに応じて、valをフォーマットします
+
+        Args:
+            output_cell_format (str): 出力フォーマット
+            otxt (str): 追加先のテキスト
+            val (str): セルの値
+            logger (logging.Logger): ロガー
+
+        Returns:
+            str: 追加後のテキスト
+        """
+        val = str(val) if val is not None else ""
+        otxt = otxt if otxt is not None else ""
+        ret = ""
+        if output_cell_format == 'csv':
+            ret = val.replace("\n", " ").replace("\r", "")
+            ret = ret.replace('"', '""')
+            ret = ret if ret.find(",")>-1 else f'"{ret}"'
+            if otxt and not otxt.endswith("\n"):
+                ret = f",{ret}"
+        elif output_cell_format == 'md':
+            ret = val.replace("\n", " ").replace("\r", "")
+            ret = ret.replace('|', r'\|')
+            if otxt and not otxt.endswith("\n"):
+                ret = f"{ret}|"
+            else:
+                ret = f"|{ret}|"
+        elif output_cell_format == 'html':
+            ret = html.escape(val)
+            ret = ret.replace("\n", "<br/>").replace("\r", "")
+            ret = f"<td>{ret}</td>"
+        return ret
+
+    def format_newline(self, output_cell_format:str, otxt:str, logger:logging.Logger) -> str:
+        """
+        テキストをフォーマットに応じて改行を追加します
+
+        Args:
+            output_cell_format (str): 出力フォーマット
+            otxt (str): 追加先のテキスト
+            logger (logging.Logger): ロガー
+
+        Returns:
+            str: 追加後のテキスト
+        """
+        otxt = otxt if otxt is not None else ""
+        ret = ""
+        if output_cell_format == 'csv':
+            ret = f"{otxt}\n" if otxt else "\n"
+        elif output_cell_format == 'md':
+            ret = f"{otxt}\n" if otxt else "\n"
+        elif output_cell_format == 'html':
+            if otxt and otxt.find(r"<TTRR/>") > -1:
+                pre = re.sub(r'<TTRR/>.*', '', otxt, flags=re.DOTALL)
+                post = re.sub(r'.+<TTRR/>', '', otxt, flags=re.DOTALL)
+                ret = f"{pre}<tr>{post}</tr>\n<TTRR/>"
+            elif otxt:
+                ret = f"<tr>{otxt}</tr>\n<TTRR/>"
+            elif not otxt:
+                ret = "<tr></tr>\n<TTRR/>"
+        return ret
+
+    def format_table(self, output_cell_format:str, otxt:str, logger:logging.Logger) -> str:
+        """
+        テキストをフォーマットに応じてテーブルを構成します
+        Args:
+            output_cell_format (str): 出力フォーマット
+            otxt (str): 追加先のテキスト
+            logger (logging.Logger): ロガー
+        Returns:
+            str: 追加後のテキスト
+        """
+        otxt = otxt if otxt is not None else ""
+        ret = ""
+        if output_cell_format == 'csv':
+            ret = f"{otxt}\n" if otxt else "\n"
+        elif output_cell_format == 'md':
+            ret = f"{otxt}\n" if otxt else "\n"
+        elif output_cell_format == 'html':
+            otxt = re.sub(r'<TTRR/>.*', '', otxt, flags=re.DOTALL)
+            if otxt:
+                ret = f"<table>{otxt}</table>\n"
+            elif not otxt:
+                ret = "\n"
+        return ret

cmdbox/app/features/web/cmdbox_web_exec_cmd.py

@@ -34,16 +34,14 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
                     raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
                 opt = None
                 content_type = req.headers.get('content-type')
-                def _marge_opt(opt, param):
-                    for k in opt.keys():
-                        if k in param: opt[k] = param[k]
+                def _marge_opt(opt:Dict[str, Any], param:Dict[str, Any]) -> Dict[str, Any]:
+                    opt.update(param)
                     return opt
+                opt_def = self.load_cmd(web, title)
                 if content_type is None:
-                    opt = self.load_cmd(web, title)
-                    opt = _marge_opt(opt, req.query_params)
+                    opt = _marge_opt(opt_def, req.query_params)
                 elif content_type.startswith('multipart/form-data'):
-                    opt = self.load_cmd(web, title)
-                    opt = _marge_opt(opt, req.query_params)
+                    opt = _marge_opt(opt_def, req.query_params)
                     form = await req.form()
                     #files = {key: value for key, value in form.multi_items() if isinstance(value, UploadFile)}
                     for key, fv in form.multi_items():
@@ -52,13 +50,12 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
                         if key == 'input_file': opt['stdin'] = False
                 elif content_type.startswith('application/json'):
                     opt = await req.json()
+                    opt = _marge_opt(opt_def, opt)
                 elif content_type.startswith('application/octet-stream'):
-                    opt = self.load_cmd(web, title)
-                    opt = _marge_opt(opt, req.query_params)
+                    opt = _marge_opt(opt_def, req.query_params)
                     opt['_stdin_body'] = await req.body()
                 else:
-                    opt = self.load_cmd(web, title)
-                    opt = _marge_opt(opt, req.query_params)
+                    opt = _marge_opt(opt_def, req.query_params)
                 if 'mode' not in opt or 'cmd' not in opt:
                     raise HTTPException(status_code=404, detail='mode or cmd is not found.')
                 opt['capture_stdout'] = nothread = True
@@ -147,9 +144,10 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
         if 'port' in opt: opt['port'] = web.redis_port
         if 'password' in opt: opt['password'] = web.redis_password
         if 'svname' in opt: opt['svname'] = web.svname
-        if req.session is not None and 'signin' in req.session and req.session['signin'] is not None:
-            if 'clmsg_id' in req.session['signin'] and req.session['signin']['clmsg_id'] is not None:
-                opt['clmsg_id'] = req.session['signin']['clmsg_id']
+        if not 'clmsg_id' in opt:  # optに含まれる場合は処理しない
+            if req.session is not None and 'signin' in req.session and req.session['signin'] is not None:
+                if 'clmsg_id' in req.session['signin'] and req.session['signin']['clmsg_id'] is not None:
+                    opt['clmsg_id'] = req.session['signin']['clmsg_id']
         ap.sv = None
         ap.cl = None
         ap.web = None

cmdbox/app/filer.py

@@ -206,13 +206,15 @@ class Filer(object):
         try:
             mime_type, encoding = mimetypes.guess_type(str(abspath))
             fname = abspath.name
-            with open(abspath, "rb") as f:
+            def _r(f):
                 fd = f.read()
                 if mime_type is not None and mime_type != 'image/svg+xml' and mime_type.startswith('image') and img_thumbnail > 0:
                     img = convert.imgbytes2thumbnail(fd, (img_thumbnail, img_thumbnail))
                     fd = convert.img2byte(img, "jpeg")
                     fname = f"{fname}.thumbnail.jpg"
                 data = convert.bytes2b64str(fd)
+                return data
+            data = common.load_file(abspath, _r, mode='rb')
             return self.RESP_SUCCESS, dict(success=dict(name=fname, data=data, mime_type=mime_type))
         except Exception as e:
             self.logger.warning(f"Failed to download {abspath}. {e}")
@@ -252,8 +254,9 @@ class Filer(object):
         try:
             if mkdir:
                 save_path.parent.mkdir(parents=True, exist_ok=True)
-            with open(save_path, "wb") as f:
+            def _w(f):
                 f.write(file_data)
+            common.save_file(Path(save_path), _w, mode='wb')
             return self.RESP_SUCCESS, dict(success=f"Uploaded {save_path}")
         except Exception as e:
             self.logger.warning(f"Failed to upload {save_path}. {e}")

cmdbox/app/mcp.py

@@ -186,8 +186,9 @@ class Mcp:
             if args.llmmodel is None: raise ValueError("llmmodel is required.")
             if args.llmlocation is None: raise ValueError("llmlocation is required.")
             if args.llmsvaccountfile is not None: 
-                with open(args.llmsvaccountfile, "r", encoding="utf-8") as f:
-                    vertex_credentials = json.load(f)
+                def _r(f):
+                    return json.load(f)
+                vertex_credentials = common.load_file(Path(args.llmsvaccountfile), _r, mode='r')
             elif args.llmprojectid is None: raise ValueError("llmprojectid is required.")
             agent = Agent(
                 name=args.agent_name,
@@ -353,7 +354,7 @@ class Mcp:
         func_txt += f'    signin_data = signin.Signin.load_signin_file(args.signin_file)\n'
         func_txt += f'    req = scope["req"] if scope["req"] is not None else scope["websocket"]\n'
         func_txt += f'    sign = signin.Signin._check_signin(req, scope["res"], signin_data, logger)\n'
-        func_txt += f'    if sign is not None:\n'
+        func_txt += f'    if sign is not None or "signin" not in req.session or "groups" not in req.session["signin"]:\n'
         func_txt += f'        logger.warning("Unable to execute command because authentication information cannot be obtained")\n'
         func_txt += f'        return dict(warn="Unable to execute command because authentication information cannot be obtained")\n'
         func_txt += f'    groups = req.session["signin"]["groups"]\n'

cmdbox/app/options.py

@@ -267,6 +267,14 @@ class Options:
             short="d", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
             description_ja="デバックモードで起動します。",
             description_en="Starts in debug mode.")
+        self._options["debug_attach"] = dict(
+            short="debug_attach", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
+            description_ja="デバックプロセスへのアタッチを有効にするかどうかを指定します。",
+            description_en="Specify whether to enable attaching to the debug process.")
+        self._options["debug_attach_port"] = dict(
+            short="debug_attach_port", type=Options.T_INT, default=5678, required=False, multi=False, hide=True, choice=None,
+            description_ja="デバックプロセスにアタッチするポート番号を指定します。",
+            description_en="Specify the port number to attach to the debug process.")
         self._options["format"] = dict(
             short="f", type=Options.T_BOOL, default=None, required=False, multi=False, hide=True,
             description_ja="処理結果を見やすい形式で出力します。指定しない場合json形式で出力します。",

cmdbox/app/web.py

@@ -719,7 +719,7 @@ class Web:
     def start(self, allow_host:str="0.0.0.0", listen_port:int=8081, ssl_listen_port:int=8443,
               ssl_cert:Path=None, ssl_key:Path=None, ssl_keypass:str=None, ssl_ca_certs:Path=None,
               session_domain:str=None, session_path:str='/', session_secure:bool=False, session_timeout:int=900, outputs_key:List[str]=[],
-              guvicorn_workers:int=-1, guvicorn_timeout:int=30,
+              gunicorn_workers:int=-1, gunicorn_timeout:int=30,
               agent_runner=None, mcp=None,):
         """
         Webサーバを起動する
@@ -737,8 +737,8 @@ class Web:
             session_secure (bool, optional): セッションセキュア. Defaults to False.
             session_timeout (int, optional): セッションタイムアウト. Defaults to 900.
             outputs_key (list, optional): 出力キー. Defaults to [].
-            guvicorn_workers (int, optional): Gunicornワーカー数. Defaults to -1.
-            guvicorn_timeout (int, optional): Gunicornタイムアウト. Defaults to 30.
+            gunicorn_workers (int, optional): Gunicornワーカー数. Defaults to -1.
+            gunicorn_timeout (int, optional): Gunicornタイムアウト. Defaults to 30.
             agent_runner (Runner, optional): エージェントランナー. Defaults to None.
             mcp (MCP, optional): MCP. Defaults to None.
         """
@@ -754,8 +754,8 @@ class Web:
         self.session_path = session_path
         self.session_secure = session_secure
         self.session_timeout = session_timeout
-        self.guvicorn_workers = guvicorn_workers
-        self.guvicorn_timeout = guvicorn_timeout
+        self.gunicorn_workers = gunicorn_workers
+        self.gunicorn_timeout = gunicorn_timeout
         self.agent_runner = agent_runner
         self.mcp = mcp
         if self.logger.level == logging.DEBUG:
@@ -771,8 +771,8 @@ class Web:
             self.logger.debug(f"web start parameter: session_path={self.session_path}")
             self.logger.debug(f"web start parameter: session_secure={self.session_secure}")
             self.logger.debug(f"web start parameter: session_timeout={self.session_timeout}")
-            self.logger.debug(f"web start parameter: guvicorn_worker={self.guvicorn_workers}")
-            self.logger.debug(f"web start parameter: guvicorn_timeout={self.guvicorn_timeout}")
+            self.logger.debug(f"web start parameter: gunicorn_workers={self.gunicorn_workers}")
+            self.logger.debug(f"web start parameter: gunicorn_timeout={self.gunicorn_timeout}")
             self.logger.debug(f"web start parameter: agent_runner={self.agent_runner}")
             self.logger.debug(f"web start parameter: mcp={self.mcp}")
 
@@ -894,21 +894,22 @@ class Web:
             https_config = Config(app=app, host=self.allow_host, port=self.ssl_listen_port,
                                   ssl_certfile=self.ssl_cert, ssl_keyfile=self.ssl_key,
                                   ssl_keyfile_password=self.ssl_keypass, ssl_ca_certs=self.ssl_ca_certs)
-            th_ssl = ThreadedUvicorn(self.logger, config=https_config,
-                                     guvicorn_config=dict(workers=self.guvicorn_workers, timeout=self.guvicorn_timeout))
+            th_ssl = ThreadedASGI(app, self.logger, config=https_config,
+                                  gunicorn_config=dict(workers=self.gunicorn_workers, timeout=self.gunicorn_timeout))
             th_ssl.start()
             browser_port = self.ssl_listen_port
         else:
             http_config = Config(app=app, host=self.allow_host, port=self.listen_port)
-            th = ThreadedUvicorn(self.logger, config=http_config,
-                                guvicorn_config=dict(workers=self.guvicorn_workers, timeout=self.guvicorn_timeout))
+            th = ThreadedASGI(app, self.logger, config=http_config,
+                              gunicorn_config=dict(workers=self.gunicorn_workers, timeout=self.gunicorn_timeout))
             th.start()
             browser_port = self.listen_port
         try:
             if self.gui_mode:
                 webbrowser.open(f'http://localhost:{browser_port}/gui')
-            with open("web.pid", mode="w", encoding="utf-8") as f:
+            def _w(f):
                 f.write(str(os.getpid()))
+            common.save_file("web.pid", _w)
             while self.is_running:
                 gevent.sleep(1)
             if th is not None:
@@ -926,35 +927,42 @@ class Web:
         Webサーバを停止する
         """
         try:
-            with open("web.pid", mode="r", encoding="utf-8") as f:
+            def _r(f):
                 pid = f.read()
                 if pid != "":
-                    os.kill(int(pid), signal.CTRL_C_EVENT)
+                    if platform.system() == "Windows":
+                        os.system(f"taskkill /F /PID {pid}")
+                    else:
+                        os.kill(int(pid), signal.SIGKILL)
                     self.logger.info(f"Stop web.")
                 else:
                     self.logger.warning(f"pid is empty.")
+            common.load_file("web.pid", _r)
             Path("web.pid").unlink(missing_ok=True)
         except:
             traceback.print_exc()
         finally:
             self.logger.info(f"Exit web.")
 
-class ThreadedUvicorn:
-    def __init__(self, logger:logging.Logger, config:Config, guvicorn_config:Dict[str, Any]=None, force_uvicorn:bool=False):
+class ThreadedASGI:
+    def __init__(self, app:FastAPI, logger:logging.Logger, config:Config, gunicorn_config:Dict[str, Any]=None, force_single:bool=False):
+        self.app = app
         self.logger = logger
-        self.guvicorn_config = guvicorn_config
-        self.force_uvicorn = True if platform.system() == "Windows" else force_uvicorn
+        self.config = config
+        self.gunicorn_config = gunicorn_config
+        # windows環境下ではシングルプロセスで動作させる
+        self.force_single = True if platform.system() == "Windows" else force_single
         # loggerの設定
         common.reset_logger("uvicorn")
         common.reset_logger("uvicorn.error")
         common.reset_logger("uvicorn.access")
         #common.reset_logger("gunicorn.error")
         #common.reset_logger("gunicorn.access")
-        if self.force_uvicorn:
+        if self.force_single:
+            config.ws = "wsproto"
             self.server = uvicorn.Server(config)
             self.thread = RaiseThread(daemon=True, target=self.server.run)
         else:
-
             from gunicorn.app.wsgiapp import WSGIApplication
             class App(WSGIApplication):
                 def __init__(self, app, options):
@@ -969,32 +977,36 @@ class ThreadedUvicorn:
                 def load(self):
                     return self.application
             opt = dict(bind=f"{config.host}:{config.port}",
-                       worker_class="uvicorn.workers.UvicornWorker",
+                       worker_class="cmdbox.app.web.ASGIWorker",
                        access_log_format='[%(t)s] %(p)s %(l)s %(h)s "%(r)s" %(s)s',
                        loglevel=logging.getLevelName(self.logger.level),
                        keyfile=config.ssl_keyfile, certfile=config.ssl_certfile,
                        ca_certs=config.ssl_ca_certs, keyfile_password=config.ssl_keyfile_password,
                        limit_request_line=8190, limit_request_fields=100, limit_request_field_size=8190)
 
-            self.guvicorn_config = self.guvicorn_config or {}
-            if 'workers' not in self.guvicorn_config:
-                self.guvicorn_config['workers'] = None
-            if self.guvicorn_config['workers'] is None or self.guvicorn_config['workers'] <= 0:
-                self.guvicorn_config['workers'] = multiprocessing.cpu_count()*2
-            if 'timeout' not in self.guvicorn_config:
-                self.guvicorn_config['timeout'] = None
-            if self.guvicorn_config['timeout'] is None or self.guvicorn_config['timeout'] <= 0:
-                self.guvicorn_config['timeout'] = 30
+            self.gunicorn_config = self.gunicorn_config or {}
+            if 'workers' not in self.gunicorn_config:
+                self.gunicorn_config['workers'] = None
+            if self.gunicorn_config['workers'] is None or self.gunicorn_config['workers'] <= 0:
+                self.gunicorn_config['workers'] = multiprocessing.cpu_count()*2
+            if 'timeout' not in self.gunicorn_config:
+                self.gunicorn_config['timeout'] = None
+            if self.gunicorn_config['timeout'] is None or self.gunicorn_config['timeout'] <= 0:
+                self.gunicorn_config['timeout'] = 30
 
-            opt = {**opt, **self.guvicorn_config}
-            self.server = App(config.app, opt)
-            #self.thread = RaiseThread(daemon=True, target=self.server.run)
+            opt = {**opt, **self.gunicorn_config}
+            self.server = App(app, opt)
 
     def start(self):
-        if self.force_uvicorn:
-            asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-            self.thread.start()
-            asyncio.run(self.wait_for_started())
+        if self.force_single:
+            if platform.system() == "Windows":
+                asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+                self.thread.start()
+                asyncio.run(self.wait_for_started())
+            else:
+                self.thread.start()
+                task = asyncio.get_event_loop().create_task(self.wait_for_started())
+                # task.result()
         else:
             async def run():
                 self.server.run()
@@ -1005,7 +1017,7 @@ class ThreadedUvicorn:
             await asyncio.sleep(0.1)
 
     def stop(self):
-        if self.force_uvicorn:
+        if self.force_single:
             if self.thread.is_alive():
                 self.server.should_exit = True
                 self.thread.raise_exception()
@@ -1015,7 +1027,7 @@ class ThreadedUvicorn:
             self.server.started = False
 
     def is_alive(self):
-        if self.force_uvicorn:
+        if self.force_single:
             return self.thread.is_alive()
         else:
             return self.server.started
@@ -1044,3 +1056,10 @@ class RaiseThread(threading.Thread):
                 0
             )
             print('Failure in raising exception')
+
+if platform.system() != "Windows":
+    from uvicorn.workers import UvicornWorker
+    class ASGIWorker(UvicornWorker):
+        def __init__(self, *args: Any, **kwargs: Any) -> None:
+            super().__init__(*args, **kwargs)
+            self.config.ws = "wsproto"

cmdbox/extensions/features.yml

@@ -46,6 +46,9 @@ agentrule:                              # Specifies a list of rules that determi
   - mode: client
     cmds: [file_download, file_list, http, server_info]
     rule: allow
+  - mode: excel
+    cmds: [cell_details, cell_search, cell_values, sheet_list]
+    rule: allow
   - mode: server
     cmds: [list]
     rule: allow