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

pywebexec/static/js/executables.js

@@ -264,42 +264,36 @@ 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);
         setHelpDivPosition();

pywebexec/static/js/schemaform.js

@@ -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",
     // }
@@ -168,9 +240,8 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
     txt.setAttribute("spellcheck", "false");
     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));
   });
   

pywebexec/static/js/script.js

@@ -265,7 +265,6 @@ async function viewOutput(command_id) {
         } else {
             command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
         }
-        console.log(command);
         setCommandStatus(data.status)
         commandInfo.innerHTML = command;
         commandInfo.setAttribute('title', command);

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
@@ -107,7 +108,8 @@ window.onload = function() {
             form.id = routePathId;
             form.classList.add("schema-form");
             jsform = createSchemaForm($(form), swaggerSchemas[routePath], null, routePath);
-            // form.addEventListener("input", formInput(node, jsform)); 
+            // 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");

pywebexec/version.py

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

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

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

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

@@ -2,7 +2,7 @@ pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
 pywebexec/pywebexec.py,sha256=R-jp9BiUMJZW7m9N9kQC6dpIueUgFVDo4n9_GFb1rOs,45734
 pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
-pywebexec/version.py,sha256=wdFcRBeaWRZXknL-E8RTk9hV9M-OMto6dfJ90sc1i9A,511
+pywebexec/version.py,sha256=wUUonx5HNvzUsCYrR_oek7De76IsD1eqg46c4ZbWiDg,511
 pywebexec/static/css/form.css,sha256=eApJskeJ3MCzC7_p4gXgoIbvbG5s8m4bP1O4KHHqeiA,5293
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
 pywebexec/static/css/style.css,sha256=R1VOPNV2ztROKy9Fgf3tvUrtuKagY027tFJ8C866yWU,9991
@@ -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=2ZSlsEMbfATr1EwUJMEAoS5G_wSUuWgT6AVQijawvtE,12160
+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=GtIfd5YBaEr-KC1vXvZPFa5sYWRqdcjvP0Ozl7mr0YQ,6474
-pywebexec/static/js/script.js,sha256=sMOwgeRi59X0QyTTI58SqC4Sp_F7pK5JfozCkJMOHjs,18234
-pywebexec/static/js/swagger-form.js,sha256=sW7cUYJnd1ZZSMaMqaB2LCkjB1tfvSkdcAr-eW6UpZU,4430
+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.2.0.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.2.0.dist-info/METADATA,sha256=PdGpfSzOG74LxsHEY8AUmPw5l_gsGIjChSTJIAKjxIk,12810
-pywebexec-2.2.0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-pywebexec-2.2.0.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.2.0.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.2.0.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,,