pywebexec 2.3.3__py3-none-any.whl → 2.3.5__py3-none-any.whl

pywebexec/pywebexec.py

@@ -921,6 +921,8 @@ def run_dynamic_command(cmd):
                     if value:
                         params += f"{prefix} "
                     continue
+                if prefix and not value: # skip empty params with prefix
+                    continue
                 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":

pywebexec/static/css/form.css

@@ -123,6 +123,7 @@
     margin-top: 0px;
     margin-bottom: 1px;
     padding: 0;
+    padding-right: 10px;
   }
   input[type="checkbox"] {
     display: block;
@@ -148,6 +149,21 @@
   .controls input[type="text"] {
     width: 110px;;
   }
+
+  .controls > div:not([id]) { /* for checkboxes */
+    scrollbar-width: thin;
+    scrollbar-gutter: stable;
+    overflow-y: auto;
+    max-height: 100px;
+    border: solid 1px #ccc;
+    border-radius: 5px;
+    padding: 5px 2px;
+  }
+  .controls > div.range {
+    overflow-y: hidden;
+    padding: 0px 5px;
+  }
+
   input[type="number"] {
     max-width: 120px;
     text-align: right;
@@ -201,9 +217,13 @@
   ._jsonform-array-deletelast {
     display: none;
   }
-  ._jsonform-array-buttons {
+  ul ~ ._jsonform-array-buttons {
     display: block;
     width: 100%;
+  }
+  ._jsonform-array-buttons {
+    /* display: block; */
+    /* width: 100%; */
     text-align: right;
   }
   i[title="Delete current"] {
@@ -237,6 +257,34 @@
     background-color: #f2dede;
     border-color: #ebccd1;  
   }
+  #reset-form:hover {
+    background-color: #e8e8e8;
+    border-color: #adadad;
+  }
+  #reset-form {
+    position: relative;
+    margin-bottom: 10px;
+    height: 24px;
+    top: 20px;
+    background-color: #f5f5f5;
+    border-color: #ccc;
+    height: 24px;
+    color: #333;
+    padding: 3px 13px;
+  }
+  fieldset {
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    padding-top: 9px;
+    width: 100%;
+    label {
+      padding-right: 5px;
+    }
+  }
+  fieldset > div {
+    /* display: block ruby; */
+    padding-bottom: 5px;
+  }
 }
 
 .swagger-ui textarea {

pywebexec/static/css/style.css

@@ -60,6 +60,8 @@ th {
     padding: 0;
     padding-bottom: 20px;
     overflow: auto;
+    font-size: 13px;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
     ul {
         margin: 0;
         padding: 0 15px;

pywebexec/static/js/schemaform.js

@@ -53,7 +53,34 @@ function extractKeysAndPlaceholders(obj, formoptions, prefix = '') {
     return result;
 }
 
-// ...existing code...
+
+// Convert objects to JSON strings where schema type is object without properties
+function convertObjectsToJsonStrings(obj, schema, prefix = '') {
+  // Helper function to get schema type and check for properties
+  function getSchemaTypeForKey(schema, keyPath) {
+    const keys = keyPath.split('.');
+    let current = schema.properties;
+    for (const key of keys) {
+      if (!current || !current[key]) return null;
+      current = current[key];
+    }
+    return current;
+  }
+
+  for (const key in obj) {
+    const keyPath = prefix ? `${prefix}.${key}` : key;
+    const schemaType = getSchemaTypeForKey(schema, keyPath);
+    
+    if (schemaType && schemaType.type === 'object' && !schemaType.properties) {
+      if (typeof obj[key] === 'object' && obj[key] !== null) {
+        obj[key] = JSON.stringify(obj[key], null, 2);
+      }
+    } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+      convertObjectsToJsonStrings(obj[key], schema, keyPath);
+    }
+  }
+}
+
 
 function convertTextareaToArray(values, formDesc, schema) {
   // Helper function to get schema type for a key path
@@ -107,6 +134,7 @@ function validateSchemaForm(form, formDesc, schema, values, schemaName) {
   err.style.display = 'none';
   return true;
 }
+
 function createSchemaForm($form, schema, onSubmit, schemaName) {
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
@@ -151,6 +179,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
         }
       }
     }
+    convertObjectsToJsonStrings(value, schema);
   } else {
     value = {};
   }
@@ -205,8 +234,27 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
       }
     }
     formDesc.push({
-      type: 'submit',
-      title: 'Run',
+      type: 'actions',
+      items: [
+        {
+          type: 'submit',
+          title: 'Run',
+          id: 'run-form',
+        },
+        {
+          type: 'button',
+          title: 'Reset',
+          id: 'reset-form',
+          onClick: function (evt) {
+            console.log('reset');
+            evt.preventDefault();
+            evt.stopPropagation();
+            evt.stopImmediatePropagation();
+            schemaValues[schemaName] = {};
+            createSchemaForm($form, schema, onSubmit, schemaName);
+          },
+        },
+      ],
     });
   } else {
     if (schema_params_options && schema_params_options.batch_param) {
@@ -308,5 +356,3 @@ async function getPostParametersSchema() {
 let schemaForm;
 // let inputHandlers = [];
 let schemaValues = JSON.parse(localStorage.getItem('schemaValues')) || {};
-
-

pywebexec/static/js/script.js

@@ -163,7 +163,7 @@ async function fetchCommands(hide=false) {
             const commandRow = document.createElement('tr');
             commandRow.className = `clickable-row ${command.command_id === currentCommandId ? 'currentcommand' : ''}`;
             commandRow.onclick = () => viewOutput(command.command_id);
-            if (command.status === 'running') runningCommands.push(command.command.replace(/^\.\//, ''));
+            if (command.status === 'running') runningCommands.push(command.command.replace(/^\.[\\/]/, ''));
             commandRow.innerHTML = `
                 <td class="monospace">
                     ${navigator.clipboard == undefined ? `${command.command_id.slice(0, 8)}` : `<span class="copy_clip" onclick="copyToClipboard('${command.command_id}', this, event)">${command.command_id.slice(0, 8)}</span>`}
@@ -174,7 +174,7 @@ async function fetchCommands(hide=false) {
                 <td align="center">
                     ${command.command.startsWith('term') ? '' : command.status === 'running' ? `<button class="stop" onclick="stopCommand('${command.command_id}', event)">Stop</button>` : `<button class="run" onclick="relaunchCommand('${command.command_id}', event)">Run</button>`}
                 </td>
-                <td title="${command.user == '-' ? '' : command.user}"><span class="command-line">${command.command.replace(/^\.\//, '')}</span></td>
+                <td title="${command.user == '-' ? '' : command.user}"><span class="command-line">${command.command.replace(/^\.[\\/]/, '')}</span></td>
                 <td class="monospace outcol">
                     <button class="popup-button" onclick="openPopup('${command.command_id}', event)"></button>
                     ${command.last_output_line || ''}
@@ -204,6 +204,7 @@ function extractHtml(text) {
 async function fetchOutput(url) {
     if (isPaused) return;
     try {
+        document.getElementById('output').classList.remove('outputhtml');
         const response = await fetch(url);
         if (!response.ok) return;
         const data = await response.json();
@@ -221,12 +222,21 @@ async function fetchOutput(url) {
                 fullOutput = fullOutput.slice(-maxSize);
 
             if (data.status != 'running') {
-                const htmlContent = extractHtml(fullOutput);
-                if (htmlContent) {
-                    document.getElementById('output').innerHTML = htmlContent;
-                    document.getElementById('output').classList.add('outputhtml');
+                if (data.status === 'success') {
+                    const htmlContent = extractHtml(fullOutput);
+                    if (htmlContent) {
+                        document.getElementById('output').innerHTML = htmlContent;
+                        document.getElementById('output').classList.add('outputhtml');
+                    } else {
+                        if (slider.value == 1000)
+                            terminal.write(data.output);
+                        else {
+                            percentage = Math.round((outputLength * 1000)/fullOutput.length);
+                            slider.value = percentage;
+                            outputPercentage.innerText = `${Math.floor(percentage/10)}%`;
+                        }
+                    }
                 } else {
-                    document.getElementById('output').classList.remove('outputhtml');
                     if (slider.value == 1000)
                         terminal.write(data.output);
                     else {
@@ -284,7 +294,7 @@ async function viewOutput(command_id) {
         if (data.command.endsWith('/run-para')) {
             command = `${data.params.join(' ').replace(/^.* -- run .\//, 'batch ')}`;
         } else {
-            command = `${data.command.replace(/^\.\//, '')} ${data.params.join(' ')}`;
+            command = `${data.command.replace(/^\.[\\/]/, '')} ${data.params.join(' ')}`;
         }
         setCommandStatus(data.status)
         commandInfo.innerHTML = command;
@@ -303,14 +313,18 @@ async function viewOutput(command_id) {
             const outputResponse = await fetch(nextOutputLink);
             const outputData = await outputResponse.json();
             const output = outputData.output;
-            const htmlContent = extractHtml(output);
-            if (htmlContent) {
-                document.getElementById('output').innerHTML = htmlContent;
-                document.getElementById('output').classList.add('outputhtml');
+            document.getElementById('output').classList.remove('outputhtml');
+            document.getElementById('output').innerHTML = '';
+            document.getElementById('output').appendChild(terminal.element);
+            if (data.status === 'success') {
+                const htmlContent = extractHtml(output);
+                if (htmlContent) {
+                    document.getElementById('output').innerHTML = htmlContent;
+                    document.getElementById('output').classList.add('outputhtml');
+                } else {
+                    terminal.write(output);
+                }
             } else {
-                document.getElementById('output').classList.remove('outputhtml');
-                document.getElementById('output').innerHTML = '';
-                document.getElementById('output').appendChild(terminal.element);
                 terminal.write(output);
             }
             toggleButton.style.display = 'none';

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.3'
-__version_tuple__ = version_tuple = (2, 3, 3)
+__version__ = version = '2.3.5'
+__version_tuple__ = version_tuple = (2, 3, 5)

{pywebexec-2.3.3.dist-info → pywebexec-2.3.5.dist-info}/METADATA

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

{pywebexec-2.3.3.dist-info → pywebexec-2.3.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
 pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=oiCMlo2o3AkkgXDarUSx8T3FWXKI0vk1-EPnx5FGBd8,1332
-pywebexec/pywebexec.py,sha256=LD917ZeDVnOSMuLWPkl9JT1baaDvZ_e0Yk7RTs5yBfk,48273
+pywebexec/pywebexec.py,sha256=1M5CtxKr5YkEMBhuVSrwnMNcVRuf7iQf-uxF4Lf0ouQ,48375
 pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
-pywebexec/version.py,sha256=jCXQNgo3M_vWr9H5OnOQsh3RaOCueobcnQFL_zQGSOY,511
-pywebexec/static/css/form.css,sha256=XC_0ES5yMHYz0S2OHR0RAboQN7fBUmg5ZIq8Qm5rHP0,5806
+pywebexec/version.py,sha256=yuw-MeUgld_ZQvHY-ySzAKeJ1b7eRT6gVg14nwqZJYY,511
+pywebexec/static/css/form.css,sha256=vfB0wEHETHWR3vyjkjm3M84CV3vh82yUxAsN8I3UwKg,6757
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
-pywebexec/static/css/style.css,sha256=KGWwU0_euWBwIPCH8e4dBFGCGFWuYp9LKZ4uOloKiXU,10178
+pywebexec/static/css/style.css,sha256=9P46lB-YLCYWRKIG58h_6Goj49ImAMxcWibh_uyrmDo,10308
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
 pywebexec/static/css/swagger-ui.css.map,sha256=dJy-xBn_htK4BNupTMIl33ddse7BXsrCdDJWlTJodnw,258842
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
@@ -35,8 +35,8 @@ 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=cTgCFHr_F9bFCirtfG_uR32vOY3vNUr4Ih3Wglj5lFc,11988
 pywebexec/static/js/popup.js,sha256=IaKmk2U2hEn-Nv6krf_PPW6LaG8NcpCkJKb7lUX0qZo,11457
-pywebexec/static/js/schemaform.js,sha256=NlFXFKJI53izxPXct3a5XiB1RhWGt0_EIp6o1HfsryU,9624
-pywebexec/static/js/script.js,sha256=V9uJVcF56e275zwRamoCGgQ-5B8DnpkiiaBslrczsPI,20158
+pywebexec/static/js/schemaform.js,sha256=57FeWNWJT1zW9sG3ujZEOG7vLoiHif5ROQZori2QNMg,11131
+pywebexec/static/js/script.js,sha256=TI3TSylgBxh_a6QvYWlg4CyJ6LMPxnhFl8WRtRDGD0Y,20810
 pywebexec/static/js/swagger-form.js,sha256=CLcSHMhk5P4-_2MIRBoJLgEnIj_9keDDSzUugXHZjio,4565
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
 pywebexec/static/js/js-yaml/js-yaml.min.js,sha256=Rdw90D3AegZwWiwpibjH9wkBPwS9U4bjJ51ORH8H69c,39430
@@ -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=MAPr-z96VERAecDvX37V8q2Nxph-O0fNDBul1x2w9SI,1147
-pywebexec-2.3.3.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.3.3.dist-info/METADATA,sha256=7JBZqcKWssh7JVLG_ox7SFnOgadyCuqVbGNjzp6v8y8,13015
-pywebexec-2.3.3.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
-pywebexec-2.3.3.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.3.3.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.3.3.dist-info/RECORD,,
+pywebexec-2.3.5.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.3.5.dist-info/METADATA,sha256=ip0nBVVxyEqlIrNJwuV0BCWPKYpjZcRAAZRCOan5tuk,13015
+pywebexec-2.3.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pywebexec-2.3.5.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.3.5.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.3.5.dist-info/RECORD,,

{pywebexec-2.3.3.dist-info → pywebexec-2.3.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.0.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any