Upload 2 files

main.py

@@ -22,6 +22,8 @@ app.add_middleware(
 
 DATA_DIR = Path("output")
 CONFIG_PATH = Path("data.json")
+POWER_RESOLUTIONS = {"1SEC", "1MIN", "15MIN", "1H", "1DAY"}
+WATER_RESOLUTIONS = {"1MIN", "15MIN", "1H", "1DAY"}
 
 # ── Helpers ──────────────────────────────────────────────────────────────
 
@@ -54,6 +56,128 @@ def load_config() -> dict:
         return json.load(f)
 
 
+def get_csv_headers(path: Path) -> list[str]:
+    """Return column names from first line of CSV."""
+    if not path.exists():
+        return []
+    with open(path) as f:
+        return next(csv.reader(f), [])
+
+
+def infer_type(col: str) -> str:
+    """Infer JSON schema type from column name."""
+    if col == "Time":
+        return "string (ISO8601)"
+    if "Pct" in col or "Level" in col or "Ah" in col or "Voltage" in col or "Flow" in col or "Total" in col or "kWh" in col or "Lpm" in col or "_L" in col:
+        return "number"
+    return "string"
+
+
+# ── Schema & Data Tables APIs ───────────────────────────────────────────
+
+def _build_schema_and_mermaid() -> tuple[dict, str]:
+    """Build schema dict and Mermaid ER diagram from actual CSV files."""
+    tables = {}
+    # Power: sample from 15MIN (flow) and 1H (totals) to cover both column sets
+    for res in POWER_RESOLUTIONS:
+        path = DATA_DIR / "power" / f"{res}.csv"
+        if path.exists():
+            headers = get_csv_headers(path)
+            if headers and (res not in tables or len(headers) > len(tables.get(res, {}).get("columns", []))):
+                tables[f"power_{res}"] = {
+                    "stream": "power",
+                    "resolution": res,
+                    "columns": [{"name": h, "type": infer_type(h)} for h in headers],
+                }
+    # Water
+    for res in WATER_RESOLUTIONS:
+        path = DATA_DIR / "water" / f"{res}.csv"
+        if path.exists():
+            headers = get_csv_headers(path)
+            if headers:
+                tables[f"water_{res}"] = {
+                    "stream": "water",
+                    "resolution": res,
+                    "columns": [{"name": h, "type": infer_type(h)} for h in headers],
+                }
+
+    # Mermaid ER diagram: one entity per logical table (power_series, water_series)
+    power_cols = set()
+    water_cols = set()
+    for key, meta in tables.items():
+        for c in meta["columns"]:
+            if meta["stream"] == "power":
+                power_cols.add((c["name"], c["type"]))
+            else:
+                water_cols.add((c["name"], c["type"]))
+    power_cols = sorted(power_cols, key=lambda x: (0 if x[0] == "Time" else 1, x[0]))
+    water_cols = sorted(water_cols, key=lambda x: (0 if x[0] == "Time" else 1, x[0]))
+
+    def mermaid_type(t: str) -> str:
+        if "string" in t or "ISO" in t:
+            return "string"
+        return "decimal"
+    def mermaid_row(name: str, t: str) -> str:
+        attr = name.replace(" ", "_")
+        typ = mermaid_type(t)
+        return f"    {typ} {attr}"
+    lines = [
+        "erDiagram",
+        "    power_timeseries {",
+        *[mermaid_row(c[0], c[1]) for c in power_cols],
+        "    }",
+        "    water_timeseries {",
+        *[mermaid_row(c[0], c[1]) for c in water_cols],
+        "    }",
+        "    power_timeseries ||--o| water_timeseries : aligned_by_Time",
+    ]
+    mermaid = "\n".join(lines)
+    return {"tables": tables}, mermaid
+
+
+@app.get("/api/schema")
+def get_schema():
+    """Return CSV data schema (tables, columns, types) and Mermaid ER diagram."""
+    schema_dict, mermaid = _build_schema_and_mermaid()
+    return {
+        **schema_dict,
+        "mermaid": mermaid,
+    }
+
+
+@app.get("/api/data/tables")
+def get_data_tables_list():
+    """Return list of available data tables (stream, resolution, columns, row_count)."""
+    result = []
+    for res in POWER_RESOLUTIONS:
+        path = DATA_DIR / "power" / f"{res}.csv"
+        if path.exists():
+            headers = get_csv_headers(path)
+            with open(path) as f:
+                row_count = sum(1 for _ in f) - 1  # exclude header
+            result.append({
+                "id": f"power_{res}",
+                "stream": "power",
+                "resolution": res,
+                "columns": headers,
+                "row_count": max(0, row_count),
+            })
+    for res in WATER_RESOLUTIONS:
+        path = DATA_DIR / "water" / f"{res}.csv"
+        if path.exists():
+            headers = get_csv_headers(path)
+            with open(path) as f:
+                row_count = sum(1 for _ in f) - 1
+            result.append({
+                "id": f"water_{res}",
+                "stream": "water",
+                "resolution": res,
+                "columns": headers,
+                "row_count": max(0, row_count),
+            })
+    return {"tables": result}
+
+
 # ── Config & Specs ───────────────────────────────────────────────────────
 
 @app.get("/api/config")
@@ -113,9 +237,6 @@ def get_water_budget():
 
 # ── Time Series Endpoints ────────────────────────────────────────────────
 
-POWER_RESOLUTIONS = {"1SEC", "1MIN", "15MIN", "1H", "1DAY"}
-WATER_RESOLUTIONS = {"1MIN", "15MIN", "1H", "1DAY"}
-
 
 # ── Hourly Profile (MUST be before /{resolution} routes) ────────────────
 

static/index.html

@@ -7,6 +7,7 @@
 <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/chart.js@4"></script>
 <script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-annotation@3"></script>
+<script src="https://cdn.jsdelivr.net/npm/mermaid@10/dist/mermaid.min.js"></script>
 <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@300;400;500;600;700&family=DM+Sans:opsz,wght@9..40,300;9..40,400;9..40,500;9..40,600;9..40,700&display=swap" rel="stylesheet">
 <style>
 *{margin:0;padding:0;box-sizing:border-box}
@@ -102,6 +103,7 @@ html,body{height:100%;background:var(--bg-0);color:var(--t1);font-family:var(--s
 .gen-status.ok{color:var(--accent)}.gen-status.err{color:var(--danger)}
 .ld{display:flex;align-items:center;justify-content:center;height:200px;color:var(--t3);font:12px var(--mono);letter-spacing:1px}
 .pulse{animation:pulse 1.2s ease infinite}
+.mermaid-wrap{display:flex;justify-content:center;align-items:center;padding:20px;background:var(--bg-0);border-radius:6px}.mermaid-wrap svg{max-width:100%}
 @keyframes pulse{0%,100%{opacity:.3}50%{opacity:1}}
 @media(max-width:900px){
   .sb{width:54px}.sb-logo p,.ni span,.sb-ft,.sb-sec{display:none}
@@ -134,6 +136,10 @@ html,body{height:100%;background:var(--bg-0);color:var(--t1);font-family:var(--s
       <div class="ni" :class="{on:pg==='components'}" @click="go('components')">
         <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="4" y="4" width="16" height="16" rx="2"/><path d="M9 1v3M15 1v3M9 20v3M15 20v3M20 9h3M20 14h3M1 9h3M1 14h3"/></svg><span>Components</span>
       </div>
+      <div class="sb-sec" style="margin-top:8px">Data</div>
+      <div class="ni" :class="{on:pg==='data'}" @click="go('data')">
+        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 16V8a2 2 0 00-1-1.73l-7-4a2 2 0 00-2 0l-7 4A2 2 0 003 8v8a2 2 0 001 1.73l7 4a2 2 0 002 0l7-4A2 2 0 0021 16z"/><polyline points="3.27 6.96 12 12.01 20.73 6.96"/><line x1="12" y1="22.08" x2="12" y2="12"/></svg><span>Schema &amp; Tables</span>
+      </div>
       <div class="sb-sec" style="margin-top:8px">Settings</div>
       <div class="ni" :class="{on:pg==='generate'}" @click="go('generate')">
         <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z"/></svg><span>Generate Data</span>
@@ -243,6 +249,25 @@ html,body{height:100%;background:var(--bg-0);color:var(--t1);font-family:var(--s
       <div class="pc"><div class="cd"><div class="cd-b" style="padding:0;max-height:calc(100vh - 130px);overflow-y:auto"><table class="tb"><thead><tr><th>Component</th><th>Voltage</th><th>Amps</th><th>Power</th><th>Water</th><th>Idle</th></tr></thead><tbody><template v-for="(items,cat) in comps" :key="cat"><tr><td colspan="6" class="tb-cat">{{cat}}</td></tr><tr v-for="(c,i) in items" :key="i"><td style="color:var(--t1)">{{c.name}}</td><td>{{c.voltage_v}}V</td><td>{{c.avg_amps}}A</td><td style="color:var(--solar)">{{(c.voltage_v*c.avg_amps).toFixed(1)}}W</td><td>{{c.water_gal_per_cycle||'—'}}</td><td>{{c.idle_amps||'—'}}</td></tr></template></tbody></table></div></div></div>
     </template>
 
+    <!-- DATA: Schema & Data Tables -->
+    <template v-if="pg==='data'">
+      <div class="ph"><div><h2>Data Schema &amp; Tables</h2><div class="sub">CSV structure and raw data tables</div></div></div>
+      <div class="pc">
+        <div class="dtabs">
+          <div class="dtab" :class="{on:dataSubTab==='schema'}" @click="dataSubTab='schema'">Schema (Mermaid)</div>
+          <div class="dtab" :class="{on:dataSubTab==='tables'}" @click="dataSubTab='tables'">Data Tables</div>
+        </div>
+        <template v-if="dataSubTab==='schema'">
+          <div class="cd" style="margin-bottom:14px"><div class="cd-h"><span class="cd-t">Entity relationship (CSV schema)</span></div><div class="cd-b" style="min-height:320px"><div id="mermaid-container" class="mermaid-wrap"></div><div v-if="schemaMermaidErr" class="insight danger"><span class="insight-icon">⚠️</span><div>{{schemaMermaidErr}}</div></div></div></div>
+          <div class="cd"><div class="cd-h"><span class="cd-t">Table definitions</span></div><div class="cd-b" style="max-height:400px;overflow-y:auto"><table class="tb"><thead><tr><th>Table</th><th>Column</th><th>Type</th></tr></thead><tbody><template v-for="(meta,key) in schemaTables" :key="key"><tr v-for="(col,i) in (meta.columns||[])" :key="i"><td v-if="i===0" :rowspan="(meta.columns||[]).length" class="tb-cat">{{key}}</td><td>{{col.name}}</td><td style="color:var(--t3)">{{col.type}}</td></tr></template></tbody></table></div></div></div>
+        </template>
+        <template v-if="dataSubTab==='tables'">
+          <div class="cd" style="margin-bottom:14px"><div class="cd-h"><span class="cd-t">Select table</span></div><div class="cd-b"><div class="form-row"><select class="form-select" v-model="selectedTableId" style="max-width:280px" @change="loadTableData"><option value="">— Choose —</option><option v-for="t in dataTablesList" :key="t.id" :value="t.id">{{t.stream}} / {{t.resolution}} ({{t.row_count}} rows)</option></select><span class="cd-t" style="color:var(--t2)" v-if="selectedTableId">Limit</span><input type="number" class="form-input" v-model.number="tableLimit" min="10" max="2000" step="50" style="width:90px" @change="loadTableData"/></div></div></div>
+          <div class="cd"><div class="cd-b" style="padding:0;max-height:calc(100vh - 280px);overflow:auto"><table class="tb" v-if="tableData.length"><thead><tr><th v-for="col in tableColumns" :key="col">{{col}}</th></tr></thead><tbody><tr v-for="(row,i) in tableData" :key="i"><td v-for="col in tableColumns" :key="col">{{fmtCell(row[col])}}</td></tr></tbody></table><div v-else class="ld" style="min-height:120px">{{selectedTableId?'Loading...':'Select a table above.'}}</div></div></div></div>
+        </template>
+      </div>
+    </template>
+
     <!-- GENERATE -->
     <template v-if="pg==='generate'">
       <div class="ph"><div><h2>Generate Data</h2><div class="sub">Configure trip parameters and regenerate simulation</div></div></div>
@@ -304,6 +329,8 @@ createApp({
     const pDay=ref(0),pDayInsight=ref('');
     const gen=reactive({user_type:'Typical',num_people:2,trip_duration_days:5,temperature:'Hot',sunlight:'Hi- Sunny',humidity:'Comfortable',seed:42});
     const genBusy=ref(false),genMsg=ref(''),genOk=ref(true);
+    const dataSubTab=ref('schema'),schemaTables=ref({}),schemaMermaidText=ref(''),schemaMermaidErr=ref(''),dataTablesList=ref([]);
+    const selectedTableId=ref(''),tableLimit=ref(500),tableData=ref([]),tableColumns=ref([]);
     let pw15=[],pwH=[],wtH=[],wtD=[],wt15=[];
 
     const pBMax=computed(()=>Math.max(...Object.values(pBudget.value||{}),1));
@@ -454,11 +481,37 @@ createApp({
       genBusy.value=false;
     }
 
+    async function renderMermaid(){
+      const container=document.getElementById('mermaid-container');if(!container||!schemaMermaidText.value||typeof mermaid==='undefined')return;
+      container.innerHTML='';
+      try{
+        mermaid.initialize({startOnLoad:false,theme:'dark',themeVariables:{primaryColor:'#0c1118',primaryTextColor:'#e8edf4',primaryBorderColor:'#283848',lineColor:'#506070',secondaryColor:'#121a24',tertiaryColor:'#182230'}});
+        const id='mermaid-'+Date.now();const {svg}=await mermaid.render(id,schemaMermaidText.value);container.innerHTML=svg;schemaMermaidErr.value='';
+      }catch(e){schemaMermaidErr.value=e.message||'Mermaid render failed';}
+    }
+    async function loadSchema(){
+      try{
+        const r=await api('/api/schema');schemaTables.value=r.tables||{};schemaMermaidText.value=r.mermaid||'';schemaMermaidErr.value='';
+        await nextTick();await renderMermaid();
+      }catch(e){schemaMermaidErr.value=e.message||'Failed to load schema';}
+    }
+    async function loadDataTablesList(){try{const r=await api('/api/data/tables');dataTablesList.value=r.tables||[];}catch(e){dataTablesList.value=[];}}
+    async function loadTableData(){
+      if(!selectedTableId.value){tableData.value=[];tableColumns.value=[];return;}
+      const [stream,res]=selectedTableId.value.split('_');const limit=Math.min(2000,Math.max(10,tableLimit.value||500));
+      try{
+        const r=await api(`/api/${stream}/${res}?limit=${limit}`);const rows=r.data||[];tableData.value=rows;
+        tableColumns.value=rows.length?Object.keys(rows[0]):(r.columns||[]);
+      }catch(e){tableData.value=[];tableColumns.value=[];}
+    }
+    function fmtCell(v){if(v==null||v==='')return '—';if(typeof v==='number')return Number.isInteger(v)?v:v.toFixed(4);return v;}
+
     function go(p){pg.value=p;}
-    watch(pg,async p=>{await nextTick();if(p==='overview')renderOV();if(p==='power')loadPW();if(p==='water')loadWT();if(p==='budget')loadBG();});
+    watch(pg,async p=>{await nextTick();if(p==='overview')renderOV();if(p==='power')loadPW();if(p==='water')loadWT();if(p==='budget')loadBG();if(p==='data'){await loadSchema();loadDataTablesList();}});
+    watch(dataSubTab,async (t)=>{if(t==='schema'&&schemaMermaidText.value)await nextTick().then(()=>renderMermaid());});
     onMounted(async()=>{await loadAll();await nextTick();renderOV();});
 
-    return{pg,loading,cfg,S,pBudget,wBudget,comps,hProfile,whProfile,pDay,pDayInsight,gen,genBusy,genMsg,genOk,battCol,pBMax,wBMax,rd,fL,fmtK,bPct,bCol,go,setPDay,doGen};
+    return{pg,loading,cfg,S,pBudget,wBudget,comps,hProfile,whProfile,pDay,pDayInsight,gen,genBusy,genMsg,genOk,battCol,pBMax,wBMax,rd,fL,fmtK,bPct,bCol,go,setPDay,doGen,dataSubTab,schemaTables,schemaMermaidErr,dataTablesList,selectedTableId,tableLimit,tableData,tableColumns,loadTableData,fmtCell};
   }
 }).mount('#app');
 </script>