geo-activity-playground 0.29.2__py3-none-any.whl → 0.31.0__py3-none-any.whl

geo_activity_playground/core/activities.py

@@ -1,5 +1,6 @@
 import datetime
 import functools
+import json
 import logging
 import pickle
 from typing import Any
@@ -16,6 +17,7 @@ from tqdm import tqdm
 from geo_activity_playground.core.paths import activities_file
 from geo_activity_playground.core.paths import activity_enriched_meta_dir
 from geo_activity_playground.core.paths import activity_enriched_time_series_dir
+from geo_activity_playground.core.paths import activity_meta_override_dir
 
 logger = logging.getLogger(__name__)
 
@@ -83,7 +85,12 @@ def build_activity_meta() -> None:
     rows = []
     for new_id in tqdm(new_ids, desc="Register new activities"):
         with open(activity_enriched_meta_dir() / f"{new_id}.pickle", "rb") as f:
-            rows.append(pickle.load(f))
+            data = pickle.load(f)
+        override_file = activity_meta_override_dir() / f"{new_id}.json"
+        if override_file.exists():
+            with open(override_file) as f:
+                data.update(json.load(f))
+        rows.append(data)
 
     if rows:
         new_shard = pd.DataFrame(rows)
@@ -140,7 +147,6 @@ class ActivityRepository:
             if not dropna or not pd.isna(row["start"]):
                 yield row
 
-    @functools.lru_cache()
     def get_activity_by_id(self, id: int) -> ActivityMeta:
         activity = self.meta.loc[id]
         assert isinstance(activity["name"], str), activity["name"]
@@ -158,6 +164,9 @@ class ActivityRepository:
 
         return df
 
+    def save(self) -> None:
+        self._meta.to_parquet(activities_file())
+
 
 def make_geojson_from_time_series(time_series: pd.DataFrame) -> str:
     fc = geojson.FeatureCollection(

geo_activity_playground/core/config.py

@@ -29,6 +29,7 @@ class Config:
     )
     heart_rate_resting: int = 0
     heart_rate_maximum: Optional[int] = None
+    kind_renames: dict[str, str] = dataclasses.field(default_factory=dict)
     kinds_without_achievements: list[str] = dataclasses.field(default_factory=list)
     metadata_extraction_regexes: list[str] = dataclasses.field(default_factory=list)
     num_processes: Optional[int] = 1
@@ -39,6 +40,7 @@ class Config:
     strava_client_id: int = 131693
     strava_client_secret: str = "0ccc0100a2c218512a7ef0cea3b0e322fb4b4365"
     strava_client_code: Optional[str] = None
+    time_diff_threshold_seconds: Optional[int] = 30
     upload_password: Optional[str] = None
 
 

geo_activity_playground/core/enrichment.py

@@ -82,11 +82,15 @@ def enrich_activities(config: Config) -> None:
             )
             continue
 
+        # Rename kinds if needed.
+        if metadata["kind"] in config.kind_renames:
+            metadata["kind"] = config.kind_renames[metadata["kind"]]
+
         # Enrich time series.
         if metadata["kind"] in config.kinds_without_achievements:
             metadata["consider_for_achievements"] = False
         time_series = _embellish_single_time_series(
-            time_series, metadata.get("start", None)
+            time_series, metadata.get("start", None), config.time_diff_threshold_seconds
         )
         metadata.update(_get_metadata_from_timeseries(time_series))
 
@@ -131,7 +135,9 @@ def _compute_moving_time(time_series: pd.DataFrame) -> datetime.timedelta:
 
 
 def _embellish_single_time_series(
-    timeseries: pd.DataFrame, start: Optional[datetime.datetime] = None
+    timeseries: pd.DataFrame,
+    start: Optional[datetime.datetime],
+    time_diff_threshold_seconds: int,
 ) -> pd.DataFrame:
     if start is not None and pd.api.types.is_dtype_equal(
         timeseries["time"].dtype, "int64"
@@ -153,10 +159,12 @@ def _embellish_single_time_series(
         timeseries["latitude"],
         timeseries["longitude"],
     ).fillna(0.0)
-    time_diff_threshold_seconds = 30
-    time_diff = (timeseries["time"] - timeseries["time"].shift(1)).dt.total_seconds()
-    jump_indices = time_diff >= time_diff_threshold_seconds
-    distances.loc[jump_indices] = 0.0
+    if time_diff_threshold_seconds:
+        time_diff = (
+            timeseries["time"] - timeseries["time"].shift(1)
+        ).dt.total_seconds()
+        jump_indices = time_diff >= time_diff_threshold_seconds
+        distances.loc[jump_indices] = 0.0
 
     if "distance_km" not in timeseries.columns:
         timeseries["distance_km"] = pd.Series(np.cumsum(distances)) / 1000
@@ -173,7 +181,10 @@ def _embellish_single_time_series(
         timeseries = timeseries.loc[~potential_jumps].copy()
 
     if "segment_id" not in timeseries.columns:
-        timeseries["segment_id"] = np.cumsum(jump_indices)
+        if time_diff_threshold_seconds:
+            timeseries["segment_id"] = np.cumsum(jump_indices)
+        else:
+            timeseries["segment_id"] = 0
 
     if "x" not in timeseries.columns:
         x, y = compute_tile_float(timeseries["latitude"], timeseries["longitude"], 0)

geo_activity_playground/core/paths.py

@@ -8,7 +8,6 @@ import typing
 
 
 def dir_wrapper(path: pathlib.Path) -> typing.Callable[[], pathlib.Path]:
-    @functools.cache
     def wrapper() -> pathlib.Path:
         path.mkdir(exist_ok=True, parents=True)
         return path
@@ -17,7 +16,6 @@ def dir_wrapper(path: pathlib.Path) -> typing.Callable[[], pathlib.Path]:
 
 
 def file_wrapper(path: pathlib.Path) -> typing.Callable[[], pathlib.Path]:
-    @functools.cache
     def wrapper() -> pathlib.Path:
         path.parent.mkdir(exist_ok=True, parents=True)
         return path
@@ -55,6 +53,8 @@ _strava_last_activity_date_path = _cache_dir / "strava-last-activity-date.json"
 
 _new_config_file = pathlib.Path("config.json")
 
+_activity_meta_override_dir = pathlib.Path("Metadata Override")
+
 
 cache_dir = dir_wrapper(_cache_dir)
 
@@ -65,6 +65,7 @@ activity_enriched_meta_dir = dir_wrapper(_activity_enriched_meta_dir)
 activity_enriched_time_series_dir = dir_wrapper(_activity_enriched_time_series_dir)
 tiles_per_time_series = dir_wrapper(_tiles_per_time_series)
 strava_api_dir = dir_wrapper(_strava_api_dir)
+activity_meta_override_dir = dir_wrapper(_activity_meta_override_dir)
 
 activities_file = file_wrapper(_activities_file)
 strava_dynamic_config_path = file_wrapper(_strava_dynamic_config_path)

geo_activity_playground/importers/strava_api.py

@@ -139,7 +139,7 @@ def try_import_strava(config: Config) -> bool:
                         "commute": activity.commute,
                         "distance_km": activity.distance / 1000,
                         "name": activity.name,
-                        "kind": str(activity.type),
+                        "kind": str(activity.type.root),
                         "start": convert_to_datetime_ns(activity.start_date),
                         "elapsed_time": activity.elapsed_time,
                         "equipment": gear_names[activity.gear_id],

geo_activity_playground/webui/activity/blueprint.py

@@ -1,21 +1,29 @@
+import json
 import urllib.parse
 from collections.abc import Collection
 
 from flask import Blueprint
+from flask import redirect
 from flask import render_template
+from flask import request
 from flask import Response
+from flask import url_for
 
 from ...core.activities import ActivityRepository
 from ...explorer.tile_visits import TileVisitAccessor
 from .controller import ActivityController
 from geo_activity_playground.core.config import Config
+from geo_activity_playground.core.paths import activity_meta_override_dir
 from geo_activity_playground.core.privacy_zones import PrivacyZone
+from geo_activity_playground.webui.authenticator import Authenticator
+from geo_activity_playground.webui.authenticator import needs_authentication
 
 
 def make_activity_blueprint(
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
     config: Config,
+    authenticator: Authenticator,
 ) -> Blueprint:
     blueprint = Blueprint("activity", __name__, template_folder="templates")
 
@@ -44,14 +52,58 @@ def make_activity_blueprint(
     def day(year: str, month: str, day: str):
         return render_template(
             "activity/day.html.j2",
-            **activity_controller.render_day(int(year), int(month), int(day))
+            **activity_controller.render_day(int(year), int(month), int(day)),
         )
 
     @blueprint.route("/name/<name>")
     def name(name: str):
         return render_template(
             "activity/name.html.j2",
-            **activity_controller.render_name(urllib.parse.unquote(name))
+            **activity_controller.render_name(urllib.parse.unquote(name)),
+        )
+
+    @blueprint.route("/edit/<id>", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def edit(id: str):
+        activity_id = int(id)
+        activity = repository.get_activity_by_id(activity_id)
+        override_file = activity_meta_override_dir() / f"{activity_id}.json"
+        if override_file.exists():
+            with open(override_file) as f:
+                override = json.load(f)
+        else:
+            override = {}
+
+        if request.method == "POST":
+            override = {}
+            if value := request.form.get("name"):
+                override["name"] = value
+                repository.meta.loc[activity_id, "name"] = value
+            if value := request.form.get("kind"):
+                override["kind"] = value
+                repository.meta.loc[activity_id, "kind"] = value
+            if value := request.form.get("equipment"):
+                override["equipment"] = value
+                repository.meta.loc[activity_id, "equipment"] = value
+            if value := request.form.get("commute"):
+                override["commute"] = True
+                repository.meta.loc[activity_id, "commute"] = True
+            if value := request.form.get("consider_for_achievements"):
+                override["consider_for_achievements"] = True
+                repository.meta.loc[activity_id, "consider_for_achievements"] = True
+
+            with open(override_file, "w") as f:
+                json.dump(override, f, ensure_ascii=False, indent=4, sort_keys=True)
+
+            repository.save()
+
+            return redirect(url_for(".show", id=activity_id))
+
+        return render_template(
+            "activity/edit.html.j2",
+            activity_id=activity_id,
+            activity=activity,
+            override=override,
         )
 
     return blueprint

geo_activity_playground/webui/activity/controller.py

@@ -115,6 +115,8 @@ class ActivityController:
             result["altitude_time_plot"] = altitude_time_plot(time_series)
         if "heartrate" in time_series.columns:
             result["heartrate_time_plot"] = heart_rate_time_plot(time_series)
+        if "cadence" in time_series.columns:
+            result["cadence_time_plot"] = cadence_time_plot(time_series)
         return result
 
     def render_sharepic(self, id: int) -> bytes:
@@ -324,6 +326,20 @@ def heart_rate_time_plot(time_series: pd.DataFrame) -> str:
     )
 
 
+def cadence_time_plot(time_series: pd.DataFrame) -> str:
+    return (
+        alt.Chart(time_series, title="Cadence")
+        .mark_line()
+        .encode(
+            alt.X("time", title="Time"),
+            alt.Y("cadence", title="Cadence"),
+            alt.Color("segment_id:N", title="Segment"),
+        )
+        .interactive(bind_y=False)
+        .to_json(format="vega")
+    )
+
+
 def heart_rate_zone_plot(heart_zones: pd.DataFrame) -> str:
     return (
         alt.Chart(heart_zones, title="Heart Rate Zones")

geo_activity_playground/webui/activity/templates/activity/day.html.j2

@@ -41,7 +41,7 @@
     <div class="col">
         <h2>Activities</h2>
 
-        <table class="table">
+        <table class="table table-sort table-arrows">
             <thead>
                 <tr>
                     <th>Name</th>
@@ -58,9 +58,9 @@
                     <td><span style="color: {{ activity['color'] }};">█</span> <a
                             href="{{ url_for('activity.show', id=activity.id) }}">{{
                             activity.name }}</a></td>
-                    <td>{{ activity.start }}</td>
+                    <td>{{ activity.start|dt }}</td>
                     <td>{{ activity.distance_km | round(1) }}</td>
-                    <td>{{ activity.elapsed_time }}</td>
+                    <td>{{ activity.elapsed_time|td }}</td>
                     <td>{{ activity["equipment"] }}</td>
                     <td>{{ activity["kind"] }}</td>
                 </tr>
@@ -70,7 +70,7 @@
                     <td><b>Total</b></td>
                     <td></td>
                     <td><b>{{ total_distance | round(1) }}</b></td>
-                    <td><b>{{ total_elapsed_time }}</b></td>
+                    <td><b>{{ total_elapsed_time|td }}</b></td>
                     <td></td>
                     <td></td>
                 </tr>

geo_activity_playground/webui/activity/templates/activity/edit.html.j2

@@ -0,0 +1,42 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Edit Activity</h1>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="name" class="form-label">Name</label>
+        <input type="text" class="form-control" id="name" name="name" value="{{ override['name'] }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="kind" class="form-label">Kind</label>
+        <input type="text" class="form-control" id="kind" name="kind" value="{{ override['kind'] }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="equipment" class="form-label">Equipment</label>
+        <input type="text" class="form-control" id="equipment" name="equipment" value="{{ override['equipment'] }}" />
+    </div>
+
+    <div class="mb-3">
+        <div class="form-check">
+            <input type="checkbox" class="form-check-input" id="commute" name="commute" {% if override['commute'] %}
+                checked {% endif %} />
+            <label for="commute" class="form-check-label">Commute</label>
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <div class="form-check">
+            <input type="checkbox" class="form-check-input" id="consider_for_achievements"
+                name="consider_for_achievements" {% if override['consider_for_achievements'] %} checked {% endif %} />
+            <label for="consider_for_achievements" class="form-check-label">Consider for achievements</label>
+        </div>
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+{% endblock %}

geo_activity_playground/webui/activity/templates/activity/name.html.j2

@@ -50,12 +50,12 @@
     <div class="col">
         <h2>Activities</h2>
 
-        <table class="table">
+        <table class="table table-sort table-arrows">
             <thead>
                 <tr>
                     <th>Name</th>
                     <th>Date</th>
-                    <th>Distance / km</th>
+                    <th class="numeric-sort">Distance / km</th>
                     <th>Elapsed time</th>
                     <th>Equipment</th>
                     <th>Kind</th>
@@ -66,9 +66,9 @@
                 <tr>
                     <td><span style="color: {{ activity['color'] }};">█</span> <a href="{{ url_for('activity.show', id=activity.id) }}">{{
                             activity.name }}</a></td>
-                    <td>{{ activity.start }}</td>
+                    <td>{{ activity.start|dt }}</td>
                     <td>{{ activity.distance_km | round(1) }}</td>
-                    <td>{{ activity.elapsed_time }}</td>
+                    <td>{{ activity.elapsed_time|td }}</td>
                     <td>{{ activity["equipment"] }}</td>
                     <td>{{ activity["kind"] }}</td>
                 </tr>

geo_activity_playground/webui/activity/templates/activity/show.html.j2

@@ -19,9 +19,9 @@
             <dt>Distance</dt>
             <dd>{{ activity.distance_km|round(1) }} km</dd>
             <dt>Elapsed time</dt>
-            <dd>{{ activity.elapsed_time }}</dd>
+            <dd>{{ activity.elapsed_time|td }}</dd>
             <dt>Moving time</dt>
-            <dd>{{ activity.moving_time }}</dd>
+            <dd>{{ activity.moving_time|td }}</dd>
             <dt>Start time</dt>
             <dd><a href="{{ url_for('activity.day', year=date.year, month=date.month, day=date.day) }}">{{ date }}</a>
                 {{ time }}
@@ -31,7 +31,7 @@
             <dt>Steps</dt>
             <dd>{{ activity.steps }}</dd>
             <dt>Equipment</dt>
-            <dd>{{ activity.equipment }}</dd>
+            <dd>{{ activity['equipment'] }}</dd>
             <dt>New Explorer Tiles</dt>
             <dd>{{ new_tiles[14] }}</dd>
             <dt>New Squadratinhos</dt>
@@ -41,6 +41,8 @@
             <dt>Source path</dt>
             <dd>{{ activity.path }}</dd>
         </dl>
+
+        <a href="{{ url_for('.edit', id=activity['id']) }}" class="btn btn-secondary btn-small">Edit metadata</a>
     </div>
     <div class="col-8">
         <div id="activity-map" style="height: 500px;" class="mb-3"></div>
@@ -129,6 +131,17 @@
 </div>
 {% endif %}
 
+{% if cadence_time_plot is defined %}
+<h2>Cadence</h2>
+
+<div class="row mb-3">
+    <div class="col-md-4">
+        {{ vega_direct("cadence_time_plot", cadence_time_plot) }}
+    </div>
+</div>
+{% endif %}
+
+
 <h2>Share picture</h2>
 
 <p><img src="{{ url_for('.sharepic', id=activity.id) }}" /></p>
@@ -177,11 +190,11 @@
 
         <p><a href="{{ url_for('.name', name=activity['name']) }}">Overview over these activities</a></p>
 
-        <table class="table">
+        <table class="table table-sort table-arrows">
             <thead>
                 <tr>
                     <th>Date</th>
-                    <th>Distance / km</th>
+                    <th class="numeric-sort">Distance / km</th>
                     <th>Elapsed time</th>
                     <th>Equipment</th>
                     <th>Kind</th>
@@ -190,10 +203,10 @@
             <tbody>
                 {% for other_activity in similar_activites %}
                 <tr>
-                    <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start
+                    <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start|dt
                             }}</a></td>
                     <td>{{ other_activity.distance_km | round(1) }}</td>
-                    <td>{{ other_activity.elapsed_time }}</td>
+                    <td>{{ other_activity.elapsed_time|td }}</td>
                     <td>{{ other_activity["equipment"] }}</td>
                     <td>{{ other_activity["kind"] }}</td>
                 </tr>

geo_activity_playground/webui/app.py

@@ -1,3 +1,4 @@
+import datetime
 import importlib
 import json
 import pathlib
@@ -60,6 +61,18 @@ def web_ui_main(
     app.config["UPLOAD_FOLDER"] = "Activities"
     app.secret_key = get_secret_key()
 
+    @app.template_filter()
+    def dt(value: datetime.datetime):
+        return value.strftime("%Y-%m-%d %H:%M")
+
+    @app.template_filter()
+    def td(v: datetime.timedelta):
+        seconds = v.total_seconds()
+        h = int(seconds // 3600)
+        m = int(seconds // 60 % 60)
+        s = int(seconds // 1 % 60)
+        return f"{h}:{m:02d}:{s:02d}"
+
     authenticator = Authenticator(config_accessor())
 
     route_start(app, repository, config_accessor())
@@ -68,9 +81,7 @@ def web_ui_main(
 
     app.register_blueprint(
         make_activity_blueprint(
-            repository,
-            tile_visit_accessor,
-            config_accessor(),
+            repository, tile_visit_accessor, config_accessor(), authenticator
         ),
         url_prefix="/activity",
     )

geo_activity_playground/webui/equipment/templates/equipment/index.html.j2

@@ -9,7 +9,7 @@
 
 <div class="row mb-3">
     <div class="col">
-        <table class="table">
+        <table class="table table-sort table-arrows">
             <thead>
                 <tr>
                     <th>Equipment</th>

geo_activity_playground/webui/heatmap/heatmap_controller.py

@@ -90,23 +90,25 @@ class HeatmapController:
             tile_counts = np.zeros(tile_pixels, dtype=np.int32)
         tile_count_cache_path.parent.mkdir(parents=True, exist_ok=True)
         activity_ids = self.activities_per_tile[z].get((x, y), set())
-        if activity_ids:
+        activity_ids_kind = set()
+        for activity_id in activity_ids:
+            activity = self._repository.get_activity_by_id(activity_id)
+            if activity["kind"] == kind:
+                activity_ids_kind.add(activity_id)
+        if activity_ids_kind:
             with work_tracker(
                 tile_count_cache_path.with_suffix(".json")
             ) as parsed_activities:
-                if parsed_activities - activity_ids:
+                if parsed_activities - activity_ids_kind:
                     logger.warning(
                         f"Resetting heatmap cache for {kind=}/{x=}/{y=}/{z=} because activities have been removed."
                     )
                     tile_counts = np.zeros(tile_pixels, dtype=np.int32)
                     parsed_activities.clear()
-                for activity_id in activity_ids:
+                for activity_id in activity_ids_kind:
                     if activity_id in parsed_activities:
                         continue
                     parsed_activities.add(activity_id)
-                    activity = self._repository.get_activity_by_id(activity_id)
-                    if activity["kind"] != kind:
-                        continue
                     time_series = self._repository.get_time_series(activity_id)
                     for _, group in time_series.groupby("segment_id"):
                         xy_pixels = (

geo_activity_playground/webui/search/blueprint.py

@@ -1,4 +1,8 @@
+from functools import reduce
+
+import dateutil.parser
 from flask import Blueprint
+from flask import flash
 from flask import render_template
 from flask import request
 from flask import Response
@@ -6,15 +10,92 @@ from flask import Response
 from ...core.activities import ActivityRepository
 
 
+def reduce_or(selections):
+    return reduce(lambda a, b: a | b, selections)
+
+
+def reduce_and(selections):
+    return reduce(lambda a, b: a & b, selections)
+
+
 def make_search_blueprint(repository: ActivityRepository) -> Blueprint:
     blueprint = Blueprint("search", __name__, template_folder="templates")
 
-    @blueprint.route("/", methods=["POST"])
+    @blueprint.route("/")
     def index():
-        activities = []
-        for _, row in repository.meta.iterrows():
-            if request.form["name"] in row["name"]:
-                activities.append(row)
-        return render_template("search/index.html.j2", activities=activities)
+        kinds_avail = repository.meta["kind"].unique()
+        equipments_avail = repository.meta["equipment"].unique()
+
+        print(request.args)
+
+        activities = repository.meta
+
+        if equipments := request.args.getlist("equipment"):
+            selection = reduce_or(
+                activities["equipment"] == equipment for equipment in equipments
+            )
+            activities = activities.loc[selection]
+
+        if kinds := request.args.getlist("kind"):
+            selection = reduce_or(activities["kind"] == kind for kind in kinds)
+            activities = activities.loc[selection]
+
+        name_exact = bool(request.args.get("name_exact", False))
+        name_casing = bool(request.args.get("name_casing", False))
+        if name := request.args.get("name", ""):
+            if name_casing:
+                haystack = activities["name"]
+                needle = name
+            else:
+                haystack = activities["name"].str.lower()
+                needle = name.lower()
+            if name_exact:
+                selection = haystack == needle
+            else:
+                selection = [needle in an for an in haystack]
+            activities = activities.loc[selection]
+
+        begin = request.args.get("begin", "")
+        end = request.args.get("end", "")
+
+        if begin:
+            try:
+                begin_dt = dateutil.parser.parse(begin)
+            except ValueError:
+                flash(
+                    f"Cannot parse date `{begin}`, please use a different format.",
+                    category="danger",
+                )
+            else:
+                selection = begin_dt <= activities["start"]
+                activities = activities.loc[selection]
+
+        if end:
+            try:
+                end_dt = dateutil.parser.parse(end)
+            except ValueError:
+                flash(
+                    f"Cannot parse date `{end}`, please use a different format.",
+                    category="danger",
+                )
+            else:
+                selection = activities["start"] < end_dt
+                activities = activities.loc[selection]
+
+        activities = activities.sort_values("start", ascending=False)
+
+        return render_template(
+            "search/index.html.j2",
+            activities=list(activities.iterrows()),
+            equipments=request.args.getlist("equipment"),
+            equipments_avail=sorted(equipments_avail),
+            kinds=request.args.getlist("kind"),
+            kinds_avail=sorted(kinds_avail),
+            name=name,
+            name_exact=name_exact,
+            name_casing=name_casing,
+            begin=begin,
+            end=end,
+        )
 
     return blueprint