pywebexec 2.0.14__tar.gz → 2.0.16__tar.gz

{pywebexec-2.0.14/pywebexec.egg-info → pywebexec-2.0.16}/PKG-INFO

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

{pywebexec-2.0.14 → pywebexec-2.0.16}/pywebexec/pywebexec.py

@@ -6,6 +6,7 @@ import os
 import json
 import uuid
 import argparse
+import shutil
 import random
 import string
 from datetime import datetime, timezone, timedelta
@@ -358,7 +359,7 @@ def parseargs():
     parser.add_argument("-g", "--gencert", action="store_true", help="https server self signed cert")
     parser.add_argument("-T", "--tokenurl", action="store_true", help="generate safe url to access")
     parser.add_argument("action", nargs="?", help="daemon action start/stop/restart/status/shareterm/term",
-                        choices=["start","stop","restart","status","shareterm", "term", "run"])
+                        choices=["start","stop","restart","status","shareterm", "term", "run", "run-para"])
     parser.add_argument("command", nargs="*", help="command to run")    
 
     args = parser.parse_args()
@@ -383,8 +384,24 @@ def parseargs():
         command = args.command[0]
         params = args.command[1:]
         command_id = term_command_id
+        print("Command:", command_id, flush=True)
         exit_code = run_command("localhost", args.user, command, params, command_id, tty_rows, tty_cols)
         sys.exit(exit_code)
+    elif args.action == "run-para":
+        runpara = shutil.which("run-para")
+        if not runpara:
+            print("Error: run-para not found, install using pip install run-para", file=sys.stderr)
+            sys.exit(1)
+        args.command = sys.argv[sys.argv.index("run-para")+1:]
+        try:
+            commandindex = args.command.index("--")
+        except ValueError:
+            print("Error: run-para: No command supplied", file=sys.stderr)
+            sys.exit(1)
+        runparams = args.command[0:commandindex]
+        command = args.command[commandindex+1:]
+        result = subprocess.run([runpara, '-n', *runparams, "--", sys.argv[0], "-d", args.dir, "--", "run", *command], bufsize=0)
+        sys.exit(result.returncode)
 
     (hostname, ip) = host_ip.get_host_ip(args.listen)
 

{pywebexec-2.0.14 → pywebexec-2.0.16}/pywebexec/static/css/form.css

@@ -80,7 +80,6 @@ font-size: 14px;
     width: auto;
     vertical-align: middle;
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);  
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
     box-sizing: border-box;
     padding: 3px 10px;
     height: 24px;
@@ -145,7 +144,7 @@ font-size: 14px;
     width: auto;
   }
   input[type="number"] {
-    max-width: 100px;
+    /* max-width: 100px; */
     text-align: right;
   }
   select {
@@ -160,11 +159,12 @@ font-size: 14px;
     resize: both;
     max-width: 700px;
     border-radius: 15px;
+    border-bottom-right-radius: 5px;
     border: 1px solid #ccc;
-    padding: 3px 8px;
+    padding: 3px 10px;
     margin: 0px;
     width: unset;
-    line-height: 1.25;
+    line-height: 1.42857143;
     font-weight: normal;
     font-family: Arial, Helvetica, sans-serif;
     font-size: 14px;

{pywebexec-2.0.14 → pywebexec-2.0.16}/pywebexec/static/css/style.css

@@ -17,7 +17,7 @@ body {
     overflow: hidden;
 }
 .table-container {
-    height: 150px;
+    height: 173px;
     overflow-y: auto;
     position: relative;
     border-radius: 10px;
@@ -29,12 +29,15 @@ table {
     border-collapse: collapse;
 }
 th, td {
-    padding: 7px;
     text-align: left;
     border-bottom: 1px solid #ddd;
     white-space: nowrap;
 }
-th { 
+td {
+    padding: 4px 7px;; /* 2px 7px; */
+}
+th {
+    padding: 7px; 
     background-color: #444;
     color: #eee;
     position: sticky;
@@ -431,6 +434,7 @@ body.dimmed * {
 }
 .command-line {
   padding: 5px 10px 6px 10px;
+  margin-top: 4px;
   background-color: #111;
   color: #eee;
   max-width: 300px;

pywebexec-2.0.16/pywebexec/static/js/schemaform.js

@@ -0,0 +1,110 @@
+function adjustInputWidth(input) {
+  input.style.width = 'auto';
+  if (input.type === 'number') {
+    delta = 30;
+  } else {
+    delta = 3;
+  }
+  input.style.width = `${input.scrollWidth + delta}px`;
+}
+
+function formInputHandle() {
+  schemaForm.querySelectorAll('input[type="text"], input[type="number"]').forEach(input => {
+    if (! inputHandlers.includes(input)) {
+      if (input.value) {
+        input.setAttribute('size', Math.max(input.value.length - 2, 2));
+      } else {
+        input.setAttribute('size', '12');
+      }
+      input.addEventListener('input', () => adjustInputWidth(input));
+      inputHandlers.push(input);
+    }
+  });
+}
+
+function extractKeysAndPlaceholders(obj, 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));
+      } else {
+        result.push({
+          key: prefix ? `${prefix}.${key}` : key,
+          placeholder: obj.properties[key].example || null
+        });
+      }
+    }
+    return result;
+}
+
+function createSchemaForm(form, schema, onSubmit) {
+  formDesc = extractKeysAndPlaceholders(schema);
+  schemaForm = form[0];
+  if (onSubmit != null) {
+    formDesc.push({
+      type: 'submit',
+      title: 'Run',
+    });
+  }
+  form[0].classList.add('form-inline');
+  jsform = form.jsonForm({
+    schema: schema,
+    onSubmit: onSubmit,
+    form: formDesc,
+    // params: {
+    //     fieldHtmlClass: "input-small",
+    // }
+  });
+  form[0].firstChild.classList.add('form-inline');
+  form[0].querySelectorAll('._jsonform-array-addmore').forEach(btn => {
+    btn.addEventListener('click', formInputHandle);
+  });
+  formInputHandle();
+
+  form[0].querySelectorAll('textarea').forEach(txt => {
+    txt.style.height = "0";
+    txt.style.height = txt.scrollHeight + "px";
+    txt.setAttribute("spellcheck", "false")
+    txt.addEventListener("input", (e) => {
+      e.target.style.height = "0";
+      e.target.style.height = (e.target.scrollHeight+2) + "px";
+    });
+  });
+    
+  return jsform;
+}
+
+async function getSwaggerSpec() {
+  const response = await fetch('/swagger.yaml');
+  if (!response.ok) {
+    return null;
+  }
+  const yamlText = await response.text();
+  // Changed from yaml.parse to jsyaml.load because js-yaml exposes jsyaml
+  return jsyaml.load(yamlText);
+}
+  
+async function getPostParametersSchema() {
+  const swaggerSpec = await getSwaggerSpec();
+  const result = {};
+  for (const path in swaggerSpec.paths) {
+    const pathItem = swaggerSpec.paths[path];
+    if (pathItem.post) {
+      const postDef = pathItem.post;
+      // Look for a parameter in the body with a schema property
+      if (postDef.parameters && Array.isArray(postDef.parameters)) {
+        const bodyParam = postDef.parameters.find(p => p.in === 'body' && p.schema);
+        result[path] = bodyParam ? bodyParam.schema : null;
+      } else {
+        result[path] = null;
+      }
+    }
+  }
+  return result;
+}
+
+let schemaForm;
+let inputHandlers = [];
+
+

{pywebexec-2.0.14 → pywebexec-2.0.16}/pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.0.14'
-__version_tuple__ = version_tuple = (2, 0, 14)
+__version__ = version = '2.0.16'
+__version_tuple__ = version_tuple = (2, 0, 16)

{pywebexec-2.0.14 → pywebexec-2.0.16/pywebexec.egg-info}/PKG-INFO

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

pywebexec-2.0.14/pywebexec/static/js/schemaform.js

@@ -1,103 +0,0 @@
-function adjustInputWidth(input) {
-    input.style.width = 'auto';
-    input.style.width = `${input.scrollWidth + 3}px`;
-}
-
-function formInputHandle() {
-    schemaForm.querySelectorAll('input[type="text"]').forEach(input => {
-        if (! inputHandlers.includes(input)) {
-            input.setAttribute('size', '12');
-            input.addEventListener('input', () => adjustInputWidth(input));
-            inputHandlers.push(input);
-        }
-    });
-}
-
-function extractKeysAndPlaceholders(obj, prefix = '') {
-    let result = [];
-  
-    for (let key in obj.properties) {
-      if (obj.properties[key].type === 'object' && obj.properties[key].properties) {
-        // Si la propriété est un objet, appeler récursivement
-        result = result.concat(extractKeysAndPlaceholders(obj.properties[key], prefix ? `${prefix}.${key}` : key));
-      } else {
-        // Sinon, ajouter au résultat
-        result.push({
-          key: prefix ? `${prefix}.${key}` : key,
-          placeholder: obj.properties[key].example || null
-        });
-      }
-    }
-    return result;
-}
-
-function createSchemaForm(form, schema, onSubmit) {
-    formDesc = extractKeysAndPlaceholders(schema);
-    schemaForm = form[0];
-    if (onSubmit != null) {
-        formDesc.push({
-            type: 'submit',
-            title: 'Run',
-        });
-    }
-    form[0].classList.add('form-inline');
-    jsform = form.jsonForm({
-        schema: schema,
-        onSubmit: onSubmit,
-        form: formDesc,
-        // params: {
-        //     fieldHtmlClass: "input-small",
-        // }
-    });
-    form[0].firstChild.classList.add('form-inline');
-    form[0].querySelectorAll('._jsonform-array-addmore').forEach(btn => {
-        btn.addEventListener('click', formInputHandle);
-    });
-    formInputHandle();
-
-    form[0].querySelectorAll('textarea').forEach(txt => {
-      txt.style.height = "0";
-      txt.style.height = txt.scrollHeight + "px";
-      txt.setAttribute("spellcheck", "false")
-      txt.addEventListener("input", (e) => {
-        e.target.style.height = "0";
-        e.target.style.height = (e.target.scrollHeight+2) + "px";
-      });
-    });
-    
-    return jsform;
-}
-
-async function getSwaggerSpec() {
-    const response = await fetch('/swagger.yaml');
-    if (!response.ok) {
-      return null;
-    }
-    const yamlText = await response.text();
-    // Changed from yaml.parse to jsyaml.load because js-yaml exposes jsyaml
-    return jsyaml.load(yamlText);
-}
-  
-async function getPostParametersSchema() {
-    const swaggerSpec = await getSwaggerSpec();
-    const result = {};
-    for (const path in swaggerSpec.paths) {
-      const pathItem = swaggerSpec.paths[path];
-      if (pathItem.post) {
-        const postDef = pathItem.post;
-        // Look for a parameter in the body with a schema property
-        if (postDef.parameters && Array.isArray(postDef.parameters)) {
-          const bodyParam = postDef.parameters.find(p => p.in === 'body' && p.schema);
-          result[path] = bodyParam ? bodyParam.schema : null;
-        } else {
-          result[path] = null;
-        }
-      }
-    }
-    return result;
-}
-
-let schemaForm;
-let inputHandlers = [];
-
-