pywebexec 2.1.14__tar.gz → 2.1.16__tar.gz

{pywebexec-2.1.14/pywebexec.egg-info → pywebexec-2.1.16}/PKG-INFO

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

{pywebexec-2.1.14 → pywebexec-2.1.16}/pywebexec/pywebexec.py

@@ -837,6 +837,7 @@ def run_dynamic_command(cmd):
         separator_params = exe.get("schema", {}).get("schema_options", {}).get("separator_params", {})
         noprefix = exe.get("schema", {}).get("schema_options", {}).get("noprefix_params", {})
         convert_params = exe.get("schema", {}).get("schema_options", {}).get("convert_params", {})
+        convert_values = exe.get("schema", {}).get("schema_options", {}).get("convert_values", {})
         schema_params = exe.get("schema", {}).get("properties", {})
         batch_param = exe.get("schema", {}).get("schema_options", {}).get("batch_param", None)
         batch_values = []
@@ -865,14 +866,17 @@ def run_dynamic_command(cmd):
                     separator = ""
                 else:
                     prefix = f"--{param}"
-                if isinstance(value, bool):
+                if isinstance(value, bool) and convert_params.get(param, None) is None:
                     if value:
                         params += f"{prefix} "
                     continue
-                if isinstance(value, dict):
-                    value = shlex.quote(json.dumps(value))
+                if isinstance(value, dict) or convert_values.get(param, None) == "json":
+                    value = shlex.quote(json.dumps(value, indent=2, sort_keys=False))
+                elif convert_values.get(param, None) == "quote":
+                    value = shlex.quote(str(value))
+                else:
+                    values = shlex.split(value) if isinstance(value, str) else value
                 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"

{pywebexec-2.1.14 → pywebexec-2.1.16}/pywebexec/static/css/form.css

@@ -196,9 +196,24 @@
     -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
     box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
   }
+  ._jsonform-array-deletelast {
+    display: none;
+  }
+  ._jsonform-array-buttons {
+    display: block;
+    width: 100%;
+    text-align: right;
+  }
+  i[title="Delete current"] {
+    top: 5px;
+  }
+  ._jsonform-array-addmore, ._jsonform-array-deletecurrent {
+    box-shadow: unset;
+    outline: 0;
+  }
 }
 
 .swagger-ui textarea {
-min-height: 130px;
-overflow-y: hidden;
+  min-height: 130px;
+  overflow-y: hidden;
 }

{pywebexec-2.1.14 → pywebexec-2.1.16}/pywebexec/static/js/executables.js

@@ -267,6 +267,8 @@ paramsInput.addEventListener('focus', () => {
         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();

{pywebexec-2.1.14 → pywebexec-2.1.16}/pywebexec/static/js/schemaform.js

@@ -13,7 +13,7 @@ function formInputHandle() {
     if (! inputHandlers.includes(input)) {
       val = input.value || input.placeholder;
       if (val) {
-        size = Math.max(val.length - 2, 2)
+        size = Math.max(val.length, 2)
         if (input.type== 'number') {
           size += 2;
         }
@@ -27,16 +27,22 @@ function formInputHandle() {
   });
 }
 
-function extractKeysAndPlaceholders(obj, prefix = '') {
+function extractKeysAndPlaceholders(obj, formoptions, prefix = '') {
     let result = [];
   
     for (let key in obj.properties) {
       if (obj.properties[key].type === 'object' && obj.properties[key].properties) {
-        result = result.concat(extractKeysAndPlaceholders(obj.properties[key], prefix ? `${prefix}.${key}` : key));
+        result = result.concat(extractKeysAndPlaceholders(obj.properties[key], formoptions, prefix ? `${prefix}.${key}` : key));
       } else {
+        if (formoptions[`${prefix}.${key}`]) {
+          foptions = formoptions[`${prefix}.${key}`];
+        } else {
+          foptions = {};
+        }
         result.push({
           key: prefix ? `${prefix}.${key}` : key,
-          placeholder: obj.properties[key].example || null
+          placeholder: obj.properties[key].example || null,
+          ... foptions
         });
       }
     }
@@ -44,11 +50,30 @@ function extractKeysAndPlaceholders(obj, prefix = '') {
 }
 
 function createSchemaForm(form, schema, onSubmit) {
-  formDesc = extractKeysAndPlaceholders(schema);
+  if (schema && schema.schema_options) {
+    schema_options = schema.schema_options;
+  } else {
+    schema_options = {};
+  }
+  if (schema && schema.properties && schema.properties.params && schema.properties.params.schema_options) {
+    schema_params_options = schema.properties.params.schema_options;
+  } else {
+    schema_params_options = {};
+  }
+
+  formoptions = {};
+  if (schema_options && schema_options.form) {
+    formoptions = schema.schema_options.form;
+  } else if (schema_params_options && schema_params_options.form) {
+    for (let key in schema_params_options.form) {
+      formoptions[`params.${key}`] = schema_params_options.form[key];
+    }
+  }
+  formDesc = extractKeysAndPlaceholders(schema, formoptions);
   schemaForm = form[0];
   if (onSubmit != null) {
-    if (schema && schema.schema_options && schema.schema_options.batch_param) {
-      schema.properties[schema.schema_options.batch_param].required = true;
+    if (schema_options && schema_options.batch_param) {
+      schema.properties[schema_options.batch_param].required = true;
       if (!schema.properties.parallel) {
         schema.properties['parallel'] = {
           type: 'integer',
@@ -74,7 +99,7 @@ function createSchemaForm(form, schema, onSubmit) {
         });
       }
       for (i = 0; i < formDesc.length; i++) {
-        if (formDesc[i].key == schema.schema_options.batch_param) {
+        if (formDesc[i].key == schema_options.batch_param) {
           formDesc[i].type = 'textarea';
           formDesc[i].required = true;
         }
@@ -93,10 +118,10 @@ function createSchemaForm(form, schema, onSubmit) {
       title: 'Run',
     });
   } else {
-    if (schema && schema.properties && schema.properties.params.schema_options && schema.properties.params.schema_options.batch_param) {
-      schema.properties.params.properties[schema.properties.params.schema_options.batch_param].required = true;
+    if (schema_params_options && schema_params_options.batch_param) {
+      schema.properties.params.properties[schema_params_options.batch_param].required = true;
       for (i = 0; i < formDesc.length; i++) {
-        if (formDesc[i].key == 'params.' + schema.properties.params.schema_options.batch_param) {
+        if (formDesc[i].key == 'params.' + schema_params_options.batch_param) {
           formDesc[i].type = 'textarea';
           formDesc[i].required = true;
         }

{pywebexec-2.1.14 → pywebexec-2.1.16}/pywebexec/static/js/script.js

@@ -262,7 +262,7 @@ async function viewOutput(command_id) {
         const commandInfo = document.getElementById('commandInfo');
         const command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
         setCommandStatus(data.status)
-        commandInfo.innerText = command;
+        commandInfo.innerHTML = command;
         commandInfo.setAttribute('title', command);
         if (data.command == 'term')
             terminal.options.cursorInactiveStyle = 'outline';