Update app.py

app.py

@@ -1,90 +1,110 @@
-
-from fastapi import FastAPI, UploadFile, File
-from fastapi.responses import JSONResponse, FileResponse
-from fastapi.middleware.cors import CORSMiddleware
+import streamlit as st
+import json
 import os
 
-app = FastAPI()
-
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=["*"], allow_credentials=True,
-    allow_methods=["*"], allow_headers=["*"],
-)
-
-@app.get("/")
-def serve_frontend():
-    return FileResponse("index.html")
-
-@app.post("/parse")
-async def parse_file(file: UploadFile = File(...)):
-    content = await file.read()
-    return JSONResponse(content=parse_dcm_assembly(content))
-
-def parse_dcm_assembly(file_bytes):
-    lines = file_bytes.decode("utf-8").splitlines()
-    blocks, current = [], []
+# ---- Optional: define parser directly here or import from module ----
+def parse_dcm_assembly(uploaded_file):
+    lines = uploaded_file.read().decode("utf-8").splitlines()
+    geometry = {}
+    constraints = []
+    parts = []
+    set_geom_map = {}
+    current = {}
+    label = None
 
     for line in lines:
-        if line.startswith("CLASS"):
+        line = line.strip()
+        if line.startswith("CLASS "):
             if current:
-                blocks.append(current)
-                current = []
-        current.append(line.strip())
-    if current: blocks.append(current)
+                if current["type"] == "SET":
+                    parts.append({
+                        "name": current.get("label", ""),
+                        "member_tags": current.get("member_tags", [])
+                    })
+                elif current["type"] == "PLANE":
+                    geometry[current["id"]] = {
+                        "base_point": current.get("base_point"),
+                        "normal": current.get("normal"),
+                        "label": current.get("label", "")
+                    }
+                elif current["type"] == "WORK_PLANE":
+                    tag = current.get("tag")
+                    if tag in geometry:
+                        geometry[tag]["label"] = current.get("label", "")
+                elif current["type"] == "CONSTRAINT":
+                    constraints.append({
+                        "from": current.get("end_1"),
+                        "to": current.get("end_2"),
+                        "label": current.get("label", "")
+                    })
+            parts_of_line = line.split()
+            current = {
+                "type": parts_of_line[1],
+                "id": int(parts_of_line[2])
+            }
+        elif line.startswith("FBASE_POINT"):
+            current["base_point"] = tuple(map(float, line.split()[1:]))
+        elif line.startswith("FNORMAL"):
+            current["normal"] = tuple(map(float, line.split()[1:]))
+        elif line.startswith("FMY_PLANE TAG"):
+            current["tag"] = int(line.split()[-1])
+        elif line.startswith("DCM3_TEXT_LABEL"):
+            current["label"] = line.split("DCM3_TEXT_LABEL", 1)[-1].strip()
+        elif line.startswith("FMEMBER TAGS"):
+            current["member_tags"] = list(map(int, line.split()[2:]))
+        elif line.startswith("FEND_1 TAG"):
+            current["end_1"] = int(line.split()[-1])
+        elif line.startswith("FEND_2 TAG"):
+            current["end_2"] = int(line.split()[-1])
+    if current:
+        if current["type"] == "SET":
+            parts.append({
+                "name": current.get("label", ""),
+                "member_tags": current.get("member_tags", [])
+            })
+        elif current["type"] == "PLANE":
+            geometry[current["id"]] = {
+                "base_point": current.get("base_point"),
+                "normal": current.get("normal"),
+                "label": current.get("label", "")
+            }
+        elif current["type"] == "WORK_PLANE":
+            tag = current.get("tag")
+            if tag in geometry:
+                geometry[tag]["label"] = current.get("label", "")
+        elif current["type"] == "CONSTRAINT":
+            constraints.append({
+                "from": current.get("end_1"),
+                "to": current.get("end_2"),
+                "label": current.get("label", "")
+            })
 
-    parts, geometry, constraints = [], {}, []
-    plane_map, tag_to_plane, label_map = {}, {}, {}
+    return {
+        "geometry": geometry,
+        "constraints": constraints,
+        "parts": parts
+    }
 
-    for block in blocks:
-        head = block[0]
-        if "CLASS SET " in head:
-            part, members = {}, []
-            for line in block:
-                if "DCM3_TEXT_LABEL" in line:
-                    part['name'] = line.split("DCM3_TEXT_LABEL", 1)[1].strip()
-                elif "FMEMBER TAGS" in line:
-                    members = list(map(int, line.split()[2:]))
-            if 'name' in part:
-                part['member_tags'] = members
-                parts.append(part)
+# ---- Streamlit UI and file handling ----
+st.set_page_config(layout="wide")
+st.title("DCM Assembly Visualizer")
 
-        elif "CLASS PLANE " in head:
-            pid = int(head.split()[-1])
-            base, norm = None, None
-            for line in block:
-                if "FBASE_POINT" in line:
-                    base = tuple(map(float, line.split()[1:]))
-                elif "FNORMAL" in line:
-                    norm = tuple(map(float, line.split()[1:]))
-            if base and norm:
-                plane_map[pid] = {'base_point': base, 'normal': norm}
+file1 = st.file_uploader("Upload File A", type=["txt"])
+file2 = st.file_uploader("Upload File B", type=["txt"])
 
-        elif "CLASS WORK_PLANE " in head:
-            wid = int(head.split()[-1])
-            tag, label = None, None
-            for line in block:
-                if "FMY_PLANE TAG" in line:
-                    tag = int(line.split()[-1])
-                elif "DCM3_TEXT_LABEL" in line:
-                    label = line.split("DCM3_TEXT_LABEL", 1)[1].strip()
-            if tag:
-                tag_to_plane[wid] = tag
-                label_map[wid] = label
+parsed_files = []
 
-        elif "CLASS CONSTRAINT " in head:
-            con = {}
-            for line in block:
-                if "FEND_1 TAG" in line:
-                    con['from'] = int(line.split()[-1])
-                elif "FEND_2 TAG" in line:
-                    con['to'] = int(line.split()[-1])
-                elif "DCM3_TEXT_LABEL" in line:
-                    con['label'] = line.split("DCM3_TEXT_LABEL", 1)[1].strip()
-            if con: constraints.append(con)
+if file1:
+    parsed_files.append(("red", "blue", parse_dcm_assembly(file1)))
+if file2:
+    parsed_files.append(("purple", "orange", parse_dcm_assembly(file2)))
 
-    for wid, pid in tag_to_plane.items():
-        if pid in plane_map:
-            geometry[wid] = {**plane_map[pid], 'label': label_map.get(wid)}
+if parsed_files:
+    os.makedirs("static", exist_ok=True)
+    with open("static/parsed_data.json", "w") as f:
+        json.dump({"files": parsed_files}, f, indent=2)
 
-    return { "parts": parts, "geometry": geometry, "constraints": constraints }
+    st.components.v1.html(
+        '<iframe src="static/index.html" width="100%" height="800" style="border:none;"></iframe>',
+        height=800,
+    )