pywebexec 2.1.13__py3-none-any.whl → 2.1.15__py3-none-any.whl

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):
+                if isinstance(value, dict) or convert_values.get(param, None) == "json":
                     value = shlex.quote(json.dumps(value))
+                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/static/css/form.css

@@ -196,9 +196,23 @@
     -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;
+  }
 }
 
 .swagger-ui textarea {
-min-height: 130px;
-overflow-y: hidden;
+  min-height: 130px;
+  overflow-y: hidden;
 }

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,12 +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) {
-    console.log(schema.schema_options.batch_param)
-    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',
@@ -75,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;
         }
@@ -94,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/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.13'
-__version_tuple__ = version_tuple = (2, 1, 13)
+__version__ = version = '2.1.15'
+__version_tuple__ = version_tuple = (2, 1, 15)

{pywebexec-2.1.13.dist-info → pywebexec-2.1.15.dist-info}/METADATA

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

{pywebexec-2.1.13.dist-info → pywebexec-2.1.15.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
-pywebexec/pywebexec.py,sha256=0k8ABFv9K5iTxBGcekH7OOEtskl2kXoiBP4Azlt35ZQ,45304
+pywebexec/pywebexec.py,sha256=QIcwYwF8UPAh6juN_LpEHJnyNhZkBlqdbuGRhP1cvqw,45635
 pywebexec/swagger.yaml,sha256=zP_Nz69vZx0iwbKTwiQgSs8rJRUTiGKRyIkWzMPANOE,6688
-pywebexec/version.py,sha256=MzsJ263HZYR6SmK-vVyZsM4dSlCzgRW6jJZBsjDPWV8,513
-pywebexec/static/css/form.css,sha256=FgeB8ihJE_RKVvN6s3vTnzs5O26DCYC9LX2xI-2Fx2g,4989
+pywebexec/version.py,sha256=B5GTyfnCcU_OVejGvc44yPuiU01UHMzbmUciqEKsU_4,513
+pywebexec/static/css/form.css,sha256=FvU2HkAn7jjJAsY4-Z0L7KaO46M46NKcuSJv8_4xIdA,5277
 pywebexec/static/css/markdown.css,sha256=3RzUnpVBdF6cQuB_NXV7hMTc0quYU8sfyuZcpsREj6A,1939
 pywebexec/static/css/style.css,sha256=ynccbEDzK07rurLm-UirUs5j_hVfXlIgaHeUIq9WvA0,9969
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
@@ -35,7 +35,7 @@ pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_q
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
 pywebexec/static/js/executables.js,sha256=Hbcpv1IZfxC406qhwkwoTvJh8TZD7kEc651IXkQDYws,12077
 pywebexec/static/js/popup.js,sha256=0fr3pp4j9D2fXEVnHyQrx2bPWFHfgbb336dbewgH1d8,9023
-pywebexec/static/js/schemaform.js,sha256=vB8d3MiANVFNGrmCQX5o-Yxalf1gKDCkLHQnrjjGpGA,5264
+pywebexec/static/js/schemaform.js,sha256=RqFzI0rAoKke0FzArxBIupK5eR1-0GBMcEIuAkfz3Zs,5945
 pywebexec/static/js/script.js,sha256=-CfZRzjusxRCY7Kol_KNOq8BdRdHYTc5X3vXNChlsdQ,17631
 pywebexec/static/js/swagger-form.js,sha256=BU64XxyfrWx4DnpAuaWtG-9YpcHF3OzzAYzjiSH0NGo,3826
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
@@ -66,9 +66,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=KeNLBH9PN_ZuGhzwrjvRTj2oBtbINv_SbwGQpOahNWo,3820
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=9ngyldkyEdLonBjl97mbIZUlVk-jxwcHrvFzMSrveyU,1067
-pywebexec-2.1.13.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.1.13.dist-info/METADATA,sha256=FSsqCYZdtuf-sLyqF5TdRRES1ygELelh3ZmchS20t1c,12811
-pywebexec-2.1.13.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-pywebexec-2.1.13.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.1.13.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.1.13.dist-info/RECORD,,
+pywebexec-2.1.15.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.1.15.dist-info/METADATA,sha256=iZVsPUPDkmF5fAn7hB_PpNtmOY_ZKCat_cROdcWqRzw,12811
+pywebexec-2.1.15.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+pywebexec-2.1.15.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.1.15.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.1.15.dist-info/RECORD,,