cmdbox 0.6.2__tar.gz → 0.6.2.2__tar.gz

{cmdbox-0.6.2/cmdbox.egg-info → cmdbox-0.6.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.2
+Version: 0.6.2.2
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox

{cmdbox-0.6.2 → cmdbox-0.6.2.2}/cmdbox/app/app.py

@@ -144,6 +144,13 @@ class CmdBoxApp:
             eloggerinittime = time.perf_counter()
             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
 
             #scmdexectime = time.perf_counter()
             feat = self.options.get_cmd_attr(args.mode, args.cmd, 'feature')

{cmdbox-0.6.2 → cmdbox-0.6.2.2}/cmdbox/app/common.py

@@ -172,11 +172,23 @@ def create_console(stderr:bool=False, file=None) -> Console:
     """
     #console = Console(soft_wrap=True, height=True, highlighter=loghandler.LogLevelHighlighter(), theme=loghandler.theme,
     #                  stderr=stderr, file=file)
-    console = Console(height=True, highlighter=loghandler.LogLevelHighlighter(), theme=loghandler.theme,
-                      soft_wrap=True, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
+    console = Console(height=False, highlighter=loghandler.LogLevelHighlighter(), theme=loghandler.theme,
+                      soft_wrap=False, stderr=stderr, file=file, log_time=True, log_path=False, log_time_format='[%Y-%m-%d %H:%M:%S]')
     #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:
+    """
+    コンソールにログを出力します。
+
+    Args:
+        console (Console): コンソール
+        message (Any): 出力するメッセージ
+        **kwargs: その他のキーワード引数
+    """
+    dtstr = datetime.datetime.now().strftime('[%Y-%m-%d %H:%M:%S]')
+    console.print(f"{dtstr} {message}", highlight=True, **kwargs)
+
 def default_logger(debug:bool=False, ver=version, webcall:bool=False) -> logging.Logger:
     """
     デフォルトのロガーを生成します。

{cmdbox-0.6.2 → cmdbox-0.6.2.2}/cmdbox/app/commons/loghandler.py

@@ -105,13 +105,13 @@ theme=Theme({
 class LogLevelHighlighter(highlighter.ReprHighlighter):
     def __init__(self):
         #self.highlights = []
-        self.highlights.append(r"(?P<log_debug>DEBUG)")
+        self.highlights.append(r"(?P<log_debug>DEBUG|EXEC)")
         self.highlights.append(r"(?P<log_info>INFO)")
         self.highlights.append(r"(?P<log_warn>WARN|WARNING|WARN|CAUTION|NOTICE|STOP|DISCONNECTED|DENY)")
         self.highlights.append(r"(?P<log_error>ERROR|ALERT|ABORT|FAILED)")
         self.highlights.append(r"(?P<log_fatal>FATAL|CRITICAL)")
         self.highlights.append(r"(?P<log_product>CMDBOX|IINFER|USOUND|GAIAN|GAIC|WITSHAPE)")
-        self.highlights.append(r"(?P<log_success>SUCCESS|OK|PASSED|DONE|COMPLETE|START|FINISH|OPEN|CONNECTED|ALLOW|EXEC)")
+        self.highlights.append(r"(?P<log_success>SUCCESS|OK|PASSED|DONE|COMPLETE|START|FINISH|OPEN|CONNECTED|ALLOW)")
         """
         self.highlights.append(r"(?P<tag_start><)(?P<tag_name>[-\w.:|]*)(?P<tag_contents>[\w\W]*)(?P<tag_end>>)")
         self.highlights.append(r'(?P<attrib_name>[\w_]{1,50})=(?P<attrib_value>"?[\w_]+"?)?')

{cmdbox-0.6.2 → cmdbox-0.6.2.2}/cmdbox/app/feature.py

@@ -123,6 +123,15 @@ class Feature(object):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
         yield status, res
 
+    def audited_by(self) -> bool:
+        """
+        この機能が監査ログを記録する対象かどうかを返します
+
+        Returns:
+            bool: 監査ログを記録する場合はTrue
+        """
+        return True
+
 class OneshotEdgeFeature(Feature):
     """
     一度だけ実行するエッジ機能の基底クラス

{cmdbox-0.6.2 → cmdbox-0.6.2.2}/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:
-                console.log(f'EXEC  - {opt_list}\n'[:logsize])
+                common.console_log(console, f'EXEC  - {opt_list}\n'[:logsize])
                 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
@@ -213,7 +213,7 @@ class ExecCmd(cmdbox_web_load_cmd.LoadCmd):
             except Exception as e:
                 web.logger.disabled = False # ログ出力を有効にする
                 msg = f'exec_cmd error. {traceback.format_exc()}'
-                console.log(f'EXEC  - {msg}'[:logsize])
+                common.console_log(console, f'EXEC  - {msg}'[:logsize])
                 web.logger.warning(msg)
                 output = [dict(warn=f'<pre>{html.escape(traceback.format_exc())}</pre>')]
             sys.stdout = old_stdout

{cmdbox-0.6.2 → cmdbox-0.6.2.2}/cmdbox/app/options.py

@@ -809,6 +809,7 @@ class Options:
         logger = self.default_logger
         clmsg_body = body.copy() if body is not None else dict()
         func_feature = None
+        audited_by = True
         for arg in list(args) + list(kwargs.values()):
             if isinstance(arg, logging.Logger): logger = arg
             elif isinstance(arg, argparse.Namespace):
@@ -842,6 +843,7 @@ class Options:
             elif isinstance(arg, feature.Feature):
                 func_feature = arg
                 opt['clmsg_src'] = func_feature.__class__.__name__
+                audited_by = arg.audited_by()
             elif isinstance(arg, Request) or isinstance(arg, WebSocket):
                 if 'signin' in arg.session and arg.session['signin'] is not None and 'name' in arg.session['signin']:
                     opt['clmsg_user'] = arg.session['signin']['name']
@@ -856,5 +858,6 @@ class Options:
             opt['clmsg_src'] = src
         if title is not None and title != "":
             opt['clmsg_title'] = title
-        audit_write_args = argparse.Namespace(**{k:common.chopdq(v) for k,v in opt.items()})
-        self.audit_write.apprun(logger, audit_write_args, tm=0.0, pf=[])
+        if audited_by:
+            audit_write_args = argparse.Namespace(**{k:common.chopdq(v) for k,v in opt.items()})
+            self.audit_write.apprun(logger, audit_write_args, tm=0.0, pf=[])

{cmdbox-0.6.2 → cmdbox-0.6.2.2}/cmdbox/app/web.py

@@ -1,6 +1,6 @@
 from cmdbox.app import common, options
 from cmdbox.app.commons import module
-from fastapi import FastAPI, Request, Response, WebSocket
+from fastapi import FastAPI, Request, Response
 from pathlib import Path
 from starlette.applications import Starlette
 from starlette.middleware.sessions import SessionMiddleware

{cmdbox-0.6.2 → cmdbox-0.6.2.2}/cmdbox/version.py

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

{cmdbox-0.6.2 → cmdbox-0.6.2.2/cmdbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.6.2
+Version: 0.6.2.2
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
 Download-URL: https://github.com/hamacom2004jp/cmdbox