Update app.py

app.py

@@ -1,82 +1,107 @@
+# === app.py (FastAPI backend) ===
 from fastapi import FastAPI, UploadFile, File
-from fastapi.responses import FileResponse, JSONResponse
-from fastapi.staticfiles import StaticFiles
-import os
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse
+import uvicorn
 
 app = FastAPI()
 
-app.mount("/", StaticFiles(directory="static", html=True), name="static")
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 
-@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):
+def parse_dcm_assembly_from_bytes(file_bytes):
     lines = file_bytes.decode("utf-8").splitlines()
-    blocks, current = [], []
+
+    blocks = []
+    current_block = []
 
     for line in lines:
         if line.startswith("CLASS"):
-            if current:
-                blocks.append(current)
-                current = []
-        current.append(line.strip())
-    if current: blocks.append(current)
+            if current_block:
+                blocks.append(current_block)
+                current_block = []
+        current_block.append(line.strip())
+    if current_block:
+        blocks.append(current_block)
 
-    parts, geometry, constraints = [], {}, []
-    plane_map, tag_to_plane, label_map = {}, {}, {}
+    parts = []
+    geometry = {}
+    constraints = []
+
+    plane_map = {}
+    tag_to_plane = {}
+    label_map = {}
 
     for block in blocks:
-        head = block[0]
-        if "CLASS SET " in head:
-            part, members = {}, []
+        header = block[0]
+        if header.startswith("CLASS SET "):
+            part = {}
+            member_tags = []
             for line in block:
-                if "DCM3_TEXT_LABEL" in line:
+                if line.startswith("DCM3_TEXT_LABEL"):
                     part['name'] = line.split("DCM3_TEXT_LABEL", 1)[1].strip()
-                elif "FMEMBER TAGS" in line:
-                    members = list(map(int, line.split()[2:]))
+                elif line.startswith("FMEMBER TAGS"):
+                    member_tags = list(map(int, line.split()[2:]))
             if 'name' in part:
-                part['member_tags'] = members
+                part['member_tags'] = member_tags
                 parts.append(part)
 
-        elif "CLASS PLANE " in head:
-            pid = int(head.split()[-1])
-            base, norm = None, None
+        elif header.startswith("CLASS PLANE "):
+            plane_id = int(header.split()[-1])
+            base_point = None
+            normal = 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}
+                if line.startswith("FBASE_POINT"):
+                    base_point = tuple(map(float, line.split()[1:]))
+                elif line.startswith("FNORMAL"):
+                    normal = tuple(map(float, line.split()[1:]))
+            if base_point and normal:
+                plane_map[plane_id] = {'base_point': base_point, 'normal': normal}
 
-        elif "CLASS WORK_PLANE " in head:
-            wid = int(head.split()[-1])
-            tag, label = None, None
+        elif header.startswith("CLASS WORK_PLANE "):
+            work_plane_id = int(header.split()[-1])
+            plane_tag = None
+            label = None
             for line in block:
-                if "FMY_PLANE TAG" in line:
-                    tag = int(line.split()[-1])
-                elif "DCM3_TEXT_LABEL" in line:
+                if line.startswith("FMY_PLANE TAG"):
+                    plane_tag = int(line.split()[-1])
+                elif line.startswith("DCM3_TEXT_LABEL"):
                     label = line.split("DCM3_TEXT_LABEL", 1)[1].strip()
-            if tag:
-                tag_to_plane[wid] = tag
-                label_map[wid] = label
+            if plane_tag:
+                tag_to_plane[work_plane_id] = plane_tag
+                label_map[work_plane_id] = label
 
-        elif "CLASS CONSTRAINT " in head:
-            con = {}
+        elif header.startswith("CLASS CONSTRAINT "):
+            constraint = {}
             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 line.startswith("FEND_1 TAG"):
+                    constraint['from'] = int(line.split()[-1])
+                elif line.startswith("FEND_2 TAG"):
+                    constraint['to'] = int(line.split()[-1])
+                elif line.startswith("DCM3_TEXT_LABEL"):
+                    constraint['label'] = line.split("DCM3_TEXT_LABEL", 1)[1].strip()
+            if constraint:
+                constraints.append(constraint)
+
+    for wp_id, plane_id in tag_to_plane.items():
+        if plane_id in plane_map:
+            geometry[wp_id] = {
+                **plane_map[plane_id],
+                'label': label_map.get(wp_id)
+            }
+
+    return {"parts": parts, "geometry": geometry, "constraints": constraints}
 
-    for wid, pid in tag_to_plane.items():
-        if pid in plane_map:
-            geometry[wid] = {**plane_map[pid], 'label': label_map.get(wid)}
+@app.post("/parse")
+async def parse_file(file: UploadFile = File(...)):
+    content = await file.read()
+    parsed_data = parse_dcm_assembly_from_bytes(content)
+    return JSONResponse(content=parsed_data)
 
-    return { "parts": parts, "geometry": geometry, "constraints": constraints }
+if __name__ == "__main__":
+    uvicorn.run(app, host="0.0.0.0", port=7860)