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

cmdbox/app/app.py

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

cmdbox/app/common.py

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

cmdbox/app/features/web/cmdbox_web_exec_cmd.py

@@ -182,7 +182,7 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
             console = common.create_console(file=old_stdout)
 
             try:
-                common.console_log(console, f'EXEC  - {opt_list}\n'[:logsize])
+                common.console_log(console, message=f'EXEC  - {opt_list}\n'[:logsize], highlight=(len(opt_list)<logsize-10))
                 status, ret_main, obj = cmdbox_app.main(args_list=[common.chopdq(o) for o in opt_list], file_dict=file_dict, webcall=True)
                 if isinstance(obj, server.Server):
                     cmdbox_app.sv = obj
@@ -209,11 +209,11 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
                             output = [dict(warn=f'The captured stdout was discarded because its size was larger than {capture_maxsize} bytes.')]
                 else:
                     output = [dict(warn='capture_stdout is off.')]
-                old_stdout.write(f'EXEC OUTPUT => {output}'[:logsize]) # コマンド実行時のアウトプットはカラーリングしない
+                old_stdout.write(f'EXEC OUTPUT => {output}'[:logsize]+'\n') # コマンド実行時のアウトプットはカラーリングしない
             except Exception as e:
                 web.logger.disabled = False # ログ出力を有効にする
                 msg = f'exec_cmd error. {traceback.format_exc()}'
-                common.console_log(console, f'EXEC  - {msg}'[:logsize])
+                common.console_log(console, message=f'EXEC  - {msg}'[:logsize], highlight=(len(msg)<logsize-10))
                 web.logger.warning(msg)
                 output = [dict(warn=f'<pre>{html.escape(traceback.format_exc())}</pre>')]
             sys.stdout = old_stdout

cmdbox/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.3
+Version: 0.6.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

{cmdbox-0.6.3.dist-info → cmdbox-0.6.3.1.dist-info}/RECORD

@@ -10,11 +10,11 @@ cmdbox/logconf_gui.yml,sha256=-95vyd0q-aB1gsabdk8rg9dJ2zRKAZc8hRxyhNOQboU,1076
 cmdbox/logconf_mcp.yml,sha256=pED0i1iKP8UoyXE0amFMA5kjV7Qc6_eJCUDVen3L4AU,1069
 cmdbox/logconf_server.yml,sha256=n3c5-KVzjUzcUX5BQ6uE-PN9rp81yXaJql3whyCcSDQ,1091
 cmdbox/logconf_web.yml,sha256=pPbdAwckbK0cgduxcVkx2mbk-Ymz5hVzR4guIsfApMQ,1076
-cmdbox/version.py,sha256=HTU-X6-2WVXAPOXs7dqpmC2oYd3v69th6uurBQSFxUg,2108
+cmdbox/version.py,sha256=Tcuxlk7iRG_2WyMlfQXA_SUW474Wfbnm4RUHd47Abe4,2110
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cmdbox/app/app.py,sha256=_UJqSTs3LStGSu3vLMTqOKmpL4x7NQAQb2hUMbEFcg4,9639
+cmdbox/app/app.py,sha256=fJU7h4uiI2y7_ohAep8PeRHy8o4f-SqqiGtZbdbWenE,9723
 cmdbox/app/client.py,sha256=n986lXeV7hhaki4iyyvsfhNptmCXDFphxlNoNe2XhKg,19542
-cmdbox/app/common.py,sha256=iY4Bl9r0MSSDhZ9Ep3Y45MVBapurKpwkBNCHYb-COnY,28130
+cmdbox/app/common.py,sha256=ltB7wIuUY-kybE5Cbfj5lCJpYGQ0BTN1_ErFo965EbU,28487
 cmdbox/app/edge.py,sha256=2Aav7n4skhP0FUvG6_3JKijHHozA-WcwALgEwNB0DUI,41439
 cmdbox/app/edge_tool.py,sha256=HXxr4Or8QaZ5ueYIN3huv8GnXSnV28RZCmZBUEfiIk0,8062
 cmdbox/app/feature.py,sha256=fK7JP1fc8b9k1zhSNOkWq02ad8i-_wuAX5kyyK2TZdE,10391
@@ -85,7 +85,7 @@ cmdbox/app/features/web/cmdbox_web_del_cmd.py,sha256=3Bx2tuXJXc63yip9gWH2bXBydD4
 cmdbox/app/features/web/cmdbox_web_del_pipe.py,sha256=tPLvuLqk-MQjkh5WZfw9gL3ujR_W18raEwX_EKddNZw,1193
 cmdbox/app/features/web/cmdbox_web_do_signin.py,sha256=Je9pYIdihmagP2eaIfyz6zIBbLc7_wHKxewjAQrt3IA,20787
 cmdbox/app/features/web/cmdbox_web_do_signout.py,sha256=b64XcmioyuyEL6VFymcs5kFIt4zviqhqJbFUWRCdMo0,1109
-cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=qfa6YzYkW0TxO-UCk1w88gzCF0BtJRAtz5cS7dn6CAA,13206
+cmdbox/app/features/web/cmdbox_web_exec_cmd.py,sha256=cwiG8f2sn0rJwKZaff2zRtBjj6FqFIeGWcUqwsynC7c,13298
 cmdbox/app/features/web/cmdbox_web_exec_pipe.py,sha256=W9jd_9MTzC9GzgEd8X5C9Jwsn8pt6-_TFxyrHfO4iWk,10581
 cmdbox/app/features/web/cmdbox_web_filer download.py,sha256=CVRDv0TZAEd87nzlquIO2O3rSm_tpc3i88H27FgNW4Y,2344
 cmdbox/app/features/web/cmdbox_web_filer.py,sha256=2BdkOQFvaMMxtSoRz07RjercnfG51yChZiVrQGRDRTQ,1871
@@ -379,9 +379,9 @@ cmdbox/web/assets/tree-menu/image/file.png,sha256=Uw4zYkHyuoZ_kSVkesHAeSeA_g9_LP
 cmdbox/web/assets/tree-menu/image/folder-close.png,sha256=TcgsKTBBF2ejgzekOEDBFBxsJf-Z5u0x9IZVi4GBR-I,284
 cmdbox/web/assets/tree-menu/image/folder-open.png,sha256=DT7y1GRK4oXJkFvqTN_oSGM5ZYARzPvjoCGL6wqkoo0,301
 cmdbox/web/assets/tree-menu/js/tree-menu.js,sha256=-GkZxI7xzHuXXHYQBHAVTcuKX4TtoiMuyIms6Xc3pxk,1029
-cmdbox-0.6.3.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.6.3.dist-info/METADATA,sha256=o68uXEPaEhHqDp9HvcnpzP4qXBc9KTt8-sLqUcrJjX4,33522
-cmdbox-0.6.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.6.3.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
-cmdbox-0.6.3.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.6.3.dist-info/RECORD,,
+cmdbox-0.6.3.1.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.6.3.1.dist-info/METADATA,sha256=oFcMi5AMijfudCVdiDrsPbY1VVtKMTTpNzQXqndSH80,33524
+cmdbox-0.6.3.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.6.3.1.dist-info/entry_points.txt,sha256=1LdoMUjTD_YdxlsAiAiJ1cREcXFG8-Xg2xQTNYoNpT4,47
+cmdbox-0.6.3.1.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.6.3.1.dist-info/RECORD,,