geo-activity-playground 1.9.2__tar.gz → 1.9.4__tar.gz

{geo_activity_playground-1.9.2 → geo_activity_playground-1.9.4}/PKG-INFO

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

{geo_activity_playground-1.9.2 → geo_activity_playground-1.9.4}/geo_activity_playground/core/parametric_plot.py

@@ -66,8 +66,24 @@ GROUP_BY_VARIABLES = {
 VARIABLES_1 = {"": "", **DISCRETE_VARIABLES}
 VARIABLES_2 = {"": "", **DISCRETE_VARIABLES, **CONTINUOUS_VARIABLES}
 
+RENAMES = {
+    "year(start):O": "year(start_local):O",
+    "yearquarter(start)": "yearquarter(start_local)",
+    "yearquartermonth(start)": "yearquartermonth(start_local)",
+    "yearmonth(start)": "yearmonth(start_local)",
+    "quarter(start)": "quarter(start_local)",
+    "quartermonth(start)": "quartermonth(start_local)",
+    "month(start)": "month(start_local)",
+    "date(start)": "date(start_local)",
+    "weekday(start)": "weekday(start_local)",
+}
+
 
 def make_parametric_plot(df: pd.DataFrame, spec: PlotSpec) -> dict[str, str]:
+    # Update renamed fields.
+    for field in spec.FIELDS:
+        setattr(spec, field, RENAMES.get(getattr(spec, field), getattr(spec, field)))
+
     if spec.group_by:
         grouped = df.groupby(spec.group_by)
     else:

{geo_activity_playground-1.9.2 → geo_activity_playground-1.9.4}/geo_activity_playground/importers/activity_parsers.py

@@ -219,12 +219,12 @@ def read_gpx_activity(path: pathlib.Path, open) -> pd.DataFrame:
                                     datum.tag
                                     == "{http://www.garmin.com/xmlschemas/TrackPointExtension/v1}hr"
                                 ):
-                                    row["heartrate"] = int(datum.text)
+                                    row["heartrate"] = int(float(datum.text))
                                 if (
                                     datum.tag
                                     == "{http://www.garmin.com/xmlschemas/TrackPointExtension/v1}cad"
                                 ):
-                                    row["cadence"] = int(datum.text)
+                                    row["cadence"] = int(float(datum.text))
 
                 points.append(row)
     df = pd.DataFrame(points)

{geo_activity_playground-1.9.2 → geo_activity_playground-1.9.4}/geo_activity_playground/importers/directory.py

@@ -1,3 +1,4 @@
+import hashlib
 import logging
 import pathlib
 import re
@@ -51,6 +52,17 @@ def import_from_directory(
         is None
     ]
 
+    for activity in DB.session.scalars(
+        sqlalchemy.select(Activity).filter(
+            Activity.upstream_id.is_(sqlalchemy.null()),
+            Activity.path.is_not(sqlalchemy.null()),
+        )
+    ):
+        assert activity.path is not None
+        if pathlib.Path(activity.path).exists():
+            activity.upstream_id = file_sha256(pathlib.Path(activity.path))
+    DB.session.commit()
+
     for i, activity_path in enumerate(
         tqdm(paths_to_import, desc="Importing activity files", delay=0)
     ):
@@ -58,10 +70,24 @@ def import_from_directory(
             activity = DB.session.scalar(
                 sqlalchemy.select(Activity).filter(Activity.path == str(activity_path))
             )
-            if activity is None:
-                import_from_file(
-                    activity_path, repository, tile_visit_accessor, config, i
+            if activity is not None:
+                continue
+
+            with_same_hash = DB.session.scalars(
+                sqlalchemy.select(Activity).filter(
+                    Activity.upstream_id == file_sha256(activity_path)
                 )
+            ).all()
+            if with_same_hash:
+                if len(with_same_hash) == 1:
+                    continue
+                else:
+                    logger.warning(
+                        "The following activities are duplicates: "
+                        + ", ".join(str(activity.id) for activity in with_same_hash)
+                    )
+
+            import_from_file(activity_path, repository, tile_visit_accessor, config, i)
 
 
 def import_from_file(
@@ -87,6 +113,7 @@ def import_from_file(
         return
 
     activity.path = str(path)
+    activity.upstream_id = file_sha256(path)
     if activity.name is None:
         activity.name = path.name.removesuffix("".join(path.suffixes))
 
@@ -120,3 +147,16 @@ def _get_metadata_from_path(
         if m := re.search(regex, str(path.relative_to(ACTIVITY_DIR))):
             return m.groupdict()
     return {}
+
+
+def file_sha256(filename: pathlib.Path) -> str:
+    """
+    Based on https://stackoverflow.com/a/44873382/653152.
+    """
+    h = hashlib.sha256(usedforsecurity=False)
+    b = bytearray(128 * 1024)
+    mv = memoryview(b)
+    with open(filename, "rb", buffering=0) as f:
+        while n := f.readinto(mv):
+            h.update(mv[:n])
+    return h.hexdigest()

{geo_activity_playground-1.9.2 → geo_activity_playground-1.9.4}/geo_activity_playground/importers/strava_checkout.py

@@ -19,8 +19,6 @@ from ..core.datamodel import get_or_make_equipment
 from ..core.datamodel import get_or_make_kind
 from ..core.enrichment import update_and_commit
 from ..core.paths import activity_extracted_meta_dir
-from ..core.tasks import get_state
-from ..core.tasks import set_state
 from ..core.tasks import work_tracker_path
 from ..core.tasks import WorkTracker
 from .activity_parsers import ActivityParseError
@@ -132,6 +130,11 @@ EXPECTED_COLUMNS = [
     "Average Grade Adjusted Pace",
     "Timer Time",
     "Total Cycles",
+    "Regeneration",
+    "Mit Haustier",
+    "Wettbewerb",
+    "Langer Lauf",
+    "Für einen guten Zweck",
     "Media",
 ]
 
@@ -161,7 +164,12 @@ def import_from_strava_checkout(config: Config) -> None:
     if header[0] == EXPECTED_COLUMNS[0]:
         dayfirst = False
     elif header[0] == "Aktivitäts-ID":
-        header = EXPECTED_COLUMNS
+        new_header = list(EXPECTED_COLUMNS)
+        if len(new_header) > len(header):
+            new_header = new_header[: len(header)]
+        elif len(new_header) < len(header):
+            new_header += [f"Ignored_{i}" for i in range(len(header) - len(new_header))]
+        header = new_header
         dayfirst = True
     else:
         logger.error(
@@ -194,7 +202,7 @@ def import_from_strava_checkout(config: Config) -> None:
 
         start_datetime = dateutil.parser.parse(
             row["Activity Date"], dayfirst=dayfirst
-        ).replace(tzinfo=zoneinfo.ZoneInfo("utc"))
+        ).replace(tzinfo=zoneinfo.ZoneInfo("UTC"))
 
         activity_file = checkout_path / row["Filename"]
 

{geo_activity_playground-1.9.2 → geo_activity_playground-1.9.4}/geo_activity_playground/webui/blueprints/export_blueprint.py

@@ -8,6 +8,7 @@ from ...core.export import export_all
 from ..authenticator import Authenticator
 from ..authenticator import needs_authentication
 
+from datetime import date
 
 def make_export_blueprint(authenticator: Authenticator) -> Blueprint:
     blueprint = Blueprint("export", __name__, template_folder="templates")
@@ -25,7 +26,7 @@ def make_export_blueprint(authenticator: Authenticator) -> Blueprint:
         return Response(
             bytes(export_all(meta_format, activity_format)),
             mimetype="application/zip",
-            headers={"Content-disposition": 'attachment; filename="export.zip"'},
+            headers={"Content-disposition": f'attachment; filename="GAP-export-{date.today().strftime("%Y-%m-%d")}.zip"'}
         )
 
     return blueprint

{geo_activity_playground-1.9.2 → geo_activity_playground-1.9.4}/geo_activity_playground/webui/columns.py

@@ -23,13 +23,13 @@ column_elevation_gain = ColumnDescription(
 )
 column_hours = ColumnDescription(
     name="hours",
-    display_name="Elapsed time",
+    display_name="Elapsed Time",
     unit="h",
     format=".1f",
 )
 column_hours_moving = ColumnDescription(
     name="hours_moving",
-    display_name="Moving time",
+    display_name="Moving Time",
     unit="h",
     format=".1f",
 )

{geo_activity_playground-1.9.2 → geo_activity_playground-1.9.4}/pyproject.toml

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