cmdbox 0.5.4__py3-none-any.whl → 0.6.0.1__py3-none-any.whl

cmdbox/web/assets/cmdbox/main.js

@@ -19,6 +19,9 @@ $(() => {
     cmdbox.init_modal_button();
     cmdbox.gui_callback_reconnectInterval_handler = null;
     cmdbox.gui_callback_ping_handler = null;
+    const ping_interval = 5000; // pingの間隔
+    const max_reconnect_count = 60000/ping_interval*1; // 最大再接続回数
+    cmdbox.callback_reconnect_count = 0; // 再接続回数
     const gui_callback = () => {
         if (cmdbox.gui_callback_reconnectInterval_handler) {
             clearInterval(cmdbox.gui_callback_reconnectInterval_handler);
@@ -68,8 +71,11 @@ $(() => {
             }
         };
         ws.onopen = () => {
-            const ping = () => {ws.send('ping');};
-            cmdbox.gui_callback_ping_handler = setInterval(() => {ping();}, 1000);
+            const ping = () => {
+                ws.send('ping');
+                cmdbox.callback_reconnect_count = 0;
+            };
+            cmdbox.gui_callback_ping_handler = setInterval(() => {ping();}, ping_interval);
         };
         ws.onerror = (e) => {
             console.error(`Websocket error: ${e}`);
@@ -77,9 +83,17 @@ $(() => {
         };
         ws.onclose = () => {
             clearInterval(cmdbox.gui_callback_ping_handler);
+            if (cmdbox.callback_reconnect_count >= max_reconnect_count) {
+                clearInterval(cmdbox.gui_callback_reconnectInterval_handler);
+                cmdbox.message({'error':'Connection to the agent has failed for several minutes. Please reload to resume reconnection.'});
+                const rand = cmdbox.random_string(8);
+                location.href = `../signin${path}?r=${rand}`;
+                return;
+            }
+            cmdbox.callback_reconnect_count++;
             cmdbox.gui_callback_reconnectInterval_handler = setInterval(() => {
                 gui_callback();
-            }, 3000);
+            }, ping_interval);
         };
     };
     gui_callback();

cmdbox/web/assets/cmdbox/signin.js

@@ -62,19 +62,19 @@ $(() => {
     const btn_saml_azure = $('.btn-saml-azure');
     btn_google.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
-        window.location.href = `../oauth2/google${path}?n=${cmdbox.randam_string(8)}`;
+        window.location.href = `../oauth2/google${path}?n=${cmdbox.random_string(8)}`;
     });
     btn_github.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
-        window.location.href = `../oauth2/github${path}?n=${cmdbox.randam_string(8)}`;
+        window.location.href = `../oauth2/github${path}?n=${cmdbox.random_string(8)}`;
     });
     btn_azure.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
-        window.location.href = `../oauth2/azure${path}?n=${cmdbox.randam_string(8)}`;
+        window.location.href = `../oauth2/azure${path}?n=${cmdbox.random_string(8)}`;
     });
     btn_saml_azure.off('click').on('click', async (event) => {
         const path = window.location.pathname.replace('/signin', '');
-        window.location.href = `../saml/azure${path}?n=${cmdbox.randam_string(8)}`;
+        window.location.href = `../saml/azure${path}?n=${cmdbox.random_string(8)}`;
     });
     oauth2_enabled().then((res) => {
         if (res.google) btn_google.show();

cmdbox/web/assets/filer/filer.js

@@ -145,7 +145,8 @@ fsapi.filer = (svpath, is_local) => {
         opt['capture_maxsize'] = 1024**3*10;
         //opt['svpath'] = event.originalEvent.dataTransfer.getData('path');
         jobs.push(cmdbox.sv_exec_cmd(opt).then(async res => {
-          if(!res[0] || !res[0]['success']) {
+          if (res && res['success']) res = [res];
+          if (!res[0] || !res[0]['success']) {
             fsapi.download_now ++;
             cmdbox.progress(0, list_downloads.length, fsapi.download_now, '', true, false)
             cmdbox.message(res);
@@ -276,6 +277,7 @@ fsapi.tree = (target, svpath, current_ul_elem, is_local) => {
         res[0]['success']['_'] = fsapi.treemem;
       }
     }
+    if (res && res['success']) res = [res];
     if(!res[0] || !res[0]['success']) {
       cmdbox.message(res);
       target.find('.file-list').html('');
@@ -420,7 +422,7 @@ fsapi.tree = (target, svpath, current_ul_elem, is_local) => {
               const opt = cmdbox.get_server_opt(false, fsapi.right);
               const thum_size = "0";
               const constr = btoa(`${opt['host']}\t${opt['port']}\t${opt['svname']}\t${opt['password']}\t${encodeURIComponent(_p)}\t${opt['scope']}\t${thum_size}`);
-              fsapi.viewer(_p, res['data'], `filer/download/${constr}?r=${cmdbox.randam_string(8)}`, _mime);
+              fsapi.viewer(_p, res['data'], `filer/download/${constr}?r=${cmdbox.random_string(8)}`, _mime);
             }
           }).finally(() => {
             cmdbox.hide_loading();

{cmdbox-0.5.4.dist-info → cmdbox-0.6.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.4
+Version: 0.6.0.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
@@ -38,6 +38,7 @@ Requires-Dist: pycryptodome
 Requires-Dist: questionary
 Requires-Dist: redis
 Requires-Dist: requests
+Requires-Dist: rich
 Requires-Dist: six
 Requires-Dist: tabulate
 Requires-Dist: uvicorn[standard]
@@ -56,8 +57,10 @@ Requires-Dist: wheel
 # Install
 
 - Install cmdbox with the following command.
+- Also install the docker version of the redis server.
 
 ```bash
+docker run -p 6379:6379 --name redis -e REDIS_PASSWORD=password -it ubuntu/redis:latest
 pip install cmdbox
 cmdbox -v
 ```
@@ -68,12 +71,34 @@ pip install xmlsec==1.3.13 python3-saml
 apt-get install -y pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl build-essential libopencv-dev
 ```
 
-- Also install the docker version of the redis server.
+- When using `--agent use` in web mode, install the modules with dependencies.
+```bash
+pip install google-adk litellm
+```
+
+# Run
+
+- Run the cmdbox server.
+
+```bash
+cmdbox -m server -c start &
+```
+
+- Run the cmdbox web.
 
 ```bash
-docker run -p 6379:6379 --name redis -it ubuntu/redis:latest
+cmdbox -m web -c start --signin_file .cmdbox/user_list.yml &
 ```
 
+- Run the cmdbox web with agent.
+- Below is an example of using Google vertexai.
+- Other available options include Azure OpenAI and Ollama.
+
+```bash
+cmdbox -m web -c start --signin_file .cmdbox/user_list.yml --agent use --llmprov vertexai --llmmodel gemini-2.0-flash --llmlocation us-central1 --llmsvaccountfile <account json file>
+```
+
+
 # Tutorial
 
 - Open the ```.sample/sample_project``` folder in the current directory with VSCode.
@@ -294,29 +319,47 @@ aliases:                                # Specify the alias for the specified co
                                         #   e.g. /{1}_exec
         move:                           # Specify whether to move the regular expression group of the source to the target.
                                         #   e.g. true
-  audit:
-    enabled: true                       # Specify whether to enable the audit function.
-    write:
-      mode: audit                       # Specify the mode of the feature to be writed.
-      cmd: write                        # Specify the command to be writed.
-    search:
-      mode: audit                       # Specify the mode of the feature to be searched.
-      cmd: search                       # Specify the command to be searched.
-    options:                            # Specify the options for the audit function.
-      host: localhost                   # Specify the service host of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
-      port: 6379                        # Specify the service port of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
-      password: password                # Specify the access password of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
-      svname: server                    # Specify the audit service name of the inference server.However, if it is specified as a command line argument, it is ignored.
-      retry_count: 3                    # Specifies the number of reconnections to the audit Redis server.If less than 0 is specified, reconnection is forever.
-      retry_interval: 1                 # Specifies the number of seconds before reconnecting to the audit Redis server.
-      timeout: 15                       # Specify the maximum waiting time until the server responds.
-      pg_enabled: False                 # Specify True if using the postgresql database server.
-      pg_host: localhost                # Specify the postgresql host.
-      pg_port: 5432                     # Specify the postgresql port.
-      pg_user: postgres                 # Specify the postgresql user name.
-      pg_password: password             # Specify the postgresql password.
-      pg_dbname: audit                  # Specify the postgresql database name.
-      retention_period_days: 365        # Specify the number of days to retain audit logs.
+agentrule:                              # Specifies a list of rules that determine which commands the agent can execute.
+  policy: deny                          # Specify the default policy for the rule. The value can be allow or deny.
+  rules:                                # Specify the rules for the commands that the agent can execute according to the group to which the user belongs.
+  - mode: audit                         # Specify the "mode" as the condition for applying the rule.
+    cmds: [search, write]               # Specify the "cmd" to which the rule applies. Multiple items can be specified in a list.
+    rule: allow                         # Specifies whether the specified command is allowed or not. Values are allow or deny.
+  - mode: client
+    cmds: [file_copy, file_download, file_list, file_mkdir, file_move, file_remove, file_rmdir, file_upload, server_info]
+    rule: allow
+  - mode: cmd
+    cmds: [list, load]
+    rule: allow
+  - mode: server
+    cmds: [list]
+    rule: allow
+  - mode: web
+    cmds: [gencert, genpass, group_list, user_list]
+    rule: allow
+audit:
+  enabled: true                         # Specify whether to enable the audit function.
+  write:
+    mode: audit                         # Specify the mode of the feature to be writed.
+    cmd: write                          # Specify the command to be writed.
+  search:
+    mode: audit                         # Specify the mode of the feature to be searched.
+    cmd: search                         # Specify the command to be searched.
+  options:                              # Specify the options for the audit function.
+    host: localhost                     # Specify the service host of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+    port: 6379                          # Specify the service port of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+    password: password                  # Specify the access password of the audit Redis server.However, if it is specified as a command line argument, it is ignored.
+    svname: cmdbox                      # Specify the audit service name of the inference server.However, if it is specified as a command line argument, it is ignored.
+    retry_count: 3                      # Specifies the number of reconnections to the audit Redis server.If less than 0 is specified, reconnection is forever.
+    retry_interval: 1                   # Specifies the number of seconds before reconnecting to the audit Redis server.
+    timeout: 15                         # Specify the maximum waiting time until the server responds.
+    pg_enabled: False                   # Specify True if using the postgresql database server.
+    pg_host: localhost                  # Specify the postgresql host.
+    pg_port: 5432                       # Specify the postgresql port.
+    pg_user: postgres                   # Specify the postgresql user name.
+    pg_password: password               # Specify the postgresql password.
+    pg_dbname: audit                    # Specify the postgresql database name.
+    retention_period_days: 365          # Specify the number of days to retain audit logs.
 
 ```