cmdbox 0.6.0__tar.gz → 0.6.0.2__tar.gz

{cmdbox-0.6.0/cmdbox.egg-info → cmdbox-0.6.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.0
+Version: 0.6.0.2
 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.0 → cmdbox-0.6.0.2}/cmdbox/app/common.py

@@ -93,32 +93,35 @@ def save_yml(yml_path:Path, data:dict) -> None:
     with open(yml_path, 'w') as f:
         yaml.dump(data, f, default_flow_style=False, sort_keys=False)
 
-def reset_logger(name:str, stderr:bool=False, fmt:str='%(message)s') -> None:
+def reset_logger(name:str, stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s - %(message)s', datefmt:str='%Y-%m-%d %H:%M:%S') -> None:
     """
     指定されたロガーのハンドラをクリアし、新しいハンドラを追加します。
     Args:
         name (str): ロガーの名前
         stderr (bool, optional): 標準エラー出力を使用するかどうか. Defaults to False.
-        fmt (str, optional): ログフォーマット. Defaults to '%(message)s'.
+        fmt (str, optional): ログフォーマット. Defaults to '[%(asctime)s] %(levelname)s - %(message)s'.
+        datefmt (str, optional): 日時フォーマット. Defaults to '%Y-%m-%d %H:%M:%S'.
     """
     logger = logging.getLogger(name)
     logger.handlers.clear()
     logger.propagate = False
-    logger.addHandler(create_log_handler(stderr, fmt))
+    logger.addHandler(create_log_handler(stderr, fmt, datefmt))
 
-def create_log_handler(stderr:bool=False, fmt:str='%(message)s') -> logging.Handler:
+def create_log_handler(stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s - %(message)s', datefmt:str='%Y-%m-%d %H:%M:%S') -> logging.Handler:
     """
     ログハンドラを生成します。
 
     Args:
         stderr (bool, optional): 標準エラー出力を使用するかどうか. Defaults to False.
-        fmt (str, optional): ログフォーマット. Defaults to '%(message)s'.
+        fmt (str, optional): ログフォーマット. Defaults to '[%(asctime)s] %(levelname)s - %(message)s'.
+        datefmt (str, optional): 日時フォーマット. Defaults to '%Y-%m-%d %H:%M:%S'.
     Returns:
         logging.Handler: ログハンドラ
     """
-    formatter = logging.Formatter(fmt)
-    handler = RichHandler(console=Console(stderr=stderr), show_path=False, omit_repeated_times=False,
-                          tracebacks_word_wrap=False, log_time_format='[%Y-%m-%d %H:%M]')
+    formatter = logging.Formatter(fmt, datefmt)
+    #handler = RichHandler(console=Console(stderr=stderr), show_path=False, omit_repeated_times=False,
+    #                      tracebacks_word_wrap=False, log_time_format='[%Y-%m-%d %H:%M]')
+    handler = loghandler.ColorfulStreamHandler(sys.stdout if not stderr else sys.stderr)
     handler.setFormatter(formatter)
     return handler
 
@@ -132,7 +135,9 @@ def create_console(stderr:bool=False, file=None) -> Console:
     Returns:
         Console: コンソール
     """
-    console = Console(stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M]')
+    console = Console(height=False,
+                      soft_wrap=False, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
+    #console = Console(soft_wrap=True, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
     return console
 
 def default_logger(debug:bool=False, ver=version, webcall:bool=False) -> logging.Logger:
@@ -149,8 +154,6 @@ def default_logger(debug:bool=False, ver=version, webcall:bool=False) -> logging
     """
     logger = logging.getLogger(ver.__appid__)
     if not webcall:
-        #formatter = logging.Formatter('%(levelname)s[%(asctime)s] - %(message)s')
-        #handler = loghandler.ColorfulStreamHandler(sys.stdout)
         handler = create_log_handler()
         handler.setLevel(logging.DEBUG if debug else logging.INFO)
         logger.addHandler(handler)

cmdbox-0.6.0.2/cmdbox/app/commons/loghandler.py

@@ -0,0 +1,153 @@
+from rich.console import Console
+from rich import highlighter
+from rich.theme import Theme
+import re
+import logging
+import logging.handlers
+
+class Colors:
+    S = "\033["
+    D = ";"
+    E = "m"
+    # https://pkg.go.dev/github.com/whitedevops/colors
+    ResetAll = 0
+
+    Bold       = 1
+    Dim        = 2
+    Underlined = 4
+    Blink      = 5
+    Reverse    = 7
+    Hidden     = 8
+
+    ResetBold       = 21
+    ResetDim        = 22
+    ResetUnderlined = 24
+    ResetBlink      = 25
+    ResetReverse    = 27
+    ResetHidden     = 28
+
+    Default      = 39
+    Black        = 30
+    Red          = 31
+    Green        = 32
+    Yellow       = 33
+    Blue         = 34
+    Magenta      = 35
+    Cyan         = 36
+    LightGray    = 37
+    DarkGray     = 90
+    LightRed     = 91
+    LightGreen   = 92
+    LightYellow  = 93
+    LightBlue    = 94
+    LightMagenta = 95
+    LightCyan    = 96
+    White        = 97
+
+    BackgroundDefault      = 49
+    BackgroundBlack        = 40
+    BackgroundRed          = 41
+    BackgroundGreen        = 42
+    BackgroundYellow       = 43
+    BackgroundBlue         = 44
+    BackgroundMagenta      = 45
+    BackgroundCyan         = 46
+    BackgroundLightGray    = 47
+    BackgroundDarkGray     = 100
+    BackgroundLightRed     = 101
+    BackgroundLightGreen   = 102
+    BackgroundLightYellow  = 103
+    BackgroundLightBlue    = 104
+    BackgroundLightMagenta = 105
+    BackgroundLightCyan    = 106
+    BackgroundWhite        = 107
+
+    _colorize_suffix = S + str(ResetAll) + E
+
+    product_word = re.compile(r"CMDBOX|IINFER|USOUND|GAIAN|GAIC|WITSHAPE", re.IGNORECASE)
+    success_word = re.compile(r"SUCCESS|OK|PASSED|DONE|COMPLETE|START|FINISH|OPEN|CONNECTED|ALLOW|EXEC", re.IGNORECASE)
+    warning_word = re.compile(r"WARNING|WARN|CAUTION|NOTICE|STOP|DISCONNECTED|DENY", re.IGNORECASE)
+    error_word = re.compile(r"ERROR|ALERT|CRITICAL|FATAL|ABORT|FAILED", re.IGNORECASE)
+
+def colorize(s:str, *colors:int) -> str:
+    return Colors.S + Colors.D.join(map(str, [Colors.ResetAll]+list(colors))) + Colors.E + s + Colors._colorize_suffix
+
+def colorize_msg(msg) -> str:
+    msg = Colors.success_word.sub(colorize(r"\g<0>", Colors.Green), msg)
+    msg = Colors.warning_word.sub(colorize(r"\g<0>", Colors.Yellow), msg)
+    msg = Colors.error_word.sub(colorize(r"\g<0>", Colors.Red), msg)
+    msg = Colors.product_word.sub(colorize(r"\g<0>", Colors.LightBlue), msg)
+    return msg
+
+level_mapping = {
+    logging.DEBUG:   f"{colorize('DEBUG', Colors.Bold, Colors.Cyan)}",
+    logging.INFO:    f"{colorize('INFO', Colors.Bold, Colors.Green)} ",
+    logging.WARNING: f"{colorize('WARN', Colors.Bold, Colors.Yellow)} ",
+    logging.ERROR:   f"{colorize('ERROR', Colors.Bold, Colors.Red)}",
+    logging.CRITICAL:f"{colorize('FATAL', Colors.Bold, Colors.LightGray, Colors.BackgroundRed)}"}
+
+level_mapping_nc = {
+    logging.DEBUG:   f"DEBUG",
+    logging.INFO:    f"INFO ",
+    logging.WARNING: f"WARN ",
+    logging.ERROR:   f"ERROR",
+    logging.CRITICAL:f"FATAL"}
+
+theme=Theme({
+    "repr.log_debug": "bold cyan",
+    "repr.log_info": "bold green",
+    "repr.log_warn": "bold Yellow",
+    "repr.log_error": "bold red",
+    "repr.log_fatal": "bold red reverse",
+    "repr.log_product": "dodger_blue2 reverse",
+    "repr.log_success": "green",})
+
+class LogLevelHighlighter(highlighter.ReprHighlighter):
+    def __init__(self):
+        #self.highlights = []
+        self.highlights.append(r"(?P<log_debug>DEBUG)")
+        self.highlights.append(r"(?P<log_info>INFO)")
+        self.highlights.append(r"(?P<log_warn>WARN|WARNING|WARN|CAUTION|NOTICE|STOP|DISCONNECTED|DENY)")
+        self.highlights.append(r"(?P<log_error>ERROR|ALERT|ABORT|FAILED)")
+        self.highlights.append(r"(?P<log_fatal>FATAL|CRITICAL)")
+        self.highlights.append(r"(?P<log_product>CMDBOX|IINFER|USOUND|GAIAN|GAIC|WITSHAPE)")
+        self.highlights.append(r"(?P<log_success>SUCCESS|OK|PASSED|DONE|COMPLETE|START|FINISH|OPEN|CONNECTED|ALLOW|EXEC)")
+        """
+        self.highlights.append(r"(?P<tag_start><)(?P<tag_name>[-\w.:|]*)(?P<tag_contents>[\w\W]*)(?P<tag_end>>)")
+        self.highlights.append(r'(?P<attrib_name>[\w_]{1,50})=(?P<attrib_value>"?[\w_]+"?)?')
+        self.highlights.append(r"(?P<brace>[][{}()])")
+        self.highlights.append(highlighter._combine_regex(
+            r"(?P<ipv4>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})",
+            r"(?P<ipv6>([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})",
+            r"(?P<eui64>(?:[0-9A-Fa-f]{1,2}-){7}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{1,2}:){7}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{4}\.){3}[0-9A-Fa-f]{4})",
+            r"(?P<eui48>(?:[0-9A-Fa-f]{1,2}-){5}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{1,2}:){5}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{4}\.){2}[0-9A-Fa-f]{4})",
+            r"(?P<uuid>[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12})",
+            r"(?P<call>[\w.]*?)\(",
+            r"\b(?P<bool_true>True)\b|\b(?P<bool_false>False)\b|\b(?P<none>None)\b",
+            r"(?P<ellipsis>\.\.\.)",
+            r"(?P<number_complex>(?<!\w)(?:\-?[0-9]+\.?[0-9]*(?:e[-+]?\d+?)?)(?:[-+](?:[0-9]+\.?[0-9]*(?:e[-+]?\d+)?))?j)",
+            r"(?P<number>(?<!\w)\-?[0-9]+\.?[0-9]*(e[-+]?\d+?)?\b|0x[0-9a-fA-F]*)",
+            r"(?P<path>\B(/[-\w._+]+)*\/)(?P<filename>[-\w._+]*)?",
+            r"(?<![\\\w])(?P<str>b?'''.*?(?<!\\)'''|b?'.*?(?<!\\)'|b?\"\"\".*?(?<!\\)\"\"\"|b?\".*?(?<!\\)\")",
+            r"(?P<url>(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~@]*)",
+        ))
+        """
+        self.highlights = [re.compile(h, re.IGNORECASE) for h in self.highlights]
+
+class ColorfulStreamHandler(logging.StreamHandler):
+    console = Console(soft_wrap=True, height=True, highlighter=LogLevelHighlighter(), theme=theme)
+
+    def emit(self, record: logging.LogRecord) -> None:
+        #record.levelname = level_mapping[record.levelno]
+        #record.asctime = colorize(record.asctime, Colors.Bold)
+        #record.msg = colorize_msg(record.msg)
+        #super().emit(record)
+        record.levelname = level_mapping_nc[record.levelno]
+        record.msg = self.format(record)
+        self.console.print(record.msg)
+
+class TimedRotatingFileHandler(logging.handlers.TimedRotatingFileHandler):
+    def emit(self, record: logging.LogRecord) -> None:
+        record.levelname = level_mapping_nc[record.levelno]
+        super().emit(record)
+

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/features/cli/agent_base.py

@@ -30,7 +30,8 @@ class AgentBase(feature.ResultEdgeFeature):
                 dict(opt="agent", type=Options.T_STR, default="no", required=False, multi=False, hide=False, choice=["no", "use"],
                      discription_ja="エージェントを使用するかどうかを指定します。",
                      discription_en="Specifies whether the agent is used.",
-                     choice_show=dict(use=["agent_name", "agent_description", "agent_instruction", "agent_session_store", "llmprov"],)),
+                     choice_show=dict(use=["agent_name", "agent_description", "agent_instruction", "agent_session_store", "llmprov",
+                                           "mcp_listen_port", "mcp_ssl_listen_port"],)),
                 dict(opt="agent_name", type=Options.T_STR, default=self.ver.__appid__, required=False, multi=False, hide=False, choice=None,
                      discription_ja="エージェント名を指定します。",
                      discription_en="Specifies the agent name."),
@@ -43,26 +44,26 @@ class AgentBase(feature.ResultEdgeFeature):
                 dict(opt="agent_session_store", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=['memory', 'sqlite', 'postgresql'],
                      discription_ja="エージェントのセッションを保存する方法を指定します。",
                      discription_en="Specify how the agent's session is to be saved.",
-                     choice_show=dict(postgresql=["pg_host", "pg_port", "pg_user", "pg_password", "pg_dbname"]),),
+                     choice_show=dict(postgresql=["agent_pg_host", "agent_pg_port", "agent_pg_user", "agent_pg_password", "agent_pg_dbname"]),),
                 dict(opt="mcp_listen_port", type=Options.T_INT, default="9081", required=False, multi=False, hide=False, choice=None,
                      discription_ja="省略した時は `9081` を使用します。",
                      discription_en="If omitted, `9081` is used."),
                 dict(opt="mcp_ssl_listen_port", type=Options.T_INT, default="9443", required=False, multi=False, hide=False, choice=None,
                      discription_ja="省略した時は `9443` を使用します。",
                      discription_en="If omitted, `9443` is used."),
-                dict(opt="pg_host", type=Options.T_STR, default='localhost', required=False, multi=False, hide=True, choice=None, web="mask",
+                dict(opt="agent_pg_host", type=Options.T_STR, default='localhost', required=False, multi=False, hide=False, choice=None, web="mask",
                      discription_ja="postgresqlホストを指定する。",
                      discription_en="Specify the postgresql host."),
-                dict(opt="pg_port", type=Options.T_INT, default=5432, required=False, multi=False, hide=True, choice=None, web="mask",
+                dict(opt="agent_pg_port", type=Options.T_INT, default=5432, required=False, multi=False, hide=False, choice=None, web="mask",
                      discription_ja="postgresqlのポートを指定する。",
                      discription_en="Specify the postgresql port."),
-                dict(opt="pg_user", type=Options.T_STR, default='postgres', required=False, multi=False, hide=True, choice=None, web="mask",
+                dict(opt="agent_pg_user", type=Options.T_STR, default='postgres', required=False, multi=False, hide=False, choice=None, web="mask",
                      discription_ja="postgresqlのユーザー名を指定する。",
                      discription_en="Specify the postgresql user name."),
-                dict(opt="pg_password", type=Options.T_STR, default='postgres', required=False, multi=False, hide=True, choice=None, web="mask",
+                dict(opt="agent_pg_password", type=Options.T_STR, default='postgres', required=False, multi=False, hide=False, choice=None, web="mask",
                      discription_ja="postgresqlのパスワードを指定する。",
                      discription_en="Specify the postgresql password."),
-                dict(opt="pg_dbname", type=Options.T_STR, default='agent', required=False, multi=False, hide=True, choice=None,
+                dict(opt="agent_pg_dbname", type=Options.T_STR, default='agent', required=False, multi=False, hide=False, choice=None,
                      discription_ja="postgresqlデータベース名を指定します。",
                      discription_en="Specify the postgresql database name."),
                 dict(opt="llmprov", type=Options.T_STR, default=None, required=False, multi=False, hide=False,
@@ -306,9 +307,10 @@ class AgentBase(feature.ResultEdgeFeature):
             agent = Agent(
                 name=args.agent_name,
                 model=LiteLlm(
-                    model=args.llmmodel,
-                    endpoint=args.llmendpoint,
+                    model=f"ollama/{args.llmmodel}",
+                    api_base=args.llmendpoint,
                     temperature=args.llmtemperature,
+                    stream=True
                 ),
                 description=description,
                 instruction=instruction,

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/features/cli/audit_base.py

@@ -84,12 +84,18 @@ class AuditBase(feature.ResultEdgeFeature):
             Any: データベース接続オブジェクト
         """
         if pg_enabled:
+            if logger.level == logging.DEBUG:
+                logger.debug(f"Initializing database with pg_enabled={pg_enabled}, pg_host={pg_host}, pg_port={pg_port}, pg_user={pg_user}, pg_dbname={pg_dbname}")
             constr = f"host={pg_host} port={pg_port} user={pg_user} password={pg_password} dbname={pg_dbname} connect_timeout=60"
             conn = psycopg.connect(constr, autocommit=False)
             cursor = conn.cursor()
             try:
                 cursor.execute("SELECT count(*) FROM information_schema.tables WHERE table_name='audit'")
-                if cursor.fetchone()[0] == 0:
+                row = cursor.fetchone()
+                if logger.level == logging.DEBUG:
+                    logger.debug(f"SQL query: SELECT count(*) FROM information_schema.tables WHERE table_name='audit'")
+                    logger.debug(f"SQL row  : {row}")
+                if row[0] == 0:
                     # テーブルが存在しない場合は作成
                     cursor.execute('''
                         CREATE TABLE IF NOT EXISTS audit (
@@ -107,16 +113,22 @@ class AuditBase(feature.ResultEdgeFeature):
                         )
                     ''')
             finally:
+                conn.commit()
                 cursor.close()
-                conn.rollback()
         else:
             db_path = data_dir / '.audit' / 'audit.db'
+            if logger.level == logging.DEBUG:
+                logger.debug(f"Initializing database with db_path={db_path}")
             db_path.parent.mkdir(parents=True, exist_ok=True)
             conn = sqlite3.connect(db_path)
             cursor = conn.cursor()
             try:
-                cursor.execute('SELECT COUNT(*) FROM sqlite_master WHERE TYPE="table" AND NAME="audit"')
-                if cursor.fetchone()[0] == 0:
+                cursor.execute("SELECT COUNT(*) FROM sqlite_master WHERE TYPE='table' AND NAME='audit'")
+                row = cursor.fetchone()
+                if logger.level == logging.DEBUG:
+                    logger.debug(f"SQL query: SELECT COUNT(*) FROM sqlite_master WHERE TYPE='table' AND NAME='audit'")
+                    logger.debug(f"SQL row  : {row}")
+                if row[0] == 0:
                     # テーブルが存在しない場合は作成
                     cursor.execute('''
                         CREATE TABLE IF NOT EXISTS audit (

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/features/cli/cmdbox_web_start.py

@@ -167,11 +167,12 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
                         assets=args.assets, signin_html=args.signin_html, signin_file=args.signin_file, gui_mode=args.gui_mode)
             agent_runner = None
             mcp = None
+            logger.info(f"Agent={args.agent}")
             if args.agent=='use':
                 if args.agent_session_store == 'sqlite':
-                    args.agent_session_dburl = "sqlite:" + pathname2url(str(w.agent_path / 'session.db'))
+                    args.agent_session_dburl = "sqlite://" + pathname2url(str(w.agent_path / 'session.db'))
                 elif args.agent_session_store == 'postgresql':
-                    args.agent_session_dburl = f"postgresql+psycopg://{args.pg_user}:{args.pg_password}@{args.pg_host}:{args.pg_port}/{args.pg_dbname}"
+                    args.agent_session_dburl = f"postgresql+psycopg://{args.agent_pg_user}:{args.agent_pg_password}@{args.agent_pg_host}:{args.agent_pg_port}/{args.agent_pg_dbname}"
                 else:
                     args.agent_session_dburl = None
                 agent_runner, mcp = self.init_agent_runner(logger, args)

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/features/web/cmdbox_web_agent.py

@@ -13,6 +13,7 @@ from typing import Dict, Any, Tuple, List, Union
 import locale
 import logging
 import json
+import re
 import time
 import traceback
 
@@ -160,6 +161,15 @@ class Agent(feature.WebFeature):
             agent_session = await web.create_agent_session(web.agent_runner.session_service, user_id, session_id=session_id)
             startmsg = "こんにちは！何かお手伝いできることはありますか？" if is_japan else "Hello! Is there anything I can help you with?"
             yield json.dumps(dict(message=startmsg), default=common.default_json_enc)
+            def _replace_match(match_obj):
+                json_str = match_obj.group(0)
+                try:
+                    data = json.loads(json_str) # ユニコード文字列をエンコード
+                    return json.dumps(data, ensure_ascii=False, default=common.default_json_enc)
+                except json.JSONDecodeError:
+                    return json_str
+            json_pattern = re.compile(r'\{.*?\}')
+
             from google.genai import types
             while True:
                 outputs = None
@@ -205,6 +215,8 @@ class Agent(feature.WebFeature):
                         elif event.actions and event.actions.escalate:
                             msg = f"Agent escalated: {event.error_message or 'No specific message.'}"
                         if msg:
+                            msg = json_pattern.sub(_replace_match, msg)
+
                             outputs['message'] = msg
                             web.options.audit_exec(sock, web, body=dict(agent_session=agent_session.id, result=msg))
                             yield json.dumps(outputs, default=common.default_json_enc)

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/features/web/cmdbox_web_do_signout.py

@@ -13,9 +13,9 @@ class DoSignout(feature.WebFeature):
             web (Web): Webオブジェクト
             app (FastAPI): FastAPIオブジェクト
         """
-        @app.get('/dosignout/{next}', response_class=HTMLResponse)
-        @app.post('/dosignout/{next}', response_class=HTMLResponse)
-        async def do_signout(next, req:Request, res:Response):
+        @app.api_route('/dosignout/{next}', methods=['GET', 'POST'], response_class=HTMLResponse)
+        @app.api_route('/{full_path:path}/dosignout/{next}/', methods=['GET', 'POST'], response_class=HTMLResponse)
+        async def do_signout(next, req:Request, res:Response, full_path:str=None):
             if 'signin' in req.session:
                 web.options.audit_exec(req, res, web, body=dict(msg='Signout.'), audit_type='auth')
                 for key in list(req.session.keys()).copy():

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/features/web/cmdbox_web_exec_cmd.py

@@ -182,7 +182,7 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
             console = common.create_console(file=old_stdout)
 
             try:
-                console.log(f'EXEC:     {opt_list}\n'[:logsize])
+                console.log(f'EXEC  - {opt_list}\n'[:logsize])
                 status, ret_main, obj = cmdbox_app.main(args_list=[common.chopdq(o) for o in opt_list], file_dict=file_dict, webcall=True)
                 if isinstance(obj, server.Server):
                     cmdbox_app.sv = obj
@@ -209,11 +209,11 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
                             output = [dict(warn=f'The captured stdout was discarded because its size was larger than {capture_maxsize} bytes.')]
                 else:
                     output = [dict(warn='capture_stdout is off.')]
-                console.log(f'EXEC:     {output}'[:logsize])
+                old_stdout.write(f'EXEC OUTPUT => {output}'[:logsize]) # コマンド実行時のアウトプットはカラーリングしない
             except Exception as e:
                 web.logger.disabled = False # ログ出力を有効にする
                 msg = f'exec_cmd error. {traceback.format_exc()}'
-                console.log(f'EXEC:     {msg}'[:logsize])
+                console.log(f'EXEC  - {msg}'[:logsize])
                 web.logger.warning(msg)
                 output = [dict(warn=f'<pre>{html.escape(traceback.format_exc())}</pre>')]
             sys.stdout = old_stdout

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/features/web/cmdbox_web_signin.py

@@ -24,7 +24,8 @@ class Signin(feature.WebFeature):
                 web.signin_html_data = f.read()
 
         @app.api_route('/signin/{next}', methods=['GET', 'POST'], response_class=HTMLResponse)
-        async def _signin(next:str, req:Request, res:Response):
+        @app.api_route('/{full_path:path}/signin/{next}', methods=['GET', 'POST'], response_class=HTMLResponse)
+        async def _signin(next:str, req:Request, res:Response, full_path:str=None):
             signin.Signin._enable_cors(req, res)
             res.headers['Access-Control-Allow-Origin'] = '*'
             return web.signin_html_data

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/options.py

@@ -632,6 +632,11 @@ class Options:
         if 'enabled' not in yml['audit']:
             raise Exception('features.yml is invalid. (The audit element must have "enabled" specified.)')
         if not yml['audit']['enabled']: return
+        # フューチャーのoptions
+        if 'options' not in yml['audit']:
+            raise Exception('features.yml is invalid. (The audit element must have "options" specified.)')
+        self.audit_write_args = yml['audit']['options'].copy()
+        self.audit_search_args = yml['audit']['options'].copy()
         # writeフューチャー
         if 'write' not in yml['audit']:
             raise Exception('features.yml is invalid. (The audit element must have "write" specified.)')
@@ -642,6 +647,8 @@ class Options:
             raise Exception('features.yml is invalid. (The audit.write element must have "cmd" specified.)')
         cmd = yml['audit']['write']['cmd']
         self.audit_write:feature.Feature = self.get_cmd_attr(mode, cmd, 'feature')
+        self.audit_write_args['mode'] = mode
+        self.audit_write_args['cmd'] = cmd
         # searchフューチャー
         if 'search' not in yml['audit']:
             raise Exception('features.yml is invalid. (The audit element must have "search" specified.)')
@@ -652,13 +659,6 @@ class Options:
             raise Exception('features.yml is invalid. (The audit.search element must have "cmd" specified.)')
         cmd = yml['audit']['search']['cmd']
         self.audit_search:feature.Feature = self.get_cmd_attr(mode, cmd, 'feature')
-        # フューチャーのoptions
-        if 'options' not in yml['audit']:
-            raise Exception('features.yml is invalid. (The audit element must have "options" specified.)')
-        self.audit_write_args = yml['audit']['options'].copy()
-        self.audit_write_args['mode'] = mode
-        self.audit_write_args['cmd'] = cmd
-        self.audit_search_args = yml['audit']['options'].copy()
         self.audit_search_args['mode'] = mode
         self.audit_search_args['cmd'] = cmd
         self.audit_loaded = True

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/app/web.py

@@ -900,19 +900,16 @@ class ThreadedUvicorn:
         self.logger = logger
         self.guvicorn_config = guvicorn_config
         self.force_uvicorn = True if platform.system() == "Windows" else force_uvicorn
-        stderr_handler = common.create_log_handler(stderr=True)
-        stdout_handler = common.create_log_handler(stderr=False)
+        # loggerの設定
+        common.reset_logger("uvicorn")
+        common.reset_logger("uvicorn.error")
+        common.reset_logger("uvicorn.access")
+        #common.reset_logger("gunicorn.error")
+        #common.reset_logger("gunicorn.access")
         if self.force_uvicorn:
-            # loggerの設定
-            common.reset_logger("uvicorn")
-            common.reset_logger("uvicorn.error")
-            common.reset_logger("uvicorn.access")
             self.server = uvicorn.Server(config)
             self.thread = RaiseThread(daemon=True, target=self.server.run)
         else:
-            # loggerの設定
-            common.reset_logger("gunicorn.error")
-            common.reset_logger("gunicorn.access")
 
             from gunicorn.app.wsgiapp import WSGIApplication
             class App(WSGIApplication):

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/extensions/sample_project/sample/extensions/features.yml

@@ -46,6 +46,24 @@ aliases:                                # Specify the alias for the specified co
                                         #   e.g. /{1}_exec
         move:                           # Specify whether to move the regular expression group of the source to the target.
                                         #   e.g. true
+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.
+    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]
+    rule: allow
 audit:
   enabled: true                         # Specify whether to enable the audit function.
   write:

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/extensions/sample_project/sample/logconf_sample.yml

@@ -2,7 +2,11 @@ version: 1
 
 formatters:
     fmt:
-        format: '%(levelname)s[%(asctime)s] - %(message)s'
+        format: '[%(asctime)s] %(levelname)s - %(message)s'
+        datefmt: '%Y-%m-%d %H:%M:%S'
+        class: logging.Formatter
+    fmt_rich:
+        format: '%(message)s'
         class: logging.Formatter
 handlers:
     std:
@@ -10,6 +14,14 @@ handlers:
         level: INFO
         formatter: fmt
         stream: ext://sys.stdout
+    rich:
+        class: rich.logging.RichHandler
+        level: INFO
+        formatter: fmt_rich
+        show_path: false
+        omit_repeated_times: false
+        tracebacks_word_wrap: false
+        log_time_format: '[%Y-%m-%d %H:%M]'
     sample:
         class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
         level: INFO
@@ -24,6 +36,7 @@ loggers:
         handlers: [sample, std]
         level: INFO
         qualname: sample
+        propagate: false
 
 #root:
 #    handlers: [sample, std]

{cmdbox-0.6.0/cmdbox/extensions/sample_project/sample → cmdbox-0.6.0.2/cmdbox}/extensions/user_list.yml

@@ -74,7 +74,8 @@ 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,
-            /exec_cmd, /exec_pipe, /filer, /gui, /get_server_opt, /usesignout, /versions_cmdbox, /versions_used]
+            /agent, /mcp,
+            /exec_cmd, /exec_pipe, /filer, /result, /gui, /get_server_opt, /usesignout, /versions_cmdbox, /versions_used]
     rule: allow
   - groups: [readonly]
     paths: [/gui/del_cmd, /gui/del_pipe, /gui/save_cmd, /gui/save_pipe]

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/logconf_audit.yml

@@ -2,13 +2,19 @@ version: 1
 
 formatters:
     fmt:
-        format: '%(levelname)s[%(asctime)s] - %(message)s'
+        format: '[%(asctime)s] %(levelname)s - %(message)s'
+        datefmt: '%Y-%m-%d %H:%M:%S'
         class: logging.Formatter
     fmt_rich:
         format: '%(message)s'
         class: logging.Formatter
 handlers:
     std:
+        class: cmdbox.app.commons.loghandler.ColorfulStreamHandler
+        level: INFO
+        formatter: fmt
+        stream: ext://sys.stdout
+    rich:
         class: rich.logging.RichHandler
         level: INFO
         formatter: fmt_rich
@@ -16,9 +22,8 @@ handlers:
         omit_repeated_times: false
         tracebacks_word_wrap: false
         log_time_format: '[%Y-%m-%d %H:%M]'
-        #stream: ext://sys.stdout
     audit:
-        class: logging.handlers.TimedRotatingFileHandler
+        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5
@@ -28,7 +33,7 @@ handlers:
 
 loggers:
     audit:
-        handlers: [audit]
+        handlers: [audit, std]
         level: INFO
         qualname: audit
         propagate: false

{cmdbox-0.6.0 → cmdbox-0.6.0.2}/cmdbox/logconf_client.yml

@@ -2,13 +2,19 @@ version: 1
 
 formatters:
     fmt:
-        format: '%(levelname)s[%(asctime)s] - %(message)s'
+        format: '[%(asctime)s] %(levelname)s - %(message)s'
+        datefmt: '%Y-%m-%d %H:%M:%S'
         class: logging.Formatter
     fmt_rich:
         format: '%(message)s'
         class: logging.Formatter
 handlers:
     std:
+        class: cmdbox.app.commons.loghandler.ColorfulStreamHandler
+        level: INFO
+        formatter: fmt
+        stream: ext://sys.stdout
+    rich:
         class: rich.logging.RichHandler
         level: INFO
         formatter: fmt_rich
@@ -16,9 +22,8 @@ handlers:
         omit_repeated_times: false
         tracebacks_word_wrap: false
         log_time_format: '[%Y-%m-%d %H:%M]'
-        #stream: ext://sys.stdout
     client:
-        class: logging.handlers.TimedRotatingFileHandler
+        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5
@@ -28,7 +33,7 @@ handlers:
 
 loggers:
     client:
-        handlers: [client]
+        handlers: [client, std]
         level: INFO
         qualname: client
         propagate: false