Adjusting create_navigation_menu() and Logging

Author: entorb

src/helper_activities_caching.py

@@ -12,7 +12,7 @@
 from helper_logging import get_logger_from_filename, track_function_usage
 from helper_pandas import reorder_cols
 
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 DIR_SERVER = "/var/www/virtual/entorb/data-web-pages/strava"
@@ -150,7 +150,7 @@ def cache_all_activities_and_gears_in_year_range(
     - Activities using id as index, ordered by start_date_local
     - Gears, using id as index, ordered by index
     """
-    logger.info("cache_all_activities_and_gears_year for user_id=%s", user_id)
+    LOGGER.info("cache_all_activities_and_gears_year for user_id=%s", user_id)
 
     df = pd.DataFrame(fetch_all_activities(year_start=year_start, year_end=year_end))
 

src/helper_api.py

@@ -9,7 +9,7 @@
 
 from helper_logging import get_logger_from_filename, track_function_usage
 
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 API_RETRIES = 5
@@ -36,7 +36,7 @@ def api_post_oauth(code: str) -> dict:
             resp.raise_for_status()
             return resp.json()
         except requests.RequestException:
-            logger.exception("Attempt %i failed", attempt)
+            LOGGER.exception("Attempt %i failed", attempt)
             # If it's the last attempt, raise the exception
             if attempt + 1 == API_RETRIES:
                 raise
@@ -73,7 +73,7 @@ def api_post_deauthorize() -> None:
 def _api_get(path: str) -> dict | list:
     """Get data from Strava API, used by fetch_* functions."""
     path = f"{URL_BASE}/{path}"
-    logger.info(path)
+    LOGGER.info(path)
 
     headers = {"Authorization": f"Bearer {st.session_state['TOKEN']}"}
 
@@ -84,7 +84,7 @@ def _api_get(path: str) -> dict | list:
             resp.raise_for_status()
             return resp.json()
         except requests.RequestException:
-            logger.exception("Attempt %i failed", attempt)
+            LOGGER.exception("Attempt %i failed", attempt)
             # If it's the last attempt, raise the exception
             if attempt + 1 == API_RETRIES:
                 raise

src/helper_login.py

@@ -13,7 +13,7 @@
     track_function_usage,
 )
 
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 @track_function_usage

src/helper_pandas.py

@@ -4,7 +4,7 @@
 
 from helper_logging import get_logger_from_filename, track_function_usage
 
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 @track_function_usage

src/helper_ui_components.py

@@ -2,23 +2,19 @@
 
 import io
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 import pandas as pd
 import streamlit as st
 from streamlit.delta_generator import DeltaGenerator
+from streamlit.navigation.page import StreamlitPage
 
 from helper_logging import get_logger_from_filename, track_function_usage
 
-if TYPE_CHECKING:
-    from streamlit.navigation.page import StreamlitPage
-
-
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 @track_function_usage
-def create_navigation_menu() -> str:
+def create_navigation_menu() -> StreamlitPage:
     """Create and populate navigation menu."""
     lst: list[StreamlitPage] = []
     for p in sorted(Path("src/reports").glob("*.py")):
@@ -35,8 +31,7 @@ def create_navigation_menu() -> str:
 
         lst.append(st.Page(page=f"reports/{f}.py", title=t))
     pg = st.navigation(lst)
-    pg.run()
-    return pg.url_path
+    return pg
 
 
 @track_function_usage

src/main.py

@@ -19,7 +19,7 @@
 
 MEASURE_MEMORY = True
 init_logging()
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 def set_env() -> None:
@@ -105,17 +105,20 @@ def main() -> None:  # noqa: D103
         if MEASURE_MEMORY:
             tracemalloc.start()
         time_start = time()
-        pagename = create_navigation_menu()
+        page = create_navigation_menu()
+        pagename = page.url_path or "main"
+        st.title(page.title)
+
+        page.run()
+
         time_end = time()
-        if pagename == "":
-            pagename = "main"
         log_line = f"stats: {pagename},{round(time_end - time_start, 1)}s"
 
         if MEASURE_MEMORY:
             max_bytes = tracemalloc.get_traced_memory()[0]
             tracemalloc.stop()
             log_line += f",{round(max_bytes / 1_048_576, 1)}MB"
-        logger.info(log_line)
+        LOGGER.info(log_line)
 
 
 if __name__ == "__main__":
@@ -124,6 +127,6 @@ def main() -> None:  # noqa: D103
     except Exception as e:
         # automatically triggered by logger.exception
         # sentry_sdk.capture_exception(e)
-        logger.exception("Exception:")
+        LOGGER.exception("Exception:")
         st.exception(e)
         st.stop()

src/reports/r01_caching.py src/reports/r01_load_data.pysrc/reports/r01_caching.py renamed to src/reports/r01_load_data.py

@@ -7,8 +7,7 @@
 )
 from helper_logging import get_logger_from_filename
 
-st.title(__doc__[:-1])  # type: ignore
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 col1, _ = st.columns((1, 5))
@@ -41,7 +40,8 @@
 else:
     st.session_state["years"] = 100
 
-df = cache_all_activities_and_gears()[0]
+with st.spinner(text="Fetching your activities", show_time=True):
+    df = cache_all_activities_and_gears()[0]
 
 # export activity_columns
 # lst = sorted(df.columns)

src/reports/r05_current_year.py

@@ -11,8 +11,7 @@
 from helper_logging import get_logger_from_filename
 from helper_ui_components import list_sports
 
-st.title(__doc__[:-1])  # type: ignore
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 def calc_days_in_year(year: int) -> int:

src/reports/r10_activity_list.py …ts/r10_activity_list_and_excel_export.pysrc/reports/r10_activity_list.py renamed to src/reports/r10_activity_list_and_excel_export.py src/reports/r10_activity_list.py renamed to src/reports/r10_activity_list_and_excel_export.py

@@ -10,8 +10,7 @@
 from helper_logging import get_logger_from_filename
 from helper_ui_components import excel_download_buttons, select_sport
 
-st.title(__doc__[:-1])  # type: ignore
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 st.markdown(

src/reports/r20_activity_stats.py src/reports/r20_activity_statistics.pysrc/reports/r20_activity_stats.py renamed to src/reports/r20_activity_statistics.py

@@ -1,4 +1,4 @@
-"""Activity Stats."""
+"""Activity Statistics."""
 
 # ruff: noqa: PLR2004
 import datetime as dt
@@ -15,8 +15,7 @@
 from helper_pandas import reorder_cols
 from helper_ui_components import excel_download_buttons, list_sports, select_sport
 
-st.title(__doc__[:-1])  # type: ignore
-logger = get_logger_from_filename(__file__)
+LOGGER = get_logger_from_filename(__file__)
 
 
 AGGREGATIONS = {
@@ -254,6 +253,8 @@ def activity_stats_grouping(
     time_unit = "yearmonth(date):T"
 elif sel_freq == "Week":
     time_unit = "date:T"
+else:
+    time_unit = "date:T"
 
 c = (
     alt.Chart(
@@ -315,18 +316,15 @@ def get_cell(df: pd.DataFrame, sport: str, period: str, agg: str) -> float | int
 for i in range(4):
     col = cols[i]
     sport = sports[i]
+    prev1, prev2, prev3 = 0, 0, 0
     col.subheader(sport)
     cur = get_cell(df=df2c, sport=sport, period=periods[0], agg=sel_agg)
     if len(periods) >= 2:
         prev1 = get_cell(df=df2c, sport=sport, period=periods[1], agg=sel_agg)
-    else:
-        prev1 = 0
     if len(periods) >= 3:
         prev2 = get_cell(df=df2c, sport=sport, period=periods[2], agg=sel_agg)
     if len(periods) >= 4:
         prev3 = get_cell(df=df2c, sport=sport, period=periods[3], agg=sel_agg)
-    else:
-        prev3 = 0
     col.metric(label=periods[0], value=cur)
     if len(periods) >= 2:
         delta = round(prev1 - prev2, 1) if len(periods) >= 3 else None