cmdbox 0.6.3.2__py3-none-any.whl → 0.6.4.1__py3-none-any.whl

cmdbox/app/mcp.py

@@ -49,21 +49,21 @@ class Mcp:
             Any: FastMCP
         """
         from fastmcp import FastMCP
-        from fastmcp.server.auth import BearerAuthProvider
+        from fastmcp.server.auth.providers.jwt import JWTVerifier
         cls = self.signin.__class__
         publickey_str = cls.verify_jwt_publickey_str if hasattr(cls, 'verify_jwt_publickey_str') else None
         issuer = cls.verify_jwt_issuer if hasattr(cls, 'verify_jwt_issuer') else None
         audience = cls.verify_jwt_audience if hasattr(cls, 'verify_jwt_audience') else None
         if publickey_str is not None and issuer is not None and audience is not None:
-            self.logger.info(f"Using BearerAuthProvider with public key, issuer: {issuer}, audience: {audience}")
-            auth = BearerAuthProvider(
+            self.logger.info(f"Using JWTVerifier with public key, issuer: {issuer}, audience: {audience}")
+            auth = JWTVerifier(
                 public_key=publickey_str,
                 issuer=issuer,
                 audience=audience
             )
             mcp = FastMCP(name=self.ver.__appid__, auth=auth, tools=tools)
         else:
-            self.logger.info(f"Using BearerAuthProvider without public key, issuer, or audience.")
+            self.logger.info(f"Using JWTVerifier without public key, issuer, or audience.")
             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))
@@ -81,8 +81,9 @@ class Mcp:
         """
         from google.adk.events import Event
         from google.adk.sessions import DatabaseSessionService, InMemorySessionService, session
-        from typing_extensions import override
+        #from typing_extensions import override
         if hasattr(args, 'agent_session_dburl') and args.agent_session_dburl is not None:
+            """
             class _DatabaseSessionService(DatabaseSessionService):
                 @override
                 async def append_event(self, session: session.Session, event: Event) -> Event:
@@ -98,6 +99,8 @@ class Mcp:
                     ret.content.parts = bk_parts
                     return ret
             dss = _DatabaseSessionService(db_url=args.agent_session_dburl)
+            """
+            dss = DatabaseSessionService(db_url=args.agent_session_dburl)
             #dss.db_engine.echo = True
             return dss
         else:
@@ -328,6 +331,9 @@ class Mcp:
         func_txt += f'        Dict[str, Any]: 実行結果\n'
         func_txt += f'    """\n'
         func_txt += f'    logger = logging.getLogger("web")\n'
+        func_txt += f'    if not options.get_cmd_attr("'+mode+'", "'+cmd+'", "use_agent"):\n'
+        func_txt += f'        logger.warning("{func_name} is not allowed to be executed by the system.")\n'
+        func_txt += f'        return dict(warn="{func_name} is not allowed to be executed by the system.")\n'
         func_txt +=  '    opt = {o["opt"]: kwargs.get(o["opt"], o["default"]) for o in options.get_cmd_choices("'+mode+'", "'+cmd+'", False)}\n'
         func_txt += f'    opt["data"] = Path(opt["data"]) if hasattr(opt, "data") else common.HOME_DIR / f".{self.ver.__appid__}"\n'
         func_txt += f'    if "{title}":\n'
@@ -379,7 +385,7 @@ class Mcp:
         Returns:
             ToolList: ToolListのリスト
         """
-        tool_list = ToolList(self, logger)
+        tool_list = ToolList(self, logger, self.data)
         tool_list.extract_callable = extract_callable
         return tool_list
 
@@ -461,13 +467,14 @@ class Mcp:
         return runner, mcp
 
 class ToolList(object):
-    def __init__(self, mcp:Mcp, logger:logging.Logger, *args:List):
+    def __init__(self, mcp:Mcp, logger:logging.Logger, data:Path, *args:List):
         """
         ツールリストを初期化します
 
         Args:
             mcp (Mcp): MCPインスタンス
             logger (logging.Logger): ロガー
+            data (Path): データパス
             *args (List): 追加するツールのリスト
         """
         from fastmcp.tools import FunctionTool
@@ -477,6 +484,7 @@ class ToolList(object):
         self.tools = []
         self.mcp = mcp
         self.logger = logger
+        self.data = data
         self.extract_callable = False
         for mode in options.get_mode_keys():
             for cmd in options.get_cmd_keys(mode):
@@ -602,7 +610,7 @@ class ToolList(object):
         options = Options.getInstance()
         is_japan = common.is_japan()
         ret_tools = self.tools.copy()
-        web = Web.getInstance()
+        web = Web.getInstance(self.logger, self.data)
         if web.signin.signin_file_data is None:
             # サインインファイルが読み込まれていない場合は登録済みのリストを返す
             if self.extract_callable:
@@ -633,6 +641,9 @@ class ToolList(object):
         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 ''
+            # ユーザーコマンドもfeatures.ymlの定義に従って実行許可するかどうか。
+            #if not options.get_cmd_attr(mode, cmd, 'use_agent'):
+            #    continue
             choices = options.get_cmd_choices(mode, cmd, False)
             description += '\n' + options.get_cmd_attr(mode, cmd, 'description_ja' if is_japan else 'description_en')
             # 関数の定義を生成

cmdbox/app/options.py

@@ -8,10 +8,8 @@ from starlette.routing import Route
 from typing import List, Dict, Any 
 import argparse
 import functools
-import locale
 import logging
 import re
-import time
 import uuid
 
 
@@ -179,8 +177,7 @@ class Options:
                 opt['action'] = 'append' if val['multi'] else None
             o = [f'-{val["short"]}'] if "short" in val else []
             o += [f'--{key}']
-            language, _ = locale.getlocale()
-            opt['help'] = val['description_en'] if language.find('Japan') < 0 and language.find('ja_JP') < 0 else val['description_ja']
+            opt['help'] = val['description_en'] if not common.is_japan() else val['description_ja']
             opt['default'] = val['default']
             if val['multi'] and val['default'] is not None:
                 raise ValueError(f'list_options: The default value must be None if multi is True. key={key}, val={val}')
@@ -300,6 +297,11 @@ class Options:
             description_ja="このコマンド登録の説明文を指定します。Agentがこのコマンドの用途を理解するのに使用します。",
             description_en="Specifies a description of this command registration, used to help the Agent understand the use of this command.",
             choice=None)
+        self._options["logsv"] = dict(
+            type=Options.T_BOOL, default=False, required=False, multi=False, hide=True,
+            description_ja="logsvを有効にします。logsvは複数のプロセスがログファイルへの書き込みを同期するための機能です。すでにlogsvが有効なプロセスがある場合は無視されます。",
+            description_en="Enables logsv. Logsv is a feature that synchronizes log file writing among multiple processes. If there is already an active process with logsv enabled, it will be ignored.",
+            choice=[False, True])
 
     def init_debugoption(self):
         # デバックオプションを追加
@@ -368,20 +370,7 @@ class Options:
         """
         return ftype in self.features_loaded and self.features_loaded[ftype]
 
-    def load_features_file(self, ftype:str, func, appcls, ver, logger:logging.Logger=None):
-        """
-        フィーチャーファイル（features.yml）を読み込みます。
-
-        Args:
-            ftype (str): フィーチャータイプ。cli又はweb
-            func (Any): フィーチャーの処理関数
-            appcls (Any): アプリケーションクラス
-            ver (Any): バージョンモジュール
-            logger (logging.Logger): ロガー
-        """
-        # 読込み済みかどうかの判定
-        if self.is_features_loaded(ftype):
-            return
+    def _load_features_yml(self, ver, logger:logging.Logger=None):
         # cmdboxを拡張したアプリをカスタマイズするときのfeatures.ymlを読み込む
         features_yml = Path(f'.{ver.__appid__}/features.yml')
         if not features_yml.exists() or not features_yml.is_file():
@@ -398,35 +387,51 @@ class Options:
                     logger.debug(f"features.yml data: {yml}")
             else:
                 yml = self.features_yml_data
-            if yml is None: return
-            if 'features' not in yml:
-                raise Exception('features.yml is invalid. (The root element must be "features".)')
-            if ftype not in yml['features']:
-                raise Exception(f'features.yml is invalid. (There is no “{ftype}” in the “features” element.)')
-            if yml['features'][ftype] is None:
-                return
-            if type(yml['features'][ftype]) is not list:
-                raise Exception(f'features.yml is invalid. (The “features.{ftype} element must be a list. {ftype}={yml["features"][ftype]})')
-            # featureモジュール読込みの前にagentruleの読み込み
-            self.load_features_agentrule(logger)
-            for data in yml['features'][ftype]:
-                if type(data) is not dict:
-                    raise Exception(f'features.yml is invalid. (The “features.{ftype}” element must be a list element must be a dictionary. data={data})')
-                if 'package' not in data:
-                    raise Exception(f'features.yml is invalid. (The “package” element must be in the dictionary of the list element of the “features.{ftype}” element. data={data})')
-                if 'prefix' not in data:
-                    raise Exception(f'features.yml is invalid. (The prefix element must be in the dictionary of the list element of the “features.{ftype}” element. data={data})')
-                if data['package'] is None or data['package'] == "":
-                    continue
-                if data['prefix'] is None or data['prefix'] == "":
-                    continue
-                exclude_modules = []
-                if 'exclude_modules' in data:
-                    if type(data['exclude_modules']) is not list:
-                        raise Exception(f'features.yml is invalid. (The “exclude_modules” element must be a list element. data={data})')
-                    exclude_modules = data['exclude_modules']
-                func(data['package'], data['prefix'], exclude_modules, appcls, ver, logger, self.is_features_loaded(ftype))
-                self.features_loaded[ftype] = True
+            return yml
+        return None
+
+    def load_features_file(self, ftype:str, func, appcls, ver, logger:logging.Logger=None):
+        """
+        フィーチャーファイル（features.yml）を読み込みます。
+
+        Args:
+            ftype (str): フィーチャータイプ。cli又はweb
+            func (Any): フィーチャーの処理関数
+            appcls (Any): アプリケーションクラス
+            ver (Any): バージョンモジュール
+            logger (logging.Logger): ロガー
+        """
+        # 読込み済みかどうかの判定
+        if self.is_features_loaded(ftype):
+            return
+        yml = self._load_features_yml(ver, logger)
+        if yml is None: return
+        if 'features' not in yml:
+            raise Exception('features.yml is invalid. (The root element must be "features".)')
+        if ftype not in yml['features']:
+            raise Exception(f'features.yml is invalid. (There is no “{ftype}” in the “features” element.)')
+        if yml['features'][ftype] is None:
+            return
+        if type(yml['features'][ftype]) is not list:
+            raise Exception(f'features.yml is invalid. (The “features.{ftype} element must be a list. {ftype}={yml["features"][ftype]})')
+        for data in yml['features'][ftype]:
+            if type(data) is not dict:
+                raise Exception(f'features.yml is invalid. (The “features.{ftype}” element must be a list element must be a dictionary. data={data})')
+            if 'package' not in data:
+                raise Exception(f'features.yml is invalid. (The “package” element must be in the dictionary of the list element of the “features.{ftype}” element. data={data})')
+            if 'prefix' not in data:
+                raise Exception(f'features.yml is invalid. (The prefix element must be in the dictionary of the list element of the “features.{ftype}” element. data={data})')
+            if data['package'] is None or data['package'] == "":
+                continue
+            if data['prefix'] is None or data['prefix'] == "":
+                continue
+            exclude_modules = []
+            if 'exclude_modules' in data:
+                if type(data['exclude_modules']) is not list:
+                    raise Exception(f'features.yml is invalid. (The “exclude_modules” element must be a list element. data={data})')
+                exclude_modules = data['exclude_modules']
+            func(data['package'], data['prefix'], exclude_modules, appcls, ver, logger, self.is_features_loaded(ftype))
+            self.features_loaded[ftype] = True
 
 
     def load_features_args(self, args_dict:Dict[str, Any]):