Update proxy/proxy_server.py

proxy/proxy_server.py

@@ -7,16 +7,20 @@ app = Flask(__name__, static_folder="static", template_folder="templates")
 EDITOR_BASE = "http://localhost:5555"
 API_BASE = "http://localhost:5556"
 
-# ---------- Combined UI page ----------
+# ---------------------------------------------------------
+# 1. Combined UI page
+# ---------------------------------------------------------
 @app.route("/")
 def index():
     return send_from_directory("templates", "index.html")
 
-# ---------- Reverse proxy to ConlluEditor root ----------
+
+# ---------------------------------------------------------
+# 2. Reverse proxy to ConlluEditor (root + all subpaths)
+# ---------------------------------------------------------
 @app.route("/editor/", defaults={"path": ""}, methods=["GET", "POST"])
 @app.route("/editor/<path:path>", methods=["GET", "POST"])
 def proxy_editor(path):
-    # Always forward to ConlluEditor root
     url = f"{EDITOR_BASE}/{path}"
     if request.query_string:
         url += "?" + request.query_string.decode()
@@ -24,8 +28,13 @@ def proxy_editor(path):
     if request.method == "GET":
         r = requests.get(url, headers=_filtered_headers(), stream=True)
     else:
-        r = requests.post(url, data=request.form or request.data,
-                          headers=_filtered_headers(), stream=True)
+        # forward POST body
+        r = requests.post(
+            url,
+            data=request.get_data(),
+            headers=_filtered_headers(),
+            stream=True
+        )
 
     return Response(
         r.iter_content(chunk_size=8192),
@@ -33,7 +42,10 @@ def proxy_editor(path):
         headers=_proxied_response_headers(r)
     )
 
-# ---------- Reverse proxy to upload API ----------
+
+# ---------------------------------------------------------
+# 3. Reverse proxy to Upload API (upload, files, download)
+# ---------------------------------------------------------
 @app.route("/api/<path:path>", methods=["GET", "POST"])
 def proxy_api(path):
     url = f"{API_BASE}/api/{path}"
@@ -42,10 +54,24 @@ def proxy_api(path):
 
     if request.method == "GET":
         r = requests.get(url, headers=_filtered_headers(), stream=True)
-    else:
-        files = {name: (f.filename, f.stream, f.mimetype) for name, f in request.files.items()}
-        r = requests.post(url, files=files, headers=_filtered_headers())
 
+    else:
+        # Correctly forward uploaded files
+        files = {
+            name: (f.filename, f.stream, f.mimetype)
+            for name, f in request.files.items()
+        }
+
+        # Forward form fields too
+        data = request.form.to_dict(flat=True)
+
+        r = requests.post(
+            url,
+            files=files if files else None,
+            data=data if data else None,
+            headers=_filtered_headers(),
+            stream=True
+        )
 
     return Response(
         r.iter_content(chunk_size=8192),
@@ -53,7 +79,10 @@ def proxy_api(path):
         headers=_proxied_response_headers(r)
     )
 
-# ---------- Catch-all: static assets, JS, CSS, images ----------
+
+# ---------------------------------------------------------
+# 4. Catch‑all: static assets for ConlluEditor
+# ---------------------------------------------------------
 @app.route("/<path:path>", methods=["GET", "POST"])
 def proxy_static(path):
     url = f"{EDITOR_BASE}/{path}"
@@ -63,8 +92,12 @@ def proxy_static(path):
     if request.method == "GET":
         r = requests.get(url, headers=_filtered_headers(), stream=True)
     else:
-        r = requests.post(url, data=request.form or request.data,
-                          headers=_filtered_headers(), stream=True)
+        r = requests.post(
+            url,
+            data=request.get_data(),
+            headers=_filtered_headers(),
+            stream=True
+        )
 
     return Response(
         r.iter_content(chunk_size=8192),
@@ -72,14 +105,23 @@ def proxy_static(path):
         headers=_proxied_response_headers(r)
     )
 
+
+# ---------------------------------------------------------
+# Header filtering helpers
+# ---------------------------------------------------------
 def _filtered_headers():
     excluded = {"host", "content-length", "content-encoding", "connection"}
     return {k: v for k, v in request.headers.items() if k.lower() not in excluded}
 
+
 def _proxied_response_headers(r):
     excluded = {"content-encoding", "transfer-encoding", "connection"}
     return [(k, v) for k, v in r.headers.items() if k.lower() not in excluded]
 
+
+# ---------------------------------------------------------
+# Main entry
+# ---------------------------------------------------------
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--port", type=int, default=7860)