pywebexec 2.1.19__tar.gz → 2.2.1__tar.gz

{pywebexec-2.1.19/pywebexec.egg-info → pywebexec-2.2.1}/PKG-INFO

@@ -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 → pywebexec-2.2.1}/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-2.1.19 → pywebexec-2.2.1}/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-2.1.19 → pywebexec-2.2.1}/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-2.1.19 → pywebexec-2.2.1}/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-2.1.19 → pywebexec-2.2.1}/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-2.1.19 → pywebexec-2.2.1}/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-2.1.19 → pywebexec-2.2.1}/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-2.1.19 → pywebexec-2.2.1}/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();