geo-activity-playground 0.26.1__tar.gz → 0.26.3__tar.gz

{geo_activity_playground-0.26.1 → geo_activity_playground-0.26.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.26.1
+Version: 0.26.3
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding
@@ -24,7 +24,7 @@ Requires-Dist: gpxpy (>=1.5.0,<2.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: matplotlib (>=3.6.3,<4.0.0)
 Requires-Dist: numpy (>=1.22.4,<2.0.0)
-Requires-Dist: pandas (>=2.0,<3.0)
+Requires-Dist: pandas (>=2.2,<3.0)
 Requires-Dist: pyarrow (>=16.1.0,<17.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)

{geo_activity_playground-0.26.1 → geo_activity_playground-0.26.3}/geo_activity_playground/core/enrichment.py

@@ -47,7 +47,17 @@ def enrich_activities(kind_defaults: dict[dict[str, Any]]) -> None:
             or enriched_metadata_path.stat().st_mtime
             < extracted_metadata_path.stat().st_mtime
         ):
-            new_extracted_metadata_paths.append(extracted_metadata_path)
+            extracted_time_series_path = (
+                activity_extracted_time_series_dir()
+                / f"{extracted_metadata_path.stem}.parquet"
+            )
+            if extracted_time_series_path.exists():
+                new_extracted_metadata_paths.append(extracted_metadata_path)
+            else:
+                logger.error(
+                    f"Extracted activity metadata {extracted_metadata_path} is lacking the corresponding time series path {extracted_time_series_path}. Likely that is an activity without location data. Deleting this."
+                )
+                extracted_metadata_path.unlink()
 
     for extracted_metadata_path in tqdm(
         new_extracted_metadata_paths, desc="Enrich new activity data"

{geo_activity_playground-0.26.1 → geo_activity_playground-0.26.3}/geo_activity_playground/importers/strava_checkout.py

@@ -190,11 +190,10 @@ def import_from_strava_checkout() -> None:
                 dateutil.parser.parse(row["Activity Date"], dayfirst=dayfirst)
             ),
         }
-        meta_path = activity_extracted_meta_dir() / f"{activity_id}.pickle"
-        with open(meta_path, "wb") as f:
-            pickle.dump(table_activity_meta, f)
 
-        time_series_path = activity_extracted_time_series_dir() / f"{activity_id}.parquet"
+        time_series_path = (
+            activity_extracted_time_series_dir() / f"{activity_id}.parquet"
+        )
         if time_series_path.exists():
             time_series = pd.read_parquet(time_series_path)
         else:
@@ -216,6 +215,9 @@ def import_from_strava_checkout() -> None:
         if "latitude" not in time_series.columns:
             continue
 
+        meta_path = activity_extracted_meta_dir() / f"{activity_id}.pickle"
+        with open(meta_path, "wb") as f:
+            pickle.dump(table_activity_meta, f)
         time_series.to_parquet(time_series_path)
     work_tracker.close()
 

{geo_activity_playground-0.26.1 → geo_activity_playground-0.26.3}/geo_activity_playground/webui/app.py

@@ -1,9 +1,9 @@
+import importlib
 import json
 import pathlib
 import secrets
 
 from flask import Flask
-from flask import redirect
 from flask import render_template
 from flask import request
 
@@ -23,7 +23,6 @@ from .summary.blueprint import make_summary_blueprint
 from .tile.blueprint import make_tile_blueprint
 from .upload.blueprint import make_upload_blueprint
 from geo_activity_playground.core.privacy_zones import PrivacyZone
-from geo_activity_playground.webui.strava.controller import StravaController
 
 
 def route_search(app: Flask, repository: ActivityRepository) -> None:
@@ -47,7 +46,7 @@ def route_start(app: Flask, repository: ActivityRepository) -> None:
 
 
 def route_settings(app: Flask) -> None:
-    @app.route("/settings")
+    @app.route("/settings/")
     def settings():
         return render_template("settings.html.j2")
 
@@ -122,4 +121,11 @@ def webui_main(
         url_prefix="/upload",
     )
 
+    @app.context_processor
+    def inject_global_variables() -> dict:
+        return {
+            "version": importlib.metadata.version("geo-activity-playground"),
+            "num_activities": len(repository),
+        }
+
     app.run(host=host, port=port)

{geo_activity_playground-0.26.1 → geo_activity_playground-0.26.3}/geo_activity_playground/webui/summary/controller.py

@@ -61,11 +61,11 @@ def nominate_activities(meta: pd.DataFrame) -> dict[int, list[str]]:
     i = subset["elapsed_time"].idxmax()
     nominations[i].append(f"Longest elapsed time: {meta.loc[i].elapsed_time}")
 
-    if "calories" in subset.columns:
+    if "calories" in subset.columns and not pd.isna(subset["calories"]).all():
         i = subset["calories"].idxmax()
         nominations[i].append(f"Most calories burnt: {meta.loc[i].calories:.0f} kcal")
 
-    if "steps" in subset:
+    if "steps" in subset.columns and not pd.isna(subset["steps"]).all():
         i = subset["steps"].idxmax()
         nominations[i].append(f"Most steps: {meta.loc[i].steps:.0f}")
 
@@ -87,15 +87,16 @@ def nominate_activities(meta: pd.DataFrame) -> dict[int, list[str]]:
         ]:
             if key in group.columns:
                 series = group[key]
-                i = series.idxmax()
-                if not pd.isna(i):
-                    nominations[i].append(text(meta.loc[i]))
+                if not pd.isna(series).all():
+                    i = series.idxmax()
+                    if not pd.isna(i):
+                        nominations[i].append(text(meta.loc[i]))
 
     return nominations
 
 
 def embellished_activities(meta: pd.DataFrame) -> pd.DataFrame:
-    df = meta.copy()
+    df = meta.loc[~pd.isna(meta["start"])].copy()
     df["year"] = [start.year for start in df["start"]]
     df["month"] = [start.month for start in df["start"]]
     df["day"] = [start.day for start in df["start"]]

{geo_activity_playground-0.26.1 → geo_activity_playground-0.26.3}/geo_activity_playground/webui/templates/page.html.j2

@@ -60,7 +60,7 @@
                 </button>
                 <div class="collapse navbar-collapse" id="navbarSupportedContent">
                     <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-
+                        {% if num_activities > 0 %}
                         <li class="nav-item">
                             <a class="nav-link" aria-current="page" href="{{ url_for('summary.index') }}">Summary</a>
                         </li>
@@ -86,6 +86,7 @@
                             <a class="nav-link" aria-current="page"
                                 href="{{ url_for('equipment.index') }}">Equipment</a>
                         </li>
+                        {% endif %}
                         <li class="nav-item">
                             <a class="nav-link" aria-current="page" href="{{ url_for('upload.index') }}">Upload</a>
                         </li>
@@ -155,7 +156,10 @@
         {% endblock %}
 
         <div class="row border-top py-3 my-4">
-            <ul class="nav col-12 justify-content-end">
+            <ul class="nav col-4">
+                <li class="nav-item text-muted px-2 nav-link">Version {{ version }}</li>
+            </ul>
+            <ul class="nav col-8 justify-content-end">
                 <li class="nav-item"><a href="https://github.com/martin-ueding/geo-activity-playground"
                         class="nav-link px-2 text-muted" target="_blank">GitHub</a></li>
                 <li class="nav-item"><a href="https://martin-ueding.github.io/geo-activity-playground/"

{geo_activity_playground-0.26.1 → geo_activity_playground-0.26.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "0.26.1"
+version = "0.26.3"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"
@@ -22,7 +22,7 @@ gpxpy = "^1.5.0"
 jinja2 = "^3.1.2"
 matplotlib = "^3.6.3"
 numpy = "^1.22.4"
-pandas = "^2.0"
+pandas = "^2.2"
 Pillow = "^10.3.0"
 pyarrow = "^16.1.0"
 python-dateutil = "^2.8.2"