cmdbox 0.6.0.3__tar.gz → 0.6.0.4__tar.gz

{cmdbox-0.6.0.3/cmdbox.egg-info → cmdbox-0.6.0.4}/PKG-INFO

@@ -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
@@ -51,7 +51,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 → cmdbox-0.6.0.4}/README.md

@@ -27,7 +27,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 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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-0.6.0.3 → cmdbox-0.6.0.4}/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