cmdbox 0.6.0.3__py3-none-any.whl → 0.6.0.4__py3-none-any.whl

cmdbox/app/common.py

@@ -135,8 +135,10 @@ def create_console(stderr:bool=False, file=None) -> Console:
     Returns:
         Console: コンソール
     """
-    console = Console(height=False,
-                      soft_wrap=False, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
+    #console = Console(soft_wrap=True, height=True, highlighter=loghandler.LogLevelHighlighter(), theme=loghandler.theme,
+    #                  stderr=stderr, file=file)
+    console = Console(height=True, highlighter=loghandler.LogLevelHighlighter(), theme=loghandler.theme,
+                      soft_wrap=True, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
     #console = Console(soft_wrap=True, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
     return console
 

cmdbox/app/features/cli/agent_base.py

@@ -30,8 +30,7 @@ class AgentBase(feature.ResultEdgeFeature):
                 dict(opt="agent", type=Options.T_STR, default="no", required=False, multi=False, hide=False, choice=["no", "use"],
                      discription_ja="エージェントを使用するかどうかを指定します。",
                      discription_en="Specifies whether the agent is used.",
-                     choice_show=dict(use=["agent_name", "agent_description", "agent_instruction", "agent_session_store", "llmprov",
-                                           "mcp_listen_port", "mcp_ssl_listen_port"],)),
+                     choice_show=dict(use=["agent_name", "agent_description", "agent_instruction", "agent_session_store", "llmprov",],)),
                 dict(opt="agent_name", type=Options.T_STR, default=self.ver.__appid__, required=False, multi=False, hide=False, choice=None,
                      discription_ja="エージェント名を指定します。",
                      discription_en="Specifies the agent name."),
@@ -45,12 +44,6 @@ class AgentBase(feature.ResultEdgeFeature):
                      discription_ja="エージェントのセッションを保存する方法を指定します。",
                      discription_en="Specify how the agent's session is to be saved.",
                      choice_show=dict(postgresql=["agent_pg_host", "agent_pg_port", "agent_pg_user", "agent_pg_password", "agent_pg_dbname"]),),
-                dict(opt="mcp_listen_port", type=Options.T_INT, default="9081", required=False, multi=False, hide=False, choice=None,
-                     discription_ja="省略した時は `9081` を使用します。",
-                     discription_en="If omitted, `9081` is used."),
-                dict(opt="mcp_ssl_listen_port", type=Options.T_INT, default="9443", required=False, multi=False, hide=False, choice=None,
-                     discription_ja="省略した時は `9443` を使用します。",
-                     discription_en="If omitted, `9443` is used."),
                 dict(opt="agent_pg_host", type=Options.T_STR, default='localhost', required=False, multi=False, hide=False, choice=None, web="mask",
                      discription_ja="postgresqlホストを指定する。",
                      discription_en="Specify the postgresql host."),
@@ -114,7 +107,7 @@ class AgentBase(feature.ResultEdgeFeature):
         Returns:
             Any: FastMCP
         """
-        from mcp.server.fastmcp import FastMCP
+        from fastmcp import FastMCP
         mcp = FastMCP(name=self.ver.__appid__)
         return mcp
 
@@ -174,33 +167,6 @@ class AgentBase(feature.ResultEdgeFeature):
                       f"1. ユーザーのクエリからが実行したいコマンドを特定します。\n" + \
                       f"2. コマンド実行に必要なパラメータのなかで、ユーザーのクエリから取得できないものは、コマンド定義にあるデフォルト値を指定して実行してください。\n" + \
                       f"3. もしエラーが発生した場合は、ユーザーにコマンド名とパラメータとエラー内容を提示してください。\n"
-        """
-                    f"2. コマンド実行に必要なパラメータを特定します。\n" + \
-                    f"3. ユーザーのクエリから指定しているパラメータを取得します。\n" + \
-                    f"4. ユーザーが指定しているパラメータと、コマンド実行に必要なパラメータを比較し、不足しているパラメータを取得します。\n" + \
-                    f"5. 以下に「パラメータ = デフォルト値」を示しているので、不足しているパラメータはデフォルト値を使用します。\n" + \
-                    f"   但しコマンドが実行に必要のないパラメータは指定しないようにしてください。\n" + \
-                    f" host = {args.host if hasattr(args, 'host') and args.host else self.default_host}\n" + \
-                    f" port = {args.port if hasattr(args, 'port') and args.port else self.default_port}\n" + \
-                    f" password = {args.password if hasattr(args, 'password') and args.password else self.default_pass}\n" + \
-                    f" svname = {args.svname if hasattr(args, 'svname') and args.svname else self.default_svname}\n" + \
-                    f" data = {args.data if hasattr(args, 'data') and args.data else self.default_data}\n" + \
-                    f" retry_count = {args.retry_count if hasattr(args, 'retry_count') and args.retry_count else 3}\n" + \
-                    f" retry_interval = {args.retry_interval if hasattr(args, 'retry_interval') and args.retry_interval else 3}\n" + \
-                    f" timeout = {args.timeout if hasattr(args, 'timeout') and args.timeout else 15}\n" + \
-                    f" output_json = {args.output_json if hasattr(args, 'output_json') and args.output_json else None}\n" + \
-                    f" output_json_append = {args.output_json_append if hasattr(args, 'output_json_append') and args.output_json_append else False}\n" + \
-                    f" stdout_log = {args.stdout_log if hasattr(args, 'stdout_log') and args.stdout_log else False}\n" + \
-                    f" capture_stdout = {args.capture_stdout if hasattr(args, 'capture_stdout') and args.capture_stdout else False}\n" + \
-                    f" capture_maxsize = {args.capture_maxsize if hasattr(args, 'capture_maxsize') and args.capture_maxsize else 100}\n" + \
-                    f" tag = {args.tag if hasattr(args, 'tag') and args.tag else None}\n" + \
-                    f" clmsg_id = {args.clmsg_id if hasattr(args, 'clmsg_id') and args.clmsg_id else None}\n" + \
-                    f" signin_file = {args.signin_file if hasattr(args, 'signin_file') and args.signin_file else f'.{self.ver.__appid__}/user_list.yml'}\n" + \
-                    f"6. 以上のパラメータを使用しても不足するパラメータは、Noneを使用します。\n" + \
-                    f"7. 以上のパラメータを使用してコマンドを実行して、コマンドの結果はJSONでユーザーに提示してください。\n" + \
-                    f"8. もし予期しないパラメータを受け取ったという旨のエラーが発生した場合は、そのパラメータを指定せずに再実行してください。\n" + \
-                    f"9. もしエラーが発生した場合は、ユーザーにコマンド名とパラメータとエラー内容を提示してください。\n"
-        """
 
         description = description if is_japan else \
                       f"Command offer registered in {self.ver.__appid__}."
@@ -210,32 +176,6 @@ class AgentBase(feature.ResultEdgeFeature):
                       f"1. Identify the command you want to execute from the user's query.\n" + \
                       f"2. Any parameters required to execute the command that cannot be obtained from the user's query should be executed with the default values provided in the command definition.\n" + \
                       f"3. If an error occurs, provide the user with the command name, parameters, and error description.\n"
-        """
-                      f"2. Identify the parameters required to execute the command.\n" + \
-                      f"3. Retrieve the specified parameters from the user's query.\n" + \
-                      f"4. It compares the parameters specified by the user with those required to execute the command and obtains the missing parameters.\n" + \
-                      f"5. The “Parameter = Default Value” is shown below, so use default values for missing parameters.\n" + \
-                      f"   However, do not specify parameters that the command does not require for execution.\n" + \
-                      f" host = {args.host if hasattr(args, 'host') and args.host else self.default_host}\n" + \
-                      f" port = {args.port if hasattr(args, 'port') and args.port else self.default_port}\n" + \
-                      f" password = {args.password if hasattr(args, 'password') and args.password else self.default_pass}\n" + \
-                      f" svname = {args.svname if hasattr(args, 'svname') and args.svname else self.default_svname}\n" + \
-                      f" data = {args.data if hasattr(args, 'data') and args.data else self.default_data}\n" + \
-                      f" retry_count = {args.retry_count if hasattr(args, 'retry_count') and args.retry_count else 3}\n" + \
-                      f" retry_interval = {args.retry_interval if hasattr(args, 'retry_interval') and args.retry_interval else 3}\n" + \
-                      f" timeout = {args.timeout if hasattr(args, 'timeout') and args.timeout else 15}\n" + \
-                      f" output_json = {args.output_json if hasattr(args, 'output_json') and args.output_json else None}\n" + \
-                      f" output_json_append = {args.output_json_append if hasattr(args, 'output_json_append') and args.output_json_append else False}\n" + \
-                      f" stdout_log = {args.stdout_log if hasattr(args, 'stdout_log') and args.stdout_log else False}\n" + \
-                      f" capture_stdout = {args.capture_stdout if hasattr(args, 'capture_stdout') and args.capture_stdout else False}\n" + \
-                      f" capture_maxsize = {args.capture_maxsize if hasattr(args, 'capture_maxsize') and args.capture_maxsize else 100}\n" + \
-                      f" tag = {args.tag if hasattr(args, 'tag') and args.tag else None}\n" + \
-                      f" clmsg_id = {args.clmsg_id if hasattr(args, 'clmsg_id') and args.clmsg_id else None}\n" + \
-                      f"6. Use None for parameters that are missing even with the above parameters.\n" + \
-                      f"7. Execute the command using the above parameters and present the results of the command to the user in JSON.\n" + \
-                      f"8. If you receive an error stating that an unexpected parameter was received, rerun the program without that parameter.\n" + \
-                      f"9. If an error occurs, provide the user with the command name, parameters, and error description.\n"
-        """
 
         description = args.agent_description if args.agent_description else description
         instruction = args.agent_instruction if args.agent_instruction else instruction
@@ -360,7 +300,7 @@ class AgentBase(feature.ResultEdgeFeature):
         common.reset_logger("google_adk.google.adk.sessions.database_session_service")
         common.reset_logger("mcp.server.streamable_http_manager")
         # モジュールインポート
-        from mcp.server.fastmcp import FastMCP
+        from fastmcp import FastMCP
         from google.adk.sessions import BaseSessionService
         mcp:FastMCP = self.create_mcpserver(args)
         session_service:BaseSessionService = self.create_session_service(args)
@@ -410,8 +350,7 @@ class AgentBase(feature.ResultEdgeFeature):
                         discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                         discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),)
                 fn = f"{mode}_{cmd}"
-                func_txt =  f'@mcp.tool()\n'
-                func_txt += f'def {fn}(' + ", ".join([f'{o["opt"]}:{_t2s(o, False)}' for o in choices]) + '):\n'
+                func_txt  = f'def {fn}(' + ", ".join([f'{o["opt"]}:{_t2s(o, False)}' for o in choices]) + '):\n'
                 func_txt += f'    """\n'
                 func_txt += f'    {discription}\n'
                 func_txt += f'    Args:\n'
@@ -472,6 +411,9 @@ class AgentBase(feature.ResultEdgeFeature):
                 exec(func_txt,
                      dict(time=time,List=List, argparse=argparse, common=common, Options=Options, logging=logging, signin=signin,),
                      dict(tools=tools, mcp=mcp))
+                exec(f"@mcp.tool\n{func_txt}",
+                     dict(time=time,List=List, argparse=argparse, common=common, Options=Options, logging=logging, signin=signin,),
+                     dict(tools=[], mcp=mcp))
         root_agent = self.create_agent(logger, args, tools)
         runner = self.create_runner(logger, args, session_service, root_agent)
         if logger.level == logging.DEBUG:

cmdbox/app/features/cli/cmdbox_cmd_list.py

@@ -45,7 +45,7 @@ class CmdList(feature.OneshotResultEdgeFeature):
                 dict(opt="kwd", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      discription_ja=f"検索したいコマンド名を指定します。中間マッチで検索します。",
                      discription_en=f"Specify the name of the command you want to search. Search with intermediate matches."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=False, multi=False, hide=True, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。",
                      discription_en="Specify a file containing users and passwords with which they can signin."),
                 dict(opt="groups", type=Options.T_STR, default=None, required=False, multi=True, hide=True, choice=None,

cmdbox/app/features/cli/cmdbox_cmd_load.py

@@ -45,7 +45,7 @@ class CmdLoad(feature.OneshotResultEdgeFeature):
                 dict(opt="title", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      discription_ja=f"読込みたいコマンド名を指定します。",
                      discription_en=f"Specify the name of the command to be read."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=False, multi=False, hide=True, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。",
                      discription_en="Specify a file containing users and passwords with which they can signin."),
                 dict(opt="groups", type=Options.T_STR, default=None, required=False, multi=True, hide=True, choice=None,

cmdbox/app/features/cli/cmdbox_web_apikey_add.py

@@ -58,7 +58,7 @@ class WebApikeyAdd(feature.UnsupportEdgeFeature):
                 dict(opt="apikey_name", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
                      discription_ja="このユーザーのApiKey名を指定します。",
                      discription_en="Specify the ApiKey name for this user."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_apikey_del.py

@@ -58,7 +58,7 @@ class WebApikeyDel(feature.UnsupportEdgeFeature):
                 dict(opt="apikey_name", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
                      discription_ja="このユーザーのApiKey名を指定します。",
                      discription_en="Specify the ApiKey name for this user."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_group_add.py

@@ -61,7 +61,7 @@ class WebGroupAdd(feature.UnsupportEdgeFeature):
                 dict(opt="group_parent", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      discription_ja="親グループ名を指定します。",
                      discription_en="Specifies the parent group name."),
-                dict(opt="signin_file", type=Options.T_FILE, default=None, required=True, multi=False, hide=False, choice=None,
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=True, multi=False, hide=False, choice=None,
                      discription_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。省略した時は認証を要求しません。",
                      discription_en="Specify a file containing users and passwords with which they can signin. If omitted, no authentication is required."),
                 dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],

cmdbox/app/features/cli/cmdbox_web_group_del.py

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

cmdbox/app/features/cli/cmdbox_web_group_edit.py

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

cmdbox/app/features/cli/cmdbox_web_group_list.py

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

cmdbox/app/features/cli/cmdbox_web_start.py

@@ -157,32 +157,12 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
         w = None
         try:
             args.gui_mode = False if not hasattr(args, 'gui_mode') or not args.gui_mode else args.gui_mode
-            ssl_cert = None if args.ssl_cert is None else Path(args.ssl_cert)
-            ssl_key = None if args.ssl_key is None else Path(args.ssl_key)
-            ssl_ca_certs = None if args.ssl_ca_certs is None else Path(args.ssl_ca_certs)
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
-                        client_only=args.client_only, doc_root=args.doc_root, gui_html=args.gui_html, filer_html=args.filer_html,
-                         result_html=args.result_html, users_html=args.users_html,
-                        assets=args.assets, signin_html=args.signin_html, signin_file=args.signin_file, gui_mode=args.gui_mode)
-            agent_runner = None
-            mcp = None
-            logger.info(f"Agent={args.agent}")
-            if args.agent=='use':
-                if args.agent_session_store == 'sqlite':
-                    args.agent_session_dburl = "sqlite://" + pathname2url(str(w.agent_path / 'session.db'))
-                elif args.agent_session_store == 'postgresql':
-                    args.agent_session_dburl = f"postgresql+psycopg://{args.agent_pg_user}:{args.agent_pg_password}@{args.agent_pg_host}:{args.agent_pg_port}/{args.agent_pg_dbname}"
-                else:
-                    args.agent_session_dburl = None
-                agent_runner, mcp = self.init_agent_runner(logger, args)
-            w.start(allow_host=args.allow_host, listen_port=args.listen_port, ssl_listen_port=args.ssl_listen_port,
-                    ssl_cert=ssl_cert, ssl_key=ssl_key, ssl_keypass=args.ssl_keypass, ssl_ca_certs=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,
-                    agent_runner=agent_runner, mcp=mcp, mcp_listen_port=args.mcp_listen_port, mcp_ssl_listen_port=args.mcp_ssl_listen_port)
-
+            w = self.createWeb(logger, args)
+            agent_runner, mcp = self._init_agent_runner(w, logger, args)
+            args.ssl_cert = None if args.ssl_cert is None else Path(args.ssl_cert)
+            args.ssl_key = None if args.ssl_key is None else Path(args.ssl_key)
+            args.ssl_ca_certs = None if args.ssl_ca_certs is None else Path(args.ssl_ca_certs)
+            self.start(w, agent_runner, mcp, logger, args)
             msg = dict(success="web complate.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
             return 0, msg, w
@@ -191,3 +171,62 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
             msg = dict(warn=f"Web server start error. {e}")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
             return 1, msg, w
+
+    def createWeb(self, logger:logging.Logger, args:argparse.Namespace) -> web.Web:
+        """
+        Webオブジェクトを作成します
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+
+        Returns:
+            web.Web: Webオブジェクト
+        """
+        w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
+                    redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+                    client_only=args.client_only, doc_root=args.doc_root, gui_html=args.gui_html, filer_html=args.filer_html,
+                    result_html=args.result_html, users_html=args.users_html,
+                    assets=args.assets, signin_html=args.signin_html, signin_file=args.signin_file, gui_mode=args.gui_mode)
+        return w
+
+    def _init_agent_runner(self, w:web.Web, logger:logging.Logger, args:argparse.Namespace) -> Tuple[Any, Any]:
+        """
+        エージェントをセットアップします
+
+        Args:
+            w (web.Web): Webオブジェクト
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+
+        Returns:
+            Tuple[agent_base.AgentBase, Any]: エージェントオブジェクト, MCPオブジェクト
+        """
+        logger.info(f"Agent={args.agent}")
+        if args.agent=='use':
+            if args.agent_session_store == 'sqlite':
+                args.agent_session_dburl = "sqlite://" + pathname2url(str(w.agent_path / 'session.db'))
+            elif args.agent_session_store == 'postgresql':
+                args.agent_session_dburl = f"postgresql+psycopg://{args.agent_pg_user}:{args.agent_pg_password}@{args.agent_pg_host}:{args.agent_pg_port}/{args.agent_pg_dbname}"
+            else:
+                args.agent_session_dburl = None
+            return self.init_agent_runner(logger, args)
+        return None, None
+
+    def start(self, w:web.Web, agent_runner, mcp, logger:logging.Logger, args:argparse.Namespace) -> None:
+        """
+        Webモードを起動します
+
+        Args:
+            w (web.Web): Webオブジェクト
+            agent_runner: エージェントランナー
+            mcp: MCPオブジェクト
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+        """
+        w.start(allow_host=args.allow_host, listen_port=args.listen_port, ssl_listen_port=args.ssl_listen_port,
+                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,
+                agent_runner=agent_runner, mcp=mcp,)

cmdbox/app/features/cli/cmdbox_web_user_add.py

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

cmdbox/app/features/cli/cmdbox_web_user_del.py

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

cmdbox/app/features/cli/cmdbox_web_user_edit.py

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

cmdbox/app/features/cli/cmdbox_web_user_list.py

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

cmdbox/app/features/web/cmdbox_web_agent.py

@@ -60,7 +60,7 @@ class Agent(feature.WebFeature):
             session_id = form.get('session_id', None)
             sessions = await web.list_agent_sessions(web.agent_runner.session_service, user_id, session_id=session_id)
             data = [dict(id=s.id, app_name=s.app_name, user_id=s.user_id, last_update_time=s.last_update_time,
-                         events=[dict(author=ev.author,text=ev.content.parts[0].text) for ev in s.events if ev.content and ev.content.parts]) for s in sessions]
+                         events=[dict(author=ev.author,text=ev.content.parts[0].text) for ev in s.events if ev.content and ev.content.parts]) for s in sessions if s]
             data.reverse()  # 最新のセッションを先頭にする
             return dict(success=data)
 
@@ -204,14 +204,20 @@ class Agent(feature.WebFeature):
                         outputs = dict()
                         if event.turn_complete:
                             outputs['turn_complete'] = True
-                            yield json.dumps(outputs, default=common.default_json_enc)
+                            yield common.to_str(outputs)
                         if event.interrupted:
                             outputs['interrupted'] = True
-                            yield json.dumps(outputs, default=common.default_json_enc)
+                            yield common.to_str(outputs)
                         #if event.is_final_response():
                         msg = None
                         if event.content and event.content.parts:
                             msg = "\n".join([p.text for p in event.content.parts if p and p.text])
+                            calls = event.get_function_calls()
+                            if calls:
+                                msg += '\n```json{"function_calls":'+common.to_str([dict(fn=c.name,args=c.args) for c in calls])+'}```'
+                            responses = event.get_function_responses()
+                            if responses:
+                                msg += '\n```json{"function_responses":'+common.to_str([dict(fn=r.name, res=r.response) for r in responses])+'}```'
                         elif event.actions and event.actions.escalate:
                             msg = f"Agent escalated: {event.error_message or 'No specific message.'}"
                         if msg:
@@ -219,7 +225,7 @@ class Agent(feature.WebFeature):
 
                             outputs['message'] = msg
                             web.options.audit_exec(sock, web, body=dict(agent_session=agent_session.id, result=msg))
-                            yield json.dumps(outputs, default=common.default_json_enc)
+                            yield common.to_str(outputs)
                             if event.is_final_response():
                                 break
                 except WebSocketDisconnect:

cmdbox/app/options.py

@@ -295,12 +295,18 @@ class Options:
             discription_ja="クライアントのメッセージIDを指定します。省略した場合はuuid4で生成されます。",
             discription_en="Specifies the message ID of the client. If omitted, uuid4 will be generated.",
             choice=None)
+        self._options["description"] = dict(
+            type=Options.T_TEXT, default=None, required=False, multi=False, hide=True,
+            discription_ja="このコマンド登録の説明文を指定します。Agentがこのコマンドの用途を理解するのに使用します。",
+            discription_en="Specifies a description of this command registration, used to help the Agent understand the use of this command.",
+            choice=None)
 
     def init_debugoption(self):
         # デバックオプションを追加
         self._options["debug"]["opt"] = "debug"
         self._options["tag"]["opt"] = "tag"
         self._options["clmsg_id"]["opt"] = "clmsg_id"
+        self._options["description"]["opt"] = "description"
         for key, mode in self._options["cmd"].items():
             if type(mode) is not dict:
                 continue
@@ -315,6 +321,8 @@ class Options:
                     c["choice"].append(self._options["tag"])
                 if "clmsg_id" not in [_o['opt'] for _o in c["choice"]]:
                     c["choice"].append(self._options["clmsg_id"])
+                if "description" not in [_o['opt'] for _o in c["choice"]]:
+                    c["choice"].append(self._options["description"])
                 if c["opt"] not in [_o['opt'] for _o in self._options["cmd"]["choice"]]:
                     self._options["cmd"]["choice"] += [c]
             self._options["mode"][key] = mode

cmdbox/app/web.py

@@ -5,7 +5,6 @@ from fastapi import FastAPI, Request, Response
 from pathlib import Path
 from starlette.applications import Starlette
 from starlette.middleware.sessions import SessionMiddleware
-from starlette.routing import Mount
 from typing import Any, Dict, List
 from uvicorn.config import Config
 import asyncio
@@ -20,7 +19,6 @@ import platform
 import requests
 import queue
 import signal
-import string
 import time
 import threading
 import traceback
@@ -30,10 +28,10 @@ import webbrowser
 
 class Web:
     def __init__(self, logger:logging.Logger, data:Path, appcls=None, ver=None,
-                 redis_host:str = "localhost", redis_port:int = 6379, redis_password:str = None, svname:str = 'server',
+                 redis_host:str="localhost", redis_port:int=6379, redis_password:str=None, svname:str='server',
                  client_only:bool=False, doc_root:Path=None, gui_html:str=None, filer_html:str=None, result_html:str=None, users_html:str=None,
                  audit_html:str=None, agent_html:str=None, assets:List[str]=None, signin_html:str=None, signin_file:str=None, gui_mode:bool=False,
-                 web_features_packages:List[str]=None, web_features_prefix:List[str]=None):
+                 web_features_packages:List[str]=None, web_features_prefix:List[str]=[]):
         """
         cmdboxクライアント側のwebapiサービス
 
@@ -679,7 +677,7 @@ class Web:
               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,
-              agent_runner=None, mcp=None, mcp_listen_port=9081, mcp_ssl_listen_port=9443):
+              agent_runner=None, mcp=None,):
         """
         Webサーバを起動する
 
@@ -700,8 +698,6 @@ class Web:
             guvicorn_timeout (int, optional): Gunicornタイムアウト. Defaults to 30.
             agent_runner (Runner, optional): エージェントランナー. Defaults to None.
             mcp (MCP, optional): MCP. Defaults to None.
-            mcp_listen_port (int, optional): MCPリスンポート. Defaults to 9081.
-            mcp_ssl_listen_port (int, optional): MCP SSLリスンポート. Defaults to 9443.
         """
         self.allow_host = allow_host
         self.listen_port = listen_port
@@ -719,8 +715,6 @@ class Web:
         self.guvicorn_timeout = guvicorn_timeout
         self.agent_runner = agent_runner
         self.mcp = mcp
-        self.mcp_listen_port = mcp_listen_port
-        self.mcp_ssl_listen_port = mcp_ssl_listen_port
         if self.logger.level == logging.DEBUG:
             self.logger.debug(f"web start parameter: allow_host={self.allow_host}")
             self.logger.debug(f"web start parameter: listen_port={self.listen_port}")
@@ -738,8 +732,6 @@ class Web:
             self.logger.debug(f"web start parameter: guvicorn_timeout={self.guvicorn_timeout}")
             self.logger.debug(f"web start parameter: agent_runner={self.agent_runner}")
             self.logger.debug(f"web start parameter: mcp={self.mcp}")
-            self.logger.debug(f"web start parameter: mcp_listen_port={self.mcp_listen_port}")
-            self.logger.debug(f"web start parameter: mcp_ssl_listen_port={self.mcp_ssl_listen_port}")
 
         if self.agent_runner is not None:
             # google.adkが大きいので必要な時にだけ読込む
@@ -778,7 +770,10 @@ class Web:
                     sessions = await session_service.list_sessions(app_name=self.ver.__appid__, user_id=user_id)
                     ret = []
                     for s in sessions.sessions:
-                        ret.append(await session_service.get_session(app_name=self.ver.__appid__, user_id=user_id, session_id=s.id))
+                        session = await session_service.get_session(app_name=self.ver.__appid__, user_id=user_id, session_id=s.id)
+                        if session is None:
+                            continue
+                        ret.append(session)
                     return ret
                 else:
                     session = await session_service.get_session(app_name=self.ver.__appid__, user_id=user_id, session_id=session_id)
@@ -801,17 +796,15 @@ class Web:
                 return await session_service.delete_session(app_name=self.ver.__appid__, user_id=user_id, session_id=session_id)
             self.delete_agent_session = delete_agent_session
 
-        """
+        mcp_app:Starlette = None
         if self.mcp is not None:
-            # MCPをFastAPIにマウント
             mcp_app:Starlette = self.mcp.streamable_http_app()
-            app = FastAPI(lifespan=self.mcp.settings.lifespan)
-            app.mount("/mcp", mcp_app)
-            #app.include_router(mcp_app.router)
+            #mcp_app:Starlette = self.mcp.http_app()
+        if mcp_app is not None:
+            app = FastAPI(lifespan=mcp_app.lifespan)
         else:
             app = FastAPI()
-        """
-        app = FastAPI()
+
         @app.middleware("http")
         async def set_context_cookie(req:Request, call_next):
             res:Response = await call_next(req)
@@ -824,20 +817,13 @@ class Web:
         if self.session_secure:
             mwparam['https_only'] = True # セッションハイジャック対策
         app.add_middleware(SessionMiddleware, **mwparam)
+        if mcp_app is not None:
+            app.mount("/mcpsv", mcp_app, name="mcp")
+            self.logger.info(f"mcp server mount: mount_path=/mcpsv app={mcp_app} routes={mcp_app.routes}")
         self.init_webfeatures(app)
 
         self.is_running = True
-        #uvicorn.run(app, host=self.allow_host, port=self.listen_port, workers=2)
-        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.start()
-        if self.mcp is not None and self.ssl_cert is None and self.ssl_key is None:
-            mcp_app:Starlette = self.mcp.streamable_http_app()
-            http_config = Config(app=mcp_app, host=self.allow_host, port=self.mcp_listen_port)
-            mcp_th = ThreadedUvicorn(self.logger, config=http_config, force_uvicorn=True)
-            mcp_th.start()
-        browser_port = self.listen_port
+        th = None
         th_ssl = None
         if self.ssl_cert is not None and self.ssl_key is not None:
             https_config = Config(app=app, host=self.allow_host, port=self.ssl_listen_port,
@@ -847,13 +833,12 @@ class Web:
                                      guvicorn_config=dict(workers=self.guvicorn_workers, timeout=self.guvicorn_timeout))
             th_ssl.start()
             browser_port = self.ssl_listen_port
-            if self.mcp is not None:
-                mcp_app:Starlette = self.mcp.streamable_http_app()
-                https_config = Config(app=mcp_app, host=self.allow_host, port=self.mcp_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)
-                mcp_th_ssl = ThreadedUvicorn(self.logger, config=https_config, force_uvicorn=True)
-                mcp_th_ssl.start()
+        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.start()
+            browser_port = self.listen_port
         try:
             if self.gui_mode:
                 webbrowser.open(f'http://localhost:{browser_port}/gui')
@@ -861,21 +846,15 @@ class Web:
                 f.write(str(os.getpid()))
             while self.is_running:
                 gevent.sleep(1)
-            th.stop()
-            if self.mcp is not None:
-                mcp_th.stop()
+            if th is not None:
+                th.stop()
             if th_ssl is not None:
                 th_ssl.stop()
-                if self.mcp is not None:
-                    mcp_th_ssl.stop()
         except KeyboardInterrupt:
-            th.stop()
-            if self.mcp is not None:
-                mcp_th.stop()
+            if th is not None:
+                th.stop()
             if th_ssl is not None:
                 th_ssl.stop()
-                if self.mcp is not None:
-                    mcp_th_ssl.stop()
 
     def stop(self):
         """

cmdbox/version.py

@@ -1,9 +1,9 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 6, 3)
+dt_now = datetime.datetime(2025, 6, 15)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.6.0.3'
+__version__ = '0.6.0.4'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'

cmdbox/web/assets/cmdbox/agent.js

@@ -49,7 +49,7 @@ agent.format_agent_message = (container, messages, txt, message) => {
             const rand = cmdbox.random_string(16);
             txt.append(`<span id="${rand}"/>`);
             agent.recursive_json_parse(jobj);
-            render_result_func(txt.find(`#${rand}`), jobj, 100);
+            render_result_func(txt.find(`#${rand}`), jobj, 256);
         } catch (e) {
             const msg = message.replace(/\n/g, '<br/>');
             txt.append(msg);
@@ -176,8 +176,7 @@ agent.init_form = async () => {
             if (agent.chat_reconnect_count >= max_reconnect_count) {
                 clearInterval(agent.chat_reconnectInterval_handler);
                 cmdbox.message({'error':'Connection to the agent has failed for several minutes. Please reload to resume reconnection.'});
-                const rand = cmdbox.random_string(8);
-                location.href = `../signin/agent?r=${rand}`;
+                location.reload(true);
                 return;
             }
             agent.chat_reconnect_count++;

cmdbox/web/assets/cmdbox/common.js

@@ -203,6 +203,24 @@ cmdbox.editapikey = async () => {
     daialog.draggable({cursor:'move',cancel:'.modal-body'});
     editapikey_modal.modal('show');
 };
+cmdbox.agentsetting = async () => {
+    const user = await cmdbox.user_info();
+    if (!user) {
+        cmdbox.message('user not found');
+        return;
+    }
+    const agentsetting_modal = $('#agentsetting_modal').length?$('#agentsetting_modal'):$(`<div id="agentsetting_modal" class="modal" tabindex="-1" style="display: none;" aria-hidden="true"/>`);
+    agentsetting_modal.html('');
+    const daialog = $(`<div class="modal-dialog ui-draggable ui-draggable-handle"/>`).appendTo(agentsetting_modal);
+    const form = $(`<form id="agentsetting_form" class="modal-content novalidate"/>`).appendTo(daialog);
+    const header = $(`<div class="modal-header"/>`).appendTo(form);
+    header.append('<h5 class="modal-title">Agent Setting</h5>');
+    header.append('<button type="button" class="btn btn_close p-0 m-0" data-bs-dismiss="modal" aria-label="Close" style="margin-left: 0px;">'
+                 +'<svg class="bi bi-x" width="24" height="24" fill="currentColor"><use href="#btn_x"></use></svg>'
+                 +'</button>');
+    const body = $(`<div class="modal-body"/>`).appendTo(form);
+    const row_content = $(`<div class="row row_content"/>`).appendTo(body);
+};
 /**
  * 現在のユーザーのパスワード変更
  */
@@ -324,14 +342,18 @@ $(()=>{
             const user_info_menu = $('.user_info');
             user_info_menu.removeClass('d-none').addClass('d-flex');
 
-            if (!user_info_menu.find('.dropdown-menu .editapikey-menu-item').length) {
-                const editapikey_item = $(`<li><a class="dropdown-item editapikey-menu-item" href="#" onclick="cmdbox.editapikey();">Edit ApiKey</a></li>`);
-                user_info_menu.find('.dropdown-menu').append(editapikey_item);
-            }
             if (!user_info_menu.find('.dropdown-menu .changepass-menu-item').length) {
                 const changepass_item = $(`<li><a class="dropdown-item changepass-menu-item" href="#" onclick="cmdbox.passchange();">Change Password</a></li>`);
                 user_info_menu.find('.dropdown-menu').append(changepass_item);
             }
+            if (!user_info_menu.find('.dropdown-menu .editapikey-menu-item').length) {
+                const editapikey_item = $(`<li><a class="dropdown-item editapikey-menu-item" href="#" onclick="cmdbox.editapikey();">Edit ApiKey</a></li>`);
+                user_info_menu.find('.dropdown-menu').append(editapikey_item);
+            }
+            /*if (!user_info_menu.find('.dropdown-menu .agentsetting-menu-item').length) {
+                const agentsetting_item = $(`<li><a class="dropdown-item agentsetting-menu-item" href="#" onclick="cmdbox.agentsetting();">Agent Setting</a></li>`);
+                user_info_menu.find('.dropdown-menu').append(agentsetting_item);
+            }*/
             if (!user_info_menu.find('.dropdown-menu .signout-menu-item').length) {
                 const parts = location.pathname.split('/');
                 const sitepath = parts[parts.length-1];

cmdbox/web/assets/cmdbox/main.js

@@ -86,8 +86,7 @@ $(() => {
             if (cmdbox.callback_reconnect_count >= max_reconnect_count) {
                 clearInterval(cmdbox.gui_callback_reconnectInterval_handler);
                 cmdbox.message({'error':'Connection to the agent has failed for several minutes. Please reload to resume reconnection.'});
-                const rand = cmdbox.random_string(8);
-                location.href = `../signin${path}?r=${rand}`;
+                location.reload(true);
                 return;
             }
             cmdbox.callback_reconnect_count++;

{cmdbox-0.6.0.3.dist-info → cmdbox-0.6.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.0.3
+Version: 0.6.0.4
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox
@@ -73,7 +73,7 @@ apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl buil
 
 - When using `--agent use` in web mode, install the modules with dependencies.
 ```bash
-pip install google-adk litellm
+pip install google-adk litellm fastmcp
 ```
 
 # Run

{cmdbox-0.6.0.3.dist-info → cmdbox-0.6.0.4.dist-info}/RECORD

@@ -8,18 +8,18 @@ cmdbox/logconf_edge.yml,sha256=vRY-LxfWztk2QZOUN9kj_Eq6Y4qj8WzmiO9H0IRvjtQ,1081
 cmdbox/logconf_gui.yml,sha256=-95vyd0q-aB1gsabdk8rg9dJ2zRKAZc8hRxyhNOQboU,1076
 cmdbox/logconf_server.yml,sha256=n3c5-KVzjUzcUX5BQ6uE-PN9rp81yXaJql3whyCcSDQ,1091
 cmdbox/logconf_web.yml,sha256=pPbdAwckbK0cgduxcVkx2mbk-Ymz5hVzR4guIsfApMQ,1076
-cmdbox/version.py,sha256=tuPmH7_OyBfaCaafFAEcDHIpAxisDnOwZKvv3Q6Xe6k,2031
+cmdbox/version.py,sha256=ebybePVS1-vifRTcWVutek50i0oYp1dzvReDgMD9JOA,2032
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/app.py,sha256=YkzNBd1S1oNVwnNj1eYQUFOcrcjwdsQzv0z4mMOb_mw,9149
 cmdbox/app/client.py,sha256=n986lXeV7hhaki4iyyvsfhNptmCXDFphxlNoNe2XhKg,19542
-cmdbox/app/common.py,sha256=qUdf8q1vK-e167nq-O2KGJ4gU-ZZNNNzzi0Bos7fWdI,25358
+cmdbox/app/common.py,sha256=puw9sEKa6EgCAEUnXmjRd6R3l01ApZEQtP23kq34SZs,25599
 cmdbox/app/edge.py,sha256=yskob1ewd5hHbPJKWvjXm6j4IpawE4gM_lOqe70gX1w,41422
 cmdbox/app/edge_tool.py,sha256=QqigDHcxRJa1BvK_DVq-ccNTVXg4BEBsHkYsaauMDu0,8050
 cmdbox/app/feature.py,sha256=O3MTyQFinKXONeCvSRAt81HqZWgXV-je_-nUZi0cdCE,9910
 cmdbox/app/filer.py,sha256=L_DSMTvnbN_ffr3JIt0obbOmVoTHEfVm2cAVz3rLH-Q,16059
-cmdbox/app/options.py,sha256=_VDUX0VeJ-UExJTFRlewTq6wT_3D-NVbYE0CvAmE-0g,45259
+cmdbox/app/options.py,sha256=N0O1NBjkeceCgDOQrsxMEQjzPwg24DB-cUttdFOWfLk,45933
 cmdbox/app/server.py,sha256=woOmIk901ONn5a_2yz_b3I1JpLYIF8g42uQRd0_MRuQ,10417
-cmdbox/app/web.py,sha256=LeiaN2qbmPS_p4fz4824tuN9lI64hEaY3sCZab1o9t4,53215
+cmdbox/app/web.py,sha256=H3r_Jc0YTsNCD2OtoRqAup2Gz4rLc6TF4MzfIFNbKX4,51700
 cmdbox/app/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/auth/azure_signin.py,sha256=ZVJTeZwdgM4y2loKiTMEPiXxbJwbdoTVMWciyJhgqc8,1666
 cmdbox/app/auth/azure_signin_saml.py,sha256=oM2buGTK4t6-OsUuiUXTlZk0YXZL01khuPYVB84dMDU,472
@@ -31,7 +31,7 @@ cmdbox/app/commons/convert.py,sha256=mkXPNQtX_pEH4L5DzonOY6Dh38SzJ5JQma_EY7UDBqU
 cmdbox/app/commons/loghandler.py,sha256=go5Ui1c4AKqRSnxLzwrtPakYSjRHguXk4dGat1jD738,6323
 cmdbox/app/commons/module.py,sha256=w63zqz5c6gLy-BZJ9dh4Q4C5PZyqM2Iqat5Zr9swJCI,4993
 cmdbox/app/commons/redis_client.py,sha256=cOHshqAGI3CRWLcc2IMhk6MtXsVKlQq6HwcdqYsoA-0,14821
-cmdbox/app/features/cli/agent_base.py,sha256=kY6lymXy9lA9-qcutRcJIBbjIHkNKKdTbvTcjKUyKs4,33625
+cmdbox/app/features/cli/agent_base.py,sha256=7Hkdb1wqZZ_oCKD16fhEu9XMw0-L44x3tN4W4CY-0Gw,26657
 cmdbox/app/features/cli/audit_base.py,sha256=wWWK31EUczvP4a1MNuz2KlqwaSn9yyt908ueRvjkuow,9405
 cmdbox/app/features/cli/cmdbox_audit_createdb.py,sha256=Hmq3NVrAUBbj-UB9fum2TuWU7MIH71754S_s0X9oj40,12133
 cmdbox/app/features/cli/cmdbox_audit_delete.py,sha256=2X6A8XtViOnUH7iDj02ZrqQhYBq7WOAwi-nL10der64,18922
@@ -46,8 +46,8 @@ cmdbox/app/features/cli/cmdbox_client_file_remove.py,sha256=e7e8iG-SBYbSZEwEsLaE
 cmdbox/app/features/cli/cmdbox_client_file_rmdir.py,sha256=pNrJ3YW8GSNUd7mXFt_HOHOQSehv9zYIdwwGLdUCHIA,11530
 cmdbox/app/features/cli/cmdbox_client_file_upload.py,sha256=X216q8dVAs_iuoOLUQ3wE-adD6QlHJJ9KVddCSxZhs0,13407
 cmdbox/app/features/cli/cmdbox_client_server_info.py,sha256=Nnnu4bcKyHU6drHvebIDIiu0PznqdDks0OartZgnVEM,9575
-cmdbox/app/features/cli/cmdbox_cmd_list.py,sha256=pyC69lYILVai2CPQA0tJ8I6VD4BUeWasowltDTfgD3Q,6570
-cmdbox/app/features/cli/cmdbox_cmd_load.py,sha256=FCdaoW6oIudQZL3i91IcS5X4_P2Uxy9xJHunBkUCyik,6356
+cmdbox/app/features/cli/cmdbox_cmd_list.py,sha256=XGsUjwpFhSofsJQE27LWdY0r4gOyCY-MFv_LP_Asixw,6604
+cmdbox/app/features/cli/cmdbox_cmd_load.py,sha256=JYCRg5JREhRgMLTlkFDrzlc7SiDA14NL2fXkMEwLtEo,6390
 cmdbox/app/features/cli/cmdbox_edge_config.py,sha256=KGqBXFQzjlYesTsP5JpeXvAsehdATHWlny5Ujnx7fUw,9460
 cmdbox/app/features/cli/cmdbox_edge_start.py,sha256=rtlYxFkW3Ud5sBKiuk8NWZ3DVXV-3T3KH4i5qwKxP_4,3824
 cmdbox/app/features/cli/cmdbox_gui_start.py,sha256=dzoso_s8-eYvL2YOK0hlJUG46LFbVNyZmSoJhpyxjg0,1390
@@ -55,21 +55,21 @@ cmdbox/app/features/cli/cmdbox_gui_stop.py,sha256=IRr73L2wIGCq9Om6aHgkgsZHhtA5CV
 cmdbox/app/features/cli/cmdbox_server_list.py,sha256=bGtV6YETNrZBVg4s-OGuZQAAppBkeJ1pqYVyJvYPGf4,5777
 cmdbox/app/features/cli/cmdbox_server_start.py,sha256=RHxK6IoSe2qeeLp-fY0OdwXKhr5zF99NritYQPGM9_4,7280
 cmdbox/app/features/cli/cmdbox_server_stop.py,sha256=PqC8TRlAbfS-ZMkiyqW-xqnqVKOdIeKNICl36A9hrw0,8644
-cmdbox/app/features/cli/cmdbox_web_apikey_add.py,sha256=aBj4JrkET9szf9cQQjBWoTGOCI8oQt8setJvNbdVIyA,7105
-cmdbox/app/features/cli/cmdbox_web_apikey_del.py,sha256=YhzmMlJhAN60WhJh1Ks_NI-pLdBydmNFFNoYg5H4Noo,7083
+cmdbox/app/features/cli/cmdbox_web_apikey_add.py,sha256=ZFIiDCR7KEhHCvCkVKwFKaLDcYDnAzRrB8Ajnmc34_o,7139
+cmdbox/app/features/cli/cmdbox_web_apikey_del.py,sha256=Ciw1nPw-wdzhUELO_pU4_tAOKPb3fF2rPkEqlk_PqfI,7117
 cmdbox/app/features/cli/cmdbox_web_gencert.py,sha256=mnGv18yUBkCuwhy-k-2Q6uTz0MNDBGhdWdpcHKCc_TE,9323
 cmdbox/app/features/cli/cmdbox_web_genpass.py,sha256=8eJTCRtZJLuj7d5NaZhJ326oCsPH1bGmfy4Pw363NLA,9541
-cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=aqeZ2BDFqRFzVG5sHKFAKuFXAat44_jwoPZkGVImmEo,7373
-cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=wpi2LAX7Xs12jk98GRQXETd-sX9WzsocQsCX422JJz4,6583
-cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=ohlJCk1c_zbRq73udSUKsg-U5pQgdvAxe-U8GjRvy34,7312
-cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=LyBsGtHZjqqr7YT-7Fa2cMqu8uY_wCmfYXbm4Z9ea0s,6678
-cmdbox/app/features/cli/cmdbox_web_start.py,sha256=um8okOGRaXS-6e9KSACtdYRPctnE_avSCj0agt1HCRY,16293
+cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=N_MUGdi2wckZe4UCU1Kgm_-nwDNHMCtrfDWWY1SVcZY,7407
+cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=d7j6UaxepvjOr6SEy_biNT4nSp7gFjLEo2UqNmAYNjM,6617
+cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=8WQGtKtMdnGBhgI8_ZwUfenWLQGwj678daW5madZ_WY,7346
+cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=1UlFEFf9GA248qe0o_LjnnUPE8BwGxnhRgY7aBTThfg,6712
+cmdbox/app/features/cli/cmdbox_web_start.py,sha256=bW6JrnNC-sskNFfFp3zCG6K-ydqRPAzdrgRbk3Keeh0,17531
 cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=yRLHhCR1sQvNep4-9-OITQkzeEQr1M-ZSLzd059D3EA,3568
-cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=FrbFXK0fVwPI5YR1uEsGQgNX3NLsfkPJ7gBfl6rjJkI,8565
-cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=bJ8Lqev4jHU68D5eYBaxkPWxmtTxWpN7sKeCJEZTIJc,6546
-cmdbox/app/features/cli/cmdbox_web_user_edit.py,sha256=IAcZe9J0NHXwy-7Jk656HZXlV-RLYcWtqsXYJDFMwvQ,8473
-cmdbox/app/features/cli/cmdbox_web_user_list.py,sha256=t2q6RthbKy0awcZR45BxRHgF-D2mOvRNC1T9thavTn4,6666
-cmdbox/app/features/web/cmdbox_web_agent.py,sha256=6VUqMCJxdCz4vT5gGGMHlUibjtAy8FSwQVQ0-q74XfA,14272
+cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=8STmtxwiCYuClcYGzK_kt7hzhxyFI7ZI0Lg1gpTiSY4,8599
+cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=2De84-SMYnOhl32tICUYe02g7m4EI991ZP9GGsfN4xU,6580
+cmdbox/app/features/cli/cmdbox_web_user_edit.py,sha256=yvZ2oGYv9QVEg2tUiQkS1RpaCqG4CkpWhDrzIAsETAE,8507
+cmdbox/app/features/cli/cmdbox_web_user_list.py,sha256=xzSJvhICU5cXzsQ5krJUFryhSWlsfObI3slUyRDDADU,6700
+cmdbox/app/features/web/cmdbox_web_agent.py,sha256=uqdjhbnWHy5LSFc0pmDSYUun083Crb8UJRuINFPw4A8,14691
 cmdbox/app/features/web/cmdbox_web_assets.py,sha256=D1dYNrvC7xBAVAAHX6PkoB6RFehEofET4hkHeCFYq7s,1931
 cmdbox/app/features/web/cmdbox_web_audit.py,sha256=-flyijdnh3hN-BKnw0GI3gSiduLP0vQFg_AiYCLXRBY,3359
 cmdbox/app/features/web/cmdbox_web_audit_metrics.py,sha256=4zcWNcI_mCT36B0CNrtYz9rOAK6QXqyLzloFIgginxw,3189
@@ -301,16 +301,16 @@ cmdbox/web/assets/apexcharts/apexcharts.css,sha256=l-xkqykcV8a22g04B-Vpt4JFWcHlw
 cmdbox/web/assets/apexcharts/apexcharts.min.js,sha256=zceUTsCKa8Y2SqjqZjLjifXQDnqsvKRTmT8fTIUix_4,570304
 cmdbox/web/assets/bootstrap/bootstrap.bundle.min.5.3.0.js,sha256=qlPVgvl-tZTCpcxYJFdHB_m6mDe84wRr-l81VoYPTgQ,80421
 cmdbox/web/assets/bootstrap/bootstrap.min.5.3.0.css,sha256=fx038NkLY4U1TCrBDiu5FWPEa9eiZu01EiLryshJbCo,232914
-cmdbox/web/assets/cmdbox/agent.js,sha256=hNkBdOCHMh9UItcoxeSuO_LxtpN6bRIyNmXIqPZ2w5Q,15839
+cmdbox/web/assets/cmdbox/agent.js,sha256=NJwNfnIzTP23qGsuQr7ov-u4Mo9ibU7h3FN66-yTEpA,15763
 cmdbox/web/assets/cmdbox/audit.js,sha256=5wFt4ejO4bwrOpt9yxOiwUz5XXXLOP8eo0ITTUwROZ0,19332
 cmdbox/web/assets/cmdbox/color_mode.css,sha256=U4UGBnWiBMcrSEEusgT-_o-pt4MP3myoA9Lgnn1g6qE,19803
-cmdbox/web/assets/cmdbox/common.js,sha256=s32LMd2eXdLE7DYlnX5HCdkCYcZm_pnpfxjICt3zA6A,65220
+cmdbox/web/assets/cmdbox/common.js,sha256=q0CvDq3sFuz381CyxjogQJrdS9o1R7h1vccE1ih3jRk,66748
 cmdbox/web/assets/cmdbox/favicon.ico,sha256=2U4MhqzJklRksOQwnK-MZigZCubxCHqKG_AuNJnvYtA,34494
 cmdbox/web/assets/cmdbox/filer_modal.js,sha256=iKhNN9urjUm22na4vHYWhbj__2De9iAuDJE7TvBWtQ0,8566
 cmdbox/web/assets/cmdbox/icon.png,sha256=xdEwDdCS8CoPQk7brW-1mV8FIGYtUeSMBRlY9Oh-3nE,296172
 cmdbox/web/assets/cmdbox/list_cmd.js,sha256=4oVpXoSaUWXHKkxxCBEjoHgtrjTP1FSsL3QEHwjtaKc,21437
 cmdbox/web/assets/cmdbox/list_pipe.js,sha256=2rPkauw9VHRMXl76qRgqy81Y815Y8B1tnVKOSKKfRwc,11315
-cmdbox/web/assets/cmdbox/main.js,sha256=JRrFgjBEu66uMPmDHCrsvQFatl39YHEgR9BHpzHxbv4,5737
+cmdbox/web/assets/cmdbox/main.js,sha256=UCI2m8GT0Ba6dQtmwBwZMUGXihYGJpFKd4xqxJaGCo8,5659
 cmdbox/web/assets/cmdbox/open_capture.js,sha256=W4IQlOYLN4Y8OaS8Xc5yp-BRlm82TVjujChr3hJKS0M,709
 cmdbox/web/assets/cmdbox/open_output_json.js,sha256=4q7mCdVmSzFudlTlW9MuIJ1-f-kDvpD6rDUU01IbKi8,727
 cmdbox/web/assets/cmdbox/result.js,sha256=m7u6-VTXT4AK_6frn4dTIjEzDg0bfajD_Jv1MWgLZRo,3154
@@ -360,9 +360,9 @@ cmdbox/web/assets/tree-menu/image/file.png,sha256=Uw4zYkHyuoZ_kSVkesHAeSeA_g9_LP
 cmdbox/web/assets/tree-menu/image/folder-close.png,sha256=TcgsKTBBF2ejgzekOEDBFBxsJf-Z5u0x9IZVi4GBR-I,284
 cmdbox/web/assets/tree-menu/image/folder-open.png,sha256=DT7y1GRK4oXJkFvqTN_oSGM5ZYARzPvjoCGL6wqkoo0,301
 cmdbox/web/assets/tree-menu/js/tree-menu.js,sha256=-GkZxI7xzHuXXHYQBHAVTcuKX4TtoiMuyIms6Xc3pxk,1029
-cmdbox-0.6.0.3.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.6.0.3.dist-info/METADATA,sha256=Pc-3quoVmGwmv-tK_tNhfeUitN3G5EUkYMEpQ7h6bno,30881
-cmdbox-0.6.0.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.6.0.3.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
-cmdbox-0.6.0.3.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.6.0.3.dist-info/RECORD,,
+cmdbox-0.6.0.4.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.6.0.4.dist-info/METADATA,sha256=ffkuAk5l_kg_k2YURFYc3bOkhDP8NEUqtr_LENF1JfU,30889
+cmdbox-0.6.0.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.6.0.4.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
+cmdbox-0.6.0.4.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.6.0.4.dist-info/RECORD,,