cmdbox 0.6.2.3__py3-none-any.whl → 0.6.3__py3-none-any.whl

cmdbox/app/auth/signin.py

@@ -931,7 +931,8 @@ async def create_request_scope(req:Request=None, res:Response=None, websocket:We
     sess = None
     if req is not None:
         sess = req.session if hasattr(req, 'session') else None
-    request_scope.set(dict(req=req, res=res, websocket=websocket))
+    from cmdbox.app.web import Web
+    request_scope.set(dict(req=req, res=res, websocket=websocket, web=Web.getInstance()))
     try:
         yield # リクエストの処理
     finally:
@@ -954,4 +955,4 @@ def get_request_scope() -> Dict[str, Any]:
     Returns:
         Dict[str, Any]: リクエストとレスポンスとWebSocket接続
     """
-    return request_scope.get() if request_scope.get() is not None else dict(req=None, res=None, session=None, websocket=None)
+    return request_scope.get() if request_scope.get() is not None else dict(req=None, res=None, session=None, websocket=None, web=None)

cmdbox/app/common.py

@@ -13,6 +13,7 @@ import asyncio
 import datetime
 import logging
 import logging.config
+import locale
 import hashlib
 import inspect
 import json
@@ -498,19 +499,23 @@ def print_format(data:dict, format:bool, tm:float, output_json:str=None, output_
     Returns:
         str: 生成された文字列
     """
-    if type(data) is dict and "success" in data and type(data["success"]) is dict and "performance" in data["success"] and type(data["success"]["performance"]) is list and pf is not None:
+    is_data_dict = isinstance(data, dict)
+    in_data_success = is_data_dict and 'success' in data
+    is_success_dict = in_data_success and isinstance(data['success'], dict)
+    is_data_list = isinstance(data, list)
+    if is_success_dict and "performance" in data["success"] and isinstance(data["success"]["performance"], list) and pf is not None:
         data["success"]["performance"] += pf
     txt = ''
     if format:
-        if 'success' in data and type(data["success"]) is dict:
-            data = data['success']['data'] if 'data' in data['success'] else data['success']
-            if type(data) == list:
-                txt = tabulate(data, headers='keys', tablefmt=tablefmt)
-            elif type(data) == dict:
-                txt = tabulate([data], headers='keys', tablefmt=tablefmt)
+        if is_success_dict:
+            _data = data['success']['data'] if 'data' in data['success'] else data['success']
+            if isinstance(_data, list):
+                txt = tabulate(_data, headers='keys', tablefmt=tablefmt)
+            elif isinstance(_data, dict):
+                txt = tabulate([_data], headers='keys', tablefmt=tablefmt)
             else:
-                txt = str(data)
-        elif type(data) == list:
+                txt = str(_data)
+        elif is_data_list:
             txt = tabulate(data, headers='keys', tablefmt=tablefmt)
         else:
             txt = tabulate([data], headers='keys', tablefmt=tablefmt)
@@ -521,13 +526,13 @@ def print_format(data:dict, format:bool, tm:float, output_json:str=None, output_
             except BrokenPipeError:
                 pass
     else:
-        if 'success' in data and type(data['success']) is dict:
+        if is_success_dict:
             if "performance" not in data["success"]:
                 data["success"]["performance"] = []
             performance = data["success"]["performance"]
             performance.append(dict(key="app_proc", val=f"{time.perf_counter() - tm:.03f}s"))
         try:
-            if type(data) == dict:
+            if is_data_dict:
                 txt = json.dumps(data, default=default_json_enc, ensure_ascii=False)
             else:
                 txt = data
@@ -685,6 +690,17 @@ def chopdq(target:str):
         return target
     return target[1:-1] if target.startswith('"') and target.endswith('"') else target
 
+def is_japan() -> bool:
+    """
+    日本語環境かどうかを判定します
+
+    Returns:
+        bool: 日本語環境ならTrue、そうでなければFalse
+    """
+    language, _ = locale.getlocale()
+    is_japan = language.find('Japan') >= 0 or language.find('ja_JP') >= 0
+    return is_japan
+
 def is_event_loop_running() -> bool:
     """
     イベントループが実行中かどうかを取得します。
@@ -721,7 +737,7 @@ def exec_sync(apprun, logger:logging.Logger, args:argparse.Namespace, tm:float,
             th.start()
             th.join()
             result = ctx[0] if ctx else None
-            return 0, result, None
+            return result
         return asyncio.run(apprun(logger, args, tm, pf))
     return apprun(logger, args, tm, pf)
 

cmdbox/app/features/cli/cmdbox_audit_search.py

@@ -144,6 +144,12 @@ class AuditSearch(audit_base.AuditBase):
         Returns:
             Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
         """
+        if not hasattr(args, 'format') or not args.format:
+            args.format = False
+        if not hasattr(args, 'output_json') or not args.output_json:
+            args.output_json = None
+        if not hasattr(args, 'output_json_append') or not args.output_json_append:
+            args.output_json_append = False
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, None, False, pf=pf)

cmdbox/app/features/cli/cmdbox_client_http.py

@@ -0,0 +1,154 @@
+from cmdbox.app import common, client, feature, filer
+from cmdbox.app.commons import convert, redis_client
+from cmdbox.app.options import Options
+from pathlib import Path
+from typing import Dict, Any, Tuple, List, Union
+import argparse
+import logging
+import requests
+import urllib.parse
+
+
+class ClientHttp(feature.ResultEdgeFeature):
+    def get_mode(self) -> Union[str, List[str]]:
+        """
+        この機能のモードを返します
+
+        Returns:
+            Union[str, List[str]]: モード
+        """
+        return 'client'
+
+    def get_cmd(self):
+        """
+        この機能のコマンドを返します
+
+        Returns:
+            str: コマンド
+        """
+        return 'http'
+    
+    def get_option(self):
+        """
+        この機能のオプションを返します
+
+        Returns:
+            Dict[str, Any]: オプション
+        """
+        return dict(
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            description_ja="HTTPサーバーに対してリクエストを送信し、レスポンスを取得します。",
+            description_en="Sends a request to the HTTP server and gets a response.",
+            choice=[
+                dict(opt="url", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
+                     description_ja="リクエスト先URLを指定します。",
+                     description_en="Specify the URL to request."),
+                dict(opt="proxy", type=Options.T_STR, default="no", required=False, multi=False, hide=False, choice=['no', 'yes'],
+                     choice_show=dict(no=["send_method", "send_content_type", "send_apikey", "send_header",],
+                                      yes=[]),
+                     description_ja="webモードで呼び出された場合、受信したリクエストパラメータをリクエスト先URLに送信するかどうかを指定します。",
+                     description_en="Specifies whether or not to send the received request parameters to the destination URL when invoked in web mode."),
+                dict(opt="send_method", type=Options.T_STR, default="GET", required=True, multi=False, hide=False,
+                     choice=['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'],
+                     description_ja="リクエストメソッドを指定します。",
+                     description_en="Specifies the request method."),
+                dict(opt="send_content_type", type=Options.T_STR, default=None, required=False, multi=False, hide=False,
+                     choice=['', 'application/octet-stream', 'application/json', 'multipart/form-data'],
+                     choice_show={'application/octet-stream':["send_param", "send_data",],
+                                  'application/json':["send_data",],
+                                  'multipart/form-data':["send_param",],},
+                     description_ja="送信するデータのContent-Typeを指定します。",
+                     description_en="Specifies the Content-Type of the data to be sent."),
+                dict(opt="send_apikey", type=Options.T_TEXT, default=None, required=False, multi=False, hide=False, choice=None,
+                     description_ja="リクエスト先の認証で使用するAPIキーを指定します。",
+                     description_en="Specify the API key to be used for authentication of the request destination."),
+                dict(opt="send_header", type=Options.T_DICT, default=None, required=False, multi=True, hide=False, choice=None,
+                     description_ja="リクエストヘッダーを指定します。",
+                     description_en="Specifies the request header."),
+                dict(opt="send_param", type=Options.T_DICT, default=None, required=False, multi=True, hide=False, choice=None,
+                     description_ja="送信するパラメータを指定します。",
+                     description_en="Specifies parameters to be sent."),
+                dict(opt="send_data", type=Options.T_TEXT, default=None, required=False, multi=False, hide=False, choice=None,
+                     description_ja="送信するデータを指定します。",
+                     description_en="Specifies the data to be sent."),
+                dict(opt="send_verify", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[False, True],
+                     description_ja="レスポンスを受け取るまでのタイムアウトを指定します。",
+                     description_en="Specifies the timeout before a response is received."),
+                dict(opt="send_timeout", type=Options.T_INT, default=30, required=False, multi=False, hide=True, choice=None,
+                     description_ja="レスポンスを受け取るまでのタイムアウトを指定します。",
+                     description_en="Specifies the timeout before a response is received."),
+                dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
+                     description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をConsole logに出力します。",
+                     description_en="Available only in GUI mode. Outputs standard output during command execution to Console log."),
+                dict(opt="capture_stdout", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
+                     description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をキャプチャーし、実行結果画面に表示します。",
+                     description_en="Available only in GUI mode. Captures standard output during command execution and displays it on the execution result screen."),
+                dict(opt="capture_maxsize", type=Options.T_INT, default=self.DEFAULT_CAPTURE_MAXSIZE, required=False, multi=False, hide=True, choice=None,
+                     description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力の最大キャプチャーサイズを指定します。",
+                     description_en="Available only in GUI mode. Specifies the maximum capture size of standard output when executing commands."),
+            ]
+        )
+
+    async def apprun(self, logger:logging.Logger, args:argparse.Namespace, tm:float, pf:List[Dict[str, float]]=[]) -> Tuple[int, Dict[str, Any], Any]:
+        """
+        この機能の実行を行います
+
+        Args:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
+            tm (float): 実行開始時間
+            pf (List[Dict[str, float]]): 呼出元のパフォーマンス情報
+
+        Returns:
+            Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
+        """
+        if args.url is None:
+            msg = dict(warn=f"Please specify the --url option.")
+            common.print_format(msg, args.format, tm, None, False, pf=pf)
+            return 1, msg, None
+        query_param = {}
+        if args.proxy == 'yes':
+            from cmdbox.app.auth import signin
+            from fastapi import Request
+            scope = signin.get_request_scope()
+            if scope is None:
+                msg = dict(warn=f"Request scope is not set. Please set the request scope.")
+                common.print_format(msg, args.format, tm, None, False, pf=pf)
+                return 1, msg, None
+            req:Request = scope['req']
+            args.send_method = req.method
+            args.send_content_type = req.headers.get('Content-Type', None)
+            args.send_apikey = req.headers.get('Authorization', '').replace('Bearer ', '')
+            args.send_header = {k:v for k, v in req.headers.items() \
+                                if k.lower() not in ['connection', 'proxy-authorization', 'proxy-connection', 'keep-alive',
+                                                     'transfer-encoding', 'te', 'trailer', 'upgrade', 'content-length']}
+            query_param = {k:v for k, v in req.query_params.items()}
+            args.send_data = await req.body()
+
+        url = urllib.parse.urlparse(args.url)
+        query = urllib.parse.parse_qs(url.query)
+        query = {**query, **query_param} if query else query_param
+        args.url = urllib.parse.urlunparse((url.scheme, url.netloc, url.path, url.params, urllib.parse.urlencode(query), url.fragment))
+        args.send_header = {**args.send_header, 'Authorization':f'Bearer {args.send_apikey}'} if args.send_apikey else args.send_header
+        res = requests.request(method=args.send_method, url=args.url, headers=args.send_header,
+                                   verify=args.send_verify, timeout=args.send_timeout, allow_redirects=True,
+                                   data=args.send_data, params=args.send_param)
+        if res.status_code != 200:
+            msg = dict(error=f"Request failed with status code {res.status_code}.")
+            common.print_format(msg, False, tm, None, False, pf=pf)
+            return 1, msg, None
+        content_type = res.headers.get('Content-Type', '')
+        if content_type.startswith('application/json'):
+            try:
+                msg = res.json()
+            except ValueError as e:
+                msg = res.text
+            common.print_format(msg, False, tm, None, False, pf=pf)
+            return 0, msg, None
+        elif content_type.startswith('text/'):
+            msg = res.text
+            common.print_format(msg, False, tm, None, False, pf=pf)
+            return 0, msg, None
+        common.print_format(res.content, False, tm, None, False, pf=pf)
+
+        return 0, res.content, None

cmdbox/app/features/cli/cmdbox_cmd_list.py

@@ -1,4 +1,4 @@
-from cmdbox.app import common, feature
+from cmdbox.app import common, feature, options
 from cmdbox.app.auth import signin
 from cmdbox.app.options import Options
 from pathlib import Path
@@ -45,10 +45,10 @@ class CmdList(feature.OneshotResultEdgeFeature):
                 dict(opt="kwd", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      description_ja=f"検索したいコマンド名を指定します。中間マッチで検索します。",
                      description_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=f".{self.ver.__appid__}/user_list.yml", required=False, multi=False, hide=True, choice=None, fileio="in",
+                dict(opt="signin_file", type=Options.T_FILE, default=f".{self.ver.__appid__}/user_list.yml", required=False, multi=False, hide=False, choice=None, fileio="in",
                      description_ja="サインイン可能なユーザーとパスワードを記載したファイルを指定します。",
                      description_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,
+                dict(opt="groups", type=Options.T_STR, default=None, required=False, multi=True, hide=False, choice=None,
                      description_ja="`signin_file` を指定した場合に、このユーザーグループに許可されているコマンドリストを返すように指定します。",
                      description_en="Specifies that `signin_file`, if specified, should return the list of commands allowed for this user group."),
                 dict(opt="output_json", short="o", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None, fileio="out",
@@ -92,11 +92,15 @@ class CmdList(feature.OneshotResultEdgeFeature):
         if not hasattr(self, 'signin_file_data') or self.signin_file_data is None:
             self.signin_file_data = signin.Signin.load_signin_file(args.signin_file, None, self=self)
         paths = glob.glob(str(Path(args.data) / ".cmds" / f"cmd-{kwd}.json"))
-        ret = [common.loadopt(path, True) for path in paths]
-        ret = sorted(ret, key=lambda cmd: cmd["title"])
-        ret = [dict(title=r.get('title',''), mode=r.get('mode',''), cmd=r.get('cmd',''), description=r.get('description',''), tag=r.get('tag','')) for r in ret \
+        cmd_list = [common.loadopt(path, True) for path in paths]
+        cmd_list = sorted(cmd_list, key=lambda cmd: cmd["title"])
+        is_japan = common.is_japan()
+        options = Options.getInstance()
+        cmd_list = [dict(title=r.get('title',''), mode=r['mode'], cmd=r['cmd'],
+                    description=r.get('description','') + options.get_cmd_attr(r['mode'], r['cmd'], 'description_ja' if is_japan else 'description_en'),
+                    tag=r.get('tag','')) for r in cmd_list \
                if signin.Signin._check_cmd(self.signin_file_data, args.groups, r['mode'], r['cmd'], logger)]
-        ret = dict(success=ret)
+        ret = dict(success=cmd_list)
 
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 

cmdbox/app/features/cli/cmdbox_web_start.py

@@ -183,7 +183,7 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
         Returns:
             web.Web: Webオブジェクト
         """
-        w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
+        w = web.Web.getInstance(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,

cmdbox/app/mcp.py

@@ -4,6 +4,7 @@ from cmdbox.app.auth import signin
 from pathlib import Path
 from typing import Callable, List, Dict, Any, Tuple
 import argparse
+import glob
 import logging
 import locale
 import json
@@ -35,14 +36,14 @@ class Mcp:
         self.ver = ver
         self.signin = sign
 
-    def create_mcpserver(self, args:argparse.Namespace, tools:List[Any], web:Any) -> Any:
+    def create_mcpserver(self, logger:logging.Logger, args:argparse.Namespace, tools) -> Any:
         """
         mcpserverを作成します
 
         Args:
+            logger (logging.Logger): ロガー
             args (argparse.Namespace): 引数
-            tools (List[Any]): ツールのリスト
-            web (Any): Web関連のオブジェクト
+            tools (List[Callable]): ツールのリスト
 
         Returns:
             Any: FastMCP
@@ -60,13 +61,12 @@ class Mcp:
                 issuer=issuer,
                 audience=audience
             )
-            mcp = FastMCP(name=self.ver.__appid__, tools=tools, auth=auth)
+            mcp = FastMCP(name=self.ver.__appid__, auth=auth, tools=tools)
         else:
             self.logger.info(f"Using BearerAuthProvider without public key, issuer, or audience.")
-            mcp = FastMCP(name=self.ver.__appid__, tools=tools)
+            mcp = FastMCP(name=self.ver.__appid__)
         mcp.add_middleware(self.create_mw_logging(self.logger, args))
-        mcp.add_middleware(self.create_mw_reqscope(self.logger, args, web))
-        mcp.add_middleware(self.create_mw_toollist(self.logger, args))
+        mcp.add_middleware(self.create_mw_reqscope(self.logger, args))
         return mcp
 
     def create_session_service(self, args:argparse.Namespace) -> Any:
@@ -117,8 +117,7 @@ class Mcp:
         """
         if logger.level == logging.DEBUG:
             logger.debug(f"create_agent processing..")
-        language, _ = locale.getlocale()
-        is_japan = language.find('Japan') >= 0 or language.find('ja_JP') >= 0
+        is_japan = common.is_japan()
         description = f"{self.ver.__appid__}に登録されているコマンド提供"
         instruction = f"あなたはコマンドの意味を熟知しているエキスパートです。" + \
                       f"ユーザーがコマンドを実行したいとき、あなたは以下の手順に従ってコマンドを確実に実行してください。\n" + \
@@ -335,6 +334,8 @@ class Mcp:
         func_txt += f'        opt_path = opt["data"] / ".cmds" / f"cmd-{title}.json"\n'
         func_txt += f'        opt.update(common.loadopt(opt_path))\n'
         func_txt += f'    scope = signin.get_request_scope()\n'
+        func_txt += f'    if logger.level == logging.DEBUG:\n'
+        func_txt +=  '        logger.debug(f"MCP Call scope={scope}")\n'
         func_txt += f'    opt["mode"] = "{mode}"\n'
         func_txt += f'    opt["cmd"] = "{cmd}"\n'
         func_txt += f'    opt["format"] = False\n'
@@ -356,6 +357,8 @@ class Mcp:
         func_txt += f'    feat = options.get_cmd_attr("{mode}", "{cmd}", "feature")\n'
         func_txt += f'    args.groups = groups\n'
         func_txt += f'    try:\n'
+        func_txt += f'        if logger.level == logging.DEBUG:\n'
+        func_txt +=  '            logger.debug(f"MCP Call {feat}#apprun, args={args}")\n'
         func_txt += f'        st, ret, _ = feat.apprun(logger, args, time.perf_counter(), [])\n'
         func_txt += f'        return ret\n'
         func_txt += f'    except Exception as e:\n'
@@ -364,133 +367,21 @@ class Mcp:
         func_txt += f'func_ctx.append({func_name})\n'
         return func_txt
 
-    def create_tools(self, logger:logging.Logger, args:argparse.Namespace) -> List[Any]:
+    def create_tools(self, logger:logging.Logger, args:argparse.Namespace, extract_callable:bool) -> Any:
         """
         ツールリストを作成します
         
         Args:
             logger (logging.Logger): ロガー
             args (argparse.Namespace): 引数
-        
-        Returns:
-            List[Any]: fastmcp.tools.FunctionToolのリスト
-        """
-        from fastmcp.tools import FunctionTool
-        options = Options.getInstance()
-        language, _ = locale.getlocale()
-        is_japan = language.find('Japan') >= 0 or language.find('ja_JP') >= 0
-        func_tools:List[FunctionTool] = []
-        for mode in options.get_mode_keys():
-            for cmd in options.get_cmd_keys(mode):
-                if not options.get_cmd_attr(mode, cmd, 'use_agent'):
-                    continue
-                # コマンドの説明と選択肢を取得
-                description = options.get_cmd_attr(mode, cmd, 'description_ja' if is_japan else 'description_en')
-                choices = options.get_cmd_choices(mode, cmd, False)
-                func_name = f"{mode}_{cmd}"
-                # 関数の定義を生成
-                func_txt  = self._create_func_txt(func_name, mode, cmd, is_japan, options)
-                if logger.level == logging.DEBUG:
-                    logger.debug(f"generating agent tool: {func_name}")
-                func_ctx = []
-                # 関数を実行してコンテキストに追加
-                exec(func_txt,
-                     dict(time=time,List=List, Path=Path, argparse=argparse, common=common, options=options, logging=logging, signin=signin,),
-                     dict(func_ctx=func_ctx))
-                # 関数のスキーマを生成
-                input_schema = dict(
-                    type="object",
-                    properties={o['opt']: self._to_schema(o, is_japan) for o in choices},
-                    required=[o['opt'] for o in choices if o['required']],
-                )
-                output_schema = dict(type="object", properties=dict())
-                func_tool = FunctionTool(fn=func_ctx[0], name=func_name, title=func_name.title(), description=description, 
-                                         tags=[f"mode={mode}", f"cmd={cmd}"],
-                                         parameters=input_schema, output_schema=output_schema,)
-                # ツールリストに追加
-                func_tools.append(func_tool)
-        return func_tools
-
-    def create_mw_toollist(self, logger:logging.Logger, args:argparse.Namespace) -> Any:
-        """
-        ツールリストを作成するミドルウェアを作成します
-
-        Args:
-            logger (logging.Logger): ロガー
-            args (argparse.Namespace): 引数
+            extract_callable (bool): コール可能な関数を抽出するかどうか
 
         Returns:
-            Any: ミドルウェア
+            ToolList: ToolListのリスト
         """
-        from cmdbox.app.web import Web
-        from fastmcp.server.middleware import Middleware, MiddlewareContext, ListToolsResult
-        from fastmcp.tools import FunctionTool
-        func_tools:List[FunctionTool] = self.create_tools(logger, args)
-        options = Options.getInstance()
-        cmd_list:feature.Feature = options.get_cmd_attr('cmd', 'list', "feature")
-        language, _ = locale.getlocale()
-        is_japan = language.find('Japan') >= 0 or language.find('ja_JP') >= 0
-        mcp = self
-        class CommandListMiddleware(Middleware):
-            async def on_list_tools(self, context: MiddlewareContext, call_next):
-                # 認証情報の取得
-                scope = signin.get_request_scope()
-                web:Web = scope["web"]
-                signin_file = web.signin_file
-                signin_data = signin.Signin.load_signin_file(signin_file)
-                if signin.Signin._check_signin(scope["req"], scope["res"], signin_data, logger) is not None:
-                    logger.warning("Unable to execute command because authentication information cannot be obtained")
-                    return dict(warn="Unable to execute command because authentication information cannot be obtained")
-                groups = scope["req"].session["signin"]["groups"]
-                ret_tools = []
-                # システムコマンドリストのフィルタリング
-                for func in func_tools:
-                    mode = [t.replace('mode=', '') for t in func.tags if t.startswith('mode=')]
-                    mode = mode[0] if mode else None
-                    cmd = [t.replace('cmd=', '') for t in func.tags if t.startswith('cmd=')]
-                    cmd = cmd[0] if cmd else None
-                    if mode is None or cmd is None:
-                        logger.warning(f"Tool {func.name} does not have mode or cmd tag, skipping.")
-                        continue
-                    if not signin.Signin._check_cmd(signin_data, groups, mode, cmd, logger):
-                        logger.warning(f"User does not have permission to use tool {func.name} (mode={mode}, cmd={cmd}), skipping.")
-                        continue
-                    ret_tools.append(func)
-                #　ユーザーコマンドリストの取得
-                args = argparse.Namespace(data=web.data, signin_file=signin_file, groups=groups, kwd=None,
-                                          format=False, output_json=None, output_json_append=False,)
-                st, ret, _ = cmd_list.apprun(logger, args, time.perf_counter(), [])
-                if ret is None or 'success' not in ret or not ret['success']:
-                    return ret_tools
-                for opt in ret['success']:
-                    func_name = f"user_{opt['title']}"
-                    mode, cmd, description = opt['mode'], opt['cmd'], opt['description'] if 'description' in opt and opt['description'] else ''
-                    choices = options.get_cmd_choices(mode, cmd, False)
-                    description += '\n' + options.get_cmd_attr(mode, cmd, 'description_ja' if is_japan else 'description_en')
-                    # 関数の定義を生成
-                    func_txt  = mcp._create_func_txt(func_name, mode, cmd, is_japan, options, title=opt['title'])
-                    if logger.level == logging.DEBUG:
-                        logger.debug(f"generating agent tool: {func_name}")
-                    func_ctx = []
-                    # 関数を実行してコンテキストに追加
-                    exec(func_txt,
-                        dict(time=time,List=List, Path=Path, argparse=argparse, common=common, options=options, logging=logging, signin=signin,),
-                        dict(func_ctx=func_ctx))
-                    # 関数のスキーマを生成
-                    input_schema = dict(
-                        type="object",
-                        properties={o['opt']: mcp._to_schema(o, is_japan) for o in choices},
-                        required=[],
-                    )
-                    output_schema = dict(type="object", properties=dict())
-                    func_tool = FunctionTool(fn=func_ctx[0], name=func_name, title=func_name.title(), description=description, 
-                                            tags=[f"mode={mode}", f"cmd={cmd}"],
-                                            parameters=input_schema, output_schema=output_schema,)
-                    # ツールリストに追加
-                    ret_tools.append(func_tool)
-
-                return ret_tools
-        return CommandListMiddleware()
+        tool_list = ToolList(self, logger)
+        tool_list.extract_callable = extract_callable
+        return tool_list
 
     def create_mw_logging(self, logger:logging.Logger, args:argparse.Namespace) -> Any:
         """
@@ -518,7 +409,7 @@ class Mcp:
                     raise e
         return LoggingMiddleware()
 
-    def create_mw_reqscope(self, logger:logging.Logger, args:argparse.Namespace, web) -> Any:
+    def create_mw_reqscope(self, logger:logging.Logger, args:argparse.Namespace) -> Any:
         """
         認証用のミドルウェアを作成します
 
@@ -530,11 +421,12 @@ class Mcp:
         Returns:
             Any: ミドルウェア
         """
+        from cmdbox.app.web import Web
         from fastapi import Response
         from fastmcp.server.middleware import Middleware, MiddlewareContext
         class ReqScopeMiddleware(Middleware):
             async def on_message(self, context: MiddlewareContext, call_next):
-                signin.request_scope.set(dict(req=context.fastmcp_context.request_context.request, res=Response(), websocket=None, web=web))
+                signin.request_scope.set(dict(req=context.fastmcp_context.request_context.request, res=Response(), websocket=None, web=Web.getInstance()))
                 result = await call_next(context)
                 return result
         return ReqScopeMiddleware()
@@ -561,11 +453,213 @@ class Mcp:
         from fastmcp import FastMCP
         from google.adk.sessions import BaseSessionService
         session_service:BaseSessionService = self.create_session_service(args)
-        from fastmcp.tools import FunctionTool
-        tools:List[FunctionTool] = self.create_tools(logger, args)
-        mcp:FastMCP = self.create_mcpserver(args, tools, web)
-        root_agent = self.create_agent(logger, args, [t.fn for t in tools])
+        mcp:FastMCP = self.create_mcpserver(logger, args, self.create_tools(logger, args, False))
+        root_agent = self.create_agent(logger, args, self.create_tools(logger, args, True))
         runner = self.create_runner(logger, args, session_service, root_agent)
         if logger.level == logging.DEBUG:
             logger.debug(f"init_agent_runner complate.")
         return runner, mcp
+
+class ToolList(object):
+    def __init__(self, mcp:Mcp, logger:logging.Logger, *args:List):
+        """
+        ツールリストを初期化します
+
+        Args:
+            mcp (Mcp): MCPインスタンス
+            logger (logging.Logger): ロガー
+            *args (List): 追加するツールのリスト
+        """
+        from fastmcp.tools import FunctionTool
+        options = Options.getInstance()
+        is_japan = common.is_japan()
+
+        self.tools = []
+        self.mcp = mcp
+        self.logger = logger
+        self.extract_callable = False
+        for mode in options.get_mode_keys():
+            for cmd in options.get_cmd_keys(mode):
+                if not options.get_cmd_attr(mode, cmd, 'use_agent'):
+                    continue
+                # コマンドの説明と選択肢を取得
+                description = options.get_cmd_attr(mode, cmd, 'description_ja' if is_japan else 'description_en')
+                choices = options.get_cmd_choices(mode, cmd, False)
+                func_name = f"{mode}_{cmd}"
+                # 関数の定義を生成
+                func_txt  = self.mcp._create_func_txt(func_name, mode, cmd, is_japan, options)
+                if self.logger.level == logging.DEBUG:
+                    self.logger.debug(f"generating agent tool: {func_name}")
+                func_ctx = []
+                # 関数を実行してコンテキストに追加
+                exec(func_txt,
+                    dict(time=time,List=List, Path=Path, argparse=argparse, common=common, options=options, logging=logging, signin=signin,),
+                    dict(func_ctx=func_ctx))
+                # 関数のスキーマを生成
+                input_schema = dict(
+                    type="object",
+                    properties={o['opt']: self.mcp._to_schema(o, is_japan) for o in choices},
+                    required=[o['opt'] for o in choices if o['required']],
+                )
+                output_schema = dict(type="object", properties=dict())
+                func_tool = FunctionTool(fn=func_ctx[0], name=func_name, title=func_name.title(), description=description, 
+                                        tags=[f"mode={mode}", f"cmd={cmd}"],
+                                        parameters=input_schema, output_schema=output_schema,)
+                # ツールリストに追加
+                self.tools.append(func_tool)
+        for tool in args:
+            if isinstance(tool, FunctionTool):
+                if self.logger.level == logging.DEBUG:
+                    self.logger.debug(f"adding tool: {tool.name}")
+            else:
+                raise TypeError(f"Expected FunctionTool, got {type(tool)}")
+            self.tools.append(tool)
+
+    @property
+    def extract_callable(self):
+        """
+        ツールリストから関数を抽出するかどうかを取得します
+
+        Returns:
+            bool: 関数を抽出する場合はTrue、しない場合はFalse
+        """
+        return self._extract_callable
+    
+    @extract_callable.setter
+    def extract_callable(self, value:bool):
+        """
+        ツールリストから関数を抽出するかどうかを設定します
+
+        Args:
+            value (bool): 関数を抽出する場合はTrue、しない場合はFalse
+        """
+        if not isinstance(value, bool):
+            raise TypeError(f"Expected bool, got {type(value)}")
+        self._extract_callable = value
+
+    def append(self, tool):
+        """
+        ツールを追加します
+
+        Args:
+            tool (FunctionTool): 追加するツール
+        """
+        from fastmcp.tools import FunctionTool
+        if isinstance(tool, FunctionTool):
+            self.tools.append(tool)
+        else:
+            raise TypeError(f"Expected FunctionTool, got {type(tool)}")
+
+    def pop(self):
+        """
+        ツールを取り出します
+
+        Returns:
+            FunctionTool: 取り出したツール
+        """
+        if len(self.tools) == 0:
+            raise IndexError("No tools available to pop.")
+        return self.tools.pop()
+
+    def __repr__(self):
+        """
+        ツールリストの文字列表現を返します
+
+        Returns:
+            str: ツールリストの文字列表現
+        """
+        return 'ToolList(' + repr(self.tools) + ')'
+
+    def __str__(self):
+        """
+        ツールリストの文字列表現を返します
+
+        Returns:
+            str: ツールリストの文字列表現
+        """
+        return str(self.tools)
+
+    def __getitem__(self, key:int):
+        """
+        ツールリストからツールを取得します
+
+        Args:
+            key (int): インデックス
+        Returns:
+            FunctionTool: 取得したツール
+        """
+        return self.tools[key]
+
+    def __iter__(self):
+        """
+        ツールリストをイテレータとして返します
+
+        Returns:
+            Iterator[FunctionTool]: ツールリストのイテレータ
+        """
+        from cmdbox.app.web import Web
+        from fastmcp.tools import FunctionTool
+        options = Options.getInstance()
+        is_japan = common.is_japan()
+        ret_tools = self.tools.copy()
+        web = Web.getInstance()
+        if web.signin.signin_file_data is None:
+            # サインインファイルが読み込まれていない場合は登録済みのリストを返す
+            if self.extract_callable:
+                # 関数を抽出する場合はツールリストから関数を抽出して返す
+                return (tool.fn for tool in ret_tools if callable(tool.fn)).__iter__()
+            return ret_tools.__iter__()
+        try:
+            # ユーザーコマンドの読み込み
+            paths = glob.glob(str(Path(web.data) / ".cmds" / f"cmd-*.json"))
+            cmd_list = [common.loadopt(path, True) for path in paths]
+            cmd_list = sorted(cmd_list, key=lambda cmd: cmd["title"])
+            # ユーザーコマンドリストの取得(すべてのコマンドを取得するためにgroupsをadminに設定)
+            # 実行時にはユーザーのグループに応じて認可する
+            cmd_list = [dict(title=r.get('title',''), mode=r['mode'], cmd=r['cmd'],
+                        description=r.get('description','') + options.get_cmd_attr(r['mode'], r['cmd'], 'description_ja' if is_japan else 'description_en'),
+                        tag=r.get('tag','')) for r in cmd_list \
+                       if signin.Signin._check_cmd(web.signin.signin_file_data, ['admin'], r['mode'], r['cmd'], self.logger)]
+
+        except Exception as e:
+            # ユーザーコマンドの読み込みに失敗した場合は警告を出して登録済みのリストを返す
+            self.logger.warning(f"Error loading user commands: {e}", exc_info=True)
+            if self.extract_callable:
+                # 関数を抽出する場合はツールリストから関数を抽出して返す
+                return (tool.fn for tool in ret_tools if callable(tool.fn)).__iter__()
+            return ret_tools.__iter__()
+        _tools_fns = [tool.name for tool in ret_tools]
+        # ユーザーコマンドの定義を関数として生成
+        for opt in cmd_list:
+            func_name = opt['title']
+            mode, cmd, description = opt['mode'], opt['cmd'], opt['description'] if 'description' in opt and opt['description'] else ''
+            choices = options.get_cmd_choices(mode, cmd, False)
+            description += '\n' + options.get_cmd_attr(mode, cmd, 'description_ja' if is_japan else 'description_en')
+            # 関数の定義を生成
+            func_txt  = self.mcp._create_func_txt(func_name, mode, cmd, is_japan, options, title=opt['title'])
+            if self.logger.level == logging.DEBUG:
+                self.logger.debug(f"generating agent tool: {func_name}")
+            func_ctx = []
+            # 関数を実行してコンテキストに追加
+            exec(func_txt,
+                dict(time=time,List=List, Path=Path, argparse=argparse, common=common, options=options, logging=logging, signin=signin,),
+                dict(func_ctx=func_ctx))
+            # 関数のスキーマを生成
+            input_schema = dict(
+                type="object",
+                properties={o['opt']: self.mcp._to_schema(o, is_japan) for o in choices},
+                required=[],
+            )
+            output_schema = dict(type="object", properties=dict())
+            func_tool = FunctionTool(fn=func_ctx[0], name=func_name, title=func_name.title(), description=description, 
+                                     tags=[f"mode={mode}", f"cmd={cmd}"],
+                                     parameters=input_schema, output_schema=output_schema,)
+            if func_name in _tools_fns:
+                # 既に同名の関数が存在する場合は差し替え
+                self.logger.warning(f"Function {func_name} already exists, replacing.")
+                ret_tools = [tool for tool in ret_tools if tool.name != func_name]
+            ret_tools.append(func_tool)
+        if self.extract_callable:
+            # 関数を抽出する場合はツールリストから関数を抽出して返す
+            return (tool.fn for tool in ret_tools if callable(tool.fn)).__iter__()
+        return ret_tools.__iter__()

cmdbox/app/options.py

@@ -389,7 +389,8 @@ class Options:
             features_yml = Path(ver.__file__).parent / 'extensions' / 'features.yml'
         #if not features_yml.exists() or not features_yml.is_file():
         #    features_yml = Path('.samples/features.yml')
-        logger.info(f"load features.yml: {features_yml}, is_file={features_yml.is_file()}")
+        if logger.level == logging.DEBUG:
+            logger.debug(f"load features.yml: {features_yml}, is_file={features_yml.is_file()}")
         if features_yml.exists() and features_yml.is_file():
             if self.features_yml_data is None:
                 self.features_yml_data = yml = common.load_yml(features_yml)

cmdbox/app/web.py

@@ -27,6 +27,21 @@ import webbrowser
 
 
 class Web:
+    @classmethod
+    def getInstance(cls, *args, **kwargs) -> 'Web':
+        """
+        Webクラスのインスタンスを取得する
+        Args:
+            *args: 可変長引数
+            **kwargs: キーワード引数
+
+        Returns:
+            Web: Webクラスのインスタンス
+        """
+        if not hasattr(cls, '_instance'):
+            cls._instance = cls(*args, **kwargs)
+        return cls._instance
+
     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',
                  client_only:bool=False, doc_root:Path=None, gui_html:str=None, filer_html:str=None, result_html:str=None, users_html:str=None,
@@ -274,7 +289,7 @@ class Web:
             pass_miss_count = self.user_data(None, u['uid'], u['name'], 'password', 'pass_miss_count')
             pass_miss_last = self.user_data(None, u['uid'], u['name'], 'password', 'pass_miss_last')
 
-            if name is None:
+            if name is None or name == '':
                 ret.append({**u, **dict(last_signin=signin_last, pass_last_update=pass_last_update,
                                 pass_miss_count=pass_miss_count, pass_miss_last=pass_miss_last)})
         return ret
@@ -515,7 +530,7 @@ class Web:
         signin_data = self.signin.get_data()
         if signin_data is None:
             raise ValueError(f'signin_file_data is None. ({self.signin_file})')
-        if name is None:
+        if name is None or name == '':
             return copy.deepcopy(signin_data['groups'])
         for g in copy.deepcopy(signin_data['groups']):
             if g['name'] == name:

cmdbox/extensions/features.yml

@@ -43,6 +43,9 @@ agentrule:                              # Specifies a list of rules that determi
   - mode: cmd                           # Specify the "mode" as the condition for applying the rule.
     cmds: [list, load]                  # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
     rule: allow                         # Specifies whether the specified command is allowed or not. Values are allow or deny.
+  - mode: client
+    cmds: [http]
+    rule: allow
 audit:
   enabled: true                         # Specify whether to enable the audit function.
   write:

cmdbox/extensions/sample_project/sample/extensions/features.yml

@@ -49,20 +49,11 @@ aliases:                                # Specify the alias for the specified co
 agentrule:                              # Specifies a list of rules that determine which commands the agent can execute.
   policy: deny                          # Specify the default policy for the rule. The value can be allow or deny.
   rules:                                # Specify the rules for the commands that the agent can execute according to the group to which the user belongs.
-  - mode: audit                         # Specify the "mode" as the condition for applying the rule.
-    cmds: [search, write]               # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
+  - mode: cmd                           # Specify the "mode" as the condition for applying the rule.
+    cmds: [list, load]                  # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
     rule: allow                         # Specifies whether the specified command is allowed or not. Values are allow or deny.
   - mode: client
-    cmds: [file_copy, file_download, file_list, file_mkdir, file_move, file_remove, file_rmdir, file_upload, server_info]
-    rule: allow
-  - mode: cmd
-    cmds: [list, load]
-    rule: allow
-  - mode: server
-    cmds: [list]
-    rule: allow
-  - mode: web
-    cmds: [gencert, genpass, group_list, user_list]
+    cmds: [http]
     rule: allow
 audit:
   enabled: true                         # Specify whether to enable the audit function.

cmdbox/extensions/sample_project/sample/extensions/user_list.yml

@@ -78,7 +78,7 @@ pathrule:                      # List of RESTAPI rules, rules that determine whe
   - groups: [user]
     paths: [/signin, /assets, /bbforce_cmd, /copyright, /dosignin, /dosignout, /password/change,
             /gui/user_data/load, /gui/user_data/save, /gui/user_data/delete,
-            /agent, /mcp,
+            /agent, /mcpsv,
             /exec_cmd, /exec_pipe, /filer, /result, /gui, /get_server_opt, /usesignout, /versions_cmdbox, /versions_used]
     rule: allow
   - groups: [readonly]
@@ -106,6 +106,30 @@ password:                       # Password settings.
     enabled: true               # Specify whether or not to enable account lockout.
     threshold: 5                # Specify the number of failed login attempts before the account is locked.
     reset: 30                   # Specify the number of minutes after which the failed login count will be reset.
+apikey:
+  gen_cert:                         # Specify whether to generate a certificate for API key.
+    enabled: true                   # Specify whether to enable certificate generation for API key.
+    privatekey: idp_private.pem     # Specify the destination file for the generated private key.
+    certificate: idp_cert.pem       # Specify the destination file for the generated certificate.
+    publickey: idp_public.pem       # Specify the destination file for the generated public key.
+  gen_jwt:                          # Specify whether to generate JWT for API key.
+    enabled: true                   # Specify whether to enable JWT generation for API key.
+    privatekey: idp_private.pem     # Specify the private key file for JWT generation.
+    privatekey_passphrase:          # Specify the passphrase for the private key file.
+                                    # If the private key is encrypted, specify the passphrase here.
+    algorithm: RS256                # Specify the algorithm used to generate the JWT. The value can be RS256, PS256, or ES256.
+    claims:                         # Specify the claims to be included in the JWT.
+      iss: identity_provider        # Specify the issuer of the JWT. This is usually the name of the identity provider.
+      sub: app_user                 # Specify the subject of the JWT. This is usually the name of the application.
+      aud: app_organization         # Specify the audience of the JWT. This is usually the name of the organization that will use the application.
+      exp: 31536000                 # Specify the expiration time of the JWT in seconds. The default is 31536000 seconds (1 year).
+  verify_jwt:                       # Specify whether to verify JWT for API key.
+    enabled: true                   # Specify whether to enable JWT verification for API key.
+    certificate: idp_cert.pem       # Specify the certificate file for JWT verification.
+    publickey: idp_public.pem       # Specify the public key file for JWT verification. Not required if certificate exists.
+    issuer: identity_provider       # Specify the issuer of the JWT. This is usually the name of the identity provider. (If not specified, no verification)
+    audience: app_organization      # Specify the audience of the JWT. This is usually the name of the organization that will use the application. (If not specified, no verification)
+    algorithm: RS256                # Specify the algorithm used to verify the JWT. The value can be RS256, PS256, or ES256.
 oauth2:                             # OAuth2 settings.
   providers:                        # This is a per-provider setting for OAuth2.
     google:                         # Google's OAuth2 configuration.

cmdbox/version.py

@@ -1,10 +1,10 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 7, 13)
+dt_now = datetime.datetime(2025, 7, 28)
 days_ago = (datetime.datetime.now() - dt_now).days
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.6.2.3'
+__version__ = '0.6.3'
 __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

@@ -253,6 +253,7 @@ agent.create_history = (histories, session_id, msg) => {
         e.preventDefault();
         e.stopPropagation();
         agent.delete_session(session_id).then((res) => {
+            const messages = $('#messages');
             if (res['success']) {
                 history.remove();
                 const sid = messages.attr('data-session_id');

cmdbox/web/assets/cmdbox/view_result.js

@@ -34,7 +34,8 @@ const render_result_func = (target_elem, result, res_size) => {
     // list型の結果をテーブルに変換
     const list2table = (data, table_head, table_body) => {
         data.forEach((row, i) => {
-            if(row['success'] && typeof row['success'] == "object" && !Array.isArray(row['success'])){
+            if (!row) return;
+            if(typeof row == "object" && row['success'] && typeof row['success'] == "object" && !Array.isArray(row['success'])){
                 dict2table(row['success'], i==0?table_head:null, table_body, row['output_image']);
                 return;
             }

{cmdbox-0.6.2.3.dist-info → cmdbox-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.2.3
+Version: 0.6.3
 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

{cmdbox-0.6.2.3.dist-info → cmdbox-0.6.3.dist-info}/RECORD

@@ -10,25 +10,25 @@ cmdbox/logconf_gui.yml,sha256=-95vyd0q-aB1gsabdk8rg9dJ2zRKAZc8hRxyhNOQboU,1076
 cmdbox/logconf_mcp.yml,sha256=pED0i1iKP8UoyXE0amFMA5kjV7Qc6_eJCUDVen3L4AU,1069
 cmdbox/logconf_server.yml,sha256=n3c5-KVzjUzcUX5BQ6uE-PN9rp81yXaJql3whyCcSDQ,1091
 cmdbox/logconf_web.yml,sha256=pPbdAwckbK0cgduxcVkx2mbk-Ymz5hVzR4guIsfApMQ,1076
-cmdbox/version.py,sha256=D2SuxXcqjci3LXjKKBnrM3ZdICKSmwsWfg6308ElaMQ,2110
+cmdbox/version.py,sha256=HTU-X6-2WVXAPOXs7dqpmC2oYd3v69th6uurBQSFxUg,2108
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/app.py,sha256=_UJqSTs3LStGSu3vLMTqOKmpL4x7NQAQb2hUMbEFcg4,9639
 cmdbox/app/client.py,sha256=n986lXeV7hhaki4iyyvsfhNptmCXDFphxlNoNe2XhKg,19542
-cmdbox/app/common.py,sha256=MQQab5rboKS2oNDAWbKR8LYoSXW_i1vgD1rFAwBMExU,27712
+cmdbox/app/common.py,sha256=iY4Bl9r0MSSDhZ9Ep3Y45MVBapurKpwkBNCHYb-COnY,28130
 cmdbox/app/edge.py,sha256=2Aav7n4skhP0FUvG6_3JKijHHozA-WcwALgEwNB0DUI,41439
 cmdbox/app/edge_tool.py,sha256=HXxr4Or8QaZ5ueYIN3huv8GnXSnV28RZCmZBUEfiIk0,8062
 cmdbox/app/feature.py,sha256=fK7JP1fc8b9k1zhSNOkWq02ad8i-_wuAX5kyyK2TZdE,10391
 cmdbox/app/filer.py,sha256=L_DSMTvnbN_ffr3JIt0obbOmVoTHEfVm2cAVz3rLH-Q,16059
-cmdbox/app/mcp.py,sha256=eLPGd_fWohPalW4ss7UApAfSys40bWknkjdvSI0zyGo,30001
-cmdbox/app/options.py,sha256=Wz2GYnuhwBieFbA3zHl2WIXsKANVWvX8Bw3MK408xPs,46220
+cmdbox/app/mcp.py,sha256=ZzpfaZHgNSrTY5Jj5KZzm28LLtW7cAMrS8-NSf6eGMc,32635
+cmdbox/app/options.py,sha256=GVGq9ID46czZsWNlCHkVf33DrM-1oY5ea90ej1-UnFQ,46268
 cmdbox/app/server.py,sha256=woOmIk901ONn5a_2yz_b3I1JpLYIF8g42uQRd0_MRuQ,10417
-cmdbox/app/web.py,sha256=5eUtb60Vb_6RK62IWbJDPFNvAVsf1THw7knp3uGmMGg,53559
+cmdbox/app/web.py,sha256=1T4cRg6TnhB7LA37sePZFgnZAc1hARC7qS6DrRGFcEc,54035
 cmdbox/app/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/auth/azure_signin.py,sha256=jJlIZJIGLZCngnJgoxBajaD2s8nM7QoszuN6-FT-5h8,1953
 cmdbox/app/auth/azure_signin_saml.py,sha256=oM2buGTK4t6-OsUuiUXTlZk0YXZL01khuPYVB84dMDU,472
 cmdbox/app/auth/github_signin.py,sha256=dg_3eu7iikTfp9mxYQscQXtFspmJIuasGZ43icCeC3k,1510
 cmdbox/app/auth/google_signin.py,sha256=LErFkKniumKgfE5jlY9_lAneKlqD6BfLHxg2lZgv_zE,1382
-cmdbox/app/auth/signin.py,sha256=8xmj19Dt5DypWqd5yJ0KFgxmL6Vbp-mwZoPKuqEwfmc,59953
+cmdbox/app/auth/signin.py,sha256=wBnZMmi7i4BehlfJtXg4owr5HDLOzQCS6Lc2UO-2dPQ,60022
 cmdbox/app/auth/signin_saml.py,sha256=MUM_hqCEjT-8xXNMHa-iH2j24SdBls4SU3k4BopRd48,2457
 cmdbox/app/commons/convert.py,sha256=mkXPNQtX_pEH4L5DzonOY6Dh38SzJ5JQma_EY7UDBqU,7078
 cmdbox/app/commons/loghandler.py,sha256=bcKTDqSlUcVpO-6vYGijZcLdJlXn7ewx9MT_N7RhgAY,6323
@@ -38,7 +38,7 @@ cmdbox/app/features/cli/agent_base.py,sha256=FShwbXWCfU-pXNTRaWfV_9z5FKeczxWsxid
 cmdbox/app/features/cli/audit_base.py,sha256=X_FvKsN_j8uVg96yifzmtXuAqGIPklihlfmhb_FvOgM,9405
 cmdbox/app/features/cli/cmdbox_audit_createdb.py,sha256=S-rE9bUOKQLg8GizVQCKhqf0fr3JapcrqNCzoSzmNLc,12133
 cmdbox/app/features/cli/cmdbox_audit_delete.py,sha256=OVPu0uIHgkJpeALILPY4lzL-gy61uywMN3KIP7lst8g,18922
-cmdbox/app/features/cli/cmdbox_audit_search.py,sha256=eCvBEogZLjqe5QmCtu4ptPKElnvg1fYPvasUL0ArdAQ,31071
+cmdbox/app/features/cli/cmdbox_audit_search.py,sha256=sSwdjaCWGiRkD_WHM4YFZFxv7kO1aY4693DnZHFvK8Y,31400
 cmdbox/app/features/cli/cmdbox_audit_write.py,sha256=Yv8SwY4nfSE0BsMJ5lz_AfiI0K_wjg6RdIK6L0kwcfU,15541
 cmdbox/app/features/cli/cmdbox_client_file_copy.py,sha256=wwth8zHslc-mm5iPGJOMXhTqeZ_tZcRSo1LIk_7v53o,13093
 cmdbox/app/features/cli/cmdbox_client_file_download.py,sha256=YzoqJPvBlg8Kwos-3RjFrPjpVVV5qjNPSB_npofdSL8,13239
@@ -48,8 +48,9 @@ cmdbox/app/features/cli/cmdbox_client_file_move.py,sha256=eSj08rmHseZDrqgit5_Jek
 cmdbox/app/features/cli/cmdbox_client_file_remove.py,sha256=oupYP04CbAZ-x7MaODjSTuXaHqHTWzuWrOtq00U3rWQ,11554
 cmdbox/app/features/cli/cmdbox_client_file_rmdir.py,sha256=E32Av7_0g-Rlesr9onc4iu-HZGtjfgaM_frLW2jMF7Y,11530
 cmdbox/app/features/cli/cmdbox_client_file_upload.py,sha256=-sAqQiIpqH4wWfv_IAN2EYafHzNjFnOOfuLjyjHPwLc,13407
+cmdbox/app/features/cli/cmdbox_client_http.py,sha256=07nR3MU5BMNcdLza3iaj0cvBfpU0F4YKccq3b6tRC8Q,10004
 cmdbox/app/features/cli/cmdbox_client_server_info.py,sha256=tBGOfFxUQojkVu_o8Jv-VR2QSMnxSLN6EBtHZy5NU6k,9575
-cmdbox/app/features/cli/cmdbox_cmd_list.py,sha256=SUieS8cEH3lNHeFxer1m-e8XBTd8_fE2-mrPfcnHw2A,6682
+cmdbox/app/features/cli/cmdbox_cmd_list.py,sha256=CNH8jfviZxH5WH1r1O1E2ilkq0J2JBmFGgHSbYrANnQ,6926
 cmdbox/app/features/cli/cmdbox_cmd_load.py,sha256=U1NWnJ_bjGOMCp9mtaqt4ujaDtPkhGnybupX-h15Tuw,6747
 cmdbox/app/features/cli/cmdbox_edge_config.py,sha256=2fppuJ5yAiepq5i4Qj_1w3ciSXhy1sFDK6FFOw5sB68,9472
 cmdbox/app/features/cli/cmdbox_edge_start.py,sha256=PVkvRBaepxqdjswUp1JzQqfzD5xdiPaZYXy72P0rlDE,3823
@@ -68,7 +69,7 @@ cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=p4VdIUv-hh0eXqV5ITyBFRUxG
 cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=qssAhZmY0wKfkpQ6UycT7G-_qQpyyE_T7w_hupgsajE,6629
 cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=04U741NeIGqeuId8m2oSOFgSguQuTK0_Krt0nSMATrw,7358
 cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=4oITsdUEkPW4jZQOTiDQkgawJTUfxEyn1YFxDuf9SVk,6724
-cmdbox/app/features/cli/cmdbox_web_start.py,sha256=1enJE1AOzPADpebFjKpGV-QqNFmfXz44W0nknN4bGGE,17836
+cmdbox/app/features/cli/cmdbox_web_start.py,sha256=uNFXWpmrhMY6AEzYgf5RXlkc7yzHJIIJZs5dJ_7TZNU,17848
 cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=5ja4IiWRSpfRrWfoRncMRmofEYj8MDfIFUcWfDtIOQ4,3567
 cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=WsuW1rt27dhxIY7aD_xyZblyEhBqq4Z_doE4Gd75O68,8611
 cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=t5CpPO4J9Wl2paBqSY_rA9vEYLXSxrYFB999Cvd-ZMU,6592
@@ -110,7 +111,7 @@ cmdbox/app/features/web/cmdbox_web_users.py,sha256=LZ3BUudBF21wqGO5EWwKvyLMxK_gE
 cmdbox/app/features/web/cmdbox_web_usesignout.py,sha256=lBjBj8M8e69uXhdv7H92wZfRRWD2j6kmC_WekSCw5yo,682
 cmdbox/app/features/web/cmdbox_web_versions_cmdbox.py,sha256=hG4ikQc0Qr6He8AhYu8kK1GD5TNjezr-VpmCSAFL7Nk,818
 cmdbox/app/features/web/cmdbox_web_versions_used.py,sha256=xA368ASudYFIrJjWOC1MGmsaAE3Mdd5i-Y8sZBWL7p4,1322
-cmdbox/extensions/features.yml,sha256=j8j3YIy34w0sprI1A1pwklZGH9KN80UdWuCpKcqVkfc,6699
+cmdbox/extensions/features.yml,sha256=Dr8C8x3381oxQmigCM9OEDbOHuYEUCeqbJhIyjSMADk,6749
 cmdbox/extensions/user_list.yml,sha256=P_KdBu9VmNDEh9rEQ4QGKObpeXb34wMF4__uOShLh44,13098
 cmdbox/extensions/sample_project/requirements.txt,sha256=z_gUanGVrPeYUExYeU5_gHiOTy8RKZkaJSeKxOM4mqY,18
 cmdbox/extensions/sample_project/.vscode/launch.json,sha256=Bj_FO1P0lPMfuwZxvyLfwQa0f7Gk276dvcVRjj2aem4,1348
@@ -123,8 +124,8 @@ cmdbox/extensions/sample_project/sample/app/features/cli/__init__.py,sha256=47DE
 cmdbox/extensions/sample_project/sample/app/features/cli/sample_client_time.py,sha256=276227PBveyHqWXah5CHQUWeJZ1W2AA6ujB9Zw8Ydh8,3131
 cmdbox/extensions/sample_project/sample/app/features/cli/sample_server_time.py,sha256=vpMBd-7gymFP9qcpFf9uvPp8dxn5qQv6VcoFw4lSZuo,7444
 cmdbox/extensions/sample_project/sample/app/features/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cmdbox/extensions/sample_project/sample/extensions/features.yml,sha256=Jn7kZVH95VU0bF6p2K2Wzv7V8u4AkUqi-_Fco5AwLoU,7374
-cmdbox/extensions/sample_project/sample/extensions/user_list.yml,sha256=ES9XHqBmD05-PtdCdxnD_0NazJfPR1ZmlL3DHlg-cxk,10577
+cmdbox/extensions/sample_project/sample/extensions/features.yml,sha256=JKPm-yRs3Ik41zmuoHPh5oua-G7ricGMMpMQGP9YrcQ,7084
+cmdbox/extensions/sample_project/sample/extensions/user_list.yml,sha256=P_KdBu9VmNDEh9rEQ4QGKObpeXb34wMF4__uOShLh44,13098
 cmdbox/extensions/sample_project/sample/web/assets/sample/favicon.ico,sha256=z-jwmfktVBIsYjhUfCOj7ZNiq55GH-uXtbbDRzk7DHQ,9662
 cmdbox/extensions/sample_project/sample/web/assets/sample/icon.png,sha256=8WmOhepVHG46KG8Sjs4OjZht16dTcgpsNIs972PiVWU,327723
 cmdbox/licenses/LICENSE_Authlib_1_6_0_BSD_License.txt,sha256=jYKqOj5UKtBY_y34_upU28Iok0WYyCO-8x-80yVPgd4,1543
@@ -318,7 +319,7 @@ 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=NJwNfnIzTP23qGsuQr7ov-u4Mo9ibU7h3FN66-yTEpA,15763
+cmdbox/web/assets/cmdbox/agent.js,sha256=IsvuprldT7iySd_3FHx63_Rj30f0pKfW51l3s2wzt8I,15808
 cmdbox/web/assets/cmdbox/audit.js,sha256=YDPQaThJSH-iBHvVK16JO4pyGZBoo-rCZou00D8x3yU,19346
 cmdbox/web/assets/cmdbox/color_mode.css,sha256=U4UGBnWiBMcrSEEusgT-_o-pt4MP3myoA9Lgnn1g6qE,19803
 cmdbox/web/assets/cmdbox/common.js,sha256=Aoq7CB9FRxpL_x-7-2a92nUSied9SoDd8B-hG--1qeU,69673
@@ -335,7 +336,7 @@ cmdbox/web/assets/cmdbox/signin.js,sha256=ZEVJJfYlcROSvEfzlnKBU-ZWU89b5YrwOsAWli
 cmdbox/web/assets/cmdbox/svgicon.js,sha256=zXaAD2CiPW9vBannU1EeM6-QV6H_9tWD_d0461pn6pI,12563
 cmdbox/web/assets/cmdbox/users.js,sha256=cMWwoEPigCeJVC_HLy2P8CgFek0Zp7oZDu0IZpWMhHY,30195
 cmdbox/web/assets/cmdbox/view_raw.js,sha256=Cyp3m-BjWGzFXyPCkruQu2d6Wtv5xy2ZGHcVOy0xmSA,2668
-cmdbox/web/assets/cmdbox/view_result.js,sha256=CQymfJZ4PvJZex0WJinH88xchF_6wSZYH1bBZ2ZGJ-w,6831
+cmdbox/web/assets/cmdbox/view_result.js,sha256=yfodJByYU5LYf_UTmBa7NoXLsXYIVvsPk2BEHPmaONE,6888
 cmdbox/web/assets/encodingjs/LICENSE.txt,sha256=mBdECJD6rOMBa4VSrrJFzs67vFDvGuMPVtxvvDbgi9o,1070
 cmdbox/web/assets/encodingjs/encoding.js,sha256=pMUL__JEPZ0hHv1iH1kt-zwfDwJcDzzrD1JpdhEKBy8,297288
 cmdbox/web/assets/encodingjs/encoding.min.js,sha256=Q8LqZsCp1UpROsdrkt6K7gL0XriXIxjVrziq5WrDWBM,227869
@@ -378,9 +379,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.2.3.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.6.2.3.dist-info/METADATA,sha256=EcpTJ3fQD3zwZYQYX-e7wD8B1lO8DOa2ykM_Qj7OwnA,33524
-cmdbox-0.6.2.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.6.2.3.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
-cmdbox-0.6.2.3.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.6.2.3.dist-info/RECORD,,
+cmdbox-0.6.3.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.6.3.dist-info/METADATA,sha256=o68uXEPaEhHqDp9HvcnpzP4qXBc9KTt8-sLqUcrJjX4,33522
+cmdbox-0.6.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.6.3.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
+cmdbox-0.6.3.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.6.3.dist-info/RECORD,,