cmdbox 0.5.2__py3-none-any.whl → 0.5.3.1__py3-none-any.whl

cmdbox/app/features/cli/cmdbox_client_file_list.py

@@ -47,7 +47,7 @@ class ClientFileList(feature.OneshotResultEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="svpath", type=Options.T_STR, default="/", required=True, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_client_file_mkdir.py

@@ -47,7 +47,7 @@ class ClientFileMkdir(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="svpath", type=Options.T_STR, default="/", required=True, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_client_file_move.py

@@ -47,7 +47,7 @@ class ClientFileMove(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="from_path", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_client_file_remove.py

@@ -47,7 +47,7 @@ class ClientFileRemove(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="svpath", type=Options.T_STR, default="/", required=True, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_client_file_rmdir.py

@@ -47,7 +47,7 @@ class ClientFileRmdir(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="svpath", type=Options.T_STR, default="/", required=True, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_client_file_upload.py

@@ -47,7 +47,7 @@ class ClientFileUpload(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="svpath", type=Options.T_STR, default="/", required=True, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_client_server_info.py

@@ -47,7 +47,7 @@ class ClientServerInfo(feature.OneshotResultEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="retry_count", type=Options.T_INT, default=3, required=False, multi=False, hide=True, choice=None,

cmdbox/app/features/cli/cmdbox_gui_start.py

@@ -47,7 +47,7 @@ class GuiStart(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_server_start.py

@@ -46,7 +46,7 @@ class ServerStart(feature.OneshotNotifyEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_server_stop.py

@@ -47,7 +47,7 @@ class ServerStop(feature.OneshotNotifyEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="retry_count", type=Options.T_INT, default=3, required=False, multi=False, hide=True, choice=None,

cmdbox/app/features/cli/cmdbox_web_apikey_add.py

@@ -46,7 +46,7 @@ class WebApikeyAdd(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_apikey_del.py

@@ -46,7 +46,7 @@ class WebApikeyDel(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_group_add.py

@@ -46,7 +46,7 @@ class WebGroupAdd(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_group_del.py

@@ -46,7 +46,7 @@ class WebGroupDel(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_group_edit.py

@@ -46,7 +46,7 @@ class WebGroupEdit(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_group_list.py

@@ -46,7 +46,7 @@ class WebGroupList(feature.OneshotResultEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_start.py

@@ -47,7 +47,7 @@ class WebStart(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_user_add.py

@@ -46,7 +46,7 @@ class WebUserAdd(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_user_del.py

@@ -46,7 +46,7 @@ class WebUserDel(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_user_edit.py

@@ -46,7 +46,7 @@ class WebUserEdit(feature.UnsupportEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_web_user_list.py

@@ -46,7 +46,7 @@ class WebUserList(feature.OneshotResultEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
                      discription_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default="server", required=True, multi=False, hide=True, choice=None, web="readonly",
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
                      discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                      discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="data", type=Options.T_FILE, default=common.HOME_DIR / f".{self.ver.__appid__}", required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/web/cmdbox_web_audit.py

@@ -0,0 +1,87 @@
+from cmdbox.app import common, feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response
+from fastapi.responses import HTMLResponse
+from typing import Dict, Any
+import argparse
+import time
+
+
+class Audit(feature.WebFeature):
+
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        if web.audit_html is not None:
+            if not web.audit_html.is_file():
+                raise FileNotFoundError(f'audit_html is not found. ({web.audit_html})')
+            with open(web.audit_html, 'r', encoding='utf-8') as f:
+                web.audit_html_data = f.read()
+
+        @app.get('/audit', response_class=HTMLResponse)
+        @app.post('/audit', response_class=HTMLResponse)
+        async def audit(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                return signin
+            res.headers['Access-Control-Allow-Origin'] = '*'
+            web.options.audit_exec(req, res, web)
+            return web.audit_html_data
+
+        @app.post('/audit/rawlog')
+        async def audit_rawlog(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                return signin
+            if web.signin.get_data() is None:
+                return dict(error='signin_file_data is None.')
+            if not hasattr(web.options, 'audit_search') or web.options.audit_search is None:
+                return dict(warn='audit feature is disabled.')
+            opt = await req.json()
+            opt = {**opt, **web.options.audit_search_args.copy()}
+            opt['host'] = web.redis_host
+            opt['port'] = web.redis_port
+            opt['password'] = web.redis_password
+            opt['svname'] = web.svname
+            args = argparse.Namespace(**{k:common.chopdq(v) for k,v in opt.items()})
+            status, ret_main, _ = web.options.audit_search.apprun(web.logger, args, time.perf_counter(), [])
+            if status != 0:
+                return dict(error=ret_main)
+            return ret_main
+
+        @app.get('/audit/mode_cmd')
+        async def audit_mode_cmd(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                return signin
+            if not hasattr(web.options, 'audit_search_args'):
+                return dict(warn='audit feature is disabled.')
+            return dict(success=web.options.audit_search_args)
+
+    def toolmenu(self, web:Web) -> Dict[str, Any]:
+        """
+        ツールメニューの情報を返します
+
+        Args:
+            web (Web): Webオブジェクト
+        
+        Returns:
+            Dict[str, Any]: ツールメニュー情報
+        
+        Sample:
+            {
+                'filer': {
+                    'html': 'Filer',
+                    'href': 'filer',
+                    'target': '_blank',
+                    'css_class': 'dropdown-item'
+                    'onclick': 'alert("filer")'
+                }
+            }
+        """
+        return dict(audit=dict(html='Audit', href='audit', target='_blank', css_class='dropdown-item'))

cmdbox/app/features/web/cmdbox_web_audit_metrics.py

@@ -0,0 +1,72 @@
+from cmdbox.app import common, feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from typing import Dict, Any
+import json
+
+
+class AuditMetrics(feature.WebFeature):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.post('/audit/metrics/save')
+        async def save_metrics(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            form = await req.form()
+            title = form.get('title')
+            opt = json.loads(form.get('opt'))
+            if common.check_fname(title):
+                return dict(warn=f'The title contains invalid characters."{title}"')
+            opt_path = web.audit_path / f"metrics-{title}.json"
+            web.logger.info(f"save_metrics: opt_path={opt_path}, opt={opt}")
+            common.saveopt(opt, opt_path, True)
+            ret = dict(success=f'Metrics "{title}" saved in "{opt_path}".')
+            web.options.audit_exec(req, res, web, title=title)
+            return ret
+
+        @app.post('/audit/metrics/load')
+        async def load_metrics(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            form = await req.form()
+            title = form.get('title')
+            opt_path = web.audit_path / f"metrics-{title}.json"
+            if not opt_path.is_file():
+                return dict(warn=f'The metrics file is not found."{opt_path}"')
+            with open(opt_path, 'r', encoding='utf-8') as f:
+                opt = json.load(f)
+            return dict(success=opt)
+
+        @app.post('/audit/metrics/delete')
+        async def delete_metrics(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            form = await req.form()
+            title = form.get('title')
+            opt_path = web.audit_path / f"metrics-{title}.json"
+            if not opt_path.is_file():
+                return dict(warn=f'The metrics file is not found."{opt_path}"')
+            opt_path.unlink()
+            return dict(success=f'Metrics "{title}" deleted.')
+
+        @app.post('/audit/metrics/list')
+        async def list_metrics(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            files = web.audit_path.glob('metrics-*.json')
+            ret = []
+            for f in files:
+                with open(f, 'r', encoding='utf-8') as f:
+                    opt = json.load(f)
+                    ret.append(opt)
+            return dict(success=ret)

cmdbox/app/features/web/cmdbox_web_exec_cmd.py

@@ -1,6 +1,6 @@
 from cmdbox.app import app, client, common, options, server, web as _web
 from cmdbox.app.commons import convert, loghandler
-from cmdbox.app.features.cli import audit_base
+from cmdbox.app.features.cli import cmdbox_audit_search, cmdbox_audit_write
 from cmdbox.app.features.web import cmdbox_web_load_cmd
 from cmdbox.app.web import Web
 from fastapi import FastAPI, Request, Response, HTTPException
@@ -96,7 +96,6 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
                 return True, output
         return False, None
 
-    @options.Options.audit()
     def exec_cmd(self, req:Request, res:Response, web:Web,
                  title:str, opt:Dict[str, Any], nothread:bool=False, appcls=None) -> List[Dict[str, Any]]:
         """
@@ -113,6 +112,10 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
         Returns:
             list: コマンド実行結果
         """
+        tags = []
+        if 'tag' in opt and isinstance(opt['tag'], list):
+            tags = [t for t in opt['tag'] if t is not None and t != '']
+        web.options.audit_exec(req, res, web, tags=tags, title=title)
         appcls = self.appcls if appcls is None else appcls
         appcls = app.CmdBoxApp if appcls is None else appcls
         web.container['cmdbox_app'] = ap = appcls.getInstance(appcls=appcls, ver=self.ver)
@@ -133,8 +136,10 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
                         found = True
                     if not found or o not in loaded: continue
                     opt[o] = loaded[o]
-                    if isinstance(feat, audit_base.AuditBase) and o in _options.audit_args:
-                        opt[o] = _options.audit_args[o]
+                    if isinstance(feat, cmdbox_audit_write.AuditWrite) and hasattr(_options, 'audit_write_args') and o in _options.audit_write_args:
+                        opt[o] = _options.audit_write_args[o]
+                    elif isinstance(feat, cmdbox_audit_search.AuditSearch) and hasattr(_options, 'audit_search_args') and o in _options.audit_search_args:
+                        opt[o] = _options.audit_search_args[o]
             except:
                 pass
         if 'host' in opt: opt['host'] = web.redis_host
@@ -175,7 +180,7 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
             logsize = 1024
             try:
                 old_stdout.write(loghandler.colorize_msg(f'EXEC:     {opt_list}\n'[:logsize]))
-                status, ret_main, obj = cmdbox_app.main(args_list=opt_list, file_dict=file_dict, webcall=True)
+                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
                 elif isinstance(obj, client.Client):

cmdbox/app/features/web/cmdbox_web_user_data.py

@@ -0,0 +1,58 @@
+from cmdbox.app import common, feature
+from cmdbox.app.web import Web
+from fastapi import FastAPI, Request, Response, HTTPException
+from typing import Dict, Any
+
+
+class UserData(feature.WebFeature):
+    def route(self, web:Web, app:FastAPI) -> None:
+        """
+        webモードのルーティングを設定します
+
+        Args:
+            web (Web): Webオブジェクト
+            app (FastAPI): FastAPIオブジェクト
+        """
+        @app.post('/gui/user_data/load')
+        async def load(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            categoly = form.get('categoly')
+            key = form.get('key')
+            sess = req.session['signin']
+            ret = web.user_data(req, sess['uid'], sess['name'], categoly, key)
+            return dict(success=ret)
+
+        @app.post('/gui/user_data/save')
+        async def save(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            categoly = form.get('categoly')
+            key = form.get('key')
+            val = form.get('val')
+            sess = req.session['signin']
+            web.user_data(req, sess['uid'], sess['name'], categoly, key, val)
+            return dict(success=f'user_data "{categoly}:{key}:val" saved.')
+
+        @app.post('/gui/user_data/delete')
+        async def delete(req:Request, res:Response):
+            signin = web.signin.check_signin(req, res)
+            if signin is not None:
+                raise HTTPException(status_code=401, detail=self.DEFAULT_401_MESSAGE)
+            if 'signin' not in req.session or req.session['signin'] is None:
+                return dict(warn='Please sign in.')
+            form = await req.form()
+            categoly = form.get('categoly')
+            key = form.get('key')
+            val = form.get('val')
+            sess = req.session['signin']
+            web.user_data(req, sess['uid'], sess['name'], categoly, key, delkey=True)
+            return dict(success=f'user_data "{categoly}:{key}:val" deleted.')