pywebexec 2.0.17__py3-none-any.whl → 2.1.0__py3-none-any.whl

pywebexec/pywebexec.py

@@ -586,7 +586,15 @@ def read_commands():
             command_id = filename[:-5]
             status = read_command_status(command_id)
             if status:
-                command = command_str(status.get('command', '-'), status.get('params', []))
+                cmd = status.get('command', '-')
+                params = status.get('params', [])
+                if cmd.endswith('/run-para'):
+                    cmd = "batch"
+                    index = params.index('run')
+                    if index:
+                        params = params[index+1:]
+                        params[0] = os.path.basename(params[0])
+                command = command_str(cmd, params)
                 if status.get('status') == 'running' and status.get('last_update',0)<datetime.now().timestamp()-5:
                     output_file_path = get_output_file_path(command_id)
                     if os.path.exists(output_file_path):
@@ -827,6 +835,8 @@ def run_dynamic_command(cmd):
         noprefix = exe.get("schema", {}).get("schema_options", {}).get("noprefix_params", {})
         convert_params = exe.get("schema", {}).get("schema_options", {}).get("convert_params", {})
         schema_params = exe.get("schema", {}).get("properties", {})
+        batch_param = exe.get("schema", {}).get("schema_options", {}).get("batch_param", None)
+        batch_values = []
         if isinstance(data_params, dict) and not schema_params:
             return None
         if isinstance(data_params, dict):
@@ -852,6 +862,10 @@ def run_dynamic_command(cmd):
                         params += f"{prefix} "
                     continue
                 params += f"{prefix}{separator}"
+                values = shlex.split(value) if isinstance(value, str) else value
+                if param == batch_param and len(values)>1:
+                    batch_values = values
+                    value="@1"
                 if isinstance(value, list):
                     params += " ".join(value)
                 else:
@@ -865,7 +879,7 @@ def run_dynamic_command(cmd):
             params = shlex.split(' '.join(params)) if isinstance(params, list) else []
         except Exception as e:
             return None
-        return params
+        return params, batch_values
 
     cmd_path = os.path.join(".", os.path.basename(cmd))
     if not os.path.isfile(cmd_path) or not os.access(cmd_path, os.X_OK):
@@ -874,11 +888,13 @@ def run_dynamic_command(cmd):
         data = request.json
     except Exception as e:
         data = {}
-    params = parse_params(cmd, data.get('params'))
+    params, batch_values = parse_params(cmd, data.get('params'))
     if params is None:
         return jsonify({'error': 'Invalid parameters'}), 400
     rows = data.get('rows', tty_rows) or tty_rows
     cols = data.get('cols', tty_cols) or tty_cols
+    parallel = data.get('parallel', 1)
+    delay = data.get('delay', 0)
     user = session.get('username', '-')
     command_id = str(uuid.uuid4())
     update_command_status(command_id, {
@@ -889,6 +905,10 @@ def run_dynamic_command(cmd):
         'from': request.remote_addr,
     })
     Path(get_output_file_path(command_id)).touch()
+    if batch_values:
+        params = ["-n", "-p", str(parallel), "-d", str(delay), "-P", *batch_values, '--', sys.argv[0], "-d", ".", "--", "run", cmd_path, *params]
+        cmd_path = shutil.which("run-para")
+        print(params)
     thread = threading.Thread(target=run_command, args=(request.remote_addr, user, cmd_path, params, command_id, rows, cols))
     thread.start()
     return jsonify({'message': 'Command is running', 'command_id': command_id})
@@ -1021,13 +1041,16 @@ def swagger_yaml():
                 "properties": {
                     "params": {"type": "array", "items": {"type": "string"}, "default": []},
                     "rows": {"type": "integer", "description": "tty nb rows", "default": tty_rows},
-                    "cols": {"type": "integer", "description": "tty nb columns", "default": tty_cols}
+                    "cols": {"type": "integer", "description": "tty nb columns", "default": tty_cols},
                 }
             }
             if exe["schema"]:
-                # if exec["schema"].get("schema_options"):
-                #     del exe["schema"]["schema_options"]
                 cmd_schema["properties"]["params"] = exe["schema"]
+                if exe["schema"].get("schema_options", {}).get("batch_param"):
+                  cmd_schema["properties"].update({
+                    "parallel": {"type": "integer", "description": 'nb parallel jobs', "default": 1, "required": True, "minimum": 1, "maximum": 100},
+                    "delay": {"type": "number", "description": "initial delay in s between jobs", "default": 10, "required": True, "minimum": 0, "maximum": 600},
+                  })
             swagger_spec.setdefault("paths", {})[dynamic_path] = {
                 "post": {
                     "summary": f"Run command {exe['command']}",
@@ -1038,7 +1061,7 @@ def swagger_yaml():
                     "parameters": [
                         {
                             "in": "body",
-                            "name": "reuqestBody",
+                            "name": "requestBody",
                             "schema": cmd_schema
                         }
                     ],
@@ -1062,6 +1085,40 @@ def swagger_yaml():
     except Exception as e:
         return Response(f"Error reading swagger spec: {e}", status=500)
 
+@app.route('/commands/<command_id>/run', methods=['POST'])
+def relaunch_command(command_id):
+    log_request(f"relaunch_command {command_id}")
+    status = read_command_status(command_id)
+    if not status:
+        return jsonify({'error': 'Invalid command_id'}), 404
+
+    data = request.json or {}
+    command = status['command']
+    params = status['params']
+    rows = data.get('rows', tty_rows)
+    cols = data.get('cols', tty_cols)
+
+    command_path = command
+    if not os.path.isfile(command_path) or not os.access(command_path, os.X_OK):
+        return jsonify({'error': 'Command not found or not executable'}), 400
+
+    # Get the user from the session
+    user = session.get('username', '-')
+    new_command_id = str(uuid.uuid4())
+    update_command_status(new_command_id, {
+        'status': 'running',
+        'command': command,
+        'params': params,
+        'user': user,
+        'from': request.remote_addr,
+    })
+
+    Path(get_output_file_path(new_command_id)).touch()
+    thread = threading.Thread(target=run_command, args=(request.remote_addr, user, command_path, params, new_command_id, rows, cols))
+    thread.start()
+
+    return jsonify({'message': 'Command is running', 'command_id': new_command_id})
+
 def main():
     global COMMAND_STATUS_DIR
     basef = f"{CONFDIR}/pywebexec_{args.listen}:{args.port}"

pywebexec/static/css/form.css

@@ -6,8 +6,8 @@
 }
 
 #schemaForm, .schema-form {
-font-size: 14px;
-
+  font-size: 14px;
+  
   .glyphicon-plus-sign:before {
     content: "\e081";
   }
@@ -142,6 +142,7 @@ font-size: 14px;
     min-width: unset;
     max-width: unset;
     width: auto;
+    margin: 0;
   }
   input[type="number"] {
     max-width: 120px;
@@ -161,7 +162,7 @@ font-size: 14px;
     border-radius: 15px;
     border-bottom-right-radius: 5px;
     border: 1px solid #ccc;
-    padding: 3px 10px;
+    padding: 2px 10px 0px 10px;
     margin: 0px;
     width: unset;
     line-height: 1.42857143;

pywebexec/static/js/executables.js

@@ -263,8 +263,7 @@ paramsInput.addEventListener('focus', () => {
     if (paramsContainer.style.display == 'none') {
         $('#schemaForm').html('');
     }
-    if (gExecutables[currentCmd] && gExecutables[currentCmd].schema && paramsContainer.style.display == 'none') {
-        // sProp = gExecutables[currentCmd].schema.properties;
+    if (gExecutables[currentCmd] && gExecutables[currentCmd].schema && gExecutables[currentCmd].schema.properties && paramsContainer.style.display == 'none') {
         createSchemaForm($('#schemaForm'), gExecutables[currentCmd].schema, async function (errors, values) {
             if (errors) {
                 console.log(errors);
@@ -272,13 +271,20 @@ paramsInput.addEventListener('focus', () => {
                 const commandName = commandInput.value;
                 fitAddon.fit();
                 terminal.clear();
+                payload = { params: values, rows: terminal.rows, cols: terminal.cols }
+                if ('parallel' in values) {
+                    payload['parallel'] = values['parallel'];
+                    payload['delay'] = values['delay'];
+                    delete payload['params']['parallel'];
+                    delete payload['params']['delay'];
+                }
                 try {
                     const response = await fetch(`/commands/${commandName}`, {
                         method: 'POST',
                         headers: {
                             'Content-Type': 'application/json'
                         },
-                        body: JSON.stringify({ params: values, rows: terminal.rows, cols: terminal.cols })
+                        body: JSON.stringify(payload)
                     });
         
                     if (!response.ok) {

pywebexec/static/js/schemaform.js

@@ -11,11 +11,16 @@ function adjustInputWidth(input) {
 function formInputHandle() {
   schemaForm.querySelectorAll('input[type="text"], input[type="number"]').forEach(input => {
     if (! inputHandlers.includes(input)) {
-      if (input.value) {
-        input.setAttribute('size', Math.max(input.value.length - 2, 2));
+      val = input.value || input.placeholder;
+      if (val) {
+        size = Math.max(val.length - 2, 2)
+        if (input.type== 'number') {
+          size += 2;
+        }
       } else {
-        input.setAttribute('size', '12');
+        size = 12;
       }
+      input.setAttribute('size', size);
       input.addEventListener('input', () => adjustInputWidth(input));
       inputHandlers.push(input);
     }
@@ -42,10 +47,68 @@ function createSchemaForm(form, schema, onSubmit) {
   formDesc = extractKeysAndPlaceholders(schema);
   schemaForm = form[0];
   if (onSubmit != null) {
+    console.log(schema.schema_options.batch_param)
+    if (schema && schema.schema_options && schema.schema_options.batch_param) {
+      if (!schema.properties.parallel) {
+        schema.properties['parallel'] = {
+          type: 'integer',
+          default: 1,
+          minimum: 1,
+          maximum: 100,
+          required: true,
+          description: "nb parallel jobs"
+        };
+        schema.properties['delay'] = {
+          type: 'integer',
+          default: 10,
+          minimum: 0,
+          maximum: 600,
+          required: true,
+          description: "initial delay in s between jobs"
+        };
+        formDesc.push({
+          key: 'parallel',
+        });
+        formDesc.push({
+          key: 'delay',
+        });
+      }
+      for (i = 0; i < formDesc.length; i++) {
+        if (formDesc[i].key == schema.schema_options.batch_param) {
+          formDesc[i].type = 'textarea';
+          formDesc[i].required = true;
+        }
+        if (formDesc[i].key == 'parallel') {
+          formDesc[i].type = 'range';
+          formDesc[i].indicator = true;
+        }
+        if (formDesc[i].key == 'delay') {
+          formDesc[i].type = 'range';
+          formDesc[i].indicator = true;
+        }
+      }
+    }
     formDesc.push({
       type: 'submit',
       title: 'Run',
     });
+  } else {
+    if (schema && schema.properties && schema.properties.params.schema_options && schema.properties.params.schema_options.batch_param) {
+      for (i = 0; i < formDesc.length; i++) {
+        if (formDesc[i].key == 'params.' + schema.properties.params.schema_options.batch_param) {
+          formDesc[i].type = 'textarea';
+          formDesc[i].required = true;
+        }
+        if (formDesc[i].key == 'parallel') {
+          formDesc[i].type = 'range';
+          formDesc[i].indicator = true;
+        }
+        if (formDesc[i].key == 'delay') {
+          formDesc[i].type = 'range';
+          formDesc[i].indicator = true;
+        }
+      }
+    }
   }
   form[0].classList.add('form-inline');
   jsform = form.jsonForm({

pywebexec/static/js/script.js

@@ -293,27 +293,16 @@ async function relaunchCommand(command_id, event) {
     event.stopPropagation();
     event.stopImmediatePropagation();
     try {
-        const response = await fetch(`/commands/${command_id}`);
-        if (!response.ok) {
-            throw new Error('Failed to fetch command status');
-        }
-        const data = await response.json();
-        if (data.error) {
-            alert(data.error);
-            return;
-        }
         fitAddon.fit();
         terminal.clear();
-        const relaunchResponse = await fetch(`/commands`, {
+        const relaunchResponse = await fetch(`/commands/${command_id}/run`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json'
             },
             body: JSON.stringify({
-                command: data.command,
-                params: data.params,
                 rows: terminal.rows,
-                cols: terminal.cols,
+                cols: terminal.cols
             })
         });
         if (!relaunchResponse.ok) {

pywebexec/static/js/swagger-form.js

@@ -69,8 +69,8 @@ window.onload = function() {
   const observer = new MutationObserver((mutations) => {
     mutations.forEach(mutation => {
       mutation.addedNodes.forEach(node => {
-        if (node.classList.contains("highlight-code") ||
-          node.classList.contains("body-param__text")) {
+        if (node.classList && (node.classList.contains("highlight-code") ||
+          node.classList.contains("body-param__text"))) {
           // Retrieve the data-path attribute from the first opblock-summary-path element
           const routePath = $(node).closest('.opblock').find('.opblock-summary-path').first().attr('data-path');
           const routePathId = `schemaForm${routePath.replaceAll("/", "_")}`;

pywebexec/swagger.yaml

@@ -194,6 +194,39 @@ paths:
             properties:
               message:
                 type: string
+  /commands/{command_id}/run:
+    post:
+      summary: "Relaunch a command"
+      tags:
+        - commands
+      parameters:
+        - in: path
+          name: command_id
+          required: true
+          type: string
+        - in: body
+          name: requestBody
+          schema:
+            type: object
+            properties:
+              rows:
+                type: integer
+                description: "tty nb rows"
+                default: 24
+              cols:
+                type: integer
+                description: "tty nb columns" 
+                default: 125
+      responses:
+        "200":
+          description: "Command relaunched"
+          schema:
+            type: object
+            properties:
+              message:
+                type: string
+              command_id:
+                type: string
   /commands/exposed:
     get:
       summary: "List available executable commands"

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.0.17'
-__version_tuple__ = version_tuple = (2, 0, 17)
+__version__ = version = '2.1.0'
+__version_tuple__ = version_tuple = (2, 1, 0)

{pywebexec-2.0.17.dist-info → pywebexec-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 2.0.17
+Version: 2.1.0
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-2.0.17.dist-info → pywebexec-2.1.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
-pywebexec/pywebexec.py,sha256=z_ri7z0r2jrpf1yeih1TEFaBnH39y40zfmuZY2UIu5c,42061
-pywebexec/swagger.yaml,sha256=j-KZnU4rGR-Fsk8y_EbqYzqVgtAZ8EjZIKAqZSxyyc0,5858
-pywebexec/version.py,sha256=DMmD4ZGa2_6FkPEauCreBHTWcl7y2bBceqfptG6Zlmw,513
-pywebexec/static/css/form.css,sha256=Zek0sCsO6CEP5fqss2C8P-OLg9FysP8r-90xwxwSWRk,4471
+pywebexec/pywebexec.py,sha256=pffAT2SEE4XVXng3n_dyFv9q0rslP829u3KwEtQ3Kbo,44634
+pywebexec/swagger.yaml,sha256=zP_Nz69vZx0iwbKTwiQgSs8rJRUTiGKRyIkWzMPANOE,6688
+pywebexec/version.py,sha256=dseuoOPG9WZ1Ezr1SC3wS9_hczkX-b1NdE4TQPHFJso,511
+pywebexec/static/css/form.css,sha256=EpYUaBt2wLYX-Vi4gq6ZFzR2LLu7bd2patNWe-BAhDs,4499
 pywebexec/static/css/markdown.css,sha256=3RzUnpVBdF6cQuB_NXV7hMTc0quYU8sfyuZcpsREj6A,1939
 pywebexec/static/css/style.css,sha256=ynccbEDzK07rurLm-UirUs5j_hVfXlIgaHeUIq9WvA0,9969
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
@@ -33,11 +33,11 @@ pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65Eiuw
 pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy6JQMww,610
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
-pywebexec/static/js/executables.js,sha256=3HfOsrrurtnVd-AAHpkAtvnbJDB8k7nxRwtZXRQTzuI,11767
+pywebexec/static/js/executables.js,sha256=Hbcpv1IZfxC406qhwkwoTvJh8TZD7kEc651IXkQDYws,12077
 pywebexec/static/js/popup.js,sha256=0fr3pp4j9D2fXEVnHyQrx2bPWFHfgbb336dbewgH1d8,9023
-pywebexec/static/js/schemaform.js,sha256=RUUnReUKlB6GnlhN-sI0AE4-nHWBONfqxo0owSSDED8,3095
-pywebexec/static/js/script.js,sha256=fwTo9Iz4xsl6wGs-Nm8-Ng8aXzDfvews5cHfzhSfg_0,17987
-pywebexec/static/js/swagger-form.js,sha256=uTRGKrcyBqq910RLmdlV-HpFri3RaAXpqUPSQSyoe6o,3806
+pywebexec/static/js/schemaform.js,sha256=tFWI4AQPN-RwuSo5RdHBO7AcsHEt-YKcXKFmMT6FSQ8,5076
+pywebexec/static/js/script.js,sha256=-CfZRzjusxRCY7Kol_KNOq8BdRdHYTc5X3vXNChlsdQ,17631
+pywebexec/static/js/swagger-form.js,sha256=BU64XxyfrWx4DnpAuaWtG-9YpcHF3OzzAYzjiSH0NGo,3826
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
 pywebexec/static/js/js-yaml/js-yaml.min.js,sha256=Rdw90D3AegZwWiwpibjH9wkBPwS9U4bjJ51ORH8H69c,39430
 pywebexec/static/js/marked/LICENSE.md,sha256=jjo_gvWaYJWPVsoI9EVkfDKkcz3HymwsRvbriYRxq5w,2942
@@ -66,9 +66,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=KeNLBH9PN_ZuGhzwrjvRTj2oBtbINv_SbwGQpOahNWo,3820
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=9ngyldkyEdLonBjl97mbIZUlVk-jxwcHrvFzMSrveyU,1067
-pywebexec-2.0.17.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.0.17.dist-info/METADATA,sha256=MQnEQHNeT4QTx7kM8o_kceb6sCUdqVKSwH2qvrxqBtY,11645
-pywebexec-2.0.17.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-pywebexec-2.0.17.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.0.17.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.0.17.dist-info/RECORD,,
+pywebexec-2.1.0.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.1.0.dist-info/METADATA,sha256=wYgWeQ99N96P1HwnibF89u-qjwXI-J14KJeivoh3Bbc,11644
+pywebexec-2.1.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+pywebexec-2.1.0.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.1.0.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.1.0.dist-info/RECORD,,