cmdbox 0.6.2.2__py3-none-any.whl → 0.6.2.4__py3-none-any.whl

cmdbox/app/auth/signin.py

@@ -217,7 +217,7 @@ class Signin(object):
                 continue
             jadge = rule['rule']
         if logger.level == logging.DEBUG:
-            logger.debug(f"rule: {req.url.path}: {jadge}")
+            logger.debug(f"path rule: {req.url.path}: {jadge}")
         if jadge == 'allow':
             res.headers['signin'] = 'success'
             return None
@@ -663,7 +663,7 @@ class Signin(object):
                 continue
             jadge = rule['rule']
         if logger.level == logging.DEBUG:
-            logger.debug(f"rule: {path}: {jadge}")
+            logger.debug(f"path rule: {path}: {jadge}")
         if jadge == 'allow':
             return None
         else:
@@ -747,7 +747,7 @@ class Signin(object):
                     continue
             jadge = rule['rule']
         if logger.level == logging.DEBUG:
-            logger.debug(f"rule: mode={mode}, cmd={cmd}: {jadge}")
+            logger.debug(f"cmd rule: mode={mode}, cmd={cmd}: {jadge}")
         return jadge == 'allow'
 
     def get_enable_modes(self, req:Request, res:Response) -> List[str]:
@@ -931,7 +931,8 @@ async def create_request_scope(req:Request=None, res:Response=None, websocket:We
     sess = None
     if req is not None:
         sess = req.session if hasattr(req, 'session') else None
-    request_scope.set(dict(req=req, res=res, websocket=websocket))
+    from cmdbox.app.web import Web
+    request_scope.set(dict(req=req, res=res, websocket=websocket, web=Web.getInstance()))
     try:
         yield # リクエストの処理
     finally:
@@ -954,4 +955,4 @@ def get_request_scope() -> Dict[str, Any]:
     Returns:
         Dict[str, Any]: リクエストとレスポンスとWebSocket接続
     """
-    return request_scope.get() if request_scope.get() is not None else dict(req=None, res=None, session=None, websocket=None)
+    return request_scope.get() if request_scope.get() is not None else dict(req=None, res=None, session=None, websocket=None, web=None)

cmdbox/app/common.py

@@ -8,6 +8,7 @@ from rich.logging import RichHandler
 from rich.console import Console
 from tabulate import tabulate
 from typing import List, Tuple, Dict, Any
+import argparse
 import asyncio
 import datetime
 import logging
@@ -27,6 +28,7 @@ import tempfile
 import time
 import yaml
 import sys
+import threading
 
 
 HOME_DIR = Path(os.path.expanduser("~"))
@@ -439,7 +441,7 @@ def check_fname(fname:str) -> bool:
     Returns:
         bool: Trueの場合は使えない文字が含まれている
     """
-    return re.search('[\s:\\\\/,\.\?\#\$\%\^\&\!\@\*\~\|\<\>\(\)\{\}\[\]\'\"\`]',str(fname)) is not None
+    return re.search('[\s:;\\\\/,\.\?\#\$\%\^\&\!\@\*\~\|\<\>\(\)\{\}\[\]\'\"\`]',str(fname)) is not None
 
 def mkdirs(dir_path:Path):
     """
@@ -696,28 +698,32 @@ def is_event_loop_running() -> bool:
     except RuntimeError:
         return False
 
-def exec_sync(func, *args, **kwargs) -> Any:
+def exec_sync(apprun, logger:logging.Logger, args:argparse.Namespace, tm:float, pf:List[Dict[str, float]]) -> Tuple[int, Dict[str, Any], Any]:
     """"
     指定された関数が非同期関数であっても同期的に実行します。
 
     Args:
-        func (function): 関数
-        args (Any): 引数
-        kwargs (Any): キーワード引数
+        apprun (function): 関数
+        logger (logging.Logger): ロガー
+        args (argparse.Namespace): コマンドライン引数
+        tm (float): 処理時間
+        pf (List[Dict[str, float]]): パフォーマンス情報
 
     Returns:
-        Any: 関数の戻り値
+        Tuple[int, Dict[str, Any], Any]: 戻り値のタプル。0は成功、1は失敗、2はキャンセル
     """
-    if inspect.iscoroutinefunction(func):
+    if inspect.iscoroutinefunction(apprun):
         if is_event_loop_running():
-            loop = asyncio.get_running_loop()
-            futuer = asyncio.run_coroutine_threadsafe(func(*args, **kwargs), loop)
-            while futuer.done() or futuer.cancelled():
-                time.sleep(0.1)
-            ret = futuer.result()
-            return ret
-        return asyncio.run(func(*args, **kwargs))
-    return func(*args, **kwargs)
+            def _run(apprun, ctx, logger, args, tm, pf):
+                ctx.append(asyncio.run(apprun(logger, args, tm, pf)))
+            ctx = []
+            th = threading.Thread(target=_run, args=(apprun, ctx, logger, args, tm, pf))
+            th.start()
+            th.join()
+            result = ctx[0] if ctx else None
+            return 0, result, None
+        return asyncio.run(apprun(logger, args, tm, pf))
+    return apprun(logger, args, tm, pf)
 
 def get_tzoffset_str() -> str:
     """

cmdbox/app/feature.py

@@ -123,13 +123,17 @@ class Feature(object):
         status, res = tool.exec_cmd(opt, logger, timeout, prevres)
         yield status, res
 
-    def audited_by(self) -> bool:
+    def audited_by(self, logger:logging.Logger, args:argparse.Namespace) -> bool:
         """
         この機能が監査ログを記録する対象かどうかを返します
 
         Returns:
+            logger (logging.Logger): ロガー
+            args (argparse.Namespace): 引数
             bool: 監査ログを記録する場合はTrue
         """
+        if hasattr(self, 'client_only') and self.client_only:
+            return False
         return True
 
 class OneshotEdgeFeature(Feature):

cmdbox/app/features/cli/agent_base.py

@@ -60,7 +60,7 @@ class AgentBase(feature.ResultEdgeFeature):
                 dict(opt="llmprojectid", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,
                      description_ja="llmのプロバイダ接続のためのプロジェクトIDを指定します。",
                      description_en="Specify the project ID for llm's provider connection."),
-                dict(opt="llmsvaccountfile", type=Options.T_FILE, default=None, required=False, multi=False, hide=False, choice=None,
+                dict(opt="llmsvaccountfile", type=Options.T_FILE, default=None, required=False, multi=False, hide=False, choice=None, fileio="in",
                      description_ja="llmのプロバイダ接続のためのサービスアカウントファイルを指定します。",
                      description_en="Specifies the service account file for llm's provider connection."),
                 dict(opt="llmlocation", type=Options.T_STR, default=None, required=False, multi=False, hide=False, choice=None,

cmdbox/app/features/cli/cmdbox_audit_search.py

@@ -103,7 +103,22 @@ class AuditSearch(audit_base.AuditBase):
                  description_en="Specifies the number of rows to retrieve."),
             dict(opt="csv", type=Options.T_BOOL, default=False, required=False, multi=False, hide=False, choice=[False, True],
                  description_ja="検索結果をcsvで出力します。",
-                 description_en="Output search results in csv.")
+                 description_en="Output search results in csv."),
+            dict(opt="output_json", short="o", type=Options.T_FILE, default=None, required=False, multi=False, hide=True, choice=None, fileio="out",
+                 description_ja="処理結果jsonの保存先ファイルを指定。",
+                 description_en="Specify the destination file for saving the processing result json."),
+            dict(opt="output_json_append", short="a", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
+                 description_ja="処理結果jsonファイルを追記保存します。",
+                 description_en="Save the processing result json file by appending."),
+            dict(opt="stdout_log", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
+                 description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をConsole logに出力します。",
+                 description_en="Available only in GUI mode. Outputs standard output during command execution to Console log."),
+            dict(opt="capture_stdout", type=Options.T_BOOL, default=True, required=False, multi=False, hide=True, choice=[True, False],
+                 description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力をキャプチャーし、実行結果画面に表示します。",
+                 description_en="Available only in GUI mode. Captures standard output during command execution and displays it on the execution result screen."),
+            dict(opt="capture_maxsize", type=Options.T_INT, default=self.DEFAULT_CAPTURE_MAXSIZE, required=False, multi=False, hide=True, choice=None,
+                 description_ja="GUIモードでのみ使用可能です。コマンド実行時の標準出力の最大キャプチャーサイズを指定します。",
+                 description_en="Available only in GUI mode. Specifies the maximum capture size of standard output when executing commands."),
         ]
         return opt
 
@@ -129,6 +144,12 @@ class AuditSearch(audit_base.AuditBase):
         Returns:
             Tuple[int, Dict[str, Any], Any]: 終了コード, 結果, オブジェクト
         """
+        if not hasattr(args, 'format') or not args.format:
+            args.format = False
+        if not hasattr(args, 'output_json') or not args.output_json:
+            args.output_json = None
+        if not hasattr(args, 'output_json_append') or not args.output_json_append:
+            args.output_json_append = False
         if args.svname is None:
             msg = dict(warn=f"Please specify the --svname option.")
             common.print_format(msg, args.format, tm, None, False, pf=pf)
@@ -210,6 +231,7 @@ class AuditSearch(audit_base.AuditBase):
                 ret = buf.getvalue()
                 ret = ret.replace('\r\n', '\n') if ret is not None else ''
 
+        common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)
         return 0, ret, cl
 
     def is_cluster_redirect(self):