geo-activity-playground 1.0.0__tar.gz → 1.2.0__tar.gz

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 1.0.0
+Version: 1.2.0
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding

geo_activity_playground-1.2.0/geo_activity_playground/alembic/versions/dc8073871da7_add_plotspec_group_by.py

@@ -0,0 +1,28 @@
+from typing import Sequence
+from typing import Union
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision: str = "dc8073871da7"
+down_revision: Union[str, None] = "0f02b92c4f94"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("plot_specs", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("group_by", sa.String(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("plot_specs", schema=None) as batch_op:
+        batch_op.drop_column("group_by")
+
+    # ### end Alembic commands ###

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/core/config.py

@@ -21,6 +21,7 @@ logger = logging.getLogger(__name__)
 @dataclasses.dataclass
 class Config:
     birth_year: Optional[int] = None
+    cluster_color_strategy: str = "colorful_cluster"
     color_scheme_for_counts: str = "teals"
     color_scheme_for_kind: str = "category10"
     color_scheme_for_heatmap: str = "hot"

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/core/datamodel.py

@@ -32,6 +32,17 @@ logger = logging.getLogger(__name__)
 DEFAULT_UNKNOWN_NAME = "Unknown"
 
 
+def format_timedelta(v: datetime.timedelta):
+    if pd.isna(v):
+        return "—"
+    else:
+        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}"
+
+
 class ActivityMeta(TypedDict):
     average_speed_elapsed_kmh: float
     average_speed_moving_kmh: float
@@ -165,6 +176,23 @@ class Activity(DB.Model):
         else:
             return self.raw_time_series
 
+    @property
+    def emoji_string(self) -> str:
+        bits = []
+        if self.kind:
+            bits.append(f"{self.kind.name} with")
+        if self.distance_km:
+            bits.append(f"📏 {round(self.distance_km, 1)} km")
+        if self.elapsed_time:
+            bits.append(f"⏱️ {format_timedelta(self.elapsed_time)} h")
+        if self.elevation_gain:
+            bits.append(f"⛰️ {round(self.elevation_gain, 1)} m")
+        if self.calories:
+            bits.append(f"🍭 {self.calories} kcal")
+        if self.steps:
+            bits.append(f"👣 {self.steps}")
+        return " ".join(bits)
+
     def delete_data(self) -> None:
         for path in [
             TIME_SERIES_DIR() / f"{self.id}.parquet",
@@ -229,11 +257,15 @@ def query_activity_meta(clauses: list = []) -> pd.DataFrame:
         .order_by(Activity.start)
     ).all()
     df = pd.DataFrame(rows)
-    # If the search yields only activities without time information, the dtype isn't derived correctly.
-    df["start"] = pd.to_datetime(df["start"])
-    df["elapsed_time"] = pd.to_timedelta(df["elapsed_time"])
 
     if len(df):
+        # If the search yields only activities without time information, the dtype isn't derived correctly.
+        df["start"] = pd.to_datetime(df["start"])
+        # start = df["start"].to_list()
+        # random.shuffle(start)
+        # df["start"] = pd.Series(start)
+        df["elapsed_time"] = pd.to_timedelta(df["elapsed_time"])
+
         for old, new in [
             ("elapsed_time", "average_speed_elapsed_kmh"),
             ("moving_time", "average_speed_moving_kmh"),
@@ -251,8 +283,12 @@ def query_activity_meta(clauses: list = []) -> pd.DataFrame:
         df["week"] = df["start"].dt.isocalendar().week
         df["day_of_week"] = df["start"].dt.day_of_week
         df["iso_year"] = df["start"].dt.isocalendar().year
+        df["iso_day"] = df["start"].dt.isocalendar().day
         df["hours"] = df["elapsed_time"].dt.total_seconds() / 3_600
         df["hours_moving"] = df["moving_time"].dt.total_seconds() / 3_600
+        df["iso_year_week"] = [
+            f"{year:04d}-{week:02d}" for year, week in zip(df["iso_year"], df["week"])
+        ]
 
         df.index = df["id"]
 
@@ -365,6 +401,7 @@ class PlotSpec(DB.Model):
     opacity: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
     column: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
     facet: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    group_by: Mapped[str] = mapped_column(sa.String, nullable=True, default="")
 
     FIELDS = [
         "name",
@@ -378,6 +415,7 @@ class PlotSpec(DB.Model):
         "opacity",
         "column",
         "facet",
+        "group_by",
     ]
 
     def __str__(self) -> str:

geo_activity_playground-1.2.0/geo_activity_playground/core/parametric_plot.py

@@ -0,0 +1,162 @@
+import altair as alt
+import pandas as pd
+
+from .datamodel import PlotSpec
+
+
+MARKS = {
+    "point": "Point",
+    "circle": "Circle",
+    "area": "Area",
+    "bar": "Bar",
+    "rect": "Rectangle",
+    "line": "Line",
+}
+CONTINUOUS_VARIABLES = {
+    "distance_km": "Distance / km",
+    "distance_km_cumsum": "Cumulative Distance / km",
+    "sum(distance_km)": "Total distance / km",
+    "mean(distance_km)": "Average distance / km",
+    "start": "Date",
+    "hours": "Elapsed time / h",
+    "hours_moving": "Moving time / h",
+    "calories": "Energy / kcal",
+    "steps": "Steps",
+    "elevation_gain": "Elevation gain / m",
+    "start_elevation": "Start elevation / m",
+    "end_elevation": "End elevation / m",
+    "sum(elevation_gain)": "Total elevation gain / m",
+    "mean(elevation_gain)": "Average elevation gain / m",
+    "num_new_tiles_14": "New tiles 14",
+    "num_new_tiles_14": "New tiles 17",
+    "average_speed_moving_kmh": "Average moving speed / km/h",
+    "average_speed_elapsed_kmh": "Average elapsed speed / km/h",
+    "start_latitude": "Start latitude / °",
+    "start_longitude": "Start longitude / °",
+    "end_latitude": "End latitude / °",
+    "end_longitude": "End longitude / °",
+}
+DISCRETE_VARIABLES = {
+    "equipment": "Equipment",
+    "kind": "Activity kind",
+    "consider_for_achievements": "Consider for achievements",
+    "year(start):O": "Year",
+    "iso_year:O": "ISO Year",
+    "yearquarter(start)": "Year, Quarter",
+    "yearquartermonth(start)": "Year, Quarter, Month",
+    "yearmonth(start)": "Year, Month",
+    "quarter(start)": "Quarter",
+    "quartermonth(start)": "Quarter, Month",
+    "month(start)": "Month",
+    "week:O": "ISO Week",
+    "date(start)": "Day of month",
+    "weekday(start)": "Day of week",
+    "iso_day:O": "ISO Day",
+}
+GROUP_BY_VARIABLES = {
+    "": "(no grouping)",
+    "equipment": "Equipment",
+    "kind": "Activity kind",
+    "consider_for_achievements": "Consider for achievements",
+    "year": "Year",
+    "iso_year": "ISO Year",
+    "week": "ISO Week",
+}
+
+VARIABLES_1 = {"": "", **DISCRETE_VARIABLES}
+VARIABLES_2 = {"": "", **DISCRETE_VARIABLES, **CONTINUOUS_VARIABLES}
+
+
+def make_parametric_plot(df: pd.DataFrame, spec: PlotSpec) -> dict[str, str]:
+    if spec.group_by:
+        grouped = df.groupby(spec.group_by)
+    else:
+        grouped = [("", df)]
+
+    chart_groups = {}
+    for key, group in grouped:
+        chart = alt.Chart(group)
+
+        match spec.mark:
+            case "point":
+                chart = chart.mark_point()
+            case "circle":
+                chart = chart.mark_circle()
+            case "area":
+                chart = chart.mark_area()
+            case "bar":
+                chart = chart.mark_bar()
+            case "rect":
+                chart = chart.mark_rect()
+            case "line":
+                chart = chart.mark_line()
+            case _:
+                raise ValueError()
+
+        if spec.mark in ["area", "line"]:
+            group_by_variables = [
+                var.split(":")[0]
+                for var in [
+                    spec.color,
+                    spec.shape,
+                    spec.size,
+                    spec.opacity,
+                    spec.row,
+                    spec.column,
+                    spec.facet,
+                ]
+                if var
+            ]
+            for column in ["distance_km"]:
+                group[column + "_cumsum"] = (
+                    group[group_by_variables + [column]]
+                    .groupby(group_by_variables)
+                    .cumsum()
+                )
+
+        encodings = [
+            (
+                alt.X(spec.x, type="ordinal", title=VARIABLES_2[spec.x])
+                if spec.mark == "rect"
+                else alt.X(spec.x, title=VARIABLES_2[spec.x])
+            ),
+            (
+                alt.Y(spec.y, type="ordinal", title=VARIABLES_2[spec.y])
+                if spec.mark == "rect"
+                else alt.Y(spec.y, title=VARIABLES_2[spec.y])
+            ),
+        ]
+        tooltips = [
+            alt.Tooltip(spec.x, title=VARIABLES_2[spec.x]),
+            alt.Tooltip(spec.y, title=VARIABLES_2[spec.y]),
+        ]
+
+        if spec.color:
+            encodings.append(alt.Color(spec.color, title=VARIABLES_2[spec.color]))
+            tooltips.append(alt.Tooltip(spec.color, title=VARIABLES_2[spec.color]))
+        if spec.shape:
+            encodings.append(alt.Shape(spec.shape, title=VARIABLES_2[spec.shape]))
+            tooltips.append(alt.Tooltip(spec.shape, title=VARIABLES_2[spec.shape]))
+        if spec.size:
+            encodings.append(alt.Size(spec.size, title=VARIABLES_2[spec.size]))
+            tooltips.append(alt.Tooltip(spec.size, title=VARIABLES_2[spec.size]))
+        if spec.opacity:
+            encodings.append(alt.Opacity(spec.opacity, title=VARIABLES_2[spec.opacity]))
+            tooltips.append(alt.Tooltip(spec.opacity, title=VARIABLES_2[spec.opacity]))
+        if spec.row:
+            encodings.append(alt.Row(spec.row, title=VARIABLES_2[spec.row]))
+            tooltips.append(alt.Tooltip(spec.row, title=VARIABLES_2[spec.row]))
+        if spec.column:
+            encodings.append(alt.Column(spec.column, title=VARIABLES_2[spec.column]))
+            tooltips.append(alt.Tooltip(spec.column, title=VARIABLES_2[spec.column]))
+        if spec.facet:
+            encodings.append(
+                alt.Facet(spec.facet, columns=3, title=VARIABLES_2[spec.facet])
+            )
+            tooltips.append(alt.Tooltip(spec.facet, title=VARIABLES_2[spec.facet]))
+
+        key = str(int(key) if isinstance(key, float) else key)
+        chart_groups[key] = (
+            chart.encode(*encodings, tooltips).interactive().to_json(format="vega")
+        )
+    return chart_groups

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/app.py

@@ -7,6 +7,7 @@ import pathlib
 import secrets
 import shutil
 import urllib.parse
+import uuid
 
 import pandas as pd
 import sqlalchemy
@@ -39,6 +40,7 @@ from .blueprints.entry_views import register_entry_views
 from .blueprints.equipment_blueprint import make_equipment_blueprint
 from .blueprints.explorer_blueprint import make_explorer_blueprint
 from .blueprints.export_blueprint import make_export_blueprint
+from .blueprints.hall_of_fame_blueprint import make_hall_of_fame_blueprint
 from .blueprints.heatmap_blueprint import make_heatmap_blueprint
 from .blueprints.photo_blueprint import make_photo_blueprint
 from .blueprints.plot_builder_blueprint import make_plot_builder_blueprint
@@ -112,6 +114,10 @@ def web_ui_main(
         else:
             return value.strftime("%Y-%m-%d %H:%M")
 
+    @app.template_global("unique_id")
+    def unique_id():
+        return f"id-{uuid.uuid4()}"
+
     @app.template_filter()
     def td(v: datetime.timedelta):
         if pd.isna(v):
@@ -162,6 +168,7 @@ def web_ui_main(
             image_transforms,
         ),
         "/export": make_export_blueprint(authenticator),
+        "/hall-of-fame": make_hall_of_fame_blueprint(repository, search_query_history),
         "/heatmap": make_heatmap_blueprint(
             repository, tile_visit_accessor, config_accessor(), search_query_history
         ),

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/activity_blueprint.py

@@ -18,6 +18,7 @@ from flask import render_template
 from flask import request
 from flask import Response
 from flask import url_for
+from flask.typing import ResponseReturnValue
 from PIL import Image
 from PIL import ImageDraw
 
@@ -59,7 +60,7 @@ def make_activity_blueprint(
     blueprint = Blueprint("activity", __name__, template_folder="templates")
 
     @blueprint.route("/all")
-    def all():
+    def all() -> ResponseReturnValue:
         cmap = matplotlib.colormaps["Dark2"]
         fc = geojson.FeatureCollection(
             features=[
@@ -93,7 +94,7 @@ def make_activity_blueprint(
         return render_template("activity/lines.html.j2", **context)
 
     @blueprint.route("/<int:id>")
-    def show(id: str):
+    def show(id: str) -> ResponseReturnValue:
         activity = repository.get_activity_by_id(id)
 
         time_series = repository.get_time_series(id)
@@ -189,7 +190,7 @@ def make_activity_blueprint(
         return render_template("activity/show.html.j2", **context)
 
     @blueprint.route("/<int:id>/sharepic.png")
-    def sharepic(id: int):
+    def sharepic(id: int) -> ResponseReturnValue:
         activity = repository.get_activity_by_id(id)
         time_series = repository.get_time_series(id)
         for coordinates in config.privacy_zones.values():
@@ -205,7 +206,7 @@ def make_activity_blueprint(
         )
 
     @blueprint.route("/day/<int:year>/<int:month>/<int:day>")
-    def day(year: int, month: int, day: int):
+    def day(year: int, month: int, day: int) -> ResponseReturnValue:
         meta = repository.meta
         selection = meta["start"].dt.date == datetime.date(year, month, day)
         activities_that_day = meta.loc[selection]
@@ -256,7 +257,7 @@ def make_activity_blueprint(
         )
 
     @blueprint.route("/day-sharepic/<int:year>/<int:month>/<int:day>/sharepic.png")
-    def day_sharepic(year: int, month: int, day: int):
+    def day_sharepic(year: int, month: int, day: int) -> ResponseReturnValue:
         meta = repository.meta
         selection = meta["start"].dt.date == datetime.date(year, month, day)
         activities_that_day = meta.loc[selection]
@@ -273,7 +274,7 @@ def make_activity_blueprint(
         )
 
     @blueprint.route("/name/<name>")
-    def name(name: str):
+    def name(name: str) -> ResponseReturnValue:
         meta = repository.meta
         selection = meta["name"] == name
         activities_with_name = meta.loc[selection]
@@ -324,7 +325,7 @@ def make_activity_blueprint(
 
     @blueprint.route("/edit/<id>", methods=["GET", "POST"])
     @needs_authentication(authenticator)
-    def edit(id: str):
+    def edit(id: str) -> ResponseReturnValue:
         activity = DB.session.get(Activity, int(id))
         if activity is None:
             abort(404)
@@ -365,7 +366,7 @@ def make_activity_blueprint(
 
     @blueprint.route("/trim/<id>", methods=["GET", "POST"])
     @needs_authentication(authenticator)
-    def trim(id: str):
+    def trim(id: str) -> ResponseReturnValue:
         activity = DB.session.get(Activity, int(id))
         if activity is None:
             abort(404)
@@ -434,7 +435,7 @@ def make_activity_blueprint(
 
     @blueprint.route("/delete/<id>")
     @needs_authentication(authenticator)
-    def delete(id: int):
+    def delete(id: int) -> ResponseReturnValue:
         activity = DB.session.get_one(Activity, id)
         activity.delete_data()
         DB.session.delete(activity)
@@ -443,7 +444,7 @@ def make_activity_blueprint(
 
     @blueprint.route("/download-original/<id>")
     @needs_authentication(authenticator)
-    def download_original(id: int):
+    def download_original(id: int) -> ResponseReturnValue:
         activity = DB.session.get_one(Activity, id)
         path = pathlib.Path(activity.path)
         with open(path) as f:

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/auth_blueprint.py

@@ -3,6 +3,7 @@ from flask import redirect
 from flask import render_template
 from flask import request
 from flask import url_for
+from flask.typing import ResponseReturnValue
 
 from ..authenticator import Authenticator
 
@@ -11,7 +12,7 @@ def make_auth_blueprint(authenticator: Authenticator) -> Blueprint:
     blueprint = Blueprint("auth", __name__, template_folder="templates")
 
     @blueprint.route("/", methods=["GET", "POST"])
-    def index():
+    def index() -> ResponseReturnValue:
         if request.method == "POST":
             authenticator.authenticate(request.form["password"])
             if redirect_to := request.form["redirect"]:
@@ -23,7 +24,7 @@ def make_auth_blueprint(authenticator: Authenticator) -> Blueprint:
         )
 
     @blueprint.route("/logout")
-    def logout():
+    def logout() -> ResponseReturnValue:
         authenticator.logout()
         return redirect(url_for(".index"))
 

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/bubble_chart_blueprint.py

@@ -2,6 +2,7 @@ import altair as alt
 import pandas as pd
 from flask import Blueprint
 from flask import render_template
+from flask.typing import ResponseReturnValue
 
 from ..columns import column_distance
 from ..columns import column_elevation_gain
@@ -12,7 +13,7 @@ def make_bubble_chart_blueprint(repository) -> Blueprint:
     blueprint = Blueprint("bubble_chart", __name__, template_folder="templates")
 
     @blueprint.route("/", endpoint="index")
-    def bubble_chart():
+    def bubble_chart() -> ResponseReturnValue:
         activities = repository.meta
 
         # Ensure 'activity_id' exists in the activities DataFrame

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/calendar_blueprint.py

@@ -5,6 +5,7 @@ import pandas as pd
 import sqlalchemy
 from flask import Blueprint
 from flask import render_template
+from flask.typing import ResponseReturnValue
 
 from ...core.activities import ActivityRepository
 from ...core.datamodel import Activity
@@ -15,7 +16,7 @@ def make_calendar_blueprint(repository: ActivityRepository) -> Blueprint:
     blueprint = Blueprint("calendar", __name__, template_folder="templates")
 
     @blueprint.route("/")
-    def index():
+    def index() -> ResponseReturnValue:
         data = DB.session.execute(
             sqlalchemy.select(Activity.start, Activity.distance_km)
         ).all()
@@ -49,7 +50,7 @@ def make_calendar_blueprint(repository: ActivityRepository) -> Blueprint:
         return render_template("calendar/index.html.j2", **context)
 
     @blueprint.route("/<int:year>/<int:month>")
-    def month(year: int, month: int):
+    def month(year: int, month: int) -> ResponseReturnValue:
         meta = repository.meta
 
         filtered = meta.loc[

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/eddington_blueprints.py

@@ -8,6 +8,7 @@ from flask import Blueprint
 from flask import render_template
 from flask import Request
 from flask import request
+from flask.typing import ResponseReturnValue
 
 from ...core.activities import ActivityRepository
 from ...core.meta_search import apply_search_query
@@ -24,7 +25,7 @@ def register_eddington_blueprint(
     blueprint = Blueprint("eddington", __name__, template_folder="templates")
 
     @blueprint.route("/")
-    def distance():
+    def distance() -> ResponseReturnValue:
         return _render_eddington_template(
             repository,
             request,
@@ -35,7 +36,7 @@ def register_eddington_blueprint(
         )
 
     @blueprint.route("/elevation_gain")
-    def elevation_gain():
+    def elevation_gain() -> ResponseReturnValue:
         return _render_eddington_template(
             repository,
             request,

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/entry_views.py

@@ -1,5 +1,6 @@
 import collections
 import datetime
+from typing import Any
 
 import altair as alt
 import flask
@@ -7,6 +8,7 @@ import pandas as pd
 import sqlalchemy
 from flask import render_template
 from flask import Response
+from flask.typing import ResponseReturnValue
 
 from ...core.activities import ActivityRepository
 from ...core.activities import make_geojson_from_time_series
@@ -16,6 +18,7 @@ from ...core.datamodel import DB
 from ..columns import column_distance
 from ..columns import column_elevation_gain
 from ..columns import ColumnDescription
+from ..columns import META_COLUMNS
 from ..plot_util import make_kind_scale
 
 
@@ -23,19 +26,16 @@ def register_entry_views(
     app: flask.Flask, repository: ActivityRepository, config: Config
 ) -> None:
     @app.route("/")
-    def index() -> Response:
-        context = {"latest_activities": []}
+    def index() -> ResponseReturnValue:
+        context: dict[str, Any] = {"latest_activities": []}
+        df = repository.meta
 
         if len(repository):
-            kind_scale = make_kind_scale(repository.meta, config)
-            context["distance_last_30_days_plot"] = _last_30_days_meta_plot(
-                repository.meta, kind_scale, column_distance
-            )
-
-            if config.reliable_elevation_measurements:
-                context["elevation_gain_last_30_days_plot"] = _last_30_days_meta_plot(
-                    repository.meta, kind_scale, column_elevation_gain
-                )
+            kind_scale = make_kind_scale(df, config)
+            context["last_30_days_plot"] = {
+                column.display_name: _last_30_days_meta_plot(df, kind_scale, column)
+                for column in META_COLUMNS
+            }
 
             context["latest_activities"] = collections.defaultdict(list)
             for activity in DB.session.scalars(

{geo_activity_playground-1.0.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/equipment_blueprint.py

@@ -2,6 +2,7 @@ import altair as alt
 import pandas as pd
 from flask import Blueprint
 from flask import render_template
+from flask.typing import ResponseReturnValue
 
 from ...core.activities import ActivityRepository
 from ...core.config import Config
@@ -15,7 +16,7 @@ def make_equipment_blueprint(
     blueprint = Blueprint("equipment", __name__, template_folder="templates")
 
     @blueprint.route("/")
-    def index():
+    def index() -> ResponseReturnValue:
         equipment_summary = get_equipment_use_table(
             repository.meta, config.equipment_offsets
         )