Agent Zero AI framework
persistent tunnel
frdel84f2d9447554
diff --git a/docker/run/fs/etc/supervisor/conf.d/supervisord.conf b/docker/run/fs/etc/supervisor/conf.d/supervisord.confindex 471a318d7..63553ddbc 100644--- a/docker/run/fs/etc/supervisor/conf.d/supervisord.conf+++ b/docker/run/fs/etc/supervisor/conf.d/supervisord.conf@@ -72,6 +72,20 @@ startretries=3stopasgroup=truekillasgroup=true+[program:run_tunnel_api]+command=/exe/run_tunnel_api.sh+environment=+user=root+stopwaitsecs=60+stdout_logfile=/dev/stdout+stdout_logfile_maxbytes=0+stderr_logfile=/dev/stderr+stderr_logfile_maxbytes=0+autorestart=true+startretries=3+stopasgroup=true+killasgroup=true+[eventlistener:the_listener]command=python3 /exe/supervisor_event_listener.pyevents=PROCESS_STATE_FATALdiff --git a/docker/run/fs/exe/run_tunnel_api.sh b/docker/run/fs/exe/run_tunnel_api.shnew file mode 100644index 000000000..bc1910840--- /dev/null+++ b/docker/run/fs/exe/run_tunnel_api.sh@@ -0,0 +1,19 @@+#!/bin/bash++. "/ins/setup_venv.sh" "$@"+. "/ins/copy_A0.sh" "$@"++python /a0/prepare.py --dockerized=true+python /a0/preload.py --dockerized=true++echo "Starting A0..."+exec python /a0/run_tunnel.py \+ --dockerized=true \+ --port=5070 \+ --host="0.0.0.0" \+ --code_exec_docker_enabled=false \+ --code_exec_ssh_enabled=true \+ # --code_exec_ssh_addr="localhost" \+ # --code_exec_ssh_port=22 \+ # --code_exec_ssh_user="root" \+ # --code_exec_ssh_pass="toor"diff --git a/docker/run/fs/exe/supervisor_event_listener.py b/docker/run/fs/exe/supervisor_event_listener.pyindex 17fcc76c2..143d589ee 100644--- a/docker/run/fs/exe/supervisor_event_listener.py+++ b/docker/run/fs/exe/supervisor_event_listener.py@@ -5,7 +5,7 @@ import loggingimport subprocessimport time-from supervisor.childutils import listener+from supervisor.childutils import listener # type: ignoredef main(args):diff --git a/python/api/tunnel.py b/python/api/tunnel.pyindex 3be62c289..f61d68e43 100644--- a/python/api/tunnel.py+++ b/python/api/tunnel.py@@ -7,6 +7,9 @@ class Tunnel(ApiHandler):action = input.get("action", "get")tunnel_manager = TunnelManager.get_instance()++ if action == "verify":+ return {"success": True}if action == "create":# Get the port from the request or use default@@ -25,10 +28,7 @@ class Tunnel(ApiHandler):}elif action == "stop":- success = tunnel_manager.stop_tunnel()- return {- "success": success- }+ return self.stop()elif action == "get":tunnel_url = tunnel_manager.get_tunnel_url()@@ -42,3 +42,10 @@ class Tunnel(ApiHandler):"success": False,"error": "Invalid action. Use 'create', 'stop', or 'get'."}++ def stop(self):+ tunnel_manager = TunnelManager.get_instance()+ tunnel_manager.stop_tunnel()+ return {+ "success": True+ }diff --git a/python/api/tunnel_proxy.py b/python/api/tunnel_proxy.pynew file mode 100644index 000000000..85e12ee46--- /dev/null+++ b/python/api/tunnel_proxy.py@@ -0,0 +1,36 @@+from flask import Request, Response+from python.helpers import dotenv, runtime+from python.helpers.api import ApiHandler+from python.helpers.tunnel_manager import TunnelManager+import requests+++class TunnelProxy(ApiHandler):+ async def process(self, input: dict, request: Request) -> dict | Response:+ # Get configuration from environment+ tunnel_api_port = (+ runtime.get_arg("tunnel_api_port")+ or int(dotenv.get_dotenv_value("TUNNEL_API_PORT", 0))+ or 5070+ )++ # first verify the service is running:+ service_ok = False+ try:+ response = requests.post(f"http://localhost:{tunnel_api_port}/", json={"action": "verify"})+ if response.status_code == 200:+ service_ok = True+ except Exception as e:+ service_ok = False++ # forward this request to the tunnel service if OK+ if service_ok:+ try:+ response = requests.post(f"http://localhost:{tunnel_api_port}/", json=input)+ return response.json()+ except Exception as e:+ return {"error": str(e)}+ else:+ # forward to API handler directly+ from python.api.tunnel import Tunnel+ return await Tunnel(self.app, self.thread_lock).process(input, request)diff --git a/run_tunnel.py b/run_tunnel.pynew file mode 100644index 000000000..ad71e5352--- /dev/null+++ b/run_tunnel.py@@ -0,0 +1,97 @@+from functools import wraps+import signal+import threading+import sys+from flask import Flask, request, Response+from python.helpers.files import get_abs_path+from python.helpers import persist_chat, runtime, dotenv, process+from python.helpers.print_style import PrintStyle++from python.api.tunnel import Tunnel++# initialize the internal Flask server+app = Flask("app")+app.config["JSON_SORT_KEYS"] = False # Disable key sorting in jsonify+++def run():+ # Suppress only request logs but keep the startup messages+ from werkzeug.serving import WSGIRequestHandler+ from werkzeug.serving import make_server++ PrintStyle().print("Starting tunnel server...")+ class NoRequestLoggingWSGIRequestHandler(WSGIRequestHandler):+ def log_request(self, code="-", size="-"):+ pass # Override to suppress request logging++ # Get configuration from environment+ web_ui_port = (+ runtime.get_arg("port")+ or int(dotenv.get_dotenv_value("WEB_UI_PORT", 0))+ or 5000+ )+ # Get configuration from environment+ tunnel_api_port = (+ runtime.get_arg("tunnel_api_port")+ or int(dotenv.get_dotenv_value("TUNNEL_API_PORT", 0))+ or 5070+ )+ host = (+ runtime.get_arg("host") or dotenv.get_dotenv_value("WEB_UI_HOST") or "localhost"+ )+ server = None+ lock = threading.Lock()+ tunnel = Tunnel(app, lock)+++ # handle api request+ @app.route("/", methods=["POST"])+ async def handle_request():+ return await tunnel.handle_request(request=request) # type: ignore+++ try:+ server = make_server(+ host=host,+ port=tunnel_api_port,+ app=app,+ request_handler=NoRequestLoggingWSGIRequestHandler,+ threaded=True,+ )++ printer = PrintStyle()++ # def signal_handler(sig=None, frame=None):+ # nonlocal tunnel, server, printer+ # with lock:+ # printer.print("Caught signal, stopping tunnel server...")+ # if server:+ # server.shutdown()+ # process.stop_server()+ # if tunnel:+ # tunnel.stop()+ # tunnel = None+ # printer.print("Tunnel server stopped")+ # sys.exit(0)++ # signal.signal(signal.SIGINT, signal_handler)+ # signal.signal(signal.SIGTERM, signal_handler)++ process.set_server(server)+ # server.log_startup()+ server.serve_forever()+ # Run Flask app+ # app.run(+ # request_handler=NoRequestLoggingWSGIRequestHandler, port=port, host=host+ # )+ finally:+ # Clean up tunnel if it was started+ if tunnel:+ tunnel.stop()+++# run the internal server+if __name__ == "__main__":+ runtime.initialize()+ dotenv.load_dotenv()+ run()diff --git a/webui/js/tunnel.js b/webui/js/tunnel.jsindex 44c96fa2b..1ce4162e1 100644--- a/webui/js/tunnel.js+++ b/webui/js/tunnel.js@@ -12,7 +12,7 @@ document.addEventListener('alpine:init', () => {async checkTunnelStatus() {try {- const response = await fetch('/tunnel', {+ const response = await fetch('/tunnel_proxy', {method: 'POST',headers: {'Content-Type': 'application/json',@@ -35,7 +35,7 @@ document.addEventListener('alpine:init', () => {if (storedTunnelUrl) {// Use the stored URL but verify it's still valid- const verifyResponse = await fetch('/tunnel', {+ const verifyResponse = await fetch('/tunnel_proxy', {method: 'POST',headers: {'Content-Type': 'application/json',@@ -82,7 +82,7 @@ document.addEventListener('alpine:init', () => {try {// First stop any existing tunnel- const stopResponse = await fetch('/tunnel', {+ const stopResponse = await fetch('/tunnel_proxy', {method: 'POST',headers: {'Content-Type': 'application/json',@@ -170,7 +170,7 @@ document.addEventListener('alpine:init', () => {try {// Call the backend API to create a tunnel- const response = await fetch('/tunnel', {+ const response = await fetch('/tunnel_proxy', {method: 'POST',headers: {'Content-Type': 'application/json',@@ -201,7 +201,7 @@ document.addEventListener('alpine:init', () => {// Check if tunnel is running nowtry {- const statusResponse = await fetch('/tunnel', {+ const statusResponse = await fetch('/tunnel_proxy', {method: 'POST',headers: {'Content-Type': 'application/json',@@ -253,7 +253,7 @@ document.addEventListener('alpine:init', () => {try {// Call the backend to stop the tunnel- const response = await fetch('/tunnel', {+ const response = await fetch('/tunnel_proxy', {method: 'POST',headers: {'Content-Type': 'application/json',