cmdbox 0.6.4__tar.gz → 0.6.4.1__tar.gz

{cmdbox-0.6.4/cmdbox.egg-info → cmdbox-0.6.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmdbox
-Version: 0.6.4
+Version: 0.6.4.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
@@ -92,6 +92,7 @@ apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl buil
 - When using `--agent use` in web mode, install the modules with dependencies.
 ```bash
 pip install google-adk litellm fastmcp
+pip install backoff cryptography orjson apscheduler litellm-enterprise email-validator fastapi-sso
 ```
 
 # Run

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/README.md

@@ -28,6 +28,7 @@ apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl buil
 - When using `--agent use` in web mode, install the modules with dependencies.
 ```bash
 pip install google-adk litellm fastmcp
+pip install backoff cryptography orjson apscheduler litellm-enterprise email-validator fastapi-sso
 ```
 
 # Run

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/app.py

@@ -6,6 +6,7 @@ import argparse
 import argcomplete
 import logging
 import time
+import threading
 import sys
 
 
@@ -180,4 +181,9 @@ class CmdBoxApp:
         アプリケーションの設定を読み込みます。
         """
         logger, _ = common.load_config(args.mode, debug=args.debug, data=args.data, webcall=webcall if args.cmd != 'webcap' else True, ver=self.ver)
+        if not hasattr(common, 'logsv') and hasattr(args, 'logsv') and args.logsv:
+            from cmdbox.app.commons import loghandler
+            common.logsv = loghandler.LogRecordTCPServer("logsv", host="localhost", port=9020, debug=args.debug)
+            threading.Thread(daemon=True, target=common.logsv.serve_until_stopped, name="logsv").start()
+
         return logger

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/common.py

@@ -4,7 +4,6 @@ from cmdbox.app.commons import convert, module, loghandler
 from cryptography.fernet import Fernet
 from pathlib import Path
 from rich.console import Console
-from rich.logging import RichHandler
 from tabulate import tabulate
 from typing import List, Tuple, Dict, Any
 import argparse
@@ -195,7 +194,7 @@ def console_log(console:Console, message:Any, highlight:bool=True, **kwargs) ->
         **kwargs: その他のキーワード引数
     """
     dtstr = datetime.datetime.now().strftime('[%Y-%m-%d %H:%M:%S]')
-    console.print(f"{dtstr} {message}", highlight=highlight, **kwargs)
+    console.print(f"{dtstr} {message}", highlight=highlight, crop=False, soft_wrap=True, **kwargs)
 
 def default_logger(debug:bool=False, ver=version, webcall:bool=False) -> logging.Logger:
     """
@@ -268,8 +267,12 @@ def load_config(mode:str, debug:bool=False, data=HOME_DIR, webcall:bool=False, v
         for k, l in log_config['loggers'].items():
             if 'handlers' in l and std_key in l['handlers']:
                 l['handlers'].remove(std_key)
-    if 'loggers' not in log_config or log_name not in log_config['loggers']:
-        raise BaseException(f"Loggers not found.({log_name}) at log_conf_path={log_conf_path}")
+    if 'loggers' not in log_config:
+        raise BaseException(f"Loggers not found at log_conf_path={log_conf_path}")
+    if log_name not in log_config['loggers']:
+        if ver.__appid__ not in log_config['loggers']:
+            raise BaseException(f"Loggers not found.({ver.__appid__}) at log_conf_path={log_conf_path}")
+        log_name = ver.__appid__
     log_config['disable_existing_loggers'] = False # これを入れないとdictConfigで既存のロガーが無効になる
     logging.config.dictConfig(log_config)
     logger = logging.getLogger(log_name)

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/commons/loghandler.py

@@ -4,6 +4,11 @@ from rich.theme import Theme
 import re
 import logging
 import logging.handlers
+import pickle
+import socketserver
+import struct
+import socket
+
 
 class Colors:
     S = "\033["
@@ -103,6 +108,9 @@ theme=Theme({
     "repr.log_success": "green",})
 
 class LogLevelHighlighter(highlighter.ReprHighlighter):
+    """
+    ログメッセージのログレベルをハイライトします。
+    """
     def __init__(self):
         #self.highlights = []
         self.highlights.append(r"(?P<log_debug>DEBUG|EXEC)")
@@ -112,29 +120,12 @@ class LogLevelHighlighter(highlighter.ReprHighlighter):
         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)")
-        """
-        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_]+"?)?')
-        self.highlights.append(r"(?P<brace>[][{}()])")
-        self.highlights.append(highlighter._combine_regex(
-            r"(?P<ipv4>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})",
-            r"(?P<ipv6>([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})",
-            r"(?P<eui64>(?:[0-9A-Fa-f]{1,2}-){7}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{1,2}:){7}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{4}\.){3}[0-9A-Fa-f]{4})",
-            r"(?P<eui48>(?:[0-9A-Fa-f]{1,2}-){5}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{1,2}:){5}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{4}\.){2}[0-9A-Fa-f]{4})",
-            r"(?P<uuid>[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12})",
-            r"(?P<call>[\w.]*?)\(",
-            r"\b(?P<bool_true>True)\b|\b(?P<bool_false>False)\b|\b(?P<none>None)\b",
-            r"(?P<ellipsis>\.\.\.)",
-            r"(?P<number_complex>(?<!\w)(?:\-?[0-9]+\.?[0-9]*(?:e[-+]?\d+?)?)(?:[-+](?:[0-9]+\.?[0-9]*(?:e[-+]?\d+)?))?j)",
-            r"(?P<number>(?<!\w)\-?[0-9]+\.?[0-9]*(e[-+]?\d+?)?\b|0x[0-9a-fA-F]*)",
-            r"(?P<path>\B(/[-\w._+]+)*\/)(?P<filename>[-\w._+]*)?",
-            r"(?<![\\\w])(?P<str>b?'''.*?(?<!\\)'''|b?'.*?(?<!\\)'|b?\"\"\".*?(?<!\\)\"\"\"|b?\".*?(?<!\\)\")",
-            r"(?P<url>(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~@]*)",
-        ))
-        """
         self.highlights = [re.compile(h, re.IGNORECASE) for h in self.highlights]
 
 class ColorfulStreamHandler(logging.StreamHandler):
+    """
+    コンソールにカラフルなログメッセージを出力します。
+    """
     console = Console(soft_wrap=True, height=True, highlighter=LogLevelHighlighter(), theme=theme)
 
     def emit(self, record: logging.LogRecord) -> None:
@@ -154,3 +145,93 @@ class TimedRotatingFileHandler(logging.handlers.TimedRotatingFileHandler):
         record.levelname = level_mapping_nc[record.levelno]
         super().emit(record)
 
+class SocketHandler(logging.handlers.SocketHandler):
+    def emit(self, record: logging.LogRecord) -> None:
+        record.levelname = level_mapping_nc[record.levelno]
+        super().emit(record)
+
+class LogRecordRequestHandler(socketserver.StreamRequestHandler):
+    """
+    ログリクエストを処理するためのハンドラ
+    """
+    def setup(self):
+        super().setup()
+        from cmdbox.app import common
+        common.set_debug(self._getLogger(), LogRecordTCPServer.debug)
+
+    def _getLogger(self):
+        if self.server.logname is not None:
+            name = self.server.logname
+        else:
+            name = self.logname
+        return logging.getLogger(name)
+
+    def handle(self):
+        """
+        ログリクエストを処理します。
+        """
+        while True:
+            chunk = self.connection.recv(4)
+            if len(chunk) < 4:
+                break
+            slen = struct.unpack('>L', chunk)[0]
+            chunk = self.connection.recv(slen)
+            while len(chunk) < slen:
+                chunk = chunk + self.connection.recv(slen - len(chunk))
+            obj = self.unPickle(chunk)
+            record = logging.makeLogRecord(obj)
+            self.handleLogRecord(record)
+
+    def unPickle(self, data):
+        return pickle.loads(data)
+    
+    def handleLogRecord(self, record):
+        logger = self._getLogger()
+        logger.handle(record)
+
+class LogRecordTCPServer(socketserver.ThreadingTCPServer):
+    """
+    ログレコードを受信するためのTCPサーバー。
+    """
+    # 停止後すぐにサーバーを再起動できるようにする
+    allow_reuse_address = True
+
+    def __init__(self, logname, host='localhost', port=logging.handlers.DEFAULT_TCP_LOGGING_PORT,
+                 handler=LogRecordRequestHandler, debug=False):
+        """
+        コンストラクタ
+
+        Args:
+            logname (str): ログ名
+            host (str): ホスト名
+            port (int): ポート番号
+            handler (socketserver.RequestHandler): リクエストハンドラ
+            debug (bool): デバッグモード
+        """
+        socketserver.ThreadingTCPServer.__init__(self, (host, port), handler, bind_and_activate=False)
+        self.allow_reuse_address = False
+        self.allow_reuse_port = False
+        self.request_queue_size = 15
+        self.abort = 0
+        self.timeout = 1
+        self.logname = logname
+        self.handler = handler
+        LogRecordTCPServer.debug = debug
+
+    def serve_until_stopped(self):
+        import select
+        abort = 0
+        try:
+            self.server_bind()
+            self.server_activate()
+        except:
+            # すでにlogsvが起動中の場合は待機しない
+            self.server_close()
+            abort = 1
+        while not abort:
+            rd, wr, ex = select.select([self.socket.fileno()],
+                                       [], [],
+                                       self.timeout)
+            if rd:
+                self.handle_request()
+            abort = self.abort

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/edge.py

@@ -9,7 +9,6 @@ from uvicorn.config import Config
 import argparse
 import json
 import logging
-import locale
 import queue
 import requests
 import time
@@ -54,7 +53,6 @@ class Edge(object):
 
         import questionary
         ref_opts = self.options.get_cmd_choices(edge_mode, edge_cmd)
-        language, _ = locale.getlocale()
         edge_dir = Path(self.data) / '.edge'
         common.mkdirs(edge_dir)
         conf_file = edge_dir / 'edge.conf'
@@ -96,7 +94,7 @@ class Edge(object):
             default = str(default) if isinstance(default, int) or isinstance(default, float) else default
             description_ja = r['description_ja'] if 'description_ja' in r else None
             description_en = r['description_en'] if 'description_en' in r else None
-            help = description_en if language.find('Japan') < 0 and language.find('ja_JP') < 0 else description_ja
+            help = description_en if not common.is_japan() else description_ja
             choice = r['choice'] if 'choice' in r else None
             choice = [str(c) for c in choice] if choice is not None else None
             required = r['required'] if 'required' in r else False

cmdbox-0.6.4/cmdbox/app/features/cli/cmdbox_mcp_client.py → cmdbox-0.6.4.1/cmdbox/app/features/cli/cmdbox_agent_mcp_client.py

@@ -6,7 +6,7 @@ import argparse
 import logging
 
 
-class McpClient(feature.UnsupportEdgeFeature):
+class AgentMcpClient(feature.UnsupportEdgeFeature):
     def get_mode(self) -> Union[str, List[str]]:
         """
         この機能のモードを返します
@@ -14,7 +14,7 @@ class McpClient(feature.UnsupportEdgeFeature):
         Returns:
             Union[str, List[str]]: モード
         """
-        return 'mcp'
+        return 'agent'
 
     def get_cmd(self) -> str:
         """
@@ -23,7 +23,7 @@ class McpClient(feature.UnsupportEdgeFeature):
         Returns:
             str: コマンド
         """
-        return 'client'
+        return 'mcp_client'
 
     def get_option(self):
         """
@@ -33,6 +33,7 @@ class McpClient(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
+            # webからclientを実行するとmcp処理とデッドロックが発生するため、webmodeを無効にします。
             use_redis=self.USE_REDIS_FALSE, nouse_webmode=True, use_agent=False,
             description_ja="リモートMCPサーバーにリクエストを行うMCPクライアントを起動します。",
             description_en="Starts an MCP client that makes requests to a remote MCP server.",

cmdbox-0.6.4/cmdbox/app/features/cli/cmdbox_mcp_proxy.py → cmdbox-0.6.4.1/cmdbox/app/features/cli/cmdbox_agent_mcp_proxy.py

@@ -6,7 +6,7 @@ import argparse
 import logging
 
 
-class McpProxy(feature.UnsupportEdgeFeature):
+class AgentMcpProxy(feature.UnsupportEdgeFeature):
     def get_mode(self) -> Union[str, List[str]]:
         """
         この機能のモードを返します
@@ -14,7 +14,7 @@ class McpProxy(feature.UnsupportEdgeFeature):
         Returns:
             Union[str, List[str]]: モード
         """
-        return 'mcp'
+        return 'agent'
 
     def get_cmd(self) -> str:
         """
@@ -23,7 +23,7 @@ class McpProxy(feature.UnsupportEdgeFeature):
         Returns:
             str: コマンド
         """
-        return 'proxy'
+        return 'mcp_proxy'
 
     def get_option(self):
         """
@@ -33,7 +33,7 @@ class McpProxy(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False, use_agent=False,
+            use_redis=self.USE_REDIS_FALSE, nouse_webmode=True, use_agent=False,
             description_ja="標準入力を受け付け、リモートMCPサーバーにリクエストを行うProxyサーバーを起動します。",
             description_en="Starts a Proxy server that accepts standard input and makes requests to a remote MCP server.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_cmd_list.py

@@ -99,7 +99,7 @@ class CmdList(feature.OneshotResultEdgeFeature):
         cmd_list = [dict(title=r.get('title',''), mode=r['mode'], cmd=r['cmd'],
                     description=r.get('description','') + options.get_cmd_attr(r['mode'], r['cmd'], 'description_ja' if is_japan else 'description_en'),
                     tag=r.get('tag','')) for r in cmd_list \
-               if signin.Signin._check_cmd(self.signin_file_data, args.groups, r['mode'], r['cmd'], logger)]
+                    if signin.Signin._check_cmd(self.signin_file_data, args.groups, r['mode'], r['cmd'], logger)]
         ret = dict(success=cmd_list)
 
         common.print_format(ret, args.format, tm, args.output_json, args.output_json_append, pf=pf)

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_server_list.py

@@ -33,7 +33,7 @@ class ServerList(feature.OneshotResultEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_TRUE, nouse_webmode=False,
+            use_redis=self.USE_REDIS_TRUE, nouse_webmode=False, use_agent=True,
             description_ja="起動中のサーバーの一覧を表示します。クライアント環境からの利用も可能です。",
             description_en="Displays a list of running inference servers. Can also be used from the client environment.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_server_start.py

@@ -6,7 +6,7 @@ import argparse
 import logging
 
 
-class ServerStart(feature.OneshotNotifyEdgeFeature):
+class ServerStart(feature.UnsupportEdgeFeature):
     def get_mode(self) -> Union[str, List[str]]:
         """
         この機能のモードを返します
@@ -33,7 +33,7 @@ class ServerStart(feature.OneshotNotifyEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_TRUE, nouse_webmode=True,
+            use_redis=self.USE_REDIS_TRUE, nouse_webmode=True, use_agent=False,
             description_ja="サーバーを起動します。installモードで `cmdbox -m install -c server` を実行している場合は、 `docker-compose up -d` を使用してください。",
             description_en="Start the inference server. If you are running `cmdbox -m install -c server` in install mode, use `docker-compose up -d`.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_server_stop.py

@@ -7,7 +7,7 @@ import argparse
 import logging
 
 
-class ServerStop(feature.OneshotNotifyEdgeFeature):
+class ServerStop(feature.UnsupportEdgeFeature):
     def get_mode(self) -> Union[str, List[str]]:
         """
         この機能のモードを返します
@@ -34,7 +34,7 @@ class ServerStop(feature.OneshotNotifyEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_TRUE, nouse_webmode=True,
+            use_redis=self.USE_REDIS_TRUE, nouse_webmode=True, use_agent=False,
             description_ja="サーバーを停止します。installモードで `cmdbox -m install -c server` を実行している場合は、 `docker-compose down` を使用してください。",
             description_en="Stop the inference server. If you are running `cmdbox -m install -c server` in install mode, use `docker-compose down`.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_tts_install.py

@@ -41,7 +41,7 @@ class TtsInstall(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=True, use_agent=False,
             description_ja="Text-to-Speech(TTS)エンジンをインストールします。",
             description_en="Installs the Text-to-Speech (TTS) engine.",
             choice=[
@@ -247,6 +247,8 @@ class TtsInstall(feature.UnsupportEdgeFeature):
                 voicevox_dir.mkdir(parents=True, exist_ok=True)
                 dlfile = voicevox_dir / dlfile
                 # ダウンローダーを保存
+                if logger.level == logging.DEBUG:
+                    logger.debug(f"Downloading.. : {downloader_url}")
                 responce = requests.get(downloader_url, allow_redirects=True)
                 if responce.status_code != 200:
                     _msg = f"Failed to download VoiceVox core: {responce.status_code} {responce.reason}. {downloader_url}"
@@ -264,6 +266,8 @@ class TtsInstall(feature.UnsupportEdgeFeature):
                     cmd_line.extend(['--devices', 'directml'])
                 elif voicevox_device == 'cuda':
                     cmd_line.extend(['--devices', 'cuda'])
+                if logger.level == logging.DEBUG:
+                    logger.debug(f"EXEC - {cmd_line}")
                 proc = subprocess.Popen(cmd_line, cwd=str(voicevox_dir), stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
                 outs, errs = proc.communicate(input=b'y\ny\n')  # 'y' to confirm installation
                 if proc.returncode != 0:
@@ -272,6 +276,8 @@ class TtsInstall(feature.UnsupportEdgeFeature):
                     _msg += f"Failed to install VoiceVox core: {_msg}"
                     logger.error(_msg, exc_info=True)
                     return dict(warn=_msg)
+                if logger.level == logging.DEBUG:
+                    logger.debug(f"Completed - {cmd_line}")
                 if (voicevox_dir / 'voicevox_core').exists():
                     for file in glob.glob(str(voicevox_dir / 'voicevox_core' / '*')):
                         shutil.move(file, voicevox_dir)
@@ -283,6 +289,8 @@ class TtsInstall(feature.UnsupportEdgeFeature):
                 whl_url = f'https://github.com/VOICEVOX/voicevox_core/releases/download/{voicevox_ver}/{voicevox_whl}'
                 voicevox_whl = voicevox_dir / voicevox_whl
                 # whlファイルをダウンロード
+                if logger.level == logging.DEBUG:
+                    logger.debug(f"Downloading.. : {whl_url}")
                 responce = requests.get(whl_url, allow_redirects=True)
                 if responce.status_code != 200:
                     _msg = f"Failed to download VoiceVox whl: {responce.status_code} {responce.reason}. {whl_url}"
@@ -291,6 +299,8 @@ class TtsInstall(feature.UnsupportEdgeFeature):
                 with open(voicevox_whl, mode='wb') as f:
                     f.write(responce.content)
                 # whlファイルをpipでインストール
+                if logger.level == logging.DEBUG:
+                    logger.debug(f"pip install {voicevox_whl}")
                 rescode = pip.main(['install', str(voicevox_whl)])  # pipのインストール
                 logger.info(f"Install wheel: {voicevox_whl}")
                 if rescode != 0:

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_tts_start.py

@@ -8,7 +8,7 @@ import argparse
 import logging
 
 
-class TtsStart(feature.OneshotNotifyEdgeFeature):
+class TtsStart(feature.UnsupportEdgeFeature):
     VOICEVOX_STYLE = dict()
     VOICEVOX_STYLE['0.vvm_2'] = dict(fn='0.vvm',ch='四国めたん',md='ノーマル',st=2)
     VOICEVOX_STYLE['0.vvm_0'] = dict(fn='0.vvm',ch='四国めたん',md='あまあま',st=0)

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_apikey_add.py

@@ -33,7 +33,7 @@ class WebApikeyAdd(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="WebモードのユーザーのApiKeyを追加します。",
             description_en="Add an ApiKey for a user in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_apikey_del.py

@@ -33,7 +33,7 @@ class WebApikeyDel(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="WebモードのユーザーのApiKeyを削除します。",
             description_en="Del an ApiKey for a user in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_gencert.py

@@ -38,7 +38,7 @@ class WebGencert(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False,
+            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False, use_agent=False,
             description_ja="webモードでSSLを簡易的に実装するために自己署名証明書を生成します。",
             description_en="Generate a self-signed certificate for simple implementation of SSL in web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_genpass.py

@@ -40,7 +40,7 @@ class WebGenpass(feature.OneshotResultEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False,
+            use_redis=self.USE_REDIS_FALSE, nouse_webmode=False, use_agent=True,
             description_ja="webモードで使用できるパスワード文字列を生成します。",
             description_en="Generates a password string that can be used in web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_group_add.py

@@ -33,7 +33,7 @@ class WebGroupAdd(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="Webモードのグループを追加します。",
             description_en="Add a group in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_group_del.py

@@ -33,7 +33,7 @@ class WebGroupDel(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="Webモードのグループを削除します。",
             description_en="Del a group in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_group_edit.py

@@ -33,7 +33,7 @@ class WebGroupEdit(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="Webモードのグループを編集します。",
             description_en="Edit a group in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_group_list.py

@@ -6,7 +6,7 @@ import argparse
 import logging
 
 
-class WebGroupList(feature.OneshotResultEdgeFeature):
+class WebGroupList(feature.UnsupportEdgeFeature):
     def get_mode(self) -> Union[str, List[str]]:
         """
         この機能のモードを返します
@@ -33,7 +33,7 @@ class WebGroupList(feature.OneshotResultEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="Webモードのグループー一覧を取得します。",
             description_en="Get a list of users in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_start.py

@@ -38,6 +38,7 @@ class WebStart(feature.UnsupportEdgeFeature, agent_base.AgentBase):
         opt = super().get_option()
         opt['use_redis'] = self.USE_REDIS_MEIGHT
         opt['nouse_webmode'] = True
+        opt['use_agent'] = False
         opt['description_ja'] = "Webモードを起動します。"
         opt['description_en'] = "Start Web mode."
         opt['choice'] += [

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_stop.py

@@ -33,7 +33,7 @@ class WebStop(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=True,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=True, use_agent=False,
             description_ja="Webモードを停止します。",
             description_en="Stop Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_user_add.py

@@ -33,7 +33,7 @@ class WebUserAdd(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="Webモードのユーザーを追加します。",
             description_en="Add a user in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_user_del.py

@@ -33,7 +33,7 @@ class WebUserDel(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="Webモードのユーザーを削除します。",
             description_en="Delete a user in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_user_edit.py

@@ -33,7 +33,7 @@ class WebUserEdit(feature.UnsupportEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="Webモードのユーザーを編集します。",
             description_en="Edit users in Web mode.",
             choice=[

{cmdbox-0.6.4 → cmdbox-0.6.4.1}/cmdbox/app/features/cli/cmdbox_web_user_list.py

@@ -6,7 +6,7 @@ import argparse
 import logging
 
 
-class WebUserList(feature.OneshotResultEdgeFeature):
+class WebUserList(feature.UnsupportEdgeFeature):
     def get_mode(self) -> Union[str, List[str]]:
         """
         この機能のモードを返します
@@ -33,7 +33,7 @@ class WebUserList(feature.OneshotResultEdgeFeature):
             Dict[str, Any]: オプション
         """
         return dict(
-            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False,
+            use_redis=self.USE_REDIS_MEIGHT, nouse_webmode=False, use_agent=False,
             description_ja="Webモードのユーザー一覧を取得します。",
             description_en="Get a list of users in Web mode.",
             choice=[