cmdbox 0.6.2.3__tar.gz → 0.6.2.4__tar.gz

{cmdbox-0.6.2.3/cmdbox.egg-info → cmdbox-0.6.2.4}/PKG-INFO

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

{cmdbox-0.6.2.3 → cmdbox-0.6.2.4}/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-0.6.2.3 → cmdbox-0.6.2.4}/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-0.6.2.3 → cmdbox-0.6.2.4}/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-0.6.2.3 → cmdbox-0.6.2.4}/cmdbox/app/mcp.py

@@ -35,11 +35,12 @@ 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:List[Any], web:Any) -> Any:
         """
         mcpserverを作成します
 
         Args:
+            logger (logging.Logger): ロガー
             args (argparse.Namespace): 引数
             tools (List[Any]): ツールのリスト
             web (Any): Web関連のオブジェクト
@@ -60,13 +61,85 @@ class Mcp:
                 issuer=issuer,
                 audience=audience
             )
-            mcp = FastMCP(name=self.ver.__appid__, tools=tools, auth=auth)
+            mcp = FastMCP(name=self.ver.__appid__, auth=auth)
         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))
+
+        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
+        _self_mcp = self
+        from cmdbox.app.web import Web
+        from fastmcp.tools import tool, tool_manager
+        class CustomToolManager(tool_manager.ToolManager):
+            async def _load_tools(self, *, via_server: bool = False) -> dict[str, tool.Tool]:
+                if hasattr(self, '_tools') and self._tools:
+                    return self._tools
+                ret = await super()._load_tools(via_server=via_server)
+                #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")
+                #    raise Exception("Unable to execute command because authentication information cannot be obtained")
+                #groups = scope["req"].session["signin"]["groups"]
+                ret_tools = dict()
+                # システムコマンドリストのフィルタリング
+                for func in 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[func.name] = func
+                #　ユーザーコマンドリストの取得(すべてのコマンドを取得するためにgroupsをadminに設定)
+                args = argparse.Namespace(data=web.data, signin_file=signin_file, groups=['admin'], 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 = 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 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_mcp._to_schema(o, is_japan) for o in choices},
+                        required=[],
+                    )
+                    output_schema = dict(type="object", properties=dict())
+                    func_tool = 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[func_name] = func_tool
+                self._tools = ret_tools
+                return ret_tools
+        mcp._tool_manager = CustomToolManager(
+            duplicate_behavior=mcp._tool_manager.duplicate_behavior,
+            mask_error_details=mcp._tool_manager.mask_error_details
+        )
         return mcp
 
     def create_session_service(self, args:argparse.Namespace) -> Any:
@@ -335,6 +408,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 +431,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'
@@ -411,87 +488,6 @@ class Mcp:
                 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): 引数
-
-        Returns:
-            Any: ミドルウェア
-        """
-        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()
-
     def create_mw_logging(self, logger:logging.Logger, args:argparse.Namespace) -> Any:
         """
         ログ出力用のミドルウェアを作成します
@@ -563,7 +559,7 @@ class Mcp:
         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)
+        mcp:FastMCP = self.create_mcpserver(logger, args, tools, web)
         root_agent = self.create_agent(logger, args, [t.fn for t in tools])
         runner = self.create_runner(logger, args, session_service, root_agent)
         if logger.level == logging.DEBUG:

{cmdbox-0.6.2.3 → cmdbox-0.6.2.4}/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,

{cmdbox-0.6.2.3/cmdbox/extensions/sample_project/sample → cmdbox-0.6.2.4/cmdbox}/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-0.6.2.3 → cmdbox-0.6.2.4}/cmdbox/version.py

@@ -1,10 +1,10 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 7, 13)
+dt_now = datetime.datetime(2025, 7, 16)
 days_ago = (datetime.datetime.now() - dt_now).days
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.6.2.3'
+__version__ = '0.6.2.4'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'

{cmdbox-0.6.2.3 → cmdbox-0.6.2.4}/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-0.6.2.3 → cmdbox-0.6.2.4/cmdbox.egg-info}/PKG-INFO

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