geo-activity-playground 0.43.2__tar.gz → 0.44.0__tar.gz

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/PKG-INFO

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

geo_activity_playground-0.44.0/geo_activity_playground/alembic/versions/0f02b92c4f94_add_tag_color.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 = "0f02b92c4f94"
+down_revision: Union[str, None] = "da2cba03b71d"
+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("tags", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("color", sa.String(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("tags", schema=None) as batch_op:
+        batch_op.drop_column("color")
+
+    # ### end Alembic commands ###

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/core/datamodel.py

@@ -21,7 +21,9 @@ from sqlalchemy.orm import mapped_column
 from sqlalchemy.orm import relationship
 
 from .config import Config
-from .paths import time_series_dir
+from .paths import activity_extracted_meta_dir
+from .paths import activity_extracted_time_series_dir
+from .paths import TIME_SERIES_DIR
 
 
 logger = logging.getLogger(__name__)
@@ -141,7 +143,7 @@ class Activity(DB.Model):
 
     @property
     def raw_time_series(self) -> pd.DataFrame:
-        path = time_series_dir() / f"{self.id}.parquet"
+        path = TIME_SERIES_DIR() / f"{self.id}.parquet"
         try:
             time_series = pd.read_parquet(path)
             if "altitude" in time_series.columns:
@@ -160,6 +162,14 @@ class Activity(DB.Model):
         else:
             return self.raw_time_series
 
+    def delete_data(self) -> None:
+        for path in [
+            TIME_SERIES_DIR() / f"{self.id}.parquet",
+            activity_extracted_meta_dir() / f"{self.upstream_id}.pickle",
+            activity_extracted_time_series_dir() / f"{self.upstream_id}.pickle",
+        ]:
+            path.unlink(missing_ok=True)
+
 
 class Tag(DB.Model):
     __tablename__ = "tags"
@@ -167,6 +177,7 @@ class Tag(DB.Model):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     tag: Mapped[str] = mapped_column(String, unique=True)
+    color: Mapped[str] = mapped_column(String, nullable=True)
 
     activities: Mapped[list[Activity]] = relationship(
         secondary=activity_tag_association_table, back_populates="tags"

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/core/enrichment.py

@@ -18,7 +18,7 @@ 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
+from .paths import TIME_SERIES_DIR
 from .tiles import compute_tile_float
 from .time_conversion import convert_to_datetime_ns
 
@@ -101,7 +101,7 @@ def populate_database_from_extracted(config: Config) -> None:
             )
             raise
 
-        enriched_time_series_path = time_series_dir() / f"{activity.id}.parquet"
+        enriched_time_series_path = TIME_SERIES_DIR() / f"{activity.id}.parquet"
         time_series.to_parquet(enriched_time_series_path)
 
 

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/core/paths.py

@@ -65,7 +65,7 @@ activity_enriched_time_series_dir = dir_wrapper(_activity_enriched_time_series_d
 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)
-time_series_dir = dir_wrapper(_time_series_dir)
+TIME_SERIES_DIR = dir_wrapper(_time_series_dir)
 PHOTOS_DIR = dir_wrapper(_photos_dir)
 
 activities_file = file_wrapper(_activities_file)

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/blueprints/activity_blueprint.py

@@ -1,6 +1,7 @@
 import datetime
 import io
 import logging
+import pathlib
 import re
 from typing import Optional
 
@@ -431,6 +432,27 @@ def make_activity_blueprint(
             color_line_geojson=geojson.dumps(fc),
         )
 
+    @blueprint.route("/delete/<id>")
+    @needs_authentication(authenticator)
+    def delete(id: int):
+        activity = DB.session.get_one(Activity, id)
+        activity.delete_data()
+        DB.session.delete(activity)
+        DB.session.commit()
+        return redirect(url_for("index"))
+
+    @blueprint.route("/download-original/<id>")
+    @needs_authentication(authenticator)
+    def download_original(id: int):
+        activity = DB.session.get_one(Activity, id)
+        path = pathlib.Path(activity.path)
+        with open(path) as f:
+            return Response(
+                f.read(),
+                mimetype="application/octet-stream",
+                headers={"Content-disposition": f'attachment; filename="{path.name}"'},
+            )
+
     return blueprint
 
 

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/blueprints/explorer_blueprint.py

@@ -212,7 +212,8 @@ def make_explorer_blueprint(
             width = 256 // factor
             for xo in range(factor):
                 for yo in range(factor):
-                    if (x * factor + xo, y * factor + yo) not in tile_visits:
+                    tile = (x * factor + xo, y * factor + yo)
+                    if tile not in tile_visits:
                         map_tile[
                             yo * width : (yo + 1) * width, xo * width : (xo + 1) * width
                         ] = grayscale[

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/blueprints/settings_blueprint.py

@@ -13,14 +13,19 @@ from flask import render_template
 from flask import request
 from flask import Response
 from flask import url_for
+from tqdm import tqdm
 
 from ...core.config import ConfigAccessor
+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 _embellish_single_time_series
+from ...core.enrichment import update_via_time_series
 from ...core.heart_rate import HeartRateZoneComputer
 from ...core.paths import _activity_enriched_dir
+from ...core.paths import TIME_SERIES_DIR
 from ..authenticator import Authenticator
 from ..authenticator import needs_authentication
 from ..flasher import Flasher
@@ -160,11 +165,11 @@ def make_settings_blueprint(
             assert len(ids) == len(names) == len(offsets)
             for id, name, offset in zip(ids, names, offsets):
                 if id:
-                    equipment = DB.session.get(Equipment, int(id))
+                    equipment = DB.session.get_one(Equipment, int(id))
                     equipment.name = name
                     equipment.offset_km = int(float(offset))
                 if not id and name:
-                    equipment = Equipment(name)
+                    equipment = Equipment(name=name)
                     if offset:
                         equipment.offset_km = int(float(offset))
                     DB.session.add(equipment)
@@ -193,11 +198,11 @@ def make_settings_blueprint(
             assert len(ids) == len(names)
             for id, name in zip(ids, names):
                 if id:
-                    kind = DB.session.get(Kind, int(id))
+                    kind = DB.session.get_one(Kind, int(id))
                     kind.name = name
                     kind.consider_for_achievements = id in consider_for_achievements
                 if not id and name:
-                    kind = Kind(name)
+                    kind = Kind(name=name)
                     if consider_for_achievements:
                         kind.consider_for_achievements = (
                             "new" in consider_for_achievements
@@ -348,8 +353,19 @@ def make_settings_blueprint(
             config_accessor().time_diff_threshold_seconds = threshold
             config_accessor.save()
             flash(f"Threshold set to {threshold}.", category="success")
-            shutil.rmtree(_activity_enriched_dir)
-            return redirect(url_for("upload.reload"))
+            for activity in tqdm(
+                DB.session.scalars(sqlalchemy.select(Activity)).all(),
+                desc="Recomputing segments",
+            ):
+                time_series = _embellish_single_time_series(
+                    activity.raw_time_series,
+                    None,
+                    threshold,
+                )
+                update_via_time_series(activity, time_series)
+                enriched_time_series_path = TIME_SERIES_DIR() / f"{activity.id}.parquet"
+                time_series.to_parquet(enriched_time_series_path)
+                DB.session.commit()
         return render_template(
             "settings/segmentation.html.j2",
             threshold=config_accessor().time_diff_threshold_seconds,
@@ -424,6 +440,7 @@ def make_settings_blueprint(
         tag = DB.session.get_one(Tag, id)
         if request.method == "POST":
             tag.tag = request.form["tag"]
+            tag.color = request.form["color"]
             DB.session.commit()
             return redirect(url_for(".tags_list"))
         else:

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/blueprints/upload_blueprint.py

@@ -124,7 +124,7 @@ def scan_for_activities(
                 kind.consider_for_achievements = True
             DB.session.commit()
             tile_visit_accessor.reset()
-            work_tracker_path("tile-state").unlink()
+            work_tracker_path("tile-state").unlink(missing_ok=True)
         compute_tile_visits_new(repository, tile_visit_accessor)
         compute_tile_evolution(tile_visit_accessor.tile_state, config)
         tile_visit_accessor.save()

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/templates/activity/show.html.j2

@@ -24,7 +24,7 @@
             <dt>Tags</dt>
             <dd>
                 {% for tag in activity.tags %}
-                <span class="badge text-bg-primary">{{ tag.tag }}</span>
+                {{ activity_tag(tag) }}
                 {% endfor %}
             </dd>
             {% endif %}
@@ -75,12 +75,16 @@
 
             <dt>ID</dt>
             <dd>{{ activity.id }}</dd>
+            <dt>Upstream ID</dt>
+            <dd>{{ activity.upstream_id }}</dd>
             <dt>Source path</dt>
-            <dd>{{ activity.path }}</dd>
+            <dd><a href="{{ url_for('.download_original', id=activity.id) }}">{{ activity.path }}</a></dd>
         </dl>
 
         <a href="{{ url_for('.edit', id=activity['id']) }}" class="btn btn-secondary btn-small">Edit</a>
         <a href="{{ url_for('.trim', id=activity['id']) }}" class="btn btn-secondary btn-small">Trim</a>
+        <a class="btn btn-small btn-danger" href="{{ url_for('.delete', id=activity.id) }}"
+            onclick="if(!confirm('Are you sure to Delete This?')){ event.preventDefault() }">Delete</a>
     </div>
     <div class="col-sm-12 col-md-8">
         <div id="activity-map" style="height: 500px;" class="mb-3"></div>

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/templates/page.html.j2

@@ -200,6 +200,10 @@
         </script>
         {% endmacro %}
 
+        {% macro activity_tag(tag) %}
+        <span class="badge" style="background-color: {{ tag.color or '#0d6efd' }}">{{ tag.tag }}</span>
+        {% endmacro %}
+
         {% with messages = get_flashed_messages(with_categories=true) %}
         {% if messages %}
         {% for category, message in messages %}

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/templates/search_form.html.j2

@@ -103,7 +103,7 @@
                                                 value="{{ tag.id }}" id="tag_{{ tag.id }}" {% if tag.id in query.tag %}
                                                 checked {% endif %}>
                                             <label class="form-check-label" for="tag_{{ tag.id }}">
-                                                {{ tag.tag }}
+                                                {{ activity_tag(tag) }}
                                             </label>
                                         </div>
                                         {% endfor %}

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/templates/settings/tags-edit.html.j2

@@ -10,6 +10,11 @@
         <input type="text" class="form-control" id="tag" name="tag" value="{{ tag.tag }}" />
     </div>
 
+    <div class="mb-3">
+        <label for="color" class="form-label">Color</label>
+        <input type="color" class="form-control" id="color" name="color" value="{{ tag.color or '#0d6efd' }}" />
+    </div>
+
     <button type="submit" class="btn btn-primary">Save</button>
 </form>
 

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/geo_activity_playground/webui/templates/settings/tags-list.html.j2

@@ -7,7 +7,7 @@
 <ul>
     {% for tag in tags %}
     <li>
-        <b>{{ tag.tag }}</b>
+        {{ activity_tag(tag) }}
         <a class="btn btn-sm btn-primary" href="{{ url_for('.tags_edit', id=tag.id) }}">Edit</a>
     </li>
     {% endfor %}

{geo_activity_playground-0.43.2 → geo_activity_playground-0.44.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "0.43.2"
+version = "0.44.0"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"