start

app.py

@@ -7,6 +7,46 @@ import os
 st.set_page_config(page_title="Crypto Dash", layout="wide")
 IS_HF_SPACE = bool(os.getenv("SPACE_ID") or os.getenv("SPACE_REPO_NAME"))
 
+
+def normalize_cohorts(raw_cohorts) -> pd.DataFrame:
+    """Return a normalized DataFrame with columns: cohort_day, user_count."""
+    if raw_cohorts is None:
+        return pd.DataFrame(columns=["cohort_day", "user_count"])
+
+    if isinstance(raw_cohorts, dict):
+        rows = []
+        for day, count in raw_cohorts.items():
+            rows.append({"cohort_day": day, "user_count": count})
+        df = pd.DataFrame(rows)
+    else:
+        df = pd.DataFrame(raw_cohorts)
+
+    if df.empty:
+        return pd.DataFrame(columns=["cohort_day", "user_count"])
+
+    # Some payloads can use alternative field names.
+    rename_map = {
+        "day": "cohort_day",
+        "cohort": "cohort_day",
+        "count": "user_count",
+        "users": "user_count",
+        "tx_count": "user_count",
+    }
+    df = df.rename(columns=rename_map)
+
+    required_cols = {"cohort_day", "user_count"}
+    if not required_cols.issubset(df.columns):
+        return pd.DataFrame(columns=["cohort_day", "user_count"])
+
+    df["cohort_day"] = pd.to_numeric(df["cohort_day"], errors="coerce")
+    df["user_count"] = pd.to_numeric(df["user_count"], errors="coerce")
+    df = df.dropna(subset=["cohort_day", "user_count"]).sort_values("cohort_day")
+
+    if df.empty:
+        return pd.DataFrame(columns=["cohort_day", "user_count"])
+
+    return df[["cohort_day", "user_count"]]
+
 def load_report_data() -> dict:
     """Load report data from data.json next to app.py.
 
@@ -52,40 +92,32 @@ c3.metric("New Wallets", f"{data['new_wallets_amount']:,}")
 # График когорт
 st.subheader("User Activity by Cohort Day")
 cohorts_raw = data.get("users_by_cohorts", [])
-df_cohorts = pd.DataFrame(cohorts_raw)
+df_cohorts = normalize_cohorts(cohorts_raw)
 
-required_cols = {"cohort_day", "user_count"}
 if df_cohorts.empty:
     st.warning("Нет данных для графика: users_by_cohorts пустой.")
-elif not required_cols.issubset(df_cohorts.columns):
-    st.error("В users_by_cohorts отсутствуют обязательные поля: cohort_day и/или user_count.")
 else:
-    df_cohorts["cohort_day"] = pd.to_numeric(df_cohorts["cohort_day"], errors="coerce")
-    df_cohorts["user_count"] = pd.to_numeric(df_cohorts["user_count"], errors="coerce")
-    df_cohorts = df_cohorts.dropna(subset=["cohort_day", "user_count"]).sort_values("cohort_day")
-
-    if df_cohorts.empty:
-        st.warning("После очистки данных не осталось валидных точек для графика.")
-    else:
-        chart_col, debug_col = st.columns([4, 1])
-
-        with chart_col:
-            try:
-                fig = px.area(df_cohorts, x="cohort_day", y="user_count", template="plotly")
-                st.plotly_chart(fig, use_container_width=True)
-            except Exception as exc:
-                st.warning(f"Plotly не отрисован ({exc}). Показываю fallback-график Streamlit.")
-                st.area_chart(df_cohorts.set_index("cohort_day")["user_count"])
-
-            if IS_HF_SPACE:
-                st.caption("HF fallback chart")
-                st.area_chart(df_cohorts.set_index("cohort_day")["user_count"])
-
-        with debug_col:
-            st.caption("Chart debug")
-            st.metric("Rows", len(df_cohorts))
-            st.metric("Min day", int(df_cohorts["cohort_day"].min()))
-            st.metric("Max day", int(df_cohorts["cohort_day"].max()))
+    chart_col, debug_col = st.columns([4, 1])
+
+    with chart_col:
+        st.caption("Native chart (always on)")
+        st.area_chart(df_cohorts.set_index("cohort_day")["user_count"], use_container_width=True)
+
+        try:
+            st.caption("Plotly chart")
+            fig = px.area(df_cohorts, x="cohort_day", y="user_count", template="plotly")
+            st.plotly_chart(fig, use_container_width=True)
+        except Exception as exc:
+            st.warning(f"Plotly не отрисован: {exc}")
+
+        if IS_HF_SPACE:
+            st.caption("HF mode: fallback enabled")
+
+    with debug_col:
+        st.caption("Chart debug")
+        st.metric("Rows", len(df_cohorts))
+        st.metric("Min day", int(df_cohorts["cohort_day"].min()))
+        st.metric("Max day", int(df_cohorts["cohort_day"].max()))
 
 # Проверка данных внизу
 with st.expander("Raw Data"):