pywebexec 2.1.19__py3-none-any.whl → 2.2.1__py3-none-any.whl

pywebexec/pywebexec.py

@@ -1038,15 +1038,12 @@ def swagger_yaml():
         swagger_spec = yaml.safe_load(swagger_spec_str)
         # Update existing POST /commands enum if present
         executables = get_executables()
-        post_cmd = swagger_spec.get('paths', {}).get('/commands', {}).get('post')
-        if post_cmd:
-            params_list = post_cmd.get('parameters', [])
-            for param in params_list:
-                if param.get('in') == 'body' and 'schema' in param:
-                    props = param['schema'].get('properties', {})
-                    if 'command' in props:
-                        props['command']['enum'] = [e['command'] for e in executables]
-        # Add dynamic paths for each 
+        post_cmd = swagger_spec.get('paths', {}).get('/commands', {}).get('post', {})
+        if post_cmd and 'requestBody' in post_cmd:
+            schema = post_cmd['requestBody'].get('content', {}).get('application/json', {}).get('schema', {})
+            if 'properties' in schema and 'command' in schema['properties']:
+                schema['properties']['command']['enum'] = [e['command'] for e in executables]
+
         # Add dynamic paths for each executable:
         for exe in executables:
             dynamic_path = "/commands/" + exe["command"]
@@ -1065,28 +1062,32 @@ def swagger_yaml():
                     "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']}",
                     "tags": ["run_commands"],
                     "description": f"{exe['help']}",
-                    "consumes": ["application/json"],
-                    "produces": ["application/json"],
-                    "parameters": [
-                        {
-                            "in": "body",
-                            "name": "requestBody",
-                            "schema": cmd_schema
+                    "requestBody": {
+                        "required": True,
+                        "content": {
+                            "application/json": {
+                                "schema": cmd_schema
+                            }
                         }
-                    ],
+                    },
                     "responses": {
                         "200": {
                             "description": "Command started",
-                            "schema": {
-                                "type": "object",
-                                "properties": {
-                                    "message": {"type": "string"},
-                                    "command_id": {"type": "string"}
+                            "content": {
+                                "application/json": {
+                                    "schema": {
+                                        "type": "object",
+                                        "properties": {
+                                            "message": {"type": "string"},
+                                            "command_id": {"type": "string"}
+                                        }
+                                    }
                                 }
                             }
                         }

pywebexec/static/css/markdown.css

@@ -1,5 +1,5 @@
 
-.markdown, .swagger-ui .markdown {
+.markdown, .swagger-ui .markdown, .swagger-ui .renderedMarkdown {
     /* background-color: #e0e0ff; */
     border: 1px solid #ccc;
     padding: 0px 8px 8px 8px;

pywebexec/static/css/style.css

@@ -449,6 +449,7 @@ body.dimmed * {
 .command-line:hover {
     text-overflow: unset;
     max-width: unset;
+    white-space: pre;
 }
 .nbrunning {
     display: inline-block;

pywebexec/static/js/executables.js

@@ -264,44 +264,38 @@ paramsInput.addEventListener('focus', () => {
     }
     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);
-                alert(errors[0].message);
-                return false;
-            } else {
-                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(payload)
-                    });
-        
-                    if (!response.ok) {
-                        throw new Error('Failed to launch command');
-                    }
-        
-                    const data = await response.json();
-                    viewOutput(data.command_id);
-                    fetchCommands();
-                    commandInput.focus();
-                    commandInput.setSelectionRange(0, commandInput.value.length);
-                } catch (error) {
-                    console.log('Error running command:', error);
+            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(payload)
+                });
+    
+                if (!response.ok) {
+                    throw new Error('Failed to launch command');
                 }
+    
+                const data = await response.json();
+                viewOutput(data.command_id);
+                fetchCommands();
+                commandInput.focus();
+                commandInput.setSelectionRange(0, commandInput.value.length);
+            } catch (error) {
+                console.log('Error running command:', error);
             }
-        }, currentCmd.toString());
+        }, currentCmd);
         setHelpDivPosition();
         paramsContainer.style.display = 'block';
         const input1 = schemaFormPW.querySelector('input, select, textarea');

pywebexec/static/js/popup.js

@@ -1,6 +1,6 @@
 const maxScrollback = 99999;
 const maxSize = 10485760; // 10MB
-let fontSize = 14;
+let fontSize = +localStorage.getItem('popupFontSize') || 14;
 let terminal = new Terminal({
     cursorBlink: false,
     cursorInactiveStyle: 'none',
@@ -75,8 +75,8 @@ let slider = null;
 let isPaused = false;
 let cols = 0;
 let rows = 0;
-let fitWindow = false;
-
+let fitWindow = localStorage.getItem('popupFitWindow') === 'false' ? false : true;
+console.log(localStorage.getItem('popupFitWindow'));
 const toggleButton = document.getElementById('toggleFetch');
 const pausedMessage = document.getElementById('pausedMessage');
 const toggleFitButton = document.getElementById('toggleFit');
@@ -169,9 +169,13 @@ async function viewOutput(command_id) {
         }
         const data = await response.json();
         const commandInfo = document.getElementById('commandInfo');
-        const command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
+        if (data.command.endsWith('/run-para')) {
+            command = `${data.params.join(' ').replace(/^.* -- run .\//, 'batch ')}`;
+        } else {
+            command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
+        }
         setCommandStatus(data.status);
-        commandInfo.innerText = command;
+        commandInfo.innerHTML = command;
         commandInfo.setAttribute('title', command);
         document.title = `${data.command} ${data.params.join(' ')} - [${data.status}]`;
         if (data.command == 'term')
@@ -232,21 +236,31 @@ function toggleFetchOutput() {
     }
     isPaused = !isPaused;
 }
-function toggleFit() {
-    fitWindow = ! fitWindow;
+function setFitIcon()
+{
+    console.log(fitWindow);
     if (fitWindow) {
+        toggleFitButton.classList.remove('fit-window');
         toggleFitButton.classList.add('fit-tty');
         toggleFitButton.setAttribute('title', 'terminal fit tty');
     } else {
         toggleFitButton.classList.remove('fit-tty');
+        toggleFitButton.classList.add('fit-window');
         toggleFitButton.setAttribute('title', 'terminal fit window');
-    }
+    }     
+}
+
+function toggleFit() {
+    fitWindow = ! fitWindow;
+    setFitIcon();
+    localStorage.setItem('popupFitWindow', fitWindow);
     autoFit();
     viewOutput(currentCommandId);
 }
 
 toggleButton.addEventListener('click', toggleFetchOutput);
 toggleFitButton.addEventListener('click', toggleFit);
+setFitIcon();
 window.addEventListener('resize', adjustOutputHeight);
 window.addEventListener('load', () => {
     slider = document.getElementById('outputSlider');
@@ -259,11 +273,13 @@ window.addEventListener('load', () => {
 document.getElementById('decreaseFontSize').addEventListener('click', () => {
     fontSize = Math.max(8, fontSize - 1);
     terminal.options.fontSize = fontSize;
+    localStorage.setItem('popupFontSize', fontSize);
     autoFit();
 });
 
 document.getElementById('increaseFontSize').addEventListener('click', () => {
     fontSize = Math.min(32, fontSize + 1);
     terminal.options.fontSize = fontSize;
+    localStorage.setItem('popupFontSize', fontSize);
     autoFit();
 });

pywebexec/static/js/schemaform.js

@@ -11,7 +11,7 @@ function adjustInputWidth(input) {
 function formInputHandle() {
   schemaForm.querySelectorAll('input[type="text"], input[type="number"]').forEach(input => {
     if (! inputHandlers.includes(input)) {
-      val = input.value || input.placeholder;
+      val = input.placeholder;
       if (val) {
         size = Math.max(val.length, 2)
         if (input.type== 'number') {
@@ -54,12 +54,46 @@ function extractKeysAndPlaceholders(obj, formoptions, prefix = '') {
     return result;
 }
 
-function createSchemaForm(form, schema, onSubmit, schemaName) {
-  if (schemaValues[schemaName]) {
-    value = schemaValues[schemaName];
-  } else {
-    value = {};
+// ...existing code...
+
+function convertTextareaToArray(values, formDesc, schema) {
+  // Helper function to get schema type for a key path
+  function getSchemaType(schema, keyPath) {
+    const keys = keyPath.split('.');
+    let current = schema.properties;
+    for (const key of keys) {
+      if (!current || !current[key] || !current[key].properties) {
+        return current?.[key]?.type;
+      }
+      current = current[key].properties;
+    }
+    return null;
+  }
+
+  // Convert textarea values to arrays if schema type matches
+  for (let i = 0; i < formDesc.length; i++) {
+    if (formDesc[i].type == 'textarea') {
+      const schemaType = getSchemaType(schema, formDesc[i].key);
+      if (schemaType === 'array') {
+        const keys = formDesc[i].key.split('.');
+        let obj = values;
+        for (let j = 0; j < keys.length - 1; j++) {
+          obj = obj[keys[j]];
+        }
+        const lastKey = keys[keys.length - 1];
+        const val = obj[lastKey];
+        if (val) {
+          obj[lastKey] = val.trim().split(/[\s\r,]+/).filter(x => x);
+        }
+      }
+    }
   }
+  return values;
+}
+
+// ...existing code...
+
+function createSchemaForm(form, schema, onSubmit, schemaName) {
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
   } else {
@@ -80,6 +114,33 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
     }
   }
   formDesc = extractKeysAndPlaceholders(schema, formoptions);
+  if (schemaValues[schemaName]) {
+    value = schemaValues[schemaName];
+    // convert array for textarea formDesc type to string separated by newlines
+    // if in formDesc a key has type textarea, convert the value to string separated by newlines
+    // formDesc=[{key: 'db.sid', type: 'textarea'}]
+    // value = {db: {sid: ['AA', 'BB']}}
+    // convert to
+    // value = {db: {sid: 'AA\nBB'}}
+    for (let i = 0; i < formDesc.length; i++) {
+      if (formDesc[i].type === 'textarea') {
+        const keys = formDesc[i].key.split('.');
+        let obj = value;
+        for (let j = 0; j < keys.length - 1; j++) {
+          if (!(keys[j] in obj)) obj[keys[j]] = {};
+          obj = obj[keys[j]];
+        }
+        const lastKey = keys[keys.length - 1];
+        const val = obj[lastKey];
+        if (val && Array.isArray(val)) {
+          obj[lastKey] = val.join('\n');
+        }
+      }
+    }
+  } else {
+    value = {};
+  }
+
   schemaForm = form[0];
   if (onSubmit != null) {
     if (schema_options && schema_options.batch_param) {
@@ -149,9 +210,20 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
   form[0].classList.add('form-inline');
   jsform = form.jsonForm({
     schema: schema,
-    onSubmit: onSubmit,
+    onSubmit: function (errors, values) {
+      convertTextareaToArray(values, formDesc, schema);
+      env = JSV.createEnvironment();
+      report = env.validate(values, schema);
+      errors = report.errors;
+      if (errors.length > 0) {
+        alert(errors[0].message);
+        return false;
+      }
+      onSubmit(errors, values);
+    },
     form: formDesc,
     value: value,
+    validate: false,
     // params: {
     //     fieldHtmlClass: "input-small",
     // }
@@ -169,15 +241,20 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
     txt.addEventListener("input", () => adjustTxtHeight(txt));
   });
   form[0].addEventListener('input', () => {
-    schemaValues[schemaName] = jsform.root.getFormValues();
+    schemaValues[schemaName] = convertTextareaToArray(jsform.root.getFormValues(), formDesc, schema);
     localStorage.setItem('schemaValues', JSON.stringify(schemaValues));
   });
   
   return jsform;
 }
 function adjustTxtHeight(txt) {
+  if (txt.value.includes('\n')) {
+    delta = 2;
+  } else {
+    delta = 0;
+  }
   txt.style.height = "0";
-  txt.style.height = txt.scrollHeight + "px";
+  txt.style.height = `${txt.scrollHeight+delta}px`;
 }
 async function getSwaggerSpec() {
   const response = await fetch('/swagger.yaml');

pywebexec/static/js/script.js

@@ -7,11 +7,11 @@ let fullOutput = '';
 let outputLength = 0;
 const maxScrollback = 99999;
 const maxSize = 10485760; // 10MB
-let fontSize = 14;
+let fontSize = +localStorage.getItem('fontSize') || 14;
 let isPaused = false;
 let showRunningOnly = false;
 let hiddenCommandIds = [];
-let fitWindow = false;
+let fitWindow = localStorage.getItem('fitWindow') === 'false' ? false : true;
 let cols = 0;
 let rows = 0;
 
@@ -260,7 +260,11 @@ async function viewOutput(command_id) {
         }
         const data = await response.json();
         const commandInfo = document.getElementById('commandInfo');
-        const command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
+        if (data.command.endsWith('/run-para')) {
+            command = `${data.params.join(' ').replace(/^.* -- run .\//, 'batch ')}`;
+        } else {
+            command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
+        }
         setCommandStatus(data.status)
         commandInfo.innerHTML = command;
         commandInfo.setAttribute('title', command);
@@ -415,12 +419,14 @@ slider.addEventListener('input', sliderUpdateOutput);
 document.getElementById('decreaseFontSize').addEventListener('click', () => {
     fontSize = Math.max(8, fontSize - 1);
     terminal.options.fontSize = fontSize;
+    localStorage.setItem('fontSize', fontSize);
     autoFit();
 });
 
 document.getElementById('increaseFontSize').addEventListener('click', () => {
     fontSize = Math.min(32, fontSize + 1);
     terminal.options.fontSize = fontSize;
+    localStorage.setItem('fontSize', fontSize);
     autoFit();
 });
 
@@ -451,21 +457,31 @@ function toggleFetchOutput() {
     }
     isPaused = !isPaused;
 }
-function toggleFit() {
-    fitWindow = ! fitWindow;
+
+function setFitIcon()
+{
     if (fitWindow) {
+        toggleFitButton.classList.remove('fit-window');
         toggleFitButton.classList.add('fit-tty');
         toggleFitButton.setAttribute('title', 'terminal fit tty');
     } else {
         toggleFitButton.classList.remove('fit-tty');
+        toggleFitButton.classList.add('fit-window');
         toggleFitButton.setAttribute('title', 'terminal fit window');
-    }
+    }     
+}
+
+function toggleFit() {
+    fitWindow = ! fitWindow;
+    setFitIcon();
+    localStorage.setItem('fitWindow', fitWindow);
     autoFit();
     viewOutput(currentCommandId);
 }
 
 toggleButton.addEventListener('click', toggleFetchOutput);
 toggleFitButton.addEventListener('click', toggleFit);
+setFitIcon();
 
 document.getElementById('thStatus').addEventListener('click', () => {
     showRunningOnly = !showRunningOnly;

pywebexec/static/js/swagger-form.js

@@ -1,8 +1,9 @@
 let ui;
 let swaggerSchemas = {};
+
 function addFormInputListener(textArea, jsform){
   return function (event) {
-    jsonString = JSON.stringify(jsform.root.getFormValues(), null, 2);
+    jsonString = JSON.stringify(convertTextareaToArray(jsform.root.getFormValues(), jsform.formDesc.form, jsform.formDesc.schema), null, 2);
     textArea.value = jsonString;
 
     // Find the React fiber node
@@ -26,6 +27,28 @@ function addFormInputListener(textArea, jsform){
   };
 }
 
+async function getPostParametersSchema() {
+  const swaggerSpec = await getSwaggerSpec();
+  const result = {};
+  for (const path in swaggerSpec.paths) {
+    const pathItem = swaggerSpec.paths[path];
+    if (pathItem.post) {
+      const postDef = pathItem.post;
+      // Look for requestBody with JSON schema in OpenAPI 3.0
+      if (postDef.requestBody && postDef.requestBody.content && postDef.requestBody.content['application/json']) {
+        result[path] = postDef.requestBody.content['application/json'].schema;
+      } else {
+        result[path] = null;
+      }
+    }
+  }
+  return result;
+}
+function adjustTxtHeight2(paramtext) {
+  paramtext.style.height = "0";
+  paramtext.style.height = `${paramtext.scrollHeight+2}px`;
+}
+
 window.onload = function() {
   ui = SwaggerUIBundle({
     url: "/swagger.yaml",
@@ -69,29 +92,26 @@ window.onload = function() {
   const observer = new MutationObserver((mutations) => {
     mutations.forEach(mutation => {
       mutation.addedNodes.forEach(node => {
-        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("/", "_")}`;
-          const prevForm = node.parentNode.querySelector(`#${routePathId}`)
-          if (prevForm) {
-            prevForm.remove();
-          }
-          if (node.classList.contains("body-param__text")) {
-            node.addEventListener("input", (e) => {
-              e.target.style.height = "0"
-              e.target.style.height = e.target.scrollHeight + "px";
-            });
-            node.style.height = "0"
-            node.style.height = node.scrollHeight + "px";
+        if (node.nodeType === Node.ELEMENT_NODE) {
+          const paramtext = node.querySelector(".body-param__text");
+          if (paramtext) {
+            // 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("/", "_")}`;
+            const prevForm = paramtext.parentNode.querySelector(`#${routePathId}`)
+            if (prevForm) {
+              prevForm.remove();
+            }
+            paramtext.addEventListener("input", () => adjustTxtHeight2(paramtext));
+            setTimeout(() => adjustTxtHeight2(paramtext), 100);
             const form = document.createElement("form");
             form.id = routePathId;
             form.classList.add("schema-form");
             jsform = createSchemaForm($(form), swaggerSchemas[routePath], null, routePath);
-            // form.addEventListener("input", formInput(node, jsform)); 
-            form.addEventListener("input", addFormInputListener(node, jsform));
-            node.parentNode.insertBefore(form, node.nextSibling);
+            // form.addEventListener("input", formInput(node, jsform));
+            setTimeout(() => addFormInputListener(paramtext, jsform)(), 100);
+            form.addEventListener("input", addFormInputListener(paramtext, jsform));
+            paramtext.parentNode.insertBefore(form, paramtext.nextSibling);
             item1 = form.querySelector("input, select, textarea");
             if (item1) {
               item1.focus();

pywebexec/swagger.yaml

@@ -1,4 +1,4 @@
-swagger: "2.0"
+openapi: "3.0.0"
 info:
   title: PyWebExec API
   version: "1.0"
@@ -11,77 +11,80 @@ paths:
       responses:
         "200":
           description: "List of all commands status"
-          schema:
-            type: object
-            properties:
-              commands:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    command_id:
-                      type: string
-                    command:
-                      type: string
-                    status:
-                      type: string
-                    start_time:
-                      type: string
-                      format: date-time
-                    end_time:
-                      type: string
-                      format: date-time
-                    exit_code:
-                      type: integer
-                    last_output_line:
-                      type: string
-                    user:
-                      type: string
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  commands:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        command_id:
+                          type: string
+                        command:
+                          type: string
+                        status:
+                          type: string
+                        start_time:
+                          type: string
+                          format: date-time
+                        end_time:
+                          type: string
+                          format: date-time
+                        exit_code:
+                          type: integer
+                        last_output_line:
+                          type: string
+                        user:
+                          type: string
     post:
       summary: "Run a command"
       tags:
         - commands
-      consumes:
-        - application/json
-      produces:
-        - application/json
-      parameters:
-        - in: body
-          name: requestBody
-          schema:
-            type: object
-            properties:
-              command:
-                type: string
-                description: "Command to run"
-                # Enum will be added dynamically by the APIs
-                default: commandName
-              params:
-                type: array
-                description: "Command parameters"
-                items:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                command:
                   type: string
-                default: []
-              rows:
-                type: integer
-                description: "tty nb rows"
-                default: 24
-              cols:
-                type: integer
-                description: "tty nb columns"
-                default: 125
-            required:
-              - command
+                  description: "Command to run"
+                  # Enum will be added dynamically by the APIs
+                  default: commandName
+                  required: true
+                params:
+                  type: array
+                  description: "Command parameters"
+                  items:
+                    type: string
+                  default: []
+                rows:
+                  type: integer
+                  description: "tty nb rows"
+                  default: 24
+                cols:
+                  type: integer
+                  description: "tty nb columns"
+                  default: 125
+              required:
+                - command
       responses:
         "200":
           description: "Command started"
-          schema:
-            type: object
-            properties:
-              command_id:
-                type: string
-              message:
-                type: string
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  command_id:
+                    type: string
+                  message:
+                    type: string
+
   /commands/{command_id}:
     get:
       summary: "Get command status"
@@ -91,43 +94,46 @@ paths:
         - in: path
           name: command_id
           required: true
-          type: string
+          schema:
+            type: string
       responses:
         "200":
           description: "Command status returned"
-          schema:
-            type: object
-            properties:
-              command_id:
-                type: string
-              command:
-                type: string
-              params:
-                type: array
-                items:
-                  type: string
-              status:
-                type: string
-              start_time:
-                type: string
-                format: date-time
-              end_time:
-                type: string
-                format: date-time
-              exit_code:
-                type: integer
-              last_output_line:
-                type: string
-              cols:
-                type: integer
-              rows:
-                type: integer
-              user:
-                type: string
-              from:
-                type: string
-              pid:
-                type: integer
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  command_id:
+                    type: string
+                  command:
+                    type: string
+                  params:
+                    type: array
+                    items:
+                      type: string
+                  status:
+                    type: string
+                  start_time:
+                    type: string
+                    format: date-time
+                  end_time:
+                    type: string
+                    format: date-time
+                  exit_code:
+                    type: integer
+                  last_output_line:
+                    type: string
+                  cols:
+                    type: integer
+                  rows:
+                    type: integer
+                  user:
+                    type: string
+                  from:
+                    type: string
+                  pid:
+                    type: integer
 
   /commands/{command_id}/output:
     get:
@@ -138,44 +144,49 @@ paths:
         - in: path
           name: command_id
           required: true
-          type: string
+          schema:
+            type: string
         - in: query
           name: offset
-          type: integer
-          default: 0
+          schema:
+            type: integer
+            default: 0
         - in: query
           name: maxsize
-          type: integer
-          default: 10485760
+          schema:
+            type: integer
+            default: 10485760
         - in: query
           name: maxlines
-          type: integer
-          default: 5000
-      consumes:
-        - application/json
-      produces:
-        - application/json
-        - text/plain
+          schema:
+            type: integer
+            default: 5000
       responses:
         "200":
           description: "Command output returned"
-          schema:
-            type: object
-            properties:
-              output:
-                type: string
-              status:
-                type: string
-              rows:
-                type: integer
-              cols:
-                type: integer
-              links:
+          content:
+            application/json:
+              schema:
                 type: object
                 properties:
-                  next:
+                  output:
                     type: string
-                    format: uri
+                  status:
+                    type: string
+                  rows:
+                    type: integer
+                  cols:
+                    type: integer
+                  links:
+                    type: object
+                    properties:
+                      next:
+                        type: string
+                        format: uri
+            text/plain:
+              schema:
+                type: string
+
   /commands/{command_id}/stop:
     patch:
       summary: "Stop a running command"
@@ -185,15 +196,19 @@ paths:
         - in: path
           name: command_id
           required: true
-          type: string
+          schema:
+            type: string
       responses:
         "200":
           description: "Command stopped successfully"
-          schema:
-            type: object
-            properties:
-              message:
-                type: string
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+
   /commands/{command_id}/run:
     post:
       summary: "Relaunch a command"
@@ -203,56 +218,61 @@ paths:
         - 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
+            type: string
+      requestBody:
+        required: true
+        content:
+          application/json:
+            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
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                  command_id:
+                    type: string
+
   /commands/exposed:
     get:
       summary: "List available executable commands"
       tags:
         - commands
-      produces:
-        - application/json
       responses:
         "200":
           description: "List of commands with markdown help"
-          schema:
-            type: object
-            properties:
-              commands:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    command:
-                      type: string
-                    help:
-                      type: string
-          examples:
+          content:
             application/json:
-              commands:
-                - command: ls
-                  help: "List directory contents \n**params**:\n* `<ls_params>`"
-                - command: cat
-                  help: "Concatenate and display files \n**params**:\n* `<cat_params>`"
+              schema:
+                type: object
+                properties:
+                  commands:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        command:
+                          type: string
+                        help:
+                          type: string
+              example:
+                commands:
+                  - command: ls
+                    help: "List directory contents \n**params**:\n* `<ls_params>`"
+                  - command: cat
+                    help: "Concatenate and display files \n**params**:\n* `<cat_params>`"

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.19'
-__version_tuple__ = version_tuple = (2, 1, 19)
+__version__ = version = '2.2.1'
+__version_tuple__ = version_tuple = (2, 2, 1)

{pywebexec-2.1.19.dist-info → pywebexec-2.2.1.dist-info}/METADATA

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

{pywebexec-2.1.19.dist-info → pywebexec-2.2.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
-pywebexec/pywebexec.py,sha256=kufip6m7MWjCIjtheUYuFUZgnNS5_W3kC5gVFVSUVX8,45662
-pywebexec/swagger.yaml,sha256=zP_Nz69vZx0iwbKTwiQgSs8rJRUTiGKRyIkWzMPANOE,6688
-pywebexec/version.py,sha256=H0zgjQHhg7kQrNE7IoxjBFCFnEnqqBnOnQe-ScWOyb4,513
+pywebexec/pywebexec.py,sha256=R-jp9BiUMJZW7m9N9kQC6dpIueUgFVDo4n9_GFb1rOs,45734
+pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
+pywebexec/version.py,sha256=wUUonx5HNvzUsCYrR_oek7De76IsD1eqg46c4ZbWiDg,511
 pywebexec/static/css/form.css,sha256=eApJskeJ3MCzC7_p4gXgoIbvbG5s8m4bP1O4KHHqeiA,5293
-pywebexec/static/css/markdown.css,sha256=3RzUnpVBdF6cQuB_NXV7hMTc0quYU8sfyuZcpsREj6A,1939
-pywebexec/static/css/style.css,sha256=ynccbEDzK07rurLm-UirUs5j_hVfXlIgaHeUIq9WvA0,9969
+pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
+pywebexec/static/css/style.css,sha256=R1VOPNV2ztROKy9Fgf3tvUrtuKagY027tFJ8C866yWU,9991
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
 pywebexec/static/css/swagger-ui.css.map,sha256=dJy-xBn_htK4BNupTMIl33ddse7BXsrCdDJWlTJodnw,258842
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -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=V9SUmRQP9M69jYbahNrsV4_oI0ASZv_F6Ax9wj0S0Ww,12171
-pywebexec/static/js/popup.js,sha256=0fr3pp4j9D2fXEVnHyQrx2bPWFHfgbb336dbewgH1d8,9023
-pywebexec/static/js/schemaform.js,sha256=mpOYvAiCcuG6-3dJiOLaGKK14mBic0UWN5WrrKxCA_g,6403
-pywebexec/static/js/script.js,sha256=KrtLF77vKvKomKAIy0rix-T1hx4VTgjkQunHvgs-jaA,17631
-pywebexec/static/js/swagger-form.js,sha256=o2ovbTpqwy6H2yubV1NIi7VBQfAqW7seZWQ6O78ACb8,3837
+pywebexec/static/js/executables.js,sha256=lF9Icb4VzbxSCTmcz-TUjvFKQ_ygmSgPq0Q_uaTRR-g,11866
+pywebexec/static/js/popup.js,sha256=O3DEWnyb5yGW9tjODYycc-ujWndyAfnJMxulaQeogtc,9700
+pywebexec/static/js/schemaform.js,sha256=uYlu8P6Y1adEGefzsRhLT-gwS27TZsLwzDGs2UBgDGk,8808
+pywebexec/static/js/script.js,sha256=X5TN2q1m6ZGPK72e1MWgyQWk1agOrcOWuGdwVWB9HJk,18204
+pywebexec/static/js/swagger-form.js,sha256=EYXqHIE105DkXPCPi5-eYzux9nPLmJuisf-5EwFypsQ,4578
 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
@@ -67,9 +67,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=w18O2plH_yS8bqlPsu5hwFFmCj9H2hWLSV8B6ADcSwU,3900
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=9ngyldkyEdLonBjl97mbIZUlVk-jxwcHrvFzMSrveyU,1067
-pywebexec-2.1.19.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.1.19.dist-info/METADATA,sha256=NDtHARH0QFd_0FthJ2ui5LPVdw2O-1TtP4stJSenWWY,12811
-pywebexec-2.1.19.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-pywebexec-2.1.19.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.1.19.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.1.19.dist-info/RECORD,,
+pywebexec-2.2.1.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.2.1.dist-info/METADATA,sha256=UWTzS7NVz171aeuAw2z8nEdeg5ggBeKEEISktYdU8ms,12810
+pywebexec-2.2.1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+pywebexec-2.2.1.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.2.1.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.2.1.dist-info/RECORD,,