Update page_files/Categorized_Search.py

page_files/Categorized_Search.py

@@ -12,6 +12,57 @@ from data_loader import get_all_sections, load_material_data
 import streamlit.components.v1 as components
 import time
 t0 = time.time()
+
+# _class -> RDS category table
+_CLASS_TABLE = {"Composites": "Composites_materials", "Fibers": "Fibers", "Polymers": "Polymers"}
+
+
+def _load_plot_bytes(selected_abbr, property_choice, result_df):
+    """Return the PNG bytes stored in the category table's `image` column for this
+    material+property, or None. Reads BYTEA from RDS (no local files, no URLs).
+
+    Matching is by property_name first, narrowed by material_name/abbreviation when
+    available — abbreviation alone is fragile (case/whitespace/mismatch) and was
+    causing rows that DO have image bytes to return nothing."""
+    table = None
+    material_name = None
+    if not result_df.empty:
+        if "_class" in result_df.columns:
+            table = _CLASS_TABLE.get(str(result_df.iloc[0]["_class"]))
+        if "material_name" in result_df.columns:
+            material_name = str(result_df.iloc[0]["material_name"])
+    tables = [table] if table else list(_CLASS_TABLE.values())  # fallback: try all
+    try:
+        import mapper5
+        from sqlalchemy import text
+        engine = mapper5.get_db_engine()
+    except Exception as e:
+        st.caption(f"(plot lookup unavailable: {e})")
+        return None
+
+    # Try progressively looser filters: (abbr+prop) -> (name+prop) -> (prop only)
+    attempts = []
+    if selected_abbr:
+        attempts.append(("material_abbreviation = :a AND property_name = :p",
+                         {"a": selected_abbr, "p": property_choice}))
+    if material_name:
+        attempts.append(("material_name = :m AND property_name = :p",
+                         {"m": material_name, "p": property_choice}))
+    attempts.append(("property_name = :p", {"p": property_choice}))
+
+    for tbl in tables:
+        for where, params in attempts:
+            try:
+                with engine.connect() as conn:
+                    img = conn.execute(text(
+                        f'SELECT image FROM "{tbl}" '
+                        f'WHERE {where} AND image IS NOT NULL LIMIT 1'),
+                        params).scalar()
+                if img:
+                    return bytes(img)   # memoryview -> bytes for st.image
+            except Exception:
+                continue
+    return None
 def clear_search():
     """Clear the search box and search term. Called as a callback from other widgets."""
     st.session_state._search_term = None
@@ -1127,10 +1178,12 @@ with right_col:
                                 st.dataframe(result.T, use_container_width=True)
 
                                 st.subheader("Property Graph")
-                                image_path = Path("images") / f"{selected_abbr}_{property_choice}.png"
-                                if image_path.exists():
-                                    image = Image.open(image_path)
-                                    st.image(image, use_container_width=True, caption="Stress strain curve")
+                                _img_bytes = _load_plot_bytes(
+                                    selected_abbr, property_choice, result
+                                )
+                                if _img_bytes:
+                                    st.image(_img_bytes, use_container_width=True,
+                                             caption="Stored plot")
                                 else:
                                     st.caption("No plot image available for this material-property pair.")