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

cmdbox/app/app.py

@@ -18,7 +18,9 @@ class CmdBoxApp:
     @staticmethod
     def getInstance(appcls=None, ver=version, cli_features_packages:List[str]=None, cli_features_prefix:List[str]=None):
         if CmdBoxApp._instance is None:
-            CmdBoxApp._instance = CmdBoxApp(appcls=appcls, ver=ver, cli_features_packages=cli_features_packages, cli_features_prefix=cli_features_prefix)
+            _self = appcls.__new__(appcls)
+            _self.__init__(appcls=appcls, ver=ver, cli_features_packages=cli_features_packages, cli_features_prefix=cli_features_prefix)
+            CmdBoxApp._instance = _self
         return CmdBoxApp._instance
 
     def __init__(self, appcls=None, ver=version, cli_features_packages:List[str]=None, cli_features_prefix:List[str]=None):
@@ -145,12 +147,12 @@ class CmdBoxApp:
             if logger.level == logging.DEBUG:
                 logger.debug(f"args.mode={args.mode}, args.cmd={args.cmd}")
                 # 警告出力時にスタックを出力する
-                #import warnings
-                #def custom_warning_handler(message, category, filename, lineno, file=None, line=None):
-                #    import traceback
-                #    print(f"Warning: {message}, Category: {category}, File: {filename}, Line: {lineno}")
-                #    traceback.print_stack()
-                #warnings.showwarning = custom_warning_handler
+                import warnings
+                def custom_warning_handler(message, category, filename, lineno, file=None, line=None):
+                    import traceback
+                    logger.warning(f"Warning: {message}, Category: {category}, File: {filename}, Line: {lineno}", exc_info=True)
+                    traceback.print_stack()
+                warnings.showwarning = custom_warning_handler
 
             #scmdexectime = time.perf_counter()
             feat = self.options.get_cmd_attr(args.mode, args.cmd, 'feature')

cmdbox/app/common.py

@@ -3,9 +3,8 @@ from cmdbox.app import feature, options
 from cmdbox.app.commons import convert, module, loghandler
 from cryptography.fernet import Fernet
 from pathlib import Path
-from pkg_resources import resource_string
-from rich.logging import RichHandler
 from rich.console import Console
+from rich.logging import RichHandler
 from tabulate import tabulate
 from typing import List, Tuple, Dict, Any
 import argparse
@@ -133,10 +132,11 @@ def reset_logger(name:str, stderr:bool=False, fmt:str='[%(asctime)s] %(levelname
         level (int, optional): ログレベル. Defaults to logging.INFO.
     """
     logger = logging.getLogger(name)
+    #colorful = [h for h in logger.handlers if isinstance(h, loghandler.ColorfulStreamHandler) or isinstance(h, RichHandler)]
     logger.handlers.clear()
     logger.propagate = False
     logger.setLevel(level)
-    logger.addHandler(create_log_handler(stderr, fmt, datefmt, level))
+    logger.addHandler(create_log_handler(stderr, fmt, datefmt, level, colorful=True))
     if get_common_value('webcall', False):
         # webcallの場合はStreamHandlerを削除
         for handler in logger.handlers:
@@ -144,7 +144,7 @@ def reset_logger(name:str, stderr:bool=False, fmt:str='[%(asctime)s] %(levelname
             if issubclass(hc, logging.StreamHandler) and not issubclass(hc, logging.FileHandler):
                 logger.removeHandler(handler)
 
-def create_log_handler(stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s - %(message)s', datefmt:str='%Y-%m-%d %H:%M:%S', level:int=logging.INFO) -> 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', level:int=logging.INFO, colorful:bool=True) -> logging.Handler:
     """
     ログハンドラを生成します。
 
@@ -152,13 +152,18 @@ def create_log_handler(stderr:bool=False, fmt:str='[%(asctime)s] %(levelname)s -
         stderr (bool, optional): 標準エラー出力を使用するかどうか. Defaults to False.
         fmt (str, optional): ログフォーマット. Defaults to '[%(asctime)s] %(levelname)s - %(message)s'.
         datefmt (str, optional): 日時フォーマット. Defaults to '%Y-%m-%d %H:%M:%S'.
+        level (int, optional): ログレベル. Defaults to logging.INFO.
+        colorful (bool, optional): カラフルなログを使用するかどうか. Defaults to True.
     Returns:
         logging.Handler: ログハンドラ
     """
     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)
+    if colorful:
+        handler = loghandler.ColorfulStreamHandler(sys.stdout if not stderr else sys.stderr)
+    else:
+        handler = logging.StreamHandler(sys.stdout if not stderr else sys.stderr)
     handler.setFormatter(formatter)
     handler.setLevel(level)
     return handler
@@ -180,7 +185,7 @@ def create_console(stderr:bool=False, file=None) -> Console:
     #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 console_log(console:Console, message:Any, **kwargs) -> None:
+def console_log(console:Console, message:Any, highlight:bool=True, **kwargs) -> None:
     """
     コンソールにログを出力します。
 
@@ -190,7 +195,7 @@ def console_log(console:Console, message:Any, **kwargs) -> None:
         **kwargs: その他のキーワード引数
     """
     dtstr = datetime.datetime.now().strftime('[%Y-%m-%d %H:%M:%S]')
-    console.print(f"{dtstr} {message}", highlight=True, **kwargs)
+    console.print(f"{dtstr} {message}", highlight=highlight, **kwargs)
 
 def default_logger(debug:bool=False, ver=version, webcall:bool=False) -> logging.Logger:
     """
@@ -269,8 +274,7 @@ def load_config(mode:str, debug:bool=False, data=HOME_DIR, webcall:bool=False, v
     logging.config.dictConfig(log_config)
     logger = logging.getLogger(log_name)
     set_debug(logger, debug)
-    config = yaml.safe_load(resource_string(version.__appid__, "config.yml"))
-    return logger, config
+    return logger, {}
 
 def set_debug(logger:logging.Logger, debug:bool=False) -> None:
     """

cmdbox/app/commons/loghandler.py

@@ -144,7 +144,10 @@ class ColorfulStreamHandler(logging.StreamHandler):
         #super().emit(record)
         record.levelname = level_mapping_nc[record.levelno]
         record.msg = self.format(record)
-        self.console.print(record.msg)
+        try:
+            self.console.print(record.msg)
+        except Exception as e:
+            self.console.print(record.msg, highlight=False)
 
 class TimedRotatingFileHandler(logging.handlers.TimedRotatingFileHandler):
     def emit(self, record: logging.LogRecord) -> None:

cmdbox/app/features/cli/cmdbox_web_apikey_add.py

@@ -37,24 +37,9 @@ class WebApikeyAdd(feature.UnsupportEdgeFeature):
             description_ja="WebモードのユーザーのApiKeyを追加します。",
             description_en="Add an ApiKey for a user in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="user_name", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
-                     description_ja="ユーザー名を指定します。他のユーザーと重複しないようにしてください。",
-                     description_en="Specify a user name. Do not duplicate other users."),
+                     description_ja="対象のユーザー名を指定します。",
+                     description_en="Specify the target user name."),
                 dict(opt="apikey_name", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="このユーザーのApiKey名を指定します。",
                      description_en="Specify the ApiKey name for this user."),
@@ -92,8 +77,8 @@ class WebApikeyAdd(feature.UnsupportEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             user = dict(name=args.user_name, apikey_name=args.apikey_name)
             apikey = w.apikey_add(user)

cmdbox/app/features/cli/cmdbox_web_apikey_del.py

@@ -37,24 +37,9 @@ class WebApikeyDel(feature.UnsupportEdgeFeature):
             description_ja="WebモードのユーザーのApiKeyを削除します。",
             description_en="Del an ApiKey for a user in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="user_name", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
-                     description_ja="ユーザー名を指定します。他のユーザーと重複しないようにしてください。",
-                     description_en="Specify a user name. Do not duplicate other users."),
+                     description_ja="対象のユーザー名を指定します。",
+                     description_en="Specify the target user name."),
                 dict(opt="apikey_name", type=Options.T_STR, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="このユーザーのApiKey名を指定します。",
                      description_en="Specify the ApiKey name for this user."),
@@ -92,8 +77,8 @@ class WebApikeyDel(feature.UnsupportEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             user = dict(name=args.user_name, apikey_name=args.apikey_name)
             w.apikey_del(user)

cmdbox/app/features/cli/cmdbox_web_group_add.py

@@ -37,21 +37,6 @@ class WebGroupAdd(feature.UnsupportEdgeFeature):
             description_ja="Webモードのグループを追加します。",
             description_en="Add a group in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="group_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="グループIDを指定します。他のグループと重複しないようにしてください。",
                      description_en="Specify the group ID. Do not duplicate other groups."),
@@ -95,8 +80,8 @@ class WebGroupAdd(feature.UnsupportEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             group = dict(gid=args.group_id, name=args.group_name, parent=args.group_parent)
             w.group_add(group)

cmdbox/app/features/cli/cmdbox_web_group_del.py

@@ -37,21 +37,6 @@ class WebGroupDel(feature.UnsupportEdgeFeature):
             description_ja="Webモードのグループを削除します。",
             description_en="Del a group in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="group_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="グループIDを指定します。",
                      description_en="Specify the group ID. Do not duplicate other groups."),
@@ -89,8 +74,8 @@ class WebGroupDel(feature.UnsupportEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             w.group_del(args.group_id)
             msg = dict(success=f"group ID {args.group_id} has been deleted.")

cmdbox/app/features/cli/cmdbox_web_group_edit.py

@@ -37,21 +37,6 @@ class WebGroupEdit(feature.UnsupportEdgeFeature):
             description_ja="Webモードのグループを編集します。",
             description_en="Edit a group in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="group_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="グループIDを指定します。",
                      description_en="Specify the group ID. Do not duplicate other groups."),
@@ -95,8 +80,8 @@ class WebGroupEdit(feature.UnsupportEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             group = dict(gid=args.group_id, name=args.group_name, parent=args.group_parent)
             w.group_edit(group)

cmdbox/app/features/cli/cmdbox_web_group_list.py

@@ -37,21 +37,6 @@ class WebGroupList(feature.OneshotResultEdgeFeature):
             description_ja="Webモードのグループー一覧を取得します。",
             description_en="Get a list of users in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="group_name", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      description_ja="グループ名を指定して取得します。省略した時は全てのグループを取得します。",
                      description_en="Retrieved by specifying a group name. If omitted, all groups are retrieved."),
@@ -89,8 +74,8 @@ class WebGroupList(feature.OneshotResultEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             groups = w.group_list(args.group_name)
             msg = dict(success=groups)

cmdbox/app/features/cli/cmdbox_web_user_add.py

@@ -37,21 +37,6 @@ class WebUserAdd(feature.UnsupportEdgeFeature):
             description_ja="Webモードのユーザーを追加します。",
             description_en="Add a user in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="user_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="ユーザーIDを指定します。他のユーザーと重複しないようにしてください。",
                      description_en="Specify the user ID. Do not duplicate other users."),
@@ -104,8 +89,8 @@ class WebUserAdd(feature.UnsupportEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             user = dict(uid=args.user_id, name=args.user_name, password=args.user_pass, hash=args.user_pass_hash,
                         email=args.user_email, groups=args.user_group)

cmdbox/app/features/cli/cmdbox_web_user_del.py

@@ -37,21 +37,6 @@ class WebUserDel(feature.UnsupportEdgeFeature):
             description_ja="Webモードのユーザーを削除します。",
             description_en="Delete a user in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="user_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="ユーザーIDを指定します。",
                      description_en="Specify the user ID."),
@@ -89,8 +74,8 @@ class WebUserDel(feature.UnsupportEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             w.user_del(args.user_id)
             msg = dict(success=f"User ID {args.user_id} has been deleted.")

cmdbox/app/features/cli/cmdbox_web_user_edit.py

@@ -37,21 +37,6 @@ class WebUserEdit(feature.UnsupportEdgeFeature):
             description_ja="Webモードのユーザーを編集します。",
             description_en="Edit users in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="user_id", type=Options.T_INT, default=None, required=True, multi=False, hide=False, choice=None,
                      description_ja="ユーザーIDを指定します。",
                      description_en="Specify the user ID."),
@@ -104,8 +89,8 @@ class WebUserEdit(feature.UnsupportEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             user = dict(uid=args.user_id, name=args.user_name, password=args.user_pass, hash=args.user_pass_hash,
                         email=args.user_email, groups=args.user_group)

cmdbox/app/features/cli/cmdbox_web_user_list.py

@@ -37,21 +37,6 @@ class WebUserList(feature.OneshotResultEdgeFeature):
             description_ja="Webモードのユーザー一覧を取得します。",
             description_en="Get a list of users in Web mode.",
             choice=[
-                dict(opt="host", type=Options.T_STR, default=self.default_host, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスホストを指定します。",
-                     description_en="Specify the service host of the Redis server."),
-                dict(opt="port", type=Options.T_INT, default=self.default_port, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのサービスポートを指定します。",
-                     description_en="Specify the service port of the Redis server."),
-                dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
-                     description_ja="Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `password` を使用します。",
-                     description_en="Specify the access password of the Redis server (optional). If omitted, `password` is used."),
-                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None, web="readonly",
-                     description_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
-                     description_en="Specify the service name of the inference server. If omitted, `server` is used."),
-                dict(opt="data", type=Options.T_DIR, default=self.default_data, required=False, multi=False, hide=False, choice=None,
-                     description_ja=f"省略した時は `$HONE/.{self.ver.__appid__}` を使用します。",
-                     description_en=f"When omitted, `$HONE/.{self.ver.__appid__}` is used."),
                 dict(opt="user_name", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      description_ja="ユーザー名を指定して取得します。省略した時は全てのユーザーを取得します。",
                      description_en="Retrieved by specifying a user name. If omitted, all users are retrieved."),
@@ -89,8 +74,8 @@ class WebUserList(feature.OneshotResultEdgeFeature):
             return 1, msg, None
         w = None
         try:
-            w = web.Web(logger, Path(args.data), appcls=self.appcls, ver=self.ver,
-                        redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname,
+            w = web.Web(logger, self.default_data, appcls=self.appcls, ver=self.ver,
+                        redis_host=self.default_host, redis_port=self.default_port, redis_password=self.default_pass, svname=self.default_svname,
                         signin_file=args.signin_file)
             users = w.user_list(args.user_name)
             msg = dict(success=users)

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:
-                common.console_log(console, f'EXEC  - {opt_list}\n'[:logsize])
+                common.console_log(console, message=f'EXEC  - {opt_list}\n'[:logsize], highlight=(len(opt_list)<logsize-10))
                 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.')]
-                old_stdout.write(f'EXEC OUTPUT => {output}'[:logsize]) # コマンド実行時のアウトプットはカラーリングしない
+                old_stdout.write(f'EXEC OUTPUT => {output}'[:logsize]+'\n') # コマンド実行時のアウトプットはカラーリングしない
             except Exception as e:
                 web.logger.disabled = False # ログ出力を有効にする
                 msg = f'exec_cmd error. {traceback.format_exc()}'
-                common.console_log(console, f'EXEC  - {msg}'[:logsize])
+                common.console_log(console, message=f'EXEC  - {msg}'[:logsize], highlight=(len(msg)<logsize-10))
                 web.logger.warning(msg)
                 output = [dict(warn=f'<pre>{html.escape(traceback.format_exc())}</pre>')]
             sys.stdout = old_stdout

cmdbox/app/web.py

@@ -475,7 +475,7 @@ class Web:
         for u in signin_data['users']:
             if u['uid'] == user['uid']:
                 u['name'] = user['name']
-                if 'password' in user and user['password'] != '':
+                if 'password' in user and user['password'] is not None and user['password'] != '':
                     jadge, msg = self.signin.check_password_policy(user['name'], u['password'], user['password'])
                     if not jadge:
                         raise ValueError(msg)

cmdbox/version.py

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

{cmdbox-0.6.3.dist-info → cmdbox-0.6.3.2.dist-info}/METADATA

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

@@ -10,11 +10,11 @@ cmdbox/logconf_gui.yml,sha256=-95vyd0q-aB1gsabdk8rg9dJ2zRKAZc8hRxyhNOQboU,1076
 cmdbox/logconf_mcp.yml,sha256=pED0i1iKP8UoyXE0amFMA5kjV7Qc6_eJCUDVen3L4AU,1069
 cmdbox/logconf_server.yml,sha256=n3c5-KVzjUzcUX5BQ6uE-PN9rp81yXaJql3whyCcSDQ,1091
 cmdbox/logconf_web.yml,sha256=pPbdAwckbK0cgduxcVkx2mbk-Ymz5hVzR4guIsfApMQ,1076
-cmdbox/version.py,sha256=HTU-X6-2WVXAPOXs7dqpmC2oYd3v69th6uurBQSFxUg,2108
+cmdbox/version.py,sha256=c5x2tcHm2AcB3MgTKcRZATwSV4RFvcauR3hXTECbeTg,2110
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cmdbox/app/app.py,sha256=_UJqSTs3LStGSu3vLMTqOKmpL4x7NQAQb2hUMbEFcg4,9639
+cmdbox/app/app.py,sha256=fJU7h4uiI2y7_ohAep8PeRHy8o4f-SqqiGtZbdbWenE,9723
 cmdbox/app/client.py,sha256=n986lXeV7hhaki4iyyvsfhNptmCXDFphxlNoNe2XhKg,19542
-cmdbox/app/common.py,sha256=iY4Bl9r0MSSDhZ9Ep3Y45MVBapurKpwkBNCHYb-COnY,28130
+cmdbox/app/common.py,sha256=ltB7wIuUY-kybE5Cbfj5lCJpYGQ0BTN1_ErFo965EbU,28487
 cmdbox/app/edge.py,sha256=2Aav7n4skhP0FUvG6_3JKijHHozA-WcwALgEwNB0DUI,41439
 cmdbox/app/edge_tool.py,sha256=HXxr4Or8QaZ5ueYIN3huv8GnXSnV28RZCmZBUEfiIk0,8062
 cmdbox/app/feature.py,sha256=fK7JP1fc8b9k1zhSNOkWq02ad8i-_wuAX5kyyK2TZdE,10391
@@ -22,7 +22,7 @@ cmdbox/app/filer.py,sha256=L_DSMTvnbN_ffr3JIt0obbOmVoTHEfVm2cAVz3rLH-Q,16059
 cmdbox/app/mcp.py,sha256=ZzpfaZHgNSrTY5Jj5KZzm28LLtW7cAMrS8-NSf6eGMc,32635
 cmdbox/app/options.py,sha256=GVGq9ID46czZsWNlCHkVf33DrM-1oY5ea90ej1-UnFQ,46268
 cmdbox/app/server.py,sha256=woOmIk901ONn5a_2yz_b3I1JpLYIF8g42uQRd0_MRuQ,10417
-cmdbox/app/web.py,sha256=1T4cRg6TnhB7LA37sePZFgnZAc1hARC7qS6DrRGFcEc,54035
+cmdbox/app/web.py,sha256=7NkbbkpRgRH41qCANvQKyJIqQmTtLv-foiewjS9A9no,54068
 cmdbox/app/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/auth/azure_signin.py,sha256=jJlIZJIGLZCngnJgoxBajaD2s8nM7QoszuN6-FT-5h8,1953
 cmdbox/app/auth/azure_signin_saml.py,sha256=oM2buGTK4t6-OsUuiUXTlZk0YXZL01khuPYVB84dMDU,472
@@ -31,7 +31,7 @@ cmdbox/app/auth/google_signin.py,sha256=LErFkKniumKgfE5jlY9_lAneKlqD6BfLHxg2lZgv
 cmdbox/app/auth/signin.py,sha256=wBnZMmi7i4BehlfJtXg4owr5HDLOzQCS6Lc2UO-2dPQ,60022
 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=bcKTDqSlUcVpO-6vYGijZcLdJlXn7ewx9MT_N7RhgAY,6323
+cmdbox/app/commons/loghandler.py,sha256=F86USTtVwJHa2-uHWi2Sypq0sNGy0lVfuwwQdl-6QHE,6431
 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=FShwbXWCfU-pXNTRaWfV_9z5FKeczxWsxidDmXeaQI0,7682
@@ -61,20 +61,20 @@ cmdbox/app/features/cli/cmdbox_mcp_proxy.py,sha256=xQ3832CdeUZ1WVRQcpoE2Yw4TQ5uR
 cmdbox/app/features/cli/cmdbox_server_list.py,sha256=J9FLVq3B5hlEBK88rT867Ey32-bHAHpZy_X9VqjZLvI,5777
 cmdbox/app/features/cli/cmdbox_server_start.py,sha256=ci9vo1G9LtazQo9XYI4-_OdfHHhU_r8gFp-meWeE2vM,7279
 cmdbox/app/features/cli/cmdbox_server_stop.py,sha256=eSdo0vW0PYAU1VIC0-wWsGKNlmZ1J8SOfN18fL_AVrI,8644
-cmdbox/app/features/cli/cmdbox_web_apikey_add.py,sha256=RrmGWUoK5aqRnUu-CSVe0y5-FenjF0E3yYED8RJefhM,7151
-cmdbox/app/features/cli/cmdbox_web_apikey_del.py,sha256=EHZ5PND4lWM3ZKkBMXC2fT-tLnnBSVMLih-mxR8ztLk,7129
+cmdbox/app/features/cli/cmdbox_web_apikey_add.py,sha256=fpqtVUt-48Ssn4yb4m-vWYs7-CjOROXS2v9QWItsBck,5253
+cmdbox/app/features/cli/cmdbox_web_apikey_del.py,sha256=k9voMzQBA9lvtH3U37OF8Uj97pTH0lTt9aSLk2UP6ik,5231
 cmdbox/app/features/cli/cmdbox_web_gencert.py,sha256=tFqP4dBXeBYCFfNKcdKN49-waJrUCxa_zDcOV9yrIsA,11396
 cmdbox/app/features/cli/cmdbox_web_genpass.py,sha256=f450z1PxofpbrPsJccnHEjkXF975ZsLbBii8RkCgVCM,9541
-cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=p4VdIUv-hh0eXqV5ITyBFRUxGBeQxImHXEPv7s7SUv4,7419
-cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=qssAhZmY0wKfkpQ6UycT7G-_qQpyyE_T7w_hupgsajE,6629
-cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=04U741NeIGqeuId8m2oSOFgSguQuTK0_Krt0nSMATrw,7358
-cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=4oITsdUEkPW4jZQOTiDQkgawJTUfxEyn1YFxDuf9SVk,6724
+cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=scvYc9OCyaPn87m8X3ONi1bcXzmLS5e5FisjR9KYmp0,5599
+cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=tmxpz_cK7PSZdiA0R94Ospf10EimNMHre5jBnpJsyKw,4809
+cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=-V3czGmUFJVcJOS7EiaT6cVPPqa7tRgtrJq7DaI6XWw,5538
+cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=LfnXCNwgOFg_W-eQzDW8nXjdOKAmju5o1v5_8D9v1_A,4904
 cmdbox/app/features/cli/cmdbox_web_start.py,sha256=uNFXWpmrhMY6AEzYgf5RXlkc7yzHJIIJZs5dJ_7TZNU,17848
 cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=5ja4IiWRSpfRrWfoRncMRmofEYj8MDfIFUcWfDtIOQ4,3567
-cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=WsuW1rt27dhxIY7aD_xyZblyEhBqq4Z_doE4Gd75O68,8611
-cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=t5CpPO4J9Wl2paBqSY_rA9vEYLXSxrYFB999Cvd-ZMU,6592
-cmdbox/app/features/cli/cmdbox_web_user_edit.py,sha256=jzwkjCNxW7vX0Nc4FIHn4hDO6PmBoVpPcmzr5P3W4rQ,8519
-cmdbox/app/features/cli/cmdbox_web_user_list.py,sha256=EGOcWMmRLZ_QHlb1twIZJ5xWSjSvDZZRTkYv9emANKI,6712
+cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=rl5QDDw6hzKNN797II7zn7hFkejsCjabHera6TWxvNg,6791
+cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=xGJs1XFuLVRlA0bpiyM5yO9tDMdfxm8VSYf4zZBHB6Y,4772
+cmdbox/app/features/cli/cmdbox_web_user_edit.py,sha256=7Lb5uWlmxOx7Jq39pZm8D1NY3PLpqYJKEe7RoB7abR4,6699
+cmdbox/app/features/cli/cmdbox_web_user_list.py,sha256=ODxHxjOVCnj6VfR3hLDaClVz6ETUyuCMHu4jhiRqGBY,4892
 cmdbox/app/features/web/cmdbox_web_agent.py,sha256=yBbPszQAkw3yfukJJ-xnQNoOsTsi32lm3WxR4iAMhJ4,14542
 cmdbox/app/features/web/cmdbox_web_assets.py,sha256=D1dYNrvC7xBAVAAHX6PkoB6RFehEofET4hkHeCFYq7s,1931
 cmdbox/app/features/web/cmdbox_web_audit.py,sha256=-flyijdnh3hN-BKnw0GI3gSiduLP0vQFg_AiYCLXRBY,3359
@@ -85,7 +85,7 @@ cmdbox/app/features/web/cmdbox_web_del_cmd.py,sha256=3Bx2tuXJXc63yip9gWH2bXBydD4
 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=b64XcmioyuyEL6VFymcs5kFIt4zviqhqJbFUWRCdMo0,1109
-cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=qfa6YzYkW0TxO-UCk1w88gzCF0BtJRAtz5cS7dn6CAA,13206
+cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=cwiG8f2sn0rJwKZaff2zRtBjj6FqFIeGWcUqwsynC7c,13298
 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
@@ -379,9 +379,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.3.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.6.3.dist-info/METADATA,sha256=o68uXEPaEhHqDp9HvcnpzP4qXBc9KTt8-sLqUcrJjX4,33522
-cmdbox-0.6.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.6.3.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
-cmdbox-0.6.3.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.6.3.dist-info/RECORD,,
+cmdbox-0.6.3.2.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.6.3.2.dist-info/METADATA,sha256=JEA6co8dTSOYH28LWFD30P6Sqzo078sF1C2eun2835I,33524
+cmdbox-0.6.3.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.6.3.2.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
+cmdbox-0.6.3.2.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.6.3.2.dist-info/RECORD,,