cmdbox 0.5.0.4__py3-none-any.whl → 0.5.0.6__py3-none-any.whl

cmdbox/app/features/cli/cmdbox_gui_start.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from typing import Dict, Any, Tuple, List, Union
 import argparse
 import logging
+import multiprocessing
 
 
 class GuiStart(feature.UnsupportEdgeFeature):
@@ -88,6 +89,12 @@ class GuiStart(feature.UnsupportEdgeFeature):
                 dict(opt="session_timeout", type=Options.T_INT, default="600", required=False, multi=False, hide=True, choice=None,
                      discription_ja="サインインしたユーザーのセッションタイムアウトの時間を秒で指定します。",
                      discription_en="Specify the session timeout in seconds for signed-in users."),
+                dict(opt="guvicorn_workers", type=Options.T_INT, default=multiprocessing.cpu_count()*2, required=False, multi=False, hide=True, choice=None,
+                     discription_ja="guvicornワーカー数を指定します。Linux環境でのみ有効です。-1又は未指定の場合はCPU数の2倍を使用します。",
+                     discription_en="Specifies the number of guvicorn workers, valid only in Linux environment. If -1 or unspecified, twice the number of CPUs is used."),
+                dict(opt="guvicorn_timeout", type=Options.T_INT, default=30, required=False, multi=False, hide=True, choice=None,
+                     discription_ja="guvicornワーカーのタイムアウトの時間を秒で指定します。",
+                     discription_en="Specify the timeout duration of the guvicorn worker in seconds."),
                 dict(opt="client_only", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
                      discription_ja="サーバーへの接続を行わないようにします。",
                      discription_en="Do not make connections to the server."),

cmdbox/app/features/cli/cmdbox_web_start.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from typing import Dict, Any, Tuple, List, Union
 import argparse
 import logging
+import multiprocessing
 
 
 class WebStart(feature.UnsupportEdgeFeature):
@@ -88,6 +89,12 @@ class WebStart(feature.UnsupportEdgeFeature):
                 dict(opt="session_timeout", type=Options.T_INT, default="600", required=False, multi=False, hide=True, choice=None,
                      discription_ja="サインインしたユーザーのセッションタイムアウトの時間を秒で指定します。",
                      discription_en="Specify the session timeout in seconds for signed-in users."),
+                dict(opt="guvicorn_workers", type=Options.T_INT, default=multiprocessing.cpu_count()*2, required=False, multi=False, hide=True, choice=None,
+                     discription_ja="guvicornワーカー数を指定します。Linux環境でのみ有効です。-1又は未指定の場合はCPU数の2倍を使用します。",
+                     discription_en="Specifies the number of guvicorn workers, valid only in Linux environment. If -1 or unspecified, twice the number of CPUs is used."),
+                dict(opt="guvicorn_timeout", type=Options.T_INT, default=30, required=False, multi=False, hide=True, choice=None,
+                     discription_ja="guvicornワーカーのタイムアウトの時間を秒で指定します。",
+                     discription_en="Specify the timeout duration of the guvicorn worker in seconds."),
                 dict(opt="client_only", type=Options.T_BOOL, default=False, required=False, multi=False, hide=True, choice=[True, False],
                      discription_ja="サーバーへの接続を行わないようにします。",
                      discription_en="Do not make connections to the server."),
@@ -158,7 +165,8 @@ class WebStart(feature.UnsupportEdgeFeature):
                     ssl_cert=ssl_cert, ssl_key=ssl_key, ssl_keypass=args.ssl_keypass, ssl_ca_certs=ssl_ca_certs,
                     session_domain=args.session_domain, session_path=args.session_path,
                     session_secure=args.session_secure, session_timeout=args.session_timeout,
-                    outputs_key=args.outputs_key)
+                    outputs_key=args.outputs_key, guvicorn_workers=args.guvicorn_workers, guvicorn_timeout=args.guvicorn_timeout)
+
             msg = dict(success="web complate.")
             common.print_format(msg, args.format, tm, args.output_json, args.output_json_append, pf=pf)
             return 0, msg, w

cmdbox/app/web.py

@@ -12,6 +12,7 @@ import ctypes
 import datetime
 import gevent
 import logging
+import multiprocessing
 import os
 import platform
 import requests
@@ -1136,7 +1137,8 @@ class Web:
 
     def start(self, allow_host:str="0.0.0.0", listen_port:int=8081, ssl_listen_port:int=8443,
               ssl_cert:Path=None, ssl_key:Path=None, ssl_keypass:str=None, ssl_ca_certs:Path=None,
-              session_domain:str=None, session_path:str='/', session_secure:bool=False, session_timeout:int=600, outputs_key:List[str]=[]):
+              session_domain:str=None, session_path:str='/', session_secure:bool=False, session_timeout:int=600, outputs_key:List[str]=[],
+              guvicorn_workers:int=-1, guvicorn_timeout:int=30):
         """
         Webサーバを起動する
 
@@ -1153,6 +1155,8 @@ class Web:
             session_secure (bool, optional): セッションセキュア. Defaults to False.
             session_timeout (int, optional): セッションタイムアウト. Defaults to 600.
             outputs_key (list, optional): 出力キー. Defaults to [].
+            guvicorn_workers (int, optional): Gunicornワーカー数. Defaults to -1.
+            guvicorn_timeout (int, optional): Gunicornタイムアウト. Defaults to 30.
         """
         self.allow_host = allow_host
         self.listen_port = listen_port
@@ -1166,6 +1170,8 @@ class Web:
         self.session_path = session_path
         self.session_secure = session_secure
         self.session_timeout = session_timeout
+        self.guvicorn_workers = guvicorn_workers
+        self.guvicorn_timeout = guvicorn_timeout
         if self.logger.level == logging.DEBUG:
             self.logger.debug(f"web start parameter: allow_host={self.allow_host}")
             self.logger.debug(f"web start parameter: listen_port={self.listen_port}")
@@ -1179,6 +1185,8 @@ class Web:
             self.logger.debug(f"web start parameter: session_path={self.session_path}")
             self.logger.debug(f"web start parameter: session_secure={self.session_secure}")
             self.logger.debug(f"web start parameter: session_timeout={self.session_timeout}")
+            self.logger.debug(f"web start parameter: guvicorn_worker={self.guvicorn_workers}")
+            self.logger.debug(f"web start parameter: guvicorn_timeout={self.guvicorn_timeout}")
 
         app = FastAPI()
         mwparam = dict(path=self.session_path, max_age=self.session_timeout, secret_key=common.random_string())
@@ -1191,7 +1199,8 @@ class Web:
 
         self.is_running = True
         #uvicorn.run(app, host=self.allow_host, port=self.listen_port, workers=2)
-        th = ThreadedUvicorn(self.logger, config=Config(app=app, host=self.allow_host, port=self.listen_port))
+        th = ThreadedUvicorn(self.logger, config=Config(app=app, host=self.allow_host, port=self.listen_port),
+                             guvicorn_config=dict(workers=self.guvicorn_workers, timeout=self.guvicorn_timeout))
         th.start()
         browser_port = self.listen_port
         th_ssl = None
@@ -1199,7 +1208,8 @@ class Web:
             th_ssl = ThreadedUvicorn(self.logger,
                                      config=Config(app=app, host=self.allow_host, port=self.ssl_listen_port,
                                                    ssl_certfile=self.ssl_cert, ssl_keyfile=self.ssl_key,
-                                                   ssl_keyfile_password=self.ssl_keypass, ssl_ca_certs=self.ssl_ca_certs))
+                                                   ssl_keyfile_password=self.ssl_keypass, ssl_ca_certs=self.ssl_ca_certs),
+                                     guvicorn_config=dict(workers=self.guvicorn_workers, timeout=self.guvicorn_timeout))
             th_ssl.start()
             browser_port = self.ssl_listen_port
         try:
@@ -1236,34 +1246,45 @@ class Web:
             self.logger.info(f"Exit web.")
 
 class ThreadedUvicorn:
-    def __init__(self, logger:logging.Logger, config:Config):
+    def __init__(self, logger:logging.Logger, config:Config, guvicorn_config:Dict[str, Any]):
         self.logger = logger
+        self.guvicorn_config = guvicorn_config
         if platform.system() == "Windows":
             self.server = uvicorn.Server(config)
             self.thread = RaiseThread(daemon=True, target=self.server.run)
         else:
             from gunicorn.app.wsgiapp import WSGIApplication
-            import multiprocessing
             class App(WSGIApplication):
-                def __init__(self, app, options=None):
-                    self.options = options or {}
+                def __init__(self, app, options):
+                    self.options = options
                     self.application = app
                     self.started = True
                     super().__init__()
                 def load_config(self):
-                    config = {key: value for key, value in self.options.items() if key in self.cfg.settings and value is not None}
+                    config = {k: v for k, v in self.options.items() if k in self.cfg.settings and v is not None}
                     for key, value in config.items():
                         self.cfg.set(key.lower(), value)
                 def load(self):
                     return self.application
             opt = dict(bind=f"{config.host}:{config.port}",
-                       workers=multiprocessing.cpu_count()*2,
                        worker_class="uvicorn.workers.UvicornWorker",
                        access_log_format='[%(t)s] %(p)s %(l)s %(h)s "%(r)s" %(s)s',
                        loglevel=logging.getLevelName(self.logger.level),
                        keyfile=config.ssl_keyfile, certfile=config.ssl_certfile,
                        ca_certs=config.ssl_ca_certs, keyfile_password=config.ssl_keyfile_password,
                        limit_request_line=8190, limit_request_fields=100, limit_request_field_size=8190)
+
+            self.guvicorn_config = self.guvicorn_config or {}
+            if 'workers' not in self.guvicorn_config:
+                self.guvicorn_config['workers'] = None
+            if self.guvicorn_config['workers'] is None or self.guvicorn_config['workers'] <= 0:
+                self.guvicorn_config['workers'] = multiprocessing.cpu_count()*2
+            if 'timeout' not in self.guvicorn_config:
+                self.guvicorn_config['timeout'] = None
+            if self.guvicorn_config['timeout'] is None or self.guvicorn_config['timeout'] <= 0:
+                self.guvicorn_config['timeout'] = 30
+
+            opt = {**opt, **self.guvicorn_config}
             self.server = App(config.app, opt)
             #self.thread = RaiseThread(daemon=True, target=self.server.run)
 

cmdbox/version.py

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

cmdbox/web/assets/cmdbox/view_raw.js

@@ -28,7 +28,10 @@ const view_raw_func = (title, result) => {
                             url.host = window.location.host;
                             const curl = val.replace(/^(curl.+[^(http)])(https?:\/\/[\w/:%#\$&\?\(\)~\.=\+\-]+)/, '$1');
                             const td = $(`<td>${curl}</td>`).appendTo(tr);
-                            const anc = $(`<a href="#">${url.href}</a>`).appendTo(td);
+                            const ctx_Path_mt = document.cookie.match(/Path=([^;]+)/);
+                            const ctx_Path = ctx_Path_mt && ctx_Path_mt.length>0 ? ctx_Path_mt[1] : '/';
+                            const href = `${url.protocol}//${url.host}${ctx_Path}${url.pathname.replace(new RegExp(`^${ctx_Path}`), '')}`;
+                            const anc = $(`<a href="#">${href}</a>`).appendTo(td);
                             anc.off('click').on('click', (e) => {
                                 if (!window.confirm(`May I execute '${title}' ?`)) return;
                                 window.open(url.href, '_blank');

{cmdbox-0.5.0.4.dist-info → cmdbox-0.5.0.6.dist-info}/METADATA

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

{cmdbox-0.5.0.4.dist-info → cmdbox-0.5.0.6.dist-info}/RECORD

@@ -6,7 +6,7 @@ cmdbox/logconf_edge.yml,sha256=RkbUebCJV2z5dLnpgvf4GSFkd-Blzu4vUUDP9CQFwdM,686
 cmdbox/logconf_gui.yml,sha256=T3yhWoiyp0DW06RjiFG6kS7jScqXYs-KLfC5EYKUImk,686
 cmdbox/logconf_server.yml,sha256=tpDpKQXgTWzUnHKGU-Vvsha7n1hyIyFdLnSeCgnOgyk,701
 cmdbox/logconf_web.yml,sha256=lzr3ytjqRbQutbhEOJdHJT0hrrR_h9sPkaEQkzX02lo,686
-cmdbox/version.py,sha256=tP_A5T983bYPC_4gWv5DkZv6XT6ap9nZi2MeQpOnpr8,1963
+cmdbox/version.py,sha256=ETvn5dzLvu--SWMntVWrUIFEeMHtYBODU_ljwNHZ3EI,1963
 cmdbox/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cmdbox/app/app.py,sha256=2rQpTbezCLuy36df89EhKsAfcPjtGepGHSTQZXimcqA,8949
 cmdbox/app/client.py,sha256=SNM4xxDh5ARxV6I7cDrmbzGc7sXUUwB3tSyIksdT1RY,19562
@@ -17,7 +17,7 @@ cmdbox/app/filer.py,sha256=L_DSMTvnbN_ffr3JIt0obbOmVoTHEfVm2cAVz3rLH-Q,16059
 cmdbox/app/options.py,sha256=A4q4dAFAsTaV_k4z7n7hT2Dl6Ei6DrQ7X0xKoVDK6sM,31092
 cmdbox/app/server.py,sha256=rrH_a6zzrx7glp_SqRrc_2gBgRoT9FX0F1bpGxVLX1I,9467
 cmdbox/app/signin.py,sha256=Ry4jxUuroOAIAfTYSolMm_izaF27-IS7914I4vhr6yU,2577
-cmdbox/app/web.py,sha256=z3M7FoqC0lWziXx1gDkeSuXzQ5ZGHUWEoFOt3Xlu3ic,78599
+cmdbox/app/web.py,sha256=6MXgl_lb4MZO8Lq1kZnGNiIZw6d0eO4c9T-izD_XzZY,80017
 cmdbox/app/commons/convert.py,sha256=etWeutkPyE8FMz11jw4KJ5uip7qu_CoD1yIqF5iypgg,6754
 cmdbox/app/commons/loghandler.py,sha256=TQXXg8KdAzHMPwSQGq7RP0qTHxb35PhUTqqDFWkimgk,3306
 cmdbox/app/commons/module.py,sha256=RsEyqP9Qty4v0qIEE6VuY4pgMlkhJKNTUhsN5p-sSoM,4880
@@ -33,7 +33,7 @@ cmdbox/app/features/cli/cmdbox_client_file_upload.py,sha256=w8vbNttQ_V-R3UWkj0iK
 cmdbox/app/features/cli/cmdbox_client_server_info.py,sha256=6cCWFoFF0stCw7Mn57LUFgUDCKFPThzAerTMuYnLc-I,9398
 cmdbox/app/features/cli/cmdbox_edge_config.py,sha256=CzuF4YlngUTOBOr6jDAe-jzQ-psb9OVXMxIEtjKddYQ,7240
 cmdbox/app/features/cli/cmdbox_edge_start.py,sha256=SWI0SEdergvVBuewyypH5cWrCZSm_M365RRkGxSLqB8,3849
-cmdbox/app/features/cli/cmdbox_gui_start.py,sha256=QbKe8Up1aam9dg7QrZfECLTKZXWktgxakO7TecmLVfw,13519
+cmdbox/app/features/cli/cmdbox_gui_start.py,sha256=A15Iol1nRCd_kTMKTyM-uKYEnEd3I_ZYPQRI8fw6Tks,14403
 cmdbox/app/features/cli/cmdbox_gui_stop.py,sha256=nxaKEM_JSbndcbuHo2CSv7XX4hQwSf3_XC_aasVcs_Y,2730
 cmdbox/app/features/cli/cmdbox_server_list.py,sha256=xinPmftRK2WkhuZiC6RPh7ldbqEpYErbNaWZSUcT03I,5689
 cmdbox/app/features/cli/cmdbox_server_start.py,sha256=2u-J5GlkJxX7a6Sh8Gw8OfsbhkzYz4zhDGXEtSd2CwM,7294
@@ -46,7 +46,7 @@ cmdbox/app/features/cli/cmdbox_web_group_add.py,sha256=pxhR1Pg-EngB3vQmPnAUys4EV
 cmdbox/app/features/cli/cmdbox_web_group_del.py,sha256=nQfS2zgqDGTZaMdiEZvscIqF84k2Kf_9cwt_aqeJmAE,6597
 cmdbox/app/features/cli/cmdbox_web_group_edit.py,sha256=M-B3txvtLc4sh6URFWVaHaDJCdz3MrLwkmQKSZ2mr-o,7326
 cmdbox/app/features/cli/cmdbox_web_group_list.py,sha256=sSj237xq5ZrvBSVh2w7ZDHwbzdDR1oJDwmaCfqbp808,6692
-cmdbox/app/features/cli/cmdbox_web_start.py,sha256=VtbbesiW9CaUncQg8Z32k4l_Ansn2_tvyozCuZS8t9Q,14307
+cmdbox/app/features/cli/cmdbox_web_start.py,sha256=aa4TncMVK3cbXDOSYhJ_N__WZziXzbYBIW3b6Fn3nr0,15272
 cmdbox/app/features/cli/cmdbox_web_stop.py,sha256=mGFRgTvm4lbt9D9O-Gnp3p0E44KQ9TyURMYk_ngTWto,3593
 cmdbox/app/features/cli/cmdbox_web_user_add.py,sha256=agMXexo99lKALEo4nAQA9BDFN1oTmu8_nCjWL6BSGuc,8547
 cmdbox/app/features/cli/cmdbox_web_user_del.py,sha256=kj1te2Sogdg8huVPbuVa_a6EBR9sJ6kbmw4VgSRHkaY,6560
@@ -204,7 +204,7 @@ cmdbox/web/assets/cmdbox/open_output_json.js,sha256=4q7mCdVmSzFudlTlW9MuIJ1-f-kD
 cmdbox/web/assets/cmdbox/result.js,sha256=DHCYMXmuN9UQjwCGJfHE6rmHD0rSwRIxDqPQWHcdl24,3210
 cmdbox/web/assets/cmdbox/signin.js,sha256=x2QOTRVdTwy9bAbOD86ZYBB0yIRAjJZ32vNVQCCyWAA,3680
 cmdbox/web/assets/cmdbox/users.js,sha256=RsmMzLZohbU0u3GsXv7W64691se4TKUrhZxISAocc1I,29215
-cmdbox/web/assets/cmdbox/view_raw.js,sha256=lVYIHD-t1705fNlDAukHkdBDf6xIX2NUJFeMPDnhgDc,2356
+cmdbox/web/assets/cmdbox/view_raw.js,sha256=n0jfz_NjfHEt0In3Z3eT9iNMorkoZcdpfnKHz93U2Io,2686
 cmdbox/web/assets/cmdbox/view_result.js,sha256=FCT7uIxFp6TKXmGldjdQo2-SNkhyRtAAMBQ2qF54HVQ,6954
 cmdbox/web/assets/encodingjs/LICENSE.txt,sha256=mBdECJD6rOMBa4VSrrJFzs67vFDvGuMPVtxvvDbgi9o,1070
 cmdbox/web/assets/encodingjs/encoding.js,sha256=pMUL__JEPZ0hHv1iH1kt-zwfDwJcDzzrD1JpdhEKBy8,297288
@@ -248,9 +248,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.5.0.4.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
-cmdbox-0.5.0.4.dist-info/METADATA,sha256=atrM6b60LmCgC9UL-fBFMGNxVoIym1m0hwxXM0OSJ2I,24050
-cmdbox-0.5.0.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cmdbox-0.5.0.4.dist-info/entry_points.txt,sha256=PIoRz-tr503YwdMmd6nxuSn2dDltf4cUMVs98E9WgaA,48
-cmdbox-0.5.0.4.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
-cmdbox-0.5.0.4.dist-info/RECORD,,
+cmdbox-0.5.0.6.dist-info/LICENSE,sha256=sBzzPc5v-5LBuIFi2V4olsnoVg-3EBI0zRX5r19SOxE,1117
+cmdbox-0.5.0.6.dist-info/METADATA,sha256=EAA5qNNWYw5jC_1PbXoJIivIo07qDq4kvHBq4hUwch4,24050
+cmdbox-0.5.0.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cmdbox-0.5.0.6.dist-info/entry_points.txt,sha256=PIoRz-tr503YwdMmd6nxuSn2dDltf4cUMVs98E9WgaA,48
+cmdbox-0.5.0.6.dist-info/top_level.txt,sha256=eMEkD5jn8_0PkCAL8h5xJu4qAzF2O8Wf3vegFkKUXR4,7
+cmdbox-0.5.0.6.dist-info/RECORD,,