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

cmdbox/app/options.py

@@ -368,20 +368,7 @@ class Options:
         """
         return ftype in self.features_loaded and self.features_loaded[ftype]
 
-    def load_features_file(self, ftype:str, func, appcls, ver, logger:logging.Logger=None):
-        """
-        フィーチャーファイル（features.yml）を読み込みます。
-
-        Args:
-            ftype (str): フィーチャータイプ。cli又はweb
-            func (Any): フィーチャーの処理関数
-            appcls (Any): アプリケーションクラス
-            ver (Any): バージョンモジュール
-            logger (logging.Logger): ロガー
-        """
-        # 読込み済みかどうかの判定
-        if self.is_features_loaded(ftype):
-            return
+    def _load_features_yml(self, ver, logger:logging.Logger=None):
         # cmdboxを拡張したアプリをカスタマイズするときのfeatures.ymlを読み込む
         features_yml = Path(f'.{ver.__appid__}/features.yml')
         if not features_yml.exists() or not features_yml.is_file():
@@ -398,35 +385,51 @@ class Options:
                     logger.debug(f"features.yml data: {yml}")
             else:
                 yml = self.features_yml_data
-            if yml is None: return
-            if 'features' not in yml:
-                raise Exception('features.yml is invalid. (The root element must be "features".)')
-            if ftype not in yml['features']:
-                raise Exception(f'features.yml is invalid. (There is no “{ftype}” in the “features” element.)')
-            if yml['features'][ftype] is None:
-                return
-            if type(yml['features'][ftype]) is not list:
-                raise Exception(f'features.yml is invalid. (The “features.{ftype} element must be a list. {ftype}={yml["features"][ftype]})')
-            # featureモジュール読込みの前にagentruleの読み込み
-            self.load_features_agentrule(logger)
-            for data in yml['features'][ftype]:
-                if type(data) is not dict:
-                    raise Exception(f'features.yml is invalid. (The “features.{ftype}” element must be a list element must be a dictionary. data={data})')
-                if 'package' not in data:
-                    raise Exception(f'features.yml is invalid. (The “package” element must be in the dictionary of the list element of the “features.{ftype}” element. data={data})')
-                if 'prefix' not in data:
-                    raise Exception(f'features.yml is invalid. (The prefix element must be in the dictionary of the list element of the “features.{ftype}” element. data={data})')
-                if data['package'] is None or data['package'] == "":
-                    continue
-                if data['prefix'] is None or data['prefix'] == "":
-                    continue
-                exclude_modules = []
-                if 'exclude_modules' in data:
-                    if type(data['exclude_modules']) is not list:
-                        raise Exception(f'features.yml is invalid. (The “exclude_modules” element must be a list element. data={data})')
-                    exclude_modules = data['exclude_modules']
-                func(data['package'], data['prefix'], exclude_modules, appcls, ver, logger, self.is_features_loaded(ftype))
-                self.features_loaded[ftype] = True
+            return yml
+        return None
+
+    def load_features_file(self, ftype:str, func, appcls, ver, logger:logging.Logger=None):
+        """
+        フィーチャーファイル（features.yml）を読み込みます。
+
+        Args:
+            ftype (str): フィーチャータイプ。cli又はweb
+            func (Any): フィーチャーの処理関数
+            appcls (Any): アプリケーションクラス
+            ver (Any): バージョンモジュール
+            logger (logging.Logger): ロガー
+        """
+        # 読込み済みかどうかの判定
+        if self.is_features_loaded(ftype):
+            return
+        yml = self._load_features_yml(ver, logger)
+        if yml is None: return
+        if 'features' not in yml:
+            raise Exception('features.yml is invalid. (The root element must be "features".)')
+        if ftype not in yml['features']:
+            raise Exception(f'features.yml is invalid. (There is no “{ftype}” in the “features” element.)')
+        if yml['features'][ftype] is None:
+            return
+        if type(yml['features'][ftype]) is not list:
+            raise Exception(f'features.yml is invalid. (The “features.{ftype} element must be a list. {ftype}={yml["features"][ftype]})')
+        for data in yml['features'][ftype]:
+            if type(data) is not dict:
+                raise Exception(f'features.yml is invalid. (The “features.{ftype}” element must be a list element must be a dictionary. data={data})')
+            if 'package' not in data:
+                raise Exception(f'features.yml is invalid. (The “package” element must be in the dictionary of the list element of the “features.{ftype}” element. data={data})')
+            if 'prefix' not in data:
+                raise Exception(f'features.yml is invalid. (The prefix element must be in the dictionary of the list element of the “features.{ftype}” element. data={data})')
+            if data['package'] is None or data['package'] == "":
+                continue
+            if data['prefix'] is None or data['prefix'] == "":
+                continue
+            exclude_modules = []
+            if 'exclude_modules' in data:
+                if type(data['exclude_modules']) is not list:
+                    raise Exception(f'features.yml is invalid. (The “exclude_modules” element must be a list element. data={data})')
+                exclude_modules = data['exclude_modules']
+            func(data['package'], data['prefix'], exclude_modules, appcls, ver, logger, self.is_features_loaded(ftype))
+            self.features_loaded[ftype] = True
 
 
     def load_features_args(self, args_dict:Dict[str, Any]):

cmdbox/app/server.py

@@ -1,224 +1,224 @@
-from pathlib import Path
-from cmdbox.app import common, filer, feature, options
-from cmdbox.app.commons import redis_client
-from redis import exceptions
-from typing import List, Dict, Any
-import logging
-import redis
-import time
-
-
-class Server(filer.Filer):
-
-    def __init__(self, data_dir:Path, logger:logging.Logger, redis_host:str="localhost", redis_port:int=6379, redis_password:str=None, svname:str='server'):
-        """
-        Redisサーバーに接続し、クライアントからのコマンドを受信し実行する
-
-        Args:
-            data_dir (Path): データフォルダのパス
-            logger (logging): ロガー
-            redis_host (str): Redisホスト名, by default "localhost"
-            redis_port (int): Redisポート番号, by default 6379
-            redis_password (str): Redisパスワード, by default None
-            svname (str, optional): サーバーのサービス名. by default 'server'
-        """
-        super().__init__(data_dir, logger)
-        if svname.find('-') >= 0:
-            raise ValueError(f"Server name is invalid. '-' is not allowed. svname={svname}")
-        self.redis_host = redis_host
-        self.redis_port = redis_port
-        self.redis_password = redis_password
-        self.org_svname = svname
-        self.svname = f"{svname}-{common.random_string(size=6)}"
-        self.redis_cli = None
-        self.sessions:Dict[str, Dict[str, Any]] = {}
-        self.is_running = False
-        self.train_thread = None
-        self.cleaning_interval = 60
-        if self.logger.level == logging.DEBUG:
-            self.logger.debug(f"server init parameter: data={self.data_dir} -> {self.data_dir.absolute()}")
-            self.logger.debug(f"server init parameter: redis_host={self.redis_host}")
-            self.logger.debug(f"server init parameter: redis_port={self.redis_port}")
-            self.logger.debug(f"server init parameter: redis_password=********")
-            self.logger.debug(f"server init parameter: svname={self.svname}")
-        self.options = options.Options.getInstance()
-
-    def __enter__(self):
-        self.start_server()
-        return self
-
-    def __exit__(self, a, b, c):
-        self.terminate_server()
-
-    def start_server(self, retry_count:int=20, retry_interval:int=5):
-        """
-        サーバー処理を開始する
-        """
-        self.is_running = False
-        self.retry_count = retry_count
-        self.retry_interval = retry_interval
-        if self.logger.level == logging.DEBUG:
-            self.logger.debug(f"server start parameter: retry_count={self.retry_count}")
-            self.logger.debug(f"server start parameter: retry_interval={self.retry_interval}")
-        self.redis_cli = redis_client.RedisClient(self.logger, host=self.redis_host, port=self.redis_port, password=self.redis_password, svname=self.svname)
-        if self.redis_cli.check_server(find_svname=False, retry_count=self.retry_count, retry_interval=self.retry_interval, outstatus=True):
-            self.is_running = True
-            self._run_server()
-
-    def list_server(self) -> Dict[str, List[Dict[str, Any]]]:
-        """
-        起動しているサーバーリストを取得する
-
-        Returns:
-            Dict[str, List[Dict[str, Any]]]: サーバーのリスト
-        """
-        if self.redis_cli is None:
-            self.redis_cli = redis_client.RedisClient(self.logger, host=self.redis_host, port=self.redis_port, password=self.redis_password, svname=self.svname)
-        svlist = self.redis_cli.list_server()
-        if len(svlist) <= 0:
-            return dict(warn="No server is running.")
-        return dict(success=svlist)
-
-    def _clean_server(self):
-        """
-        Redisサーバーに残っている停止済みのサーバーキーを削除する
-        """
-        hblist = self.redis_cli.keys("hb-*")
-        for hb in hblist:
-            hb = hb.decode()
-            try:
-                v = self.redis_cli.hget(hb, 'ctime')
-                if v is None:
-                    continue
-            except exceptions.ResponseError:
-                self.logger.warning(f"Failed to get ctime. {hb}", exc_info=True)
-                continue
-            tm = time.time() - float(v)
-            if tm > self.cleaning_interval:
-                self.redis_cli.delete(hb)
-                self.redis_cli.delete(hb.replace("hb-", "sv-"))
-
-    def _clean_reskey(self):
-        """
-        Redisサーバーに残っている停止済みのクライアントキーを削除する
-        """
-        rlist = self.redis_cli.keys("cl-*")
-        for reskey in rlist:
-            try:
-                tm = int(reskey.decode().split("-")[2])
-                if time.time() - tm > self.cleaning_interval:
-                    self.redis_cli.delete(reskey)
-            except Exception as e:
-                self.redis_cli.delete(reskey)
-
-    def _run_server(self):
-        self.logger.info(f"start server. svname={self.svname}")
-        ltime = time.time()
-        receive_cnt = 0
-        sccess_cnt = 0
-        warn_cnt = 0
-        error_cnt = 0
-        self.redis_cli.hset(self.redis_cli.hbname, 'receive_cnt', receive_cnt)
-        self.redis_cli.hset(self.redis_cli.hbname, 'sccess_cnt', sccess_cnt)
-        self.redis_cli.hset(self.redis_cli.hbname, 'warn_cnt', warn_cnt)
-        self.redis_cli.hset(self.redis_cli.hbname, 'error_cnt', error_cnt)
-
-        def _publish(msg_str):
-            # 各サーバーにメッセージを配布する
-            hblist = self.redis_cli.keys(f"hb-{self.org_svname}-*")
-            for hb in hblist:
-                hb = hb.decode()
-                sv = hb.replace("hb-", "sv-")
-                self.redis_cli.rpush(sv, msg_str)
-
-        while self.is_running:
-            try:
-                msg = None
-                # ブロッキングリストから要素を取り出す
-                ctime = time.time()
-                self.redis_cli.hset(self.redis_cli.hbname, 'ctime', ctime)
-                self.redis_cli.hset(self.redis_cli.hbname, 'status', 'ready')
-                result = self.redis_cli.blpop(self.redis_cli.svname)
-                if ctime - ltime > self.cleaning_interval:
-                    self._clean_server()
-                    self._clean_reskey()
-                    ltime = ctime
-                to_cluster = False
-                if result is None or len(result) <= 0:
-                    # クラスター宛メッセージがあるか確認する
-                    result = self.redis_cli.blpop(f"sv-{self.org_svname}")
-                    if result is None or len(result) <= 0:
-                        time.sleep(1)
-                        continue
-                    to_cluster = True
-                msg_str = result[1].decode()
-                msg = msg_str.split(' ')
-                if len(msg) <= 0:
-                    time.sleep(1)
-                    continue
-
-                st = None
-                receive_cnt += 1
-                self.redis_cli.hset(self.redis_cli.hbname, 'receive_cnt', receive_cnt)
-                self.redis_cli.hset(self.redis_cli.hbname, 'status', 'processing')
-
-                svcmd_feature:feature.Feature = self.options.get_svcmd_feature(msg[0])
-                if svcmd_feature is not None:
-                    if to_cluster and svcmd_feature.is_cluster_redirect():
-                        _publish(msg_str)
-                        continue
-                    if msg[0] == 'stop_server':
-                        self.is_running = False
-                    st = svcmd_feature.svrun(self.data_dir, self.logger, self.redis_cli, msg, self.sessions)
-                else:
-                    self.logger.warning(f"Unknown command {msg}")
-                    st = self.RESP_WARN
-
-                if st==self.RESP_SCCESS:
-                    sccess_cnt += 1
-                    self.redis_cli.hset(self.redis_cli.hbname, 'sccess_cnt', sccess_cnt)
-                elif st==self.RESP_WARN:
-                    warn_cnt += 1
-                    self.redis_cli.hset(self.redis_cli.hbname, 'warn_cnt', warn_cnt)
-                elif st==self.RESP_ERROR:
-                    error_cnt += 1
-                    self.redis_cli.hset(self.redis_cli.hbname, 'error_cnt', error_cnt)
-                self.redis_cli.hset(self.redis_cli.hbname, 'ctime', time.time())
-            except exceptions.TimeoutError:
-                pass
-            except exceptions.ConnectionError as e:
-                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}. 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}. 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)
-        self.redis_cli.delete(self.redis_cli.hbname)
-        self.logger.info(f"stop server. svname={self.redis_cli.svname}")
-
-    def terminate_server(self):
-        """
-        サーバー処理を終了する
-        """
-        self.redis_cli.close()
-        self.logger.info(f"terminate server.")
+from pathlib import Path
+from cmdbox.app import common, filer, feature, options
+from cmdbox.app.commons import redis_client
+from redis import exceptions
+from typing import List, Dict, Any
+import logging
+import redis
+import time
+
+
+class Server(filer.Filer):
+
+    def __init__(self, data_dir:Path, logger:logging.Logger, redis_host:str="localhost", redis_port:int=6379, redis_password:str=None, svname:str='server'):
+        """
+        Redisサーバーに接続し、クライアントからのコマンドを受信し実行する
+
+        Args:
+            data_dir (Path): データフォルダのパス
+            logger (logging): ロガー
+            redis_host (str): Redisホスト名, by default "localhost"
+            redis_port (int): Redisポート番号, by default 6379
+            redis_password (str): Redisパスワード, by default None
+            svname (str, optional): サーバーのサービス名. by default 'server'
+        """
+        super().__init__(data_dir, logger)
+        if svname.find('-') >= 0:
+            raise ValueError(f"Server name is invalid. '-' is not allowed. svname={svname}")
+        self.redis_host = redis_host
+        self.redis_port = redis_port
+        self.redis_password = redis_password
+        self.org_svname = svname
+        self.svname = f"{svname}-{common.random_string(size=6)}"
+        self.redis_cli = None
+        self.sessions:Dict[str, Dict[str, Any]] = {}
+        self.is_running = False
+        self.train_thread = None
+        self.cleaning_interval = 60
+        if self.logger.level == logging.DEBUG:
+            self.logger.debug(f"server init parameter: data={self.data_dir} -> {self.data_dir.absolute()}")
+            self.logger.debug(f"server init parameter: redis_host={self.redis_host}")
+            self.logger.debug(f"server init parameter: redis_port={self.redis_port}")
+            self.logger.debug(f"server init parameter: redis_password=********")
+            self.logger.debug(f"server init parameter: svname={self.svname}")
+        self.options = options.Options.getInstance()
+
+    def __enter__(self):
+        self.start_server()
+        return self
+
+    def __exit__(self, a, b, c):
+        self.terminate_server()
+
+    def start_server(self, retry_count:int=20, retry_interval:int=5):
+        """
+        サーバー処理を開始する
+        """
+        self.is_running = False
+        self.retry_count = retry_count
+        self.retry_interval = retry_interval
+        if self.logger.level == logging.DEBUG:
+            self.logger.debug(f"server start parameter: retry_count={self.retry_count}")
+            self.logger.debug(f"server start parameter: retry_interval={self.retry_interval}")
+        self.redis_cli = redis_client.RedisClient(self.logger, host=self.redis_host, port=self.redis_port, password=self.redis_password, svname=self.svname)
+        if self.redis_cli.check_server(find_svname=False, retry_count=self.retry_count, retry_interval=self.retry_interval, outstatus=True):
+            self.is_running = True
+            self._run_server()
+
+    def list_server(self) -> Dict[str, List[Dict[str, Any]]]:
+        """
+        起動しているサーバーリストを取得する
+
+        Returns:
+            Dict[str, List[Dict[str, Any]]]: サーバーのリスト
+        """
+        if self.redis_cli is None:
+            self.redis_cli = redis_client.RedisClient(self.logger, host=self.redis_host, port=self.redis_port, password=self.redis_password, svname=self.svname)
+        svlist = self.redis_cli.list_server()
+        if len(svlist) <= 0:
+            return dict(warn="No server is running.")
+        return dict(success=svlist)
+
+    def _clean_server(self):
+        """
+        Redisサーバーに残っている停止済みのサーバーキーを削除する
+        """
+        hblist = self.redis_cli.keys("hb-*")
+        for hb in hblist:
+            hb = hb.decode()
+            try:
+                v = self.redis_cli.hget(hb, 'ctime')
+                if v is None:
+                    continue
+            except exceptions.ResponseError:
+                self.logger.warning(f"Failed to get ctime. {hb}", exc_info=True)
+                continue
+            tm = time.time() - float(v)
+            if tm > self.cleaning_interval:
+                self.redis_cli.delete(hb)
+                self.redis_cli.delete(hb.replace("hb-", "sv-"))
+
+    def _clean_reskey(self):
+        """
+        Redisサーバーに残っている停止済みのクライアントキーを削除する
+        """
+        rlist = self.redis_cli.keys("cl-*")
+        for reskey in rlist:
+            try:
+                tm = int(reskey.decode().split("-")[2])
+                if time.time() - tm > self.cleaning_interval:
+                    self.redis_cli.delete(reskey)
+            except Exception as e:
+                self.redis_cli.delete(reskey)
+
+    def _run_server(self):
+        self.logger.info(f"start server. svname={self.svname}")
+        ltime = time.time()
+        receive_cnt = 0
+        sccess_cnt = 0
+        warn_cnt = 0
+        error_cnt = 0
+        self.redis_cli.hset(self.redis_cli.hbname, 'receive_cnt', receive_cnt)
+        self.redis_cli.hset(self.redis_cli.hbname, 'sccess_cnt', sccess_cnt)
+        self.redis_cli.hset(self.redis_cli.hbname, 'warn_cnt', warn_cnt)
+        self.redis_cli.hset(self.redis_cli.hbname, 'error_cnt', error_cnt)
+
+        def _publish(msg_str):
+            # 各サーバーにメッセージを配布する
+            hblist = self.redis_cli.keys(f"hb-{self.org_svname}-*")
+            for hb in hblist:
+                hb = hb.decode()
+                sv = hb.replace("hb-", "sv-")
+                self.redis_cli.rpush(sv, msg_str)
+
+        while self.is_running:
+            try:
+                msg = None
+                # ブロッキングリストから要素を取り出す
+                ctime = time.time()
+                self.redis_cli.hset(self.redis_cli.hbname, 'ctime', ctime)
+                self.redis_cli.hset(self.redis_cli.hbname, 'status', 'ready')
+                result = self.redis_cli.blpop(self.redis_cli.svname)
+                if ctime - ltime > self.cleaning_interval:
+                    self._clean_server()
+                    self._clean_reskey()
+                    ltime = ctime
+                to_cluster = False
+                if result is None or len(result) <= 0:
+                    # クラスター宛メッセージがあるか確認する
+                    result = self.redis_cli.blpop(f"sv-{self.org_svname}")
+                    if result is None or len(result) <= 0:
+                        time.sleep(1)
+                        continue
+                    to_cluster = True
+                msg_str = result[1].decode()
+                msg = msg_str.split(' ')
+                if len(msg) <= 0:
+                    time.sleep(1)
+                    continue
+
+                st = None
+                receive_cnt += 1
+                self.redis_cli.hset(self.redis_cli.hbname, 'receive_cnt', receive_cnt)
+                self.redis_cli.hset(self.redis_cli.hbname, 'status', 'processing')
+
+                svcmd_feature:feature.Feature = self.options.get_svcmd_feature(msg[0])
+                if svcmd_feature is not None:
+                    if to_cluster and svcmd_feature.is_cluster_redirect():
+                        _publish(msg_str)
+                        continue
+                    if msg[0] == 'stop_server':
+                        self.is_running = False
+                    st = svcmd_feature.svrun(self.data_dir, self.logger, self.redis_cli, msg, self.sessions)
+                else:
+                    self.logger.warning(f"Unknown command {msg}")
+                    st = self.RESP_WARN
+
+                if st==self.RESP_SUCCESS:
+                    sccess_cnt += 1
+                    self.redis_cli.hset(self.redis_cli.hbname, 'sccess_cnt', sccess_cnt)
+                elif st==self.RESP_WARN:
+                    warn_cnt += 1
+                    self.redis_cli.hset(self.redis_cli.hbname, 'warn_cnt', warn_cnt)
+                elif st==self.RESP_ERROR:
+                    error_cnt += 1
+                    self.redis_cli.hset(self.redis_cli.hbname, 'error_cnt', error_cnt)
+                self.redis_cli.hset(self.redis_cli.hbname, 'ctime', time.time())
+            except exceptions.TimeoutError:
+                pass
+            except exceptions.ConnectionError as e:
+                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}. 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}. 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)
+        self.redis_cli.delete(self.redis_cli.hbname)
+        self.logger.info(f"stop server. svname={self.redis_cli.svname}")
+
+    def terminate_server(self):
+        """
+        サーバー処理を終了する
+        """
+        self.redis_cli.close()
+        self.logger.info(f"terminate server.")

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/extensions/features.yml

@@ -46,6 +46,9 @@ agentrule:                              # Specifies a list of rules that determi
   - mode: client
     cmds: [http]
     rule: allow
+  - mode: tts
+    cmds: [say]
+    rule: allow
 audit:
   enabled: true                         # Specify whether to enable the audit function.
   write:

cmdbox/extensions/sample_project/sample/app/features/cli/sample_client_time.py

@@ -60,8 +60,8 @@ class ClientTime(feature.Feature):
         ret = dict(success=dict(data=dt.strftime('%Y-%m-%d %H:%M:%S')))
         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 0, ret, None
+            return self.RESP_WARN, ret, None
+        return self.RESP_SUCCESS, ret, None
 
     def edgerun(self, opt, tool, logger, timeout, prevres = None):
         """

cmdbox/extensions/sample_project/sample/app/features/cli/sample_server_time.py

@@ -92,8 +92,8 @@ class ServerTime(feature.Feature):
                                     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, None
-        return 0, ret, None
+            return self.RESP_WARN, ret, None
+        return self.RESP_SUCCESS, ret, None
 
     def is_cluster_redirect(self):
         """
@@ -124,7 +124,7 @@ class ServerTime(feature.Feature):
         dt = datetime.datetime.now(tz)
         ret = dict(success=dict(data=dt.strftime('%Y-%m-%d %H:%M:%S')))
         redis_cli.rpush(msg[1], ret)
-        return self.RESP_SCCESS
+        return self.RESP_SUCCESS
 
     def edgerun(self, opt, tool, logger, timeout, prevres = None):
         """

cmdbox/licenses/LICENSE_Werkzeug_3_1_1_BSD_License.txt

@@ -0,0 +1,28 @@
+Copyright 2007 Pallets
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1.  Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+2.  Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+3.  Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.