pywebexec 1.6.9__tar.gz → 1.6.11__tar.gz

{pywebexec-1.6.9/pywebexec.egg-info → pywebexec-1.6.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.6.9
+Version: 1.6.11
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -200,6 +200,7 @@ $ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 | POST      | /run_command                | command: str<br>params: array[str]       | command_id: uuid<br>message: str    |
 | POST      | /stop_command/command_id    |                    | message: str        |
 | GET       | /command_status/command_id  |                    | command_id: uuid<br>command: str<br>params: array[str]<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
-| GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
 | GET       | /commands                   |                    | array of<br>command_id: uuid<br>command: str<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
 | GET       | /executables                |                    | array of str        |
+| GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
+| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -N -s http://srv/command_output_raw/command_id|

{pywebexec-1.6.9 → pywebexec-1.6.11}/README.md

@@ -138,6 +138,7 @@ $ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 | POST      | /run_command                | command: str<br>params: array[str]       | command_id: uuid<br>message: str    |
 | POST      | /stop_command/command_id    |                    | message: str        |
 | GET       | /command_status/command_id  |                    | command_id: uuid<br>command: str<br>params: array[str]<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
-| GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
 | GET       | /commands                   |                    | array of<br>command_id: uuid<br>command: str<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
 | GET       | /executables                |                    | array of str        |
+| GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
+| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -N -s http://srv/command_output_raw/command_id|

{pywebexec-1.6.9 → pywebexec-1.6.11}/pywebexec/pywebexec.py

@@ -1,5 +1,5 @@
 import sys
-from flask import Flask, request, jsonify, render_template, session, redirect, url_for
+from flask import Flask, request, jsonify, render_template, session, redirect, url_for, Response, stream_with_context
 from flask_httpauth import HTTPBasicAuth
 import threading
 import os
@@ -330,11 +330,13 @@ def print_urls(command_id=None):
     if token:
         url_params = f"?token={token}"
     if command_id:
-        print(f"{protocol}://{hostname}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
-        print(f"{protocol}://{ip}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
+        print(f"web popup: {protocol}://{hostname}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
+        print(f"web popup: {protocol}://{ip}:{args.port}/dopopup/{command_id}{url_params}", flush=True)
+        print(f"raw output: {protocol}://{hostname}:{args.port}/command_output_raw/{command_id}{url_params}", flush=True)
+        print(f"raw output: {protocol}://{ip}:{args.port}/command_output_raw/{command_id}{url_params}", flush=True)
     else:
-        print(f"{protocol}://{hostname}:{args.port}{url_params}", flush=True)
-        print(f"{protocol}://{ip}:{args.port}{url_params}", flush=True)
+        print(f"web commands: {protocol}://{hostname}:{args.port}{url_params}", flush=True)
+        print(f"web commands: {protocol}://{ip}:{args.port}{url_params}", flush=True)
 
 
 def is_port_in_use(address, port):
@@ -798,14 +800,26 @@ def get_command_output(command_id):
 @app.route('/command_output_raw/<command_id>', methods=['GET'])
 def get_command_output_raw(command_id):
     offset = int(request.args.get('offset', 0))
-    maxsize = int(request.args.get('maxsize', 10485760))
-    output_file_path = get_output_file_path(command_id)
-    if os.path.exists(output_file_path):
-        with open(output_file_path, 'rb') as output_file:
-            output_file.seek(offset)
-            output = output_file.read(maxsize)
-        return output, 200, {'Content-Type': 'text/plain'}
-    return jsonify({'error': 'Invalid command_id'}), 404
+    @stream_with_context
+    def generate(offset):
+        try:
+            output_file_path = get_output_file_path(command_id)
+            if os.path.exists(output_file_path):
+                with open(output_file_path, 'rb') as output_file:
+                    while True:
+                        while True:
+                            chunk = output_file.read(1024)
+                            if not chunk:
+                                time.sleep(0.5)
+                                break
+                            yield chunk
+                        status = read_command_status(command_id)
+                        if not status or status['status'] != 'running':
+                            yield f"\nEnd of command {command_id} {status.get('status', '')} exit: {status.get('exit_code')}\n"
+                            break
+        except GeneratorExit:
+            return
+    return Response(generate(offset), content_type='text/plain')
 
 @app.route('/executables', methods=['GET'])
 def list_executables():

{pywebexec-1.6.9 → pywebexec-1.6.11}/pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.9'
-__version_tuple__ = version_tuple = (1, 6, 9)
+__version__ = version = '1.6.11'
+__version_tuple__ = version_tuple = (1, 6, 11)

{pywebexec-1.6.9 → pywebexec-1.6.11/pywebexec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.6.9
+Version: 1.6.11
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau
@@ -200,6 +200,7 @@ $ curl http://myhost:8080/command_output/<command_id> -H "Accept: text/plain"
 | POST      | /run_command                | command: str<br>params: array[str]       | command_id: uuid<br>message: str    |
 | POST      | /stop_command/command_id    |                    | message: str        |
 | GET       | /command_status/command_id  |                    | command_id: uuid<br>command: str<br>params: array[str]<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
-| GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
 | GET       | /commands                   |                    | array of<br>command_id: uuid<br>command: str<br>start_time: isotime<br>end_time: isotime<br>status: str<br>exit_code: int<br>last_output_line: str      |
 | GET       | /executables                |                    | array of str        |
+| GET       | /command_output/command_id  | offset: int        | output: str<br>status: str<br>links: { next: str }         |
+| GET       | /command_output_raw/command_id  | offset: int        | output: stream raw output until end of command<br>curl -N -s http://srv/command_output_raw/command_id|