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

cmdbox/app/features/cli/cmdbox_web_group_del.py

@@ -40,9 +40,9 @@ class WebGroupDel(feature.UnsupportEdgeFeature):
                 dict(opt="group_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="グループIDを指定します。",
                      description_en="Specify the group ID. Do not duplicate other groups."),
-                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None, fileio="in",
-                     description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
-                     description_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
+                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None, fileio="in",
+                     description_ja=f"サインイン可能なユーザーとパスワードを記載したファイルを指定します。通常 '.{self.ver.__appid__}/user_list.yml' を指定します。",
+                     description_en=f"Specify a file containing users and passwords with which they can signin.Typically, specify '.{self.ver.__appid__}/user_list.yml'."),
                 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."),

cmdbox/app/features/cli/cmdbox_web_group_edit.py

@@ -46,9 +46,9 @@ class WebGroupEdit(feature.UnsupportEdgeFeature):
                 dict(opt="group_parent", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      description_ja="親グループ名を指定します。",
                      description_en="Specifies the parent group name."),
-                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None, fileio="in",
-                     description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
-                     description_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
+                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None, fileio="in",
+                     description_ja=f"サインイン可能なユーザーとパスワードを記載したファイルを指定します。通常 '.{self.ver.__appid__}/user_list.yml' を指定します。",
+                     description_en=f"Specify a file containing users and passwords with which they can signin.Typically, specify '.{self.ver.__appid__}/user_list.yml'."),
                 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."),

cmdbox/app/features/cli/cmdbox_web_group_list.py

@@ -40,9 +40,9 @@ class WebGroupList(feature.UnsupportEdgeFeature):
                 dict(opt="group_name", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      description_ja="グループ名を指定して取得します。省略した時は全てのグループを取得します。",
                      description_en="Retrieved by specifying a group name. If omitted, all groups are retrieved."),
-                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None, fileio="in",
-                     description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
-                     description_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
+                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None, fileio="in",
+                     description_ja=f"サインイン可能なユーザーとパスワードを記載したファイルを指定します。通常 '.{self.ver.__appid__}/user_list.yml' を指定します。",
+                     description_en=f"Specify a file containing users and passwords with which they can signin.Typically, specify '.{self.ver.__appid__}/user_list.yml'."),
                 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."),

cmdbox/app/features/cli/cmdbox_web_start.py

@@ -78,9 +78,9 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
             dict(opt="ssl_ca_certs", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None, fileio="in",
                     description_ja="SSLサーバーCA証明書ファイルを指定します。",
                     description_en="Specify the SSL server CA certificate file."),
-            dict(opt="signin_file", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None, fileio="in",
-                    description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
-                    description_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
+            dict(opt="signin_file", type=Options.T_FILE, default=None, required=False, multi=False, hide=False, choice=None, fileio="in",
+                    description_ja=f"サインイン可能なユーザーとパスワードを記載したファイルを指定します。通常 '.{self.ver.__appid__}/user_list.yml' を指定します。",
+                    description_en=f"Specify a file containing users and passwords with which they can signin.Typically, specify '.{self.ver.__appid__}/user_list.yml'."),
             dict(opt="session_domain", type=Options.T_STR, default=None, required=False, multi=False, hide=True, choice=None,
                     description_ja="サインインしたユーザーのセッションが有効なドメインを指定します。",
                     description_en="Specify the domain for which the signed-in user's session is valid."),
@@ -93,12 +93,12 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
             dict(opt="session_timeout", type=Options.T_INT, default="900", required=False, multi=False, hide=True, choice=None,
                     description_ja="サインインしたユーザーのセッションタイムアウトの時間を秒で指定します。",
                     description_en="Specify the session timeout in seconds for signed-in users."),
-            dict(opt="guvicorn_workers", type=Options.T_INT, default=multiprocessing.cpu_count()*2, required=False, multi=False, hide=True, choice=None,
-                    description_ja="guvicornワーカー数を指定します。Linux環境でのみ有効です。-1又は未指定の場合はCPU数の2倍を使用します。",
-                    description_en="Specifies the number of guvicorn workers, valid only in Linux environment. If -1 or unspecified, twice the number of CPUs is used."),
-            dict(opt="guvicorn_timeout", type=Options.T_INT, default=30, required=False, multi=False, hide=True, choice=None,
-                    description_ja="guvicornワーカーのタイムアウトの時間を秒で指定します。",
-                    description_en="Specify the timeout duration of the guvicorn worker in seconds."),
+            dict(opt="gunicorn_workers", type=Options.T_INT, default=multiprocessing.cpu_count()*2, required=False, multi=False, hide=True, choice=None,
+                    description_ja="gunicornワーカー数を指定します。Linux環境でのみ有効です。-1又は未指定の場合はCPU数の2倍を使用します。",
+                    description_en="Specifies the number of gunicorn workers, valid only in Linux environment. If -1 or unspecified, twice the number of CPUs is used."),
+            dict(opt="gunicorn_timeout", type=Options.T_INT, default=30, required=False, multi=False, hide=True, choice=None,
+                    description_ja="gunicornワーカーのタイムアウトの時間を秒で指定します。",
+                    description_en="Specify the timeout duration of the gunicorn worker in seconds."),
             dict(opt="client_only", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
                     description_ja="サーバーへの接続を行わないようにします。",
                     description_en="Do not make connections to the server."),
@@ -232,5 +232,5 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
                 ssl_cert=args.ssl_cert, ssl_key=args.ssl_key, ssl_keypass=args.ssl_keypass, ssl_ca_certs=args.ssl_ca_certs,
                 session_domain=args.session_domain, session_path=args.session_path,
                 session_secure=args.session_secure, session_timeout=args.session_timeout,
-                outputs_key=args.outputs_key, guvicorn_workers=args.guvicorn_workers, guvicorn_timeout=args.guvicorn_timeout,
+                outputs_key=args.outputs_key, gunicorn_workers=args.gunicorn_workers, gunicorn_timeout=args.gunicorn_timeout,
                 agent_runner=agent_runner, mcp=mcp,)

cmdbox/app/features/cli/cmdbox_web_user_add.py

@@ -55,9 +55,9 @@ class WebUserAdd(feature.UnsupportEdgeFeature):
                 dict(opt="user_group", type=Options.T_STR, default=None, required=True, multi=True, hide=False, choice=None,
                      description_ja="ユーザーが所属するグループを指定します。",
                      description_en="Specifies the groups to which the user belongs."),
-                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None, fileio="in",
-                     description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
-                     description_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
+                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None, fileio="in",
+                     description_ja=f"サインイン可能なユーザーとパスワードを記載したファイルを指定します。通常 '.{self.ver.__appid__}/user_list.yml' を指定します。",
+                     description_en=f"Specify a file containing users and passwords with which they can signin.Typically, specify '.{self.ver.__appid__}/user_list.yml'."),
                 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."),

cmdbox/app/features/cli/cmdbox_web_user_del.py

@@ -40,9 +40,9 @@ class WebUserDel(feature.UnsupportEdgeFeature):
                 dict(opt="user_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="ユーザーIDを指定します。",
                      description_en="Specify the user ID."),
-                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None, fileio="in",
-                     description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
-                     description_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
+                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None, fileio="in",
+                     description_ja=f"サインイン可能なユーザーとパスワードを記載したファイルを指定します。通常 '.{self.ver.__appid__}/user_list.yml' を指定します。",
+                     description_en=f"Specify a file containing users and passwords with which they can signin.Typically, specify '.{self.ver.__appid__}/user_list.yml'."),
                 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."),

cmdbox/app/features/cli/cmdbox_web_user_edit.py

@@ -55,9 +55,9 @@ class WebUserEdit(feature.UnsupportEdgeFeature):
                 dict(opt="user_group", type=Options.T_STR, default=None, required=True, multi=True, hide=False, choice=None,
                      description_ja="ユーザーが所属するグループを指定します。",
                      description_en="Specifies the groups to which the user belongs."),
-                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None, fileio="in",
-                     description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
-                     description_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
+                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None, fileio="in",
+                     description_ja=f"サインイン可能なユーザーとパスワードを記載したファイルを指定します。通常 '.{self.ver.__appid__}/user_list.yml' を指定します。",
+                     description_en=f"Specify a file containing users and passwords with which they can signin.Typically, specify '.{self.ver.__appid__}/user_list.yml'."),
                 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."),

cmdbox/app/features/cli/cmdbox_web_user_list.py

@@ -40,9 +40,9 @@ class WebUserList(feature.UnsupportEdgeFeature):
                 dict(opt="user_name", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      description_ja="ユーザー名を指定して取得します。省略した時は全てのユーザーを取得します。",
                      description_en="Retrieved by specifying a user name. If omitted, all users are retrieved."),
-                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None, fileio="in",
-                     description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
-                     description_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
+                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None, fileio="in",
+                     description_ja=f"サインイン可能なユーザーとパスワードを記載したファイルを指定します。通常 '.{self.ver.__appid__}/user_list.yml' を指定します。",
+                     description_en=f"Specify a file containing users and passwords with which they can signin.Typically, specify '.{self.ver.__appid__}/user_list.yml'."),
                 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."),

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.CTRL_C_EVENT)
                     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,29 +977,28 @@ 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:
+        if self.force_single:
             asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
             self.thread.start()
             asyncio.run(self.wait_for_started())
@@ -1005,7 +1012,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 +1022,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 +1051,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/licenses/LICENSE_Hypercorn_0_17_3_MIT_License.txt

@@ -0,0 +1,22 @@
+Copyright P G Jones 2018.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

cmdbox/licenses/{LICENSE_cffi_1_17_1_MIT_License.txt → LICENSE_cffi_2_0_0_UNKNOWN.txt}

@@ -3,7 +3,7 @@ Except when otherwise stated (look for LICENSE files in directories or
 information at the beginning of each file) all software and
 documentation is licensed as follows: 
 
-    The MIT License
+    MIT No Attribution
 
     Permission is hereby granted, free of charge, to any person 
     obtaining a copy of this software and associated documentation 
@@ -11,10 +11,7 @@ documentation is licensed as follows:
     restriction, including without limitation the rights to use, 
     copy, modify, merge, publish, distribute, sublicense, and/or 
     sell copies of the Software, and to permit persons to whom the 
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included 
-    in all copies or substantial portions of the Software.
+    Software is furnished to do so.
 
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 

cmdbox/licenses/{LICENSE_jsonschema-specifications_2025_4_1_UNKNOWN.txt → LICENSE_h2_4_3_0_MIT_License.txt}

@@ -1,4 +1,6 @@
-Copyright (c) 2022 Julian Berman
+The MIT License (MIT)
+
+Copyright (c) 2015-2020 Cory Benfield and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cmdbox/licenses/{LICENSE_backoff_2_2_1_MIT_License.txt → LICENSE_hpack_4_1_0_MIT_License.txt}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 litl, LLC.
+Copyright (c) 2014 Cory Benfield
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cmdbox/licenses/{LICENSE_graphviz_0_21_UNKNOWN.txt → LICENSE_hyperframe_6_1_0_MIT_License.txt}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2025 Sebastian Bank
+Copyright (c) 2014 Cory Benfield
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cmdbox/licenses/{LICENSE_jsonschema_4_25_0_UNKNOWN.txt → LICENSE_priority_2_0_0_MIT_License.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Julian Berman
+Copyright (c) 2015 Cory Benfield
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.