cmdbox 0.6.0__py3-none-any.whl → 0.6.0.1__py3-none-any.whl

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/app/commons/loghandler.py

@@ -1,3 +1,6 @@
+from rich.console import Console
+from rich import highlighter
+from rich.theme import Theme
 import re
 import logging
 import logging.handlers
@@ -77,25 +80,71 @@ def colorize_msg(msg) -> str:
     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('WARNING', Colors.Bold, Colors.Yellow)}:  ",
-    logging.ERROR:   f"{colorize('ERROR', Colors.Bold, Colors.Red)}:    ",
-    logging.CRITICAL:f"{colorize('CRITICAL', Colors.Bold, Colors.LightGray, Colors.BackgroundRed)}: "}
+    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"WARNING:  ",
-    logging.ERROR:   f"ERROR:    ",
-    logging.CRITICAL:f"CRITICAL: "}
+    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.levelname = level_mapping[record.levelno]
         #record.asctime = colorize(record.asctime, Colors.Bold)
-        record.msg = colorize_msg(record.msg)
-        super().emit(record)
+        #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:

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/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/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'))
                 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/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/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/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/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/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/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/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/extensions/sample_project/sample/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/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/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/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

cmdbox/logconf_cmdbox.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
     cmdbox:
-        class: logging.handlers.TimedRotatingFileHandler
+        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5
@@ -28,7 +33,7 @@ handlers:
 
 loggers:
     cmdbox:
-        handlers: [cmdbox]
+        handlers: [cmdbox, std]
         level: INFO
         qualname: cmdbox
         propagate: false

cmdbox/logconf_edge.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
     edge:
-        class: logging.handlers.TimedRotatingFileHandler
+        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5
@@ -28,7 +33,7 @@ handlers:
 
 loggers:
     edge:
-        handlers: [edge]
+        handlers: [edge, std]
         level: INFO
         qualname: edge
         propagate: false

cmdbox/logconf_gui.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
     gui:
-        class: logging.handlers.TimedRotatingFileHandler
+        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5

cmdbox/logconf_server.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
     server:
-        class: logging.handlers.TimedRotatingFileHandler
+        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5

cmdbox/logconf_web.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
     web:
-        class: logging.handlers.TimedRotatingFileHandler
+        class: cmdbox.app.commons.loghandler.TimedRotatingFileHandler
         level: INFO
         formatter: fmt
         backupCount: 5

cmdbox/version.py

@@ -1,9 +1,9 @@
 import datetime
 
-dt_now = datetime.datetime(2025, 5, 30)
+dt_now = datetime.datetime(2025, 6, 1)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.6.0'
+__version__ = '0.6.0.1'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'
@@ -18,7 +18,7 @@ __logo__ = '''
  ╚═════╝╚═╝     ╚═╝╚═════╝ ╚═════╝  ╚═════╝ ╚═╝  ╚═╝'''
 __description__ = f'{__title__} {__version__}\n\n' + \
                   f'{__copyright__}\n' + \
-                  f'build: {dt_now.strftime("%Y-%m-%d")}\n' + \
+                  f'Build Date: {dt_now.strftime("%Y-%m-%d")}\n' + \
                   f'Web Site: PyPi <{__pypiurl__}>\n' + \
                   f'Web Site: SorceCode <{__srcurl__}>\n' + \
                   f'Web Site: Document <{__docurl__}>\n' + \

cmdbox/web/assets/cmdbox/agent.js

@@ -160,7 +160,10 @@ agent.init_form = async () => {
             agent.format_agent_message(container, messages, txt, packet.message);
         };
         ws.onopen = () => {
-            const ping = () => {ws.send('ping');};
+            const ping = () => {
+                ws.send('ping');
+                agent.chat_reconnect_count = 0; // pingが成功したら再接続回数をリセット
+            };
             btn_user_msg.prop('disabled', false);
             agent.chat_callback_ping_handler = setInterval(() => {ping();}, ping_interval);
         };
@@ -174,7 +177,7 @@ agent.init_form = async () => {
                 clearInterval(agent.chat_reconnectInterval_handler);
                 cmdbox.message({'error':'Connection to the agent has failed for several minutes. Please reload to resume reconnection.'});
                 const rand = cmdbox.random_string(8);
-                location.href = `signin/agent?r=${rand}`;
+                location.href = `../signin/agent?r=${rand}`;
                 return;
             }
             agent.chat_reconnect_count++;

cmdbox/web/assets/cmdbox/common.js

@@ -136,7 +136,7 @@ cmdbox.set_logoicon = async (sel) => {
 cmdbox.singout = (sitepath) => {
     if (confirm('Sign out ok ?')) {
         const rand = cmdbox.random_string(8);
-        location.href = `dosignout/${sitepath}?r=${rand}`;
+        location.href = `../dosignout/${sitepath}?r=${rand}`;
     }
 };
 cmdbox.editapikey = async () => {

cmdbox/web/assets/cmdbox/main.js

@@ -19,6 +19,9 @@ $(() => {
     cmdbox.init_modal_button();
     cmdbox.gui_callback_reconnectInterval_handler = null;
     cmdbox.gui_callback_ping_handler = null;
+    const ping_interval = 5000; // pingの間隔
+    const max_reconnect_count = 60000/ping_interval*1; // 最大再接続回数
+    cmdbox.callback_reconnect_count = 0; // 再接続回数
     const gui_callback = () => {
         if (cmdbox.gui_callback_reconnectInterval_handler) {
             clearInterval(cmdbox.gui_callback_reconnectInterval_handler);
@@ -68,8 +71,11 @@ $(() => {
             }
         };
         ws.onopen = () => {
-            const ping = () => {ws.send('ping');};
-            cmdbox.gui_callback_ping_handler = setInterval(() => {ping();}, 1000);
+            const ping = () => {
+                ws.send('ping');
+                cmdbox.callback_reconnect_count = 0;
+            };
+            cmdbox.gui_callback_ping_handler = setInterval(() => {ping();}, ping_interval);
         };
         ws.onerror = (e) => {
             console.error(`Websocket error: ${e}`);
@@ -77,9 +83,17 @@ $(() => {
         };
         ws.onclose = () => {
             clearInterval(cmdbox.gui_callback_ping_handler);
+            if (cmdbox.callback_reconnect_count >= max_reconnect_count) {
+                clearInterval(cmdbox.gui_callback_reconnectInterval_handler);
+                cmdbox.message({'error':'Connection to the agent has failed for several minutes. Please reload to resume reconnection.'});
+                const rand = cmdbox.random_string(8);
+                location.href = `../signin${path}?r=${rand}`;
+                return;
+            }
+            cmdbox.callback_reconnect_count++;
             cmdbox.gui_callback_reconnectInterval_handler = setInterval(() => {
                 gui_callback();
-            }, 3000);
+            }, ping_interval);
         };
     };
     gui_callback();

{cmdbox-0.6.0.dist-info → cmdbox-0.6.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.0
+Version: 0.6.0.1
 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.dist-info → cmdbox-0.6.0.1.dist-info}/RECORD

@@ -1,26 +1,25 @@
 cmdbox/__init__.py,sha256=j2OAwj0wXaIoo_J_4tsEc5OaYd-5Vhco0SkBGf3Sd94,69
 cmdbox/__main__.py,sha256=cHR9OrUw9fYbs3drwG4pJgafQEU_coNED4pZP7ZntMQ,109
 cmdbox/config.yml,sha256=-gtxBIJzPw2wSM3bDd6HdqHdo1eeJ1gyPxWDmL5NUpk,54
-cmdbox/logconf_agent.yml,sha256=z1uB1AY-cpBIUIDAEHfrH2bQdc1fIolaWapqOLTrQ0o,906
-cmdbox/logconf_audit.yml,sha256=keB6PXmg9a2p2gE8nHvLv7aQ9ZXZ1cy3ytz5ioAOtdA,906
-cmdbox/logconf_client.yml,sha256=TU-u_uCHVtc4uZrkkA2Hiz3tY9D05QmJerbuni3NN4Q,911
-cmdbox/logconf_cmdbox.yml,sha256=B90zfAuRhe0MNA03Bwam0CPF0rPe9H03LIEjip3ztpg,904
-cmdbox/logconf_edge.yml,sha256=x59-OWeAF8cAIkDr4wiGRptJawJargkiJpqnpKESu28,901
-cmdbox/logconf_gui.yml,sha256=nl69pAO_Ov98O2XwK-2IAQZyyzH1FB_LIUHv71PcZEU,901
-cmdbox/logconf_server.yml,sha256=jgyyA-9IBUXucMXEMDWNJlAwQhdQV7HO0OZBwOW-Hgo,916
-cmdbox/logconf_web.yml,sha256=_qSCYvx0GdyMNXjNg565nJLB8W3qC70z-SXzD7T0zAE,901
-cmdbox/version.py,sha256=witXeFqtNU9tsY24CMLUof-xvWlbPt9AsDS-kOfbPVc,2025
+cmdbox/logconf_audit.yml,sha256=24GXtFQR-4eJyf01Nj1R8yeQudcu2ruMx9YhkCTzrA0,1086
+cmdbox/logconf_client.yml,sha256=JrEHo6IrV-wRyUZhvfsCMlRFVU3t1eVyPMGHYbhGmto,1091
+cmdbox/logconf_cmdbox.yml,sha256=t-3lCjT6mJQnS9NpLxz9bALOy9eD9Oz0yb1WKl29P80,1084
+cmdbox/logconf_edge.yml,sha256=vRY-LxfWztk2QZOUN9kj_Eq6Y4qj8WzmiO9H0IRvjtQ,1081
+cmdbox/logconf_gui.yml,sha256=-95vyd0q-aB1gsabdk8rg9dJ2zRKAZc8hRxyhNOQboU,1076
+cmdbox/logconf_server.yml,sha256=n3c5-KVzjUzcUX5BQ6uE-PN9rp81yXaJql3whyCcSDQ,1091
+cmdbox/logconf_web.yml,sha256=pPbdAwckbK0cgduxcVkx2mbk-Ymz5hVzR4guIsfApMQ,1076
+cmdbox/version.py,sha256=61HZPeSTkOI0C5UMLs1RY6MJZUeEsWc7viwC8phuEhU,2031
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/app.py,sha256=YkzNBd1S1oNVwnNj1eYQUFOcrcjwdsQzv0z4mMOb_mw,9149
 cmdbox/app/client.py,sha256=n986lXeV7hhaki4iyyvsfhNptmCXDFphxlNoNe2XhKg,19542
-cmdbox/app/common.py,sha256=uvvdSxdygmAwaTYmPSGPtsjXyHgP-28VZZ5sse1zqKo,24832
+cmdbox/app/common.py,sha256=qUdf8q1vK-e167nq-O2KGJ4gU-ZZNNNzzi0Bos7fWdI,25358
 cmdbox/app/edge.py,sha256=yskob1ewd5hHbPJKWvjXm6j4IpawE4gM_lOqe70gX1w,41422
 cmdbox/app/edge_tool.py,sha256=QqigDHcxRJa1BvK_DVq-ccNTVXg4BEBsHkYsaauMDu0,8050
 cmdbox/app/feature.py,sha256=O3MTyQFinKXONeCvSRAt81HqZWgXV-je_-nUZi0cdCE,9910
 cmdbox/app/filer.py,sha256=L_DSMTvnbN_ffr3JIt0obbOmVoTHEfVm2cAVz3rLH-Q,16059
-cmdbox/app/options.py,sha256=trtSkCfVHQMnx8xwoJwKiBgSVlqXXXmFMozsmQ-MzE0,45259
+cmdbox/app/options.py,sha256=_VDUX0VeJ-UExJTFRlewTq6wT_3D-NVbYE0CvAmE-0g,45259
 cmdbox/app/server.py,sha256=woOmIk901ONn5a_2yz_b3I1JpLYIF8g42uQRd0_MRuQ,10417
-cmdbox/app/web.py,sha256=DzDyNMoLAV5SeFUKmZ2LK0esRh9XU0hOkXeU3tLP0iY,53399
+cmdbox/app/web.py,sha256=LeiaN2qbmPS_p4fz4824tuN9lI64hEaY3sCZab1o9t4,53215
 cmdbox/app/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/auth/azure_signin.py,sha256=ZVJTeZwdgM4y2loKiTMEPiXxbJwbdoTVMWciyJhgqc8,1666
 cmdbox/app/auth/azure_signin_saml.py,sha256=oM2buGTK4t6-OsUuiUXTlZk0YXZL01khuPYVB84dMDU,472
@@ -29,11 +28,11 @@ cmdbox/app/auth/google_signin.py,sha256=LErFkKniumKgfE5jlY9_lAneKlqD6BfLHxg2lZgv
 cmdbox/app/auth/signin.py,sha256=auRSJGJblQOF9mGDccSx2IptawF8BSnDCNs1Xgty2c0,49364
 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=HFTlsQEshFaIubCH-AjvXOE0swbYtv77kSy2pwRz_8c,3469
+cmdbox/app/commons/loghandler.py,sha256=go5Ui1c4AKqRSnxLzwrtPakYSjRHguXk4dGat1jD738,6323
 cmdbox/app/commons/module.py,sha256=w63zqz5c6gLy-BZJ9dh4Q4C5PZyqM2Iqat5Zr9swJCI,4993
 cmdbox/app/commons/redis_client.py,sha256=cOHshqAGI3CRWLcc2IMhk6MtXsVKlQq6HwcdqYsoA-0,14821
-cmdbox/app/features/cli/agent_base.py,sha256=givxyjBLDVXJA9BVgYursLY91VogDBN9i6SBxTPuAAE,33431
-cmdbox/app/features/cli/audit_base.py,sha256=zlXkTFtc94mUevVN07wCzlvbQAA1ziytHsNLklhXyEk,8574
+cmdbox/app/features/cli/agent_base.py,sha256=kY6lymXy9lA9-qcutRcJIBbjIHkNKKdTbvTcjKUyKs4,33625
+cmdbox/app/features/cli/audit_base.py,sha256=wWWK31EUczvP4a1MNuz2KlqwaSn9yyt908ueRvjkuow,9405
 cmdbox/app/features/cli/cmdbox_audit_createdb.py,sha256=Hmq3NVrAUBbj-UB9fum2TuWU7MIH71754S_s0X9oj40,12133
 cmdbox/app/features/cli/cmdbox_audit_delete.py,sha256=2X6A8XtViOnUH7iDj02ZrqQhYBq7WOAwi-nL10der64,18922
 cmdbox/app/features/cli/cmdbox_audit_search.py,sha256=Ib09SNAJ8lwkM6hiqn6knvN469PGaR9GQBJBIxRoeJM,28172
@@ -64,13 +63,13 @@ cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=aqeZ2BDFqRFzVG5sHKFAKuFXA
 cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=wpi2LAX7Xs12jk98GRQXETd-sX9WzsocQsCX422JJz4,6583
 cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=ohlJCk1c_zbRq73udSUKsg-U5pQgdvAxe-U8GjRvy34,7312
 cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=LyBsGtHZjqqr7YT-7Fa2cMqu8uY_wCmfYXbm4Z9ea0s,6678
-cmdbox/app/features/cli/cmdbox_web_start.py,sha256=zye-tFQRgwteRlY8kmlU8gCrOGj1msbI752oAmg1w8I,16214
+cmdbox/app/features/cli/cmdbox_web_start.py,sha256=2H6x7GpTIyGzyLxvqR_LREFksiuiGJShKmccLvFTY5s,16291
 cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=yRLHhCR1sQvNep4-9-OITQkzeEQr1M-ZSLzd059D3EA,3568
 cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=FrbFXK0fVwPI5YR1uEsGQgNX3NLsfkPJ7gBfl6rjJkI,8565
 cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=bJ8Lqev4jHU68D5eYBaxkPWxmtTxWpN7sKeCJEZTIJc,6546
 cmdbox/app/features/cli/cmdbox_web_user_edit.py,sha256=IAcZe9J0NHXwy-7Jk656HZXlV-RLYcWtqsXYJDFMwvQ,8473
 cmdbox/app/features/cli/cmdbox_web_user_list.py,sha256=t2q6RthbKy0awcZR45BxRHgF-D2mOvRNC1T9thavTn4,6666
-cmdbox/app/features/web/cmdbox_web_agent.py,sha256=DQXkyd60lkxVTU-wkEzeolvbxxoSvaAEBDXxakzxKNQ,13745
+cmdbox/app/features/web/cmdbox_web_agent.py,sha256=6VUqMCJxdCz4vT5gGGMHlUibjtAy8FSwQVQ0-q74XfA,14272
 cmdbox/app/features/web/cmdbox_web_assets.py,sha256=D1dYNrvC7xBAVAAHX6PkoB6RFehEofET4hkHeCFYq7s,1931
 cmdbox/app/features/web/cmdbox_web_audit.py,sha256=-flyijdnh3hN-BKnw0GI3gSiduLP0vQFg_AiYCLXRBY,3359
 cmdbox/app/features/web/cmdbox_web_audit_metrics.py,sha256=4zcWNcI_mCT36B0CNrtYz9rOAK6QXqyLzloFIgginxw,3189
@@ -79,8 +78,8 @@ cmdbox/app/features/web/cmdbox_web_copyright.py,sha256=kyDHGPQNSmnaZrORevNBvv4gU
 cmdbox/app/features/web/cmdbox_web_del_cmd.py,sha256=3Bx2tuXJXc63yip9gWH2bXBydD4GNNYkmrFRXpK0sC0,1194
 cmdbox/app/features/web/cmdbox_web_del_pipe.py,sha256=tPLvuLqk-MQjkh5WZfw9gL3ujR_W18raEwX_EKddNZw,1193
 cmdbox/app/features/web/cmdbox_web_do_signin.py,sha256=Je9pYIdihmagP2eaIfyz6zIBbLc7_wHKxewjAQrt3IA,20787
-cmdbox/app/features/web/cmdbox_web_do_signout.py,sha256=InbXA3_xrHM6v5w_0XHX5b9a0-gq8hXKSoPNPLFC-bs,1010
-cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=MksOBPyZUgjk-GVIGgjJxSBimnZvdAoldA6dstkD4-s,13093
+cmdbox/app/features/web/cmdbox_web_do_signout.py,sha256=b64XcmioyuyEL6VFymcs5kFIt4zviqhqJbFUWRCdMo0,1109
+cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=SUuaapl7Q7eTyrn45sTyjRtsVtZ3nAHXACffiQbcNCM,13174
 cmdbox/app/features/web/cmdbox_web_exec_pipe.py,sha256=W9jd_9MTzC9GzgEd8X5C9Jwsn8pt6-_TFxyrHfO4iWk,10581
 cmdbox/app/features/web/cmdbox_web_filer download.py,sha256=CVRDv0TZAEd87nzlquIO2O3rSm_tpc3i88H27FgNW4Y,2344
 cmdbox/app/features/web/cmdbox_web_filer.py,sha256=2BdkOQFvaMMxtSoRz07RjercnfG51yChZiVrQGRDRTQ,1871
@@ -100,7 +99,7 @@ cmdbox/app/features/web/cmdbox_web_raw_pipe.py,sha256=vYyErScUwFQiv7HJ8xDgaja0bJ
 cmdbox/app/features/web/cmdbox_web_result.py,sha256=hANYh1Qito_Fzs6qeTBetqWlsjsWlI2az-mNSoPkNf8,2404
 cmdbox/app/features/web/cmdbox_web_save_cmd.py,sha256=pSuCcd-UTiQJ5MG2zMiQe5uo91S8wlyixijyaPZEclo,2134
 cmdbox/app/features/web/cmdbox_web_save_pipe.py,sha256=QJjWeGVZH9G0Uj5FbnZx6Z4nUWQBTJstaolKfu5cX5Y,1614
-cmdbox/app/features/web/cmdbox_web_signin.py,sha256=rRRF-vnCOolqE0hy64BU7Rdpxrj6rSlLFnqcy9rNYaA,5545
+cmdbox/app/features/web/cmdbox_web_signin.py,sha256=TvLKqmbZ0r96OXzK5XfRFuj_XJTREs73ls5DrfpZcuk,5677
 cmdbox/app/features/web/cmdbox_web_user_data.py,sha256=vL_p2I6_dCmhz792nKZ2zvea-GhaRLrThvPvIShN-TU,2669
 cmdbox/app/features/web/cmdbox_web_users.py,sha256=LZ3BUudBF21wqGO5EWwKvyLMxK_gE-foV7z1egv6-T8,10119
 cmdbox/app/features/web/cmdbox_web_usesignout.py,sha256=lBjBj8M8e69uXhdv7H92wZfRRWD2j6kmC_WekSCw5yo,682
@@ -112,15 +111,15 @@ cmdbox/extensions/sample_project/requirements.txt,sha256=z_gUanGVrPeYUExYeU5_gHi
 cmdbox/extensions/sample_project/.vscode/launch.json,sha256=Bj_FO1P0lPMfuwZxvyLfwQa0f7Gk276dvcVRjj2aem4,1348
 cmdbox/extensions/sample_project/sample/__init__.py,sha256=UiUuJV0knNR9PazyIf-pyQGVZXAxHP01UjbwU9GXnRw,69
 cmdbox/extensions/sample_project/sample/__main__.py,sha256=tVrTfVcCBhKcZp2qfkTxEV0DkPgQvEIDy4CMkqB_2cs,109
-cmdbox/extensions/sample_project/sample/logconf_sample.yml,sha256=Zip46PoadBV_XUDCDWHmS-pOp1kUKYfc4aL-oHHKYBM,701
+cmdbox/extensions/sample_project/sample/logconf_sample.yml,sha256=RxPUzt-ZBzJMmCxordsM7Xm31xPH_TQlLFUjBAP6NNM,1092
 cmdbox/extensions/sample_project/sample/version.py,sha256=Yj03cWCvXUFjCGDinEkiB5a7GEkFriJVsQurnGBYAPI,1448
 cmdbox/extensions/sample_project/sample/app/app.py,sha256=2snmsdwgYuHfCNMpGtpOzJJUWJoB5Ovem1JsQRWqZrk,231
 cmdbox/extensions/sample_project/sample/app/features/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/extensions/sample_project/sample/app/features/cli/sample_client_time.py,sha256=5ft6kjW7zgVWwtcGy-2eskg_sF6VamZ3oo2x80_oQgk,3131
 cmdbox/extensions/sample_project/sample/app/features/cli/sample_server_time.py,sha256=XM8LvglW_e7ywYJihKItgw1ORdZxmb8FouTMU3PqeyU,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=o4nDo-sBDe1AT8Kzk0PWZF-fq-90yndyadL5LaVK-48,6286
-cmdbox/extensions/sample_project/sample/extensions/user_list.yml,sha256=FvA-148CRZv6JrDpSECYp0UpsvHZdSA_p3FPxabz7SY,10470
+cmdbox/extensions/sample_project/sample/extensions/features.yml,sha256=Jn7kZVH95VU0bF6p2K2Wzv7V8u4AkUqi-_Fco5AwLoU,7374
+cmdbox/extensions/sample_project/sample/extensions/user_list.yml,sha256=NfddsRnBOTOjPyN7UGTLoBppR1_boTvNXeZLodKgfZQ,10505
 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.5.2(BSD License).txt,sha256=jYKqOj5UKtBY_y34_upU28Iok0WYyCO-8x-80yVPgd4,1543
@@ -302,16 +301,16 @@ 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=gBM001yi59xDqbB9rz82-KerUg6ZKg9q9WzNKh5i6Kg,15702
+cmdbox/web/assets/cmdbox/agent.js,sha256=hNkBdOCHMh9UItcoxeSuO_LxtpN6bRIyNmXIqPZ2w5Q,15839
 cmdbox/web/assets/cmdbox/audit.js,sha256=5wFt4ejO4bwrOpt9yxOiwUz5XXXLOP8eo0ITTUwROZ0,19332
 cmdbox/web/assets/cmdbox/color_mode.css,sha256=U4UGBnWiBMcrSEEusgT-_o-pt4MP3myoA9Lgnn1g6qE,19803
-cmdbox/web/assets/cmdbox/common.js,sha256=TDnfFrKFdty97UkQNkZEgNsvX-GIbo5ohI2Rpd5s2Ts,65217
+cmdbox/web/assets/cmdbox/common.js,sha256=s32LMd2eXdLE7DYlnX5HCdkCYcZm_pnpfxjICt3zA6A,65220
 cmdbox/web/assets/cmdbox/favicon.ico,sha256=2U4MhqzJklRksOQwnK-MZigZCubxCHqKG_AuNJnvYtA,34494
 cmdbox/web/assets/cmdbox/filer_modal.js,sha256=iKhNN9urjUm22na4vHYWhbj__2De9iAuDJE7TvBWtQ0,8566
 cmdbox/web/assets/cmdbox/icon.png,sha256=xdEwDdCS8CoPQk7brW-1mV8FIGYtUeSMBRlY9Oh-3nE,296172
 cmdbox/web/assets/cmdbox/list_cmd.js,sha256=4oVpXoSaUWXHKkxxCBEjoHgtrjTP1FSsL3QEHwjtaKc,21437
 cmdbox/web/assets/cmdbox/list_pipe.js,sha256=2rPkauw9VHRMXl76qRgqy81Y815Y8B1tnVKOSKKfRwc,11315
-cmdbox/web/assets/cmdbox/main.js,sha256=p8dhVkcyF9uSGxiVyQrmknvvP1KHt8b-_DuIw1BXsiA,4941
+cmdbox/web/assets/cmdbox/main.js,sha256=JRrFgjBEu66uMPmDHCrsvQFatl39YHEgR9BHpzHxbv4,5737
 cmdbox/web/assets/cmdbox/open_capture.js,sha256=W4IQlOYLN4Y8OaS8Xc5yp-BRlm82TVjujChr3hJKS0M,709
 cmdbox/web/assets/cmdbox/open_output_json.js,sha256=4q7mCdVmSzFudlTlW9MuIJ1-f-kDvpD6rDUU01IbKi8,727
 cmdbox/web/assets/cmdbox/result.js,sha256=m7u6-VTXT4AK_6frn4dTIjEzDg0bfajD_Jv1MWgLZRo,3154
@@ -361,9 +360,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.0.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.6.0.dist-info/METADATA,sha256=hC-PPave5cAJXTsArP-gVSheuAqfg4IGGwN7EztZWUo,30879
-cmdbox-0.6.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.6.0.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
-cmdbox-0.6.0.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.6.0.dist-info/RECORD,,
+cmdbox-0.6.0.1.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.6.0.1.dist-info/METADATA,sha256=poydbldXRceRfMhIkVm9YhSOEQrtZaXJCefp6-BIF3A,30881
+cmdbox-0.6.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.6.0.1.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
+cmdbox-0.6.0.1.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.6.0.1.dist-info/RECORD,,

cmdbox/logconf_agent.yml

@@ -1,38 +0,0 @@
-version: 1
-
-formatters:
-    fmt:
-        format: '%(levelname)s[%(asctime)s] - %(message)s'
-        class: logging.Formatter
-    fmt_rich:
-        format: '%(message)s'
-        class: logging.Formatter
-handlers:
-    std:
-        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]'
-        #stream: ext://sys.stdout
-    agent:
-        class: logging.handlers.TimedRotatingFileHandler
-        level: INFO
-        formatter: fmt
-        backupCount: 5
-        when : 'D'
-        encoding : 'utf-8'
-        filename: .logs/cmdbox_agent.log
-
-loggers:
-    agent:
-        handlers: [agent]
-        level: INFO
-        qualname: agent
-        propagate: false
-
-#root:
-#    handlers: [std]
-#    level: NOTSET