pywebexec 2.2.0__tar.gz → 2.2.2__tar.gz

{pywebexec-2.2.0/pywebexec.egg-info → pywebexec-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pywebexec
-Version: 2.2.0
+Version: 2.2.2
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -62,6 +62,7 @@ Requires-Dist: ldap3>=2.9.1
 Requires-Dist: pyte>=0.8.1
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: run-para>=1.0.2
+Dynamic: license-file
 
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![Publish Package](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)

{pywebexec-2.2.0 → pywebexec-2.2.2}/pywebexec/static/css/form.css

@@ -211,6 +211,19 @@
     box-shadow: unset;
     outline: 0;
   }
+  .controls > .checkbox input {
+    top: 5px;
+  }
+  .checkbox {
+    label {
+      font-weight: normal;
+    }
+    input {
+      top: 1px;
+      display: unset;
+      margin-right: 4px;
+    }
+  }
 }
 
 .swagger-ui textarea {

{pywebexec-2.2.0 → pywebexec-2.2.2}/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-2.2.0 → pywebexec-2.2.2}/pywebexec/static/js/schemaform.js

@@ -54,12 +54,48 @@ 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);
+        } else {
+          delete obj[lastKey];
+        }
+      }
+    }
   }
+  return values;
+}
+
+// ...existing code...
+
+function createSchemaForm(form, schema, onSubmit, schemaName) {
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
   } else {
@@ -80,6 +116,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 +212,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 +242,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-2.2.0 → pywebexec-2.2.2}/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-2.2.0 → pywebexec-2.2.2}/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-2.2.0 → pywebexec-2.2.2}/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.2'
+__version_tuple__ = version_tuple = (2, 2, 2)

{pywebexec-2.2.0 → pywebexec-2.2.2/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pywebexec
-Version: 2.2.0
+Version: 2.2.2
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -62,6 +62,7 @@ Requires-Dist: ldap3>=2.9.1
 Requires-Dist: pyte>=0.8.1
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: run-para>=1.0.2
+Dynamic: license-file
 
 [![Pypi version](https://img.shields.io/pypi/v/pywebexec.svg)](https://pypi.org/project/pywebexec/)
 ![Publish Package](https://github.com/joknarf/pywebexec/actions/workflows/python-publish.yml/badge.svg)