geo-activity-playground 0.41.0__tar.gz → 0.42.0__tar.gz

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.41.0
+Version: 0.42.0
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: Pillow (>=11.0.0,<12.0.0)
 Requires-Dist: alembic (>=1.15.2,<2.0.0)
 Requires-Dist: altair (>=5.5.0,<6.0.0)

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/core/activities.py

@@ -2,6 +2,7 @@ import datetime
 import functools
 import logging
 from collections.abc import Callable
+from collections.abc import Sequence
 from typing import Any
 from typing import Optional
 
@@ -21,17 +22,6 @@ from geo_activity_playground.core.datamodel import query_activity_meta
 logger = logging.getLogger(__name__)
 
 
-def make_activity_meta() -> ActivityMeta:
-    return ActivityMeta(
-        calories=None,
-        commute=False,
-        consider_for_achievements=True,
-        equipment="Unknown",
-        kind="Unknown",
-        steps=None,
-    )
-
-
 class ActivityRepository:
     def __len__(self) -> int:
         return len(self.get_activity_ids())
@@ -52,14 +42,14 @@ class ActivityRepository:
         else:
             return None
 
-    def get_activity_ids(self, only_achievements: bool = False) -> list[int]:
+    def get_activity_ids(self, only_achievements: bool = False) -> Sequence[int]:
         query = sqlalchemy.select(Activity.id)
         if only_achievements:
             query = query.where(Kind.consider_for_achievements)
-        result = DB.session.scalars(query).all()
+        result = DB.session.scalars(query.order_by(Activity.start)).all()
         return result
 
-    def iter_activities(self, new_to_old=True, drop_na=False) -> list[Activity]:
+    def iter_activities(self, new_to_old=True, drop_na=False) -> Sequence[Activity]:
         query = sqlalchemy.select(Activity)
         if drop_na:
             query = query.where(Activity.start.is_not(None))

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/core/datamodel.py

@@ -117,9 +117,6 @@ class Activity(DB.Model):
         secondary=activity_tag_association_table, back_populates="activities"
     )
 
-    def __getitem__(self, item) -> Any:
-        return self.to_dict()[item]
-
     def __str__(self) -> str:
         return f"{self.start} {self.name}"
 
@@ -127,11 +124,15 @@ class Activity(DB.Model):
     def average_speed_moving_kmh(self) -> Optional[float]:
         if self.moving_time:
             return self.distance_km / (self.moving_time.total_seconds() / 3_600)
+        else:
+            return None
 
     @property
     def average_speed_elapsed_kmh(self) -> Optional[float]:
         if self.elapsed_time:
             return self.distance_km / (self.elapsed_time.total_seconds() / 3_600)
+        else:
+            return None
 
     @property
     def raw_time_series(self) -> pd.DataFrame:
@@ -154,38 +155,6 @@ class Activity(DB.Model):
         else:
             return self.raw_time_series
 
-    def to_dict(self) -> ActivityMeta:
-        equipment = self.equipment.name if self.equipment is not None else "Unknown"
-        kind = self.kind.name if self.kind is not None else "Unknown"
-        consider_for_achievements = (
-            self.kind.consider_for_achievements if self.kind is not None else True
-        )
-        return ActivityMeta(
-            id=self.id,
-            name=self.name,
-            path=self.path,
-            distance_km=self.distance_km,
-            start=self.start,
-            elapsed_time=self.elapsed_time,
-            moving_time=self.moving_time,
-            start_latitude=self.start_latitude,
-            start_longitude=self.start_longitude,
-            end_latitude=self.end_latitude,
-            end_longitude=self.end_longitude,
-            elevation_gain=self.elevation_gain,
-            start_elevation=self.start_elevation,
-            end_elevation=self.end_elevation,
-            calories=self.calories,
-            steps=self.steps,
-            num_new_tiles_14=self.num_new_tiles_14,
-            num_new_tiles_17=self.num_new_tiles_17,
-            equipment=equipment,
-            kind=kind,
-            average_speed_moving_kmh=self.average_speed_moving_kmh,
-            average_speed_elapsed_kmh=self.average_speed_elapsed_kmh,
-            consider_for_achievements=consider_for_achievements,
-        )
-
 
 class Tag(DB.Model):
     __tablename__ = "tags"
@@ -199,6 +168,17 @@ class Tag(DB.Model):
     )
 
 
+def get_or_make_tag(tag: str) -> Tag:
+    tags = DB.session.scalars(sqlalchemy.select(Tag).where(Tag.tag == tag)).all()
+    if tags:
+        assert len(tags) == 1, f"There must be only one tag with name '{tag}'."
+        return tags[0]
+    else:
+        tag = Tag(tag=tag)
+        DB.session.add(tag)
+        return tag
+
+
 def query_activity_meta() -> pd.DataFrame:
     rows = DB.session.execute(
         sqlalchemy.select(
@@ -276,6 +256,23 @@ class Equipment(DB.Model):
     __table_args__ = (sa.UniqueConstraint("name", name="equipments_name"),)
 
 
+def get_or_make_equipment(name: str, config: Config) -> Equipment:
+    equipments = DB.session.scalars(
+        sqlalchemy.select(Equipment).where(Equipment.name == name)
+    ).all()
+    if equipments:
+        assert (
+            len(equipments) == 1
+        ), f"There must be only one equipment with name '{name}'."
+        return equipments[0]
+    else:
+        equipment = Equipment(
+            name=name, offset_km=config.equipment_offsets.get(name, 0)
+        )
+        DB.session.add(equipment)
+        return equipment
+
+
 class Kind(DB.Model):
     __tablename__ = "kinds"
 
@@ -299,20 +296,6 @@ class Kind(DB.Model):
     __table_args__ = (sa.UniqueConstraint("name", name="kinds_name"),)
 
 
-class SquarePlannerBookmark(DB.Model):
-    __tablename__ = "square_planner_bookmarks"
-
-    id: Mapped[int] = mapped_column(primary_key=True)
-
-    zoom: Mapped[int] = mapped_column(sa.Integer, nullable=False)
-    x: Mapped[int] = mapped_column(sa.Integer, nullable=False)
-    y: Mapped[int] = mapped_column(sa.Integer, nullable=False)
-    size: Mapped[int] = mapped_column(sa.Integer, nullable=False)
-    name: Mapped[str] = mapped_column(sa.String, nullable=False)
-
-    __table_args__ = (sa.UniqueConstraint("zoom", "x", "y", "size", name="kinds_name"),)
-
-
 def get_or_make_kind(name: str, config: Config) -> Kind:
     kinds = DB.session.scalars(sqlalchemy.select(Kind).where(Kind.name == name)).all()
     if kinds:
@@ -327,21 +310,18 @@ def get_or_make_kind(name: str, config: Config) -> Kind:
         return kind
 
 
-def get_or_make_equipment(name: str, config: Config) -> Equipment:
-    equipments = DB.session.scalars(
-        sqlalchemy.select(Equipment).where(Equipment.name == name)
-    ).all()
-    if equipments:
-        assert (
-            len(equipments) == 1
-        ), f"There must be only one equipment with name '{name}'."
-        return equipments[0]
-    else:
-        equipment = Equipment(
-            name=name, offset_km=config.equipment_offsets.get(name, 0)
-        )
-        DB.session.add(equipment)
-        return equipment
+class SquarePlannerBookmark(DB.Model):
+    __tablename__ = "square_planner_bookmarks"
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+
+    zoom: Mapped[int] = mapped_column(sa.Integer, nullable=False)
+    x: Mapped[int] = mapped_column(sa.Integer, nullable=False)
+    y: Mapped[int] = mapped_column(sa.Integer, nullable=False)
+    size: Mapped[int] = mapped_column(sa.Integer, nullable=False)
+    name: Mapped[str] = mapped_column(sa.String, nullable=False)
+
+    __table_args__ = (sa.UniqueConstraint("zoom", "x", "y", "size", name="kinds_name"),)
 
 
 class PlotSpec(DB.Model):

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/core/enrichment.py

@@ -15,6 +15,7 @@ from .datamodel import ActivityMeta
 from .datamodel import DB
 from .datamodel import get_or_make_equipment
 from .datamodel import get_or_make_kind
+from .missing_values import some
 from .paths import activity_extracted_meta_dir
 from .paths import activity_extracted_time_series_dir
 from .paths import time_series_dir
@@ -82,9 +83,9 @@ def populate_database_from_extracted(config: Config) -> None:
             distance_km=0,
             equipment=equipment,
             kind=kind,
-            calories=extracted_metadata.get("calories", None),
-            elevation_gain=extracted_metadata.get("elevation_gain", None),
-            steps=extracted_metadata.get("steps", None),
+            calories=some(extracted_metadata.get("calories", None)),
+            elevation_gain=some(extracted_metadata.get("elevation_gain", None)),
+            steps=some(extracted_metadata.get("steps", None)),
             path=extracted_metadata.get("path", None),
             upstream_id=upstream_id,
         )
@@ -92,7 +93,13 @@ def populate_database_from_extracted(config: Config) -> None:
         update_via_time_series(activity, time_series)
 
         DB.session.add(activity)
-        DB.session.commit()
+        try:
+            DB.session.commit()
+        except sqlalchemy.exc.StatementError:
+            logger.error(
+                f"Could not insert the following activity into the database: {vars(activity)=}"
+            )
+            raise
 
         enriched_time_series_path = time_series_dir() / f"{activity.id}.parquet"
         time_series.to_parquet(enriched_time_series_path)

geo_activity_playground-0.42.0/geo_activity_playground/core/missing_values.py

@@ -0,0 +1,13 @@
+from typing import Optional
+from typing import Union
+
+import numpy as np
+
+
+def some(value) -> Optional[Union[float, int]]:
+    if value is None:
+        return None
+    elif np.isnan(value):
+        return None
+    else:
+        return value

geo_activity_playground-0.42.0/geo_activity_playground/core/test_missing_values.py

@@ -0,0 +1,19 @@
+import numpy as np
+
+from .missing_values import some
+
+
+def test_none() -> None:
+    assert some(None) == None
+
+
+def test_nan() -> None:
+    assert some(np.nan) == None
+
+
+def test_float() -> None:
+    assert some(1.0) == 1.0
+
+
+def test_integer() -> None:
+    assert some(1) == 1

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/explorer/tile_visits.py

@@ -176,7 +176,7 @@ def _process_activity(
             activity_tiles["time"],
             zip(activity_tiles["tile_x"], activity_tiles["tile_y"]),
         ):
-            if activity["consider_for_achievements"]:
+            if activity.kind.consider_for_achievements:
                 if tile not in tile_state["tile_visits"][zoom]:
                     new_tile_history_soa["activity_id"].append(activity_id)
                     new_tile_history_soa["time"].append(time)

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/webui/app.py

@@ -70,7 +70,7 @@ def web_ui_main(
 
     app = Flask(__name__)
 
-    database_path = basedir / "database.sqlite"
+    database_path = pathlib.Path("database.sqlite")
     logger.info(f"Using database file at '{database_path.absolute()}'.")
     app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{database_path.absolute()}"
     app.config["ALEMBIC"] = {"script_location": "../alembic/versions"}

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/webui/blueprints/activity_blueprint.py

@@ -29,6 +29,7 @@ from ...core.datamodel import Activity
 from ...core.datamodel import DB
 from ...core.datamodel import Equipment
 from ...core.datamodel import Kind
+from ...core.datamodel import Tag
 from ...core.enrichment import update_via_time_series
 from ...core.heart_rate import HeartRateZoneComputer
 from ...core.privacy_zones import PrivacyZone
@@ -71,14 +72,14 @@ def make_activity_blueprint(
                                 )
                             ]
                             for _, group in repository.get_time_series(
-                                activity["id"]
+                                activity.id
                             ).groupby("segment_id")
                         ]
                     ),
                     properties={
                         "color": matplotlib.colors.to_hex(cmap(i % 8)),
-                        "activity_name": activity["name"],
-                        "activity_id": str(activity["id"]),
+                        "activity_name": activity.name,
+                        "activity_id": str(activity.id),
                     },
                 )
                 for i, activity in enumerate(repository.iter_activities())
@@ -99,7 +100,7 @@ def make_activity_blueprint(
 
         meta = repository.meta
         similar_activities = meta.loc[
-            (meta.name == activity["name"]) & (meta.id != activity["id"])
+            (meta.name == activity.name) & (meta.id != activity.id)
         ]
         similar_activities = [row for _, row in similar_activities.iterrows()]
         similar_activities.reverse()
@@ -107,7 +108,7 @@ def make_activity_blueprint(
         new_tiles = {
             zoom: sum(
                 tile_visit_accessor.tile_state["tile_history"][zoom]["activity_id"]
-                == activity["id"]
+                == activity.id
             )
             for zoom in sorted(config.explorer_zoom_levels)
         }
@@ -117,7 +118,7 @@ def make_activity_blueprint(
         for zoom in sorted(config.explorer_zoom_levels):
             new_tiles = tile_visit_accessor.tile_state["tile_history"][zoom].loc[
                 tile_visit_accessor.tile_state["tile_history"][zoom]["activity_id"]
-                == activity["id"]
+                == activity.id
             ]
             if len(new_tiles):
                 points = make_grid_points(
@@ -152,8 +153,8 @@ def make_activity_blueprint(
                 time_series[line_color_column],
                 line_color_columns_avail[line_color_column].format,
             ),
-            "date": activity["start"].date(),
-            "time": activity["start"].time(),
+            "date": activity.start.date(),
+            "time": activity.start.time(),
             "new_tiles": new_tiles_per_zoom,
             "new_tiles_geojson": new_tiles_geojson,
             "line_color_column": line_color_column,
@@ -318,6 +319,7 @@ def make_activity_blueprint(
             abort(404)
         equipments = DB.session.scalars(sqlalchemy.select(Equipment)).all()
         kinds = DB.session.scalars(sqlalchemy.select(Kind)).all()
+        tags = DB.session.scalars(sqlalchemy.select(Tag)).all()
 
         if request.method == "POST":
             activity.name = request.form.get("name")
@@ -326,13 +328,18 @@ def make_activity_blueprint(
             if form_equipment == "null":
                 activity.equipment = None
             else:
-                activity.equipment = DB.session.get(Equipment, int(form_equipment))
+                activity.equipment = DB.session.get_one(Equipment, int(form_equipment))
 
             form_kind = request.form.get("kind")
             if form_kind == "null":
                 activity.kind = None
             else:
-                activity.kind = DB.session.get(Kind, int(form_kind))
+                activity.kind = DB.session.get_one(Kind, int(form_kind))
+
+            form_tags = request.form.getlist("tag")
+            activity.tags = [
+                DB.session.get_one(Tag, int(tag_id_str)) for tag_id_str in form_tags
+            ]
 
             DB.session.commit()
             return redirect(url_for(".show", id=activity.id))
@@ -342,6 +349,7 @@ def make_activity_blueprint(
             activity=activity,
             kinds=kinds,
             equipments=equipments,
+            tags=tags,
         )
 
     @blueprint.route("/trim/<id>", methods=["GET", "POST"])

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/webui/blueprints/settings_blueprint.py

@@ -18,6 +18,7 @@ from ...core.config import ConfigAccessor
 from ...core.datamodel import DB
 from ...core.datamodel import Equipment
 from ...core.datamodel import Kind
+from ...core.datamodel import Tag
 from ...core.heart_rate import HeartRateZoneComputer
 from ...core.paths import _activity_enriched_dir
 from ..authenticator import Authenticator
@@ -395,6 +396,37 @@ def make_settings_blueprint(
         strava_login_helper.save_strava_code(code)
         return redirect(url_for(".strava"))
 
+    @blueprint.route("/tags")
+    @needs_authentication(authenticator)
+    def tags_list():
+        return render_template(
+            "settings/tags-list.html.j2",
+            tags=DB.session.scalars(sqlalchemy.select(Tag)).all(),
+        )
+
+    @blueprint.route("/tags/new", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def tags_new():
+        if request.method == "POST":
+            tag_str = request.form["tag"]
+            tag = Tag(tag=tag_str)
+            DB.session.add(tag)
+            DB.session.commit()
+            return redirect(url_for(".tags_list"))
+        else:
+            return render_template("settings/tags-new.html.j2")
+
+    @blueprint.route("/tags/edit/<int:id>", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def tags_edit(id: int):
+        tag = DB.session.get_one(Tag, id)
+        if request.method == "POST":
+            tag.tag = request.form["tag"]
+            DB.session.commit()
+            return redirect(url_for(".tags_list"))
+        else:
+            return render_template("settings/tags-edit.html.j2", tag=tag)
+
     return blueprint
 
 

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/webui/templates/activity/edit.html.j2

@@ -32,6 +32,21 @@
         </select>
     </div>
 
+    <div class="mb-3">
+        <label for="" class="form-label">Tags</label>
+        <div class="form-control">
+            {% for tag in tags %}
+            <div class="form-check form-check-inline">
+                <input class="form-check-input" type="checkbox" name="tag" value="{{ tag.id }}" id="tag_{{ tag.id }}" {%
+                    if tag in activity.tags %} checked {% endif %}>
+                <label class="form-check-label" for="tag_{{ tag.id }}">
+                    {{ tag.tag }}
+                </label>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
+
     <button type="submit" class="btn btn-primary">Save</button>
 </form>
 

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/webui/templates/activity/show.html.j2

@@ -11,13 +11,22 @@
     <div class="col-sm-12 col-md-4">
         <dl>
             <dt>Name</dt>
-            <dd>{{ activity["name"] }}</dd>
+            <dd>{{ activity.name }}</dd>
 
             {% if activity.kind %}
             <dt>Kind</dt>
             <dd>{{ activity.kind.name }}</dd>
             {% endif %}
 
+            {% if activity.tags %}
+            <dt>Tags</dt>
+            <dd>
+                {% for tag in activity.tags %}
+                <span class="badge text-bg-primary">{{ tag.tag }}</span>
+                {% endfor %}
+            </dd>
+            {% endif %}
+
             <dt>Distance</dt>
             <dd>{{ activity.distance_km|round(1) }} km</dd>
 
@@ -114,9 +123,11 @@
         <div class="mb-3" style="padding-top: 10px;">
             <form method="GET">
                 <label class="form-label">Line Color by</label>
-                <select class="form-select" aria-label="Line Color by" name="line_color_column" onchange="this.form.submit()">
+                <select class="form-select" aria-label="Line Color by" name="line_color_column"
+                    onchange="this.form.submit()">
                     {% for name, column in line_color_columns_avail.items() %}
-                    <option {% if name == line_color_column %} selected {% endif %} value="{{ name }}">{{ column.display_name }}</option>
+                    <option {% if name==line_color_column %} selected {% endif %} value="{{ name }}">{{
+                        column.display_name }}</option>
                     {% endfor %}
                 </select>
             </form>

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/geo_activity_playground/webui/templates/settings/index.html.j2

@@ -103,6 +103,15 @@
                 </div>
             </div>
         </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Tags</h5>
+                    <p class="card-text">You can assign tags to activities. Create and manage them here.</p>
+                    <a href="{{ url_for('.tags_list') }}" class="btn btn-primary">Manage tags</a>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
 {% endblock %}

geo_activity_playground-0.42.0/geo_activity_playground/webui/templates/settings/tags-edit.html.j2

@@ -0,0 +1,17 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Edit Tag</h1>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="tag" class="form-label">Tag</label>
+        <input type="text" class="form-control" id="tag" name="tag" value="{{ tag.tag }}" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

geo_activity_playground-0.42.0/geo_activity_playground/webui/templates/settings/tags-list.html.j2

@@ -0,0 +1,19 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Tags</h1>
+
+<ul>
+    {% for tag in tags %}
+    <li>
+        <b>{{ tag.tag }}</b>
+        <a class="btn btn-sm btn-primary" href="{{ url_for('.tags_edit', id=tag.id) }}">Edit</a>
+    </li>
+    {% endfor %}
+</ul>
+
+
+<a class="btn btn-primary" href="{{ url_for('.tags_new') }}">New</a>
+
+{% endblock %}

geo_activity_playground-0.42.0/geo_activity_playground/webui/templates/settings/tags-new.html.j2

@@ -0,0 +1,17 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Create Tag</h1>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="tag" class="form-label">Tag</label>
+        <input type="text" class="form-control" id="tag" name="tag" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

{geo_activity_playground-0.41.0 → geo_activity_playground-0.42.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "0.41.0"
+version = "0.42.0"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"
@@ -59,6 +59,7 @@ types-requests = "^2.31.0.20240125"
 types-tqdm = "^4.66.0.20240417"
 types-typed-ast = "^1.5.8.7"
 types-xmltodict = "^0.13.0.3"
+pyright = "^1.1.399"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
@@ -66,3 +67,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.mypy]
 disable_error_code = "import-untyped"
+
+
+[tool.pyright]
+include = ['geo_activity_playground']