Improve handling of bad encodings

Author: Donaim

alldata/bblab_site/tools/isoforms_plot/run_isoforms.py

@@ -4,10 +4,8 @@
 sys.path.append(os.environ.get("BBLAB_UTIL_PATH", "fail"))
 
 import io
-import html
 import traceback
 from pathlib import Path
-from typing import Tuple
 
 # Add the parent directory to sys.path to enable isoforms_plot imports
 CURDIR = Path(__file__).parent.absolute()
@@ -20,19 +18,16 @@
 
 
 # -- Utility helpers -------------------------------------------------------
-def _read_csv_text(csv_data) -> Tuple[str, str]:
+def _read_csv_text(csv_data) -> str:
     """Return CSV text or (None, error_message)."""
-    try:
-        if hasattr(csv_data, "read"):
-            raw = csv_data.read()
-            if isinstance(raw, bytes):
-                raw = raw.decode("utf8")
-            return raw, ""
-        # allow path-like input
-        text = Path(csv_data).read_text(encoding="utf8")
-        return text, ""
-    except Exception as exc:
-        return "", f"Could not read input CSV: {html.escape(str(exc))}"
+    if hasattr(csv_data, "read"):
+        raw = csv_data.read()
+        if isinstance(raw, bytes):
+            raw = raw.decode("utf8")
+        return raw
+    # allow path-like input
+    text = Path(csv_data).read_text(encoding="utf8")
+    return text
 
 
 def get_default_csv() -> str:
@@ -46,7 +41,7 @@ def get_default_csv() -> str:
 # -- Main runner ----------------------------------------------------------
 
 
-def run(csv_data):
+def run(csv_file):
     """Orchestrate plotting. Returns dict with results.
 
     Returns:
@@ -57,17 +52,17 @@ def run(csv_data):
         - 'error_details': str (if not success, traceback)
     """
 
-    # Read CSV text
-    csv_text, read_err = _read_csv_text(csv_data)
-    if read_err:
-        return {"success": False, "error_message": read_err, "error_details": None}
-
     # Try to generate plot - all validation happens in the plotter
     try:
         import isoforms_plot.parser as parser
         import isoforms_plot.compiler as compiler
         import isoforms_plot.plotter as plotter
 
+        # Read CSV text
+        file_bytes = csv_file.read()
+        csv_data = file_bytes.decode("utf-8")
+        csv_text = _read_csv_text(csv_data)
+
         # Parse
         input_stream = io.StringIO(csv_text)
         parsed = parser.parse(input_stream)

alldata/bblab_site/tools/isoforms_plot/views.py

@@ -52,8 +52,13 @@ def results(request):
     if request.method == "POST":
         from . import run_isoforms
 
-        csv_data = StringIO(request.FILES["file"].read().decode("utf-8"))
-        result = run_isoforms.run(csv_data)
+        try:
+            csv_file = request.FILES["file"]
+        except KeyError:
+            context = _build_context(request, show_results=False)
+            return render(request, "isoforms_plot/index.html", context)
+
+        result = run_isoforms.run(csv_file)
 
         context = _build_context(request, show_results=True, result=result)
         return render(request, "isoforms_plot/index.html", context)