cmdbox 0.5.3__tar.gz → 0.5.3.1__tar.gz

{cmdbox-0.5.3/cmdbox.egg-info → cmdbox-0.5.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.3
+Version: 0.5.3.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
@@ -173,7 +173,7 @@ class ServerTime(feature.Feature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None,
                         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,
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None,
                         discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                         discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="timedelta", type=Options.T_INT, default=9, required=False, multi=False, hide=False, choice=None,
@@ -276,10 +276,10 @@ aliases:                                # Specify the alias for the specified co
       mode: audit                       # Specify the mode of the feature to be searched.
       cmd: search                       # Specify the command to be searched.
     options:                            # Specify the options for the audit function.
-      host: localhost                   # Specify the service host of the audit Redis server.
-      port: 6379                        # Specify the service port of the audit Redis server.
-      password: password                # Specify the access password of the audit Redis server.
-      svname: server                    # Specify the audit service name of the inference server.
+      host: localhost                   # Specify the service host of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+      port: 6379                        # Specify the service port of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+      password: password                # Specify the access password of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+      svname: server                    # Specify the audit service name of the inference server.However, if it is specified as a command line argument, it is ignored.
       retry_count: 3                    # Specifies the number of reconnections to the audit Redis server.If less than 0 is specified, reconnection is forever.
       retry_interval: 1                 # Specifies the number of seconds before reconnecting to the audit Redis server.
       timeout: 15                       # Specify the maximum waiting time until the server responds.

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/README.md

@@ -149,7 +149,7 @@ class ServerTime(feature.Feature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None,
                         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,
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None,
                         discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                         discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="timedelta", type=Options.T_INT, default=9, required=False, multi=False, hide=False, choice=None,
@@ -252,10 +252,10 @@ aliases:                                # Specify the alias for the specified co
       mode: audit                       # Specify the mode of the feature to be searched.
       cmd: search                       # Specify the command to be searched.
     options:                            # Specify the options for the audit function.
-      host: localhost                   # Specify the service host of the audit Redis server.
-      port: 6379                        # Specify the service port of the audit Redis server.
-      password: password                # Specify the access password of the audit Redis server.
-      svname: server                    # Specify the audit service name of the inference server.
+      host: localhost                   # Specify the service host of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+      port: 6379                        # Specify the service port of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+      password: password                # Specify the access password of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+      svname: server                    # Specify the audit service name of the inference server.However, if it is specified as a command line argument, it is ignored.
       retry_count: 3                    # Specifies the number of reconnections to the audit Redis server.If less than 0 is specified, reconnection is forever.
       retry_interval: 1                 # Specifies the number of seconds before reconnecting to the audit Redis server.
       timeout: 15                       # Specify the maximum waiting time until the server responds.

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/feature.py

@@ -22,10 +22,12 @@ class Feature(object):
     default_host:str = os.environ.get('REDIS_HOST', 'localhost')
     default_port:int = int(os.environ.get('REDIS_PORT', '6379'))
     default_pass:str = os.environ.get('REDIS_PASSWORD', 'password')
+    default_svname:str = os.environ.get('SVNAME', 'server')
 
     def __init__(self, appcls, ver):
         self.ver = ver
         self.appcls = appcls
+        self.default_svname:str = ver.__appid__
 
     def get_mode(self) -> Union[str, List[str]]:
         """

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/features/cli/audit_base.py

@@ -31,7 +31,7 @@ class AuditBase(feature.ResultEdgeFeature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None, web="mask",
                      discription_ja=f"Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `{self.default_pass}` を使用します。",
                      discription_en=f"Specify the access password of the Redis server (optional). If omitted, `{self.default_pass}` 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."),
 

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/features/cli/cmdbox_audit_createdb.py

@@ -70,7 +70,7 @@ class AuditCreatedb(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=f"Redisサーバーのアクセスパスワード(任意)を指定します。省略時は `{self.default_pass}` を使用します。",
                      discription_en=f"Specify the access password of the Redis server (optional). If omitted, `{self.default_pass}` 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-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/features/cli/cmdbox_audit_write.py

@@ -123,6 +123,8 @@ class AuditWrite(audit_base.AuditBase):
         pg_password_b64 = convert.str2b64str(args.pg_password)
         pg_dbname_b64 = convert.str2b64str(args.pg_dbname)
 
+        if logger.level == logging.DEBUG:
+            logger.debug(f"audit write args: {args}")
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
         cl.redis_cli.send_cmd(self.get_svcmd(),
                               [audit_type_b64, clmsg_id_b64, clmsg_date_b64, clmsg_src_b64, clmsg_title_b64, clmsg_user_b64, clmsg_body_b64, clmsg_tag_b64,
@@ -157,6 +159,8 @@ class AuditWrite(audit_base.AuditBase):
         Returns:
             int: 終了コード
         """
+        if logger.level == logging.DEBUG:
+            logger.debug(f"audit write svrun msg: {msg}")
         audit_type = convert.b64str2str(msg[2])
         clmsg_id = convert.b64str2str(msg[3])
         clmsg_date = convert.b64str2str(msg[4])

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/features/cli/cmdbox_client_file_copy.py

@@ -47,7 +47,7 @@ class ClientFileCopy(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-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/features/cli/cmdbox_client_file_download.py

@@ -47,7 +47,7 @@ class ClientFileDownload(feature.OneshotEdgeFeature):
                 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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/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-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/features/web/cmdbox_web_audit.py

@@ -41,9 +41,13 @@ class Audit(feature.WebFeature):
             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:
-                raise dict(error='audit search feature is not found.')
+                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:
@@ -55,6 +59,8 @@ class Audit(feature.WebFeature):
             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]:

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/features/web/cmdbox_web_exec_cmd.py

@@ -136,9 +136,9 @@ 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, cmdbox_audit_write.AuditWrite) and o in _options.audit_write_args:
+                    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 o in _options.audit_search_args:
+                    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

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/options.py

@@ -713,6 +713,11 @@ class Options:
             user (str): メッセージを発生させたユーザー名
             kwargs (Any): 呼び出し元で使用しているキーワード引数
         """
+        if not hasattr(self, 'audit_write_args') or self.audit_write_args is None:
+            return
+        yml = self.features_yml_data
+        if yml is None or 'audit' not in yml or 'enabled' not in yml['audit'] or not yml['audit']['enabled']:
+            return
         if not hasattr(self, 'audit_write') or self.audit_write is None:
             raise Exception('audit write feature is not found.')
         clmsg_date = datetime.now().strftime('%Y-%m-%d %H:%M:%S') + common.get_tzoffset_str()
@@ -761,6 +766,10 @@ class Options:
                         else:
                             clmsg_body[key] = common.to_str(val, 100)
                         opt[key] = val
+                if hasattr(arg, 'redis_host'): opt['host'] = arg.redis_host
+                if hasattr(arg, 'redis_port'): opt['port'] = arg.redis_port
+                if hasattr(arg, 'redis_password'): opt['password'] = arg.redis_password
+                if hasattr(arg, 'svname'): opt['svname'] = arg.svname
                 if hasattr(arg, 'clmsg_id'): opt['clmsg_id'] = arg.clmsg_id
             elif isinstance(arg, web.Web):
                 opt['host'] = arg.redis_host

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/app/server.py

@@ -133,6 +133,7 @@ class Server(filer.Filer):
 
         while self.is_running:
             try:
+                msg = None
                 # ブロッキングリストから要素を取り出す
                 ctime = time.time()
                 self.redis_cli.hset(self.redis_cli.hbname, 'ctime', ctime)
@@ -186,18 +187,29 @@ class Server(filer.Filer):
             except exceptions.TimeoutError:
                 pass
             except exceptions.ConnectionError as e:
-                self.logger.warning(f"Connection to the server was lost. {e}", exec_info=True)
+                self.logger.warning(f"Connection to the server was lost. {e}", exc_info=True)
                 if not self.redis_cli.check_server(find_svname=False, retry_count=self.retry_count, retry_interval=self.retry_interval, outstatus=True):
                     self.is_running = False
                     break
             except OSError as e:
-                self.logger.warning(f"OSError. {e}", exec_info=True)
+                self.logger.warning(f"OSError. {e}. This message is not executable in the server environment. ({msg})", exc_info=True)
+                if msg is not None and len(msg) > 1:
+                    self.redis_cli.rpush(msg[1], dict(warn=f"OSError. {e}. This message is not executable in the server environment. ({msg[0]})"))
+                error_cnt += 1
+                self.redis_cli.hset(self.redis_cli.hbname, 'error_cnt', error_cnt)
+                pass
+            except IndexError as e:
+                self.logger.warning(f"IndexError. {e}. The message received by the server is invalid. ({msg})", exc_info=True)
+                if msg is not None and len(msg) > 1:
+                    self.redis_cli.rpush(msg[1], dict(warn=f"IndexError. {e}. The message received by the server is invalid. ({msg[0]})"))
+                error_cnt += 1
+                self.redis_cli.hset(self.redis_cli.hbname, 'error_cnt', error_cnt)
                 pass
             except KeyboardInterrupt as e:
                 self.is_running = False
                 break
             except Exception as e:
-                self.logger.warning(f"Unknown error occurred. {e}", exc_info=True)
+                self.logger.warning(f"Unknown error occurred. {e}. Service will be stopped due to unknown cause.({msg})", exc_info=True)
                 self.is_running = False
                 break
         self.redis_cli.delete(self.redis_cli.svname)

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/extensions/features.yml

@@ -46,10 +46,10 @@ audit:
     mode: audit                         # Specify the mode of the feature to be searched.
     cmd: search                         # Specify the command to be searched.
   options:                              # Specify the options for the audit function.
-    host: localhost                     # Specify the service host of the audit Redis server.
-    port: 6379                          # Specify the service port of the audit Redis server.
-    password: password                  # Specify the access password of the audit Redis server.
-    svname: server                      # Specify the audit service name of the inference server.
+    host: localhost                     # Specify the service host of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+    port: 6379                          # Specify the service port of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+    password: password                  # Specify the access password of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+    svname: cmdbox                      # Specify the audit service name of the inference server.However, if it is specified as a command line argument, it is ignored.
     retry_count: 3                      # Specifies the number of reconnections to the audit Redis server.If less than 0 is specified, reconnection is forever.
     retry_interval: 1                   # Specifies the number of seconds before reconnecting to the audit Redis server.
     timeout: 15                         # Specify the maximum waiting time until the server responds.

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/extensions/sample_project/sample/app/features/cli/sample_server_time.py

@@ -48,7 +48,7 @@ class ServerTime(feature.Feature):
                 dict(opt="password", type=Options.T_STR, default=self.default_pass, required=True, multi=False, hide=True, choice=None,
                         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,
+                dict(opt="svname", type=Options.T_STR, default=self.default_svname, required=True, multi=False, hide=True, choice=None,
                         discription_ja="サーバーのサービス名を指定します。省略時は `server` を使用します。",
                         discription_en="Specify the service name of the inference server. If omitted, `server` is used."),
                 dict(opt="timedelta", type=Options.T_INT, default=9, required=False, multi=False, hide=False, choice=None,

{cmdbox-0.5.3 → cmdbox-0.5.3.1}/cmdbox/version.py

@@ -3,7 +3,7 @@ import datetime
 dt_now = datetime.datetime(2025, 4, 18)
 __appid__ = 'cmdbox'
 __title__ = 'cmdbox (Command Development Application)'
-__version__ = '0.5.3'
+__version__ = '0.5.3.1'
 __copyright__ = f'Copyright © 2023-{dt_now.strftime("%Y")} hamacom2004jp'
 __pypiurl__ = 'https://pypi.org/project/cmdbox/'
 __srcurl__ = 'https://github.com/hamacom2004jp/cmdbox'