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

cmdbox/app/features/cli/cmdbox_audit_write.py

@@ -29,7 +29,7 @@ class AuditWrite(audit_base.AuditBase):
             str: コマンド
         """
         return 'write'
-    
+
     def get_option(self):
         """
         この機能のオプションを返します
@@ -99,11 +99,11 @@ class AuditWrite(audit_base.AuditBase):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, False, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         if args.audit_type is None:
             msg = dict(warn=f"Please specify the --audit_type option.")
             common.print_format(msg, False, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         if args.clmsg_id is None:
             args.clmsg_id = str(uuid.uuid4())
         if args.clmsg_date is None:
@@ -113,7 +113,7 @@ class AuditWrite(audit_base.AuditBase):
             logger.warning(f"client_only is True. Not connecting to server. Skip writing the audit log.")
             ret = dict(success={k:v for k, v in vars(args).items() if v})
             common.print_format(ret, False, tm, args.output_json, args.output_json_append, pf=pf)
-            return 0, ret, None
+            return self.RESP_SUCCESS, ret, None
 
         audit_type_b64 = convert.str2b64str(args.audit_type)
         clmsg_id_b64 = convert.str2b64str(args.clmsg_id)
@@ -132,8 +132,6 @@ 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,
@@ -142,7 +140,7 @@ class AuditWrite(audit_base.AuditBase):
                               retry_count=args.retry_count, retry_interval=args.retry_interval, timeout=args.timeout, nowait=True)
         ret = dict(success=True)
         #common.print_format(ret, False, tm, None, False, pf=pf)
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """
@@ -249,7 +247,7 @@ class AuditWrite(audit_base.AuditBase):
                             cursor.execute("DELETE FROM audit WHERE svmsg_date < CURRENT_TIMESTAMP + %s ",
                                            (f'-{retention_period_days} day',))
                     conn.commit()
-                    rescode, msg = (self.RESP_SCCESS, dict(success=True))
+                    rescode, msg = (self.RESP_SUCCESS, dict(success=True))
                     redis_cli.rpush(reskey, msg)
                     return rescode
                 finally:

cmdbox/app/features/cli/cmdbox_client_file_copy.py

@@ -133,7 +133,7 @@ class ClientFileCopy(feature.UnsupportEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
@@ -143,9 +143,9 @@ class ClientFileCopy(feature.UnsupportEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """

cmdbox/app/features/cli/cmdbox_client_file_download.py

@@ -131,7 +131,7 @@ class ClientFileDownload(feature.OneshotEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
@@ -141,9 +141,9 @@ class ClientFileDownload(feature.OneshotEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """

cmdbox/app/features/cli/cmdbox_client_file_list.py

@@ -123,7 +123,7 @@ class ClientFileList(feature.OneshotResultEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
@@ -132,9 +132,9 @@ class ClientFileList(feature.OneshotResultEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """

cmdbox/app/features/cli/cmdbox_client_file_mkdir.py

@@ -121,7 +121,7 @@ class ClientFileMkdir(feature.UnsupportEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
@@ -130,9 +130,9 @@ class ClientFileMkdir(feature.UnsupportEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """

cmdbox/app/features/cli/cmdbox_client_file_move.py

@@ -127,7 +127,7 @@ class ClientFileMove(feature.UnsupportEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
@@ -137,9 +137,9 @@ class ClientFileMove(feature.UnsupportEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """

cmdbox/app/features/cli/cmdbox_client_file_remove.py

@@ -121,7 +121,7 @@ class ClientFileRemove(feature.UnsupportEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
@@ -130,9 +130,9 @@ class ClientFileRemove(feature.UnsupportEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """

cmdbox/app/features/cli/cmdbox_client_file_rmdir.py

@@ -121,7 +121,7 @@ class ClientFileRmdir(feature.UnsupportEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
@@ -130,9 +130,9 @@ class ClientFileRmdir(feature.UnsupportEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """

cmdbox/app/features/cli/cmdbox_client_file_upload.py

@@ -132,7 +132,7 @@ class ClientFileUpload(feature.UnsupportEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         client_data = Path(args.client_data.replace('"','')) if args.client_data is not None else None
@@ -143,9 +143,9 @@ class ClientFileUpload(feature.UnsupportEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """

cmdbox/app/features/cli/cmdbox_client_http.py

@@ -57,6 +57,7 @@ class ClientHttp(feature.ResultEdgeFeature):
                      choice_show={'application/octet-stream':["send_param", "send_data",],
                                   'application/json':["send_data",],
                                   'multipart/form-data':["send_param",],},
+                     choice_edit=True,
                      description_ja="送信するデータのContent-Typeを指定します。",
                      description_en="Specifies the Content-Type of the data to be sent."),
                 dict(opt="send_apikey", type=Options.T_TEXT, default=None, required=False, multi=False, hide=False, choice=None,
@@ -105,7 +106,7 @@ class ClientHttp(feature.ResultEdgeFeature):
         if args.url is None:
             msg = dict(warn=f"Please specify the --url option.")
             common.print_format(msg, args.format, tm, None, False, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         query_param = {}
         if args.proxy == 'yes':
             from cmdbox.app.auth import signin
@@ -114,7 +115,7 @@ class ClientHttp(feature.ResultEdgeFeature):
             if scope is None:
                 msg = dict(warn=f"Request scope is not set. Please set the request scope.")
                 common.print_format(msg, args.format, tm, None, False, pf=pf)
-                return 1, msg, None
+                return self.RESP_WARN, msg, None
             req:Request = scope['req']
             args.send_method = req.method
             args.send_content_type = req.headers.get('Content-Type', None)
@@ -136,7 +137,7 @@ class ClientHttp(feature.ResultEdgeFeature):
         if res.status_code != 200:
             msg = dict(error=f"Request failed with status code {res.status_code}.")
             common.print_format(msg, False, tm, None, False, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         content_type = res.headers.get('Content-Type', '')
         if content_type.startswith('application/json'):
             try:
@@ -144,11 +145,11 @@ class ClientHttp(feature.ResultEdgeFeature):
             except ValueError as e:
                 msg = res.text
             common.print_format(msg, False, tm, None, False, pf=pf)
-            return 0, msg, None
+            return self.RESP_SUCCESS, msg, None
         elif content_type.startswith('text/'):
             msg = res.text
             common.print_format(msg, False, tm, None, False, pf=pf)
-            return 0, msg, None
+            return self.RESP_SUCCESS, msg, None
         common.print_format(res.content, False, tm, None, False, pf=pf)
 
-        return 0, res.content, None
+        return self.RESP_SUCCESS, res.content, None

cmdbox/app/features/cli/cmdbox_client_server_info.py

@@ -102,16 +102,16 @@ class ClientServerInfo(feature.OneshotResultEdgeFeature):
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         cl = client.Client(logger, redis_host=args.host, redis_port=args.port, redis_password=args.password, svname=args.svname)
 
         ret = cl.server_info(retry_count=args.retry_count, retry_interval=args.retry_interval, timeout=args.timeout)
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, cl
+            return self.RESP_WARN, ret, cl
 
-        return 0, ret, cl
+        return self.RESP_SUCCESS, ret, cl
 
     def is_cluster_redirect(self):
         """
@@ -159,7 +159,7 @@ class ClientServerInfo(feature.OneshotResultEdgeFeature):
             server_info = dict(svname=redis_cli.svname, redis_host=redis_cli.host, redis_port=redis_cli.port, redis_password=redis_cli.password, data_dir=data_dir)
             msg = dict(success=server_info)
             redis_cli.rpush(reskey, msg)
-            return self.RESP_SCCESS
+            return self.RESP_SUCCESS
         except Exception as e:
             logger.warning(f"Failed to get server info: {e}", exc_info=True)
             redis_cli.rpush(reskey, dict(warn=f"Failed to get server info: {e}"))

cmdbox/app/features/cli/cmdbox_cmd_list.py

@@ -85,7 +85,7 @@ class CmdList(feature.OneshotResultEdgeFeature):
         if args.data is None:
             msg = dict(warn=f"Please specify the --data option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         kwd = args.kwd
         if kwd is None or kwd == '':
             kwd = '*'
@@ -105,6 +105,6 @@ class CmdList(feature.OneshotResultEdgeFeature):
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, None
+            return self.RESP_WARN, ret, None
 
-        return 0, ret, None
+        return self.RESP_SUCCESS, ret, None

cmdbox/app/features/cli/cmdbox_cmd_load.py

@@ -85,11 +85,11 @@ class CmdLoad(feature.OneshotResultEdgeFeature):
         if args.data is None:
             msg = dict(warn=f"Please specify the --data option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         if args.title is None:
             msg = dict(warn=f"Please specify the --title option.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, msg, None
+            return self.RESP_WARN, msg, None
         if not hasattr(self, 'signin_file_data') or self.signin_file_data is None:
             self.signin_file_data = signin.Signin.load_signin_file(args.signin_file, None, self=self)
         opt_path = Path(args.data) / ".cmds" / f"cmd-{args.title}.json"
@@ -97,12 +97,12 @@ class CmdLoad(feature.OneshotResultEdgeFeature):
         if not signin.Signin._check_cmd(self.signin_file_data, args.groups, opt['mode'], opt['cmd'], logger):
             ret = dict(warn=f"You do not have permission to execute this command.")
             common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
-            return 1, ret, None
+            return self.RESP_WARN, ret, None
         ret = dict(success=opt)
 
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
 
         if 'success' not in ret:
-            return 1, ret, None
+            return self.RESP_WARN, ret, None
 
-        return 0, ret, None
+        return self.RESP_SUCCESS, ret, None

cmdbox/app/features/cli/cmdbox_edge_config.py

@@ -124,4 +124,4 @@ class EdgeConfig(feature.UnsupportEdgeFeature):
         app = edge.Edge(logger, args.data, self.appcls, self.ver)
         msg = app.configure(self.get_mode(), self.get_cmd(), args, tm, pf)
         common.print_format(msg, True, tm, None, False, pf=pf)
-        return 0, msg, None
+        return self.RESP_SUCCESS, msg, None

cmdbox/app/features/cli/cmdbox_edge_start.py

@@ -62,7 +62,7 @@ class EdgeStart(feature.UnsupportEdgeFeature):
 
         msg = dict(success="edge complate.")
         common.print_format(msg, True, tm, None, False, pf=pf)
-        return 0, msg, None
+        return self.RESP_SUCCESS, msg, None
 
     def load_cmds(self, logger:logging.Logger, args:argparse.Namespace) -> Tuple[int, List[Dict[str, Any]]]:
         """
@@ -80,7 +80,7 @@ class EdgeStart(feature.UnsupportEdgeFeature):
         if res.status_code != 200:
             return res.status_code, dict(warn=f"Access failed. status_code={res.status_code}")
         cmds = res.json()
-        return 0, cmds
+        return self.RESP_SUCCESS, cmds
 
     def load_pipes(self, logger:logging.Logger, args:argparse.Namespace) -> Tuple[int, List[Dict[str, Any]]]:
         """
@@ -98,5 +98,5 @@ class EdgeStart(feature.UnsupportEdgeFeature):
         if res.status_code != 200:
             return res.status_code, dict(warn=f"Access failed. status_code={res.status_code}")
         pipes = res.json()
-        return 0, pipes
+        return self.RESP_SUCCESS, pipes