geo-activity-playground 1.9.2__py3-none-any.whl → 1.9.4__py3-none-any.whl

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/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/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/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/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/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.dist-info → geo_activity_playground-1.9.4.dist-info}/METADATA

@@ -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.dist-info → geo_activity_playground-1.9.4.dist-info}/RECORD

@@ -27,7 +27,7 @@ geo_activity_playground/core/export.py,sha256=ayOmhWL72263oP9NLIZRYCg_Db0GLUFhgN
 geo_activity_playground/core/heart_rate.py,sha256=-S3WAhS7AOywrw_Lk5jfuo_fu6zvZQ1VtjwEKSycWpU,1542
 geo_activity_playground/core/meta_search.py,sha256=Sevl4AtBwJZMW3VJ6ihRqwjC0M9fhJqX3MN6tw_hIFQ,6627
 geo_activity_playground/core/missing_values.py,sha256=HjonaLV0PFMICnuMrbdUNnK9uy_8PBh_RxI5GuEMQK0,250
-geo_activity_playground/core/parametric_plot.py,sha256=4MFm-KF5QgzLUZHWHKHlbDWAE_IM-raT1xOl_StKmkk,5797
+geo_activity_playground/core/parametric_plot.py,sha256=sPaBnrcjvbzys0s0ge5OHtSSp1bJMaLtoO0UxXdffqo,6400
 geo_activity_playground/core/paths.py,sha256=qQ4ujaIHmsxTGEWzf-76XS8FclEI2RC5COTUeuLEbDI,2938
 geo_activity_playground/core/photos.py,sha256=pHdVUpgKfbyrTddZL_mgmsXQJ3k_IHKf70jtcIjjcCA,1229
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
@@ -52,11 +52,11 @@ geo_activity_playground/explorer/tile_visits.py,sha256=DzAmZmyLSeGe8mIg6-Kx1gXtC
 geo_activity_playground/explorer/video.py,sha256=7j6Qv3HG6On7Tn7xh7Olwrx_fbQnfzS7CeRg3TEApHg,4397
 geo_activity_playground/heatmap_video.py,sha256=I8i1uVvbbPUXVtvLAROaLy58nQoUPnuMCZkERWNkQjg,3318
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/importers/activity_parsers.py,sha256=dWtumZM4igsfWSECDOazLjTEf1YcaU04wJJ45EhfCVw,12461
+geo_activity_playground/importers/activity_parsers.py,sha256=lh7B_ZwZkcwZgrwLhptobcLfxvDIiPJRgWdE9fZzKw4,12475
 geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
-geo_activity_playground/importers/directory.py,sha256=sHcLIi0DOPEATt4wiE_vp00h89fO940wUQyJZUzzpnw,3978
+geo_activity_playground/importers/directory.py,sha256=UBs-iWGZx_LkknytsRykAo_BaScUg0wYkfThpk5HG-8,5338
 geo_activity_playground/importers/strava_api.py,sha256=1sRb_CD4tbsW-MwP6QPg7zpATlb6XpniS4rtH72iwkw,9606
-geo_activity_playground/importers/strava_checkout.py,sha256=joJI_uic9fYtu7E5Odh6GUq_LyiLqQ72Ucy_Mbjr-X0,9289
+geo_activity_playground/importers/strava_checkout.py,sha256=Tpln_IweoTIo-dkkTyRsVPGWesSu3S3C3ifd874NqUA,9590
 geo_activity_playground/importers/test_csv_parser.py,sha256=nOTVTdlzIY0TDcbWp7xNyNaIO6Mkeu55hVziVl22QE4,1092
 geo_activity_playground/importers/test_directory.py,sha256=_fn_-y98ZyElbG0BRxAmGFdtGobUShPU86SdEOpuv-A,691
 geo_activity_playground/importers/test_strava_api.py,sha256=7b8bl5Rh2BctCmvTPEhCadxtUOq3mfzuadD6F5XxRio,398
@@ -72,7 +72,7 @@ geo_activity_playground/webui/blueprints/eddington_blueprints.py,sha256=s5o_U1rq
 geo_activity_playground/webui/blueprints/entry_views.py,sha256=slGyYokGattdG-e5Ef9s_ys4ohVVAkFLFclEQS5fEr4,2954
 geo_activity_playground/webui/blueprints/equipment_blueprint.py,sha256=6u81Hestr4FP6mix_avQp9jaK0In4WNdYaSwKL5cJDs,5757
 geo_activity_playground/webui/blueprints/explorer_blueprint.py,sha256=fe4ZNROmpks-nP4Wsw2vc9t5_X508-6Xi1dv07O_NfQ,20979
-geo_activity_playground/webui/blueprints/export_blueprint.py,sha256=C9yFH5gEJs2YtWE-EhcGDEyGwwaLgC1umybgIRi6duE,1036
+geo_activity_playground/webui/blueprints/export_blueprint.py,sha256=Rppuyk_TkP1GeDplxgKnRkyujDR-hGhD3oWRnNNCEjc,1102
 geo_activity_playground/webui/blueprints/hall_of_fame_blueprint.py,sha256=NGVk8Xgwpt-YNX5_zgGWTMRctN_N4NCnMq10DSDteVg,3121
 geo_activity_playground/webui/blueprints/heatmap_blueprint.py,sha256=prERVBOxq2xvmgyH_dwtLwMMMFILeu-6yZE9h9U_T9g,8418
 geo_activity_playground/webui/blueprints/photo_blueprint.py,sha256=i4-AS9icK6pDypTdl-coTZyKldXtpukGiNbKsihfpl0,7299
@@ -84,7 +84,7 @@ geo_activity_playground/webui/blueprints/summary_blueprint.py,sha256=giVLJttJ2my
 geo_activity_playground/webui/blueprints/tile_blueprint.py,sha256=YzZf9OrNdjhc1_j4MtO1DMcw1uCv29ueNsYd-mWqgbg,837
 geo_activity_playground/webui/blueprints/time_zone_fixer_blueprint.py,sha256=PEHsk3kRHx2EvQ-6VPD4xeOmXGjh64GMAagFkQ0wbeg,2301
 geo_activity_playground/webui/blueprints/upload_blueprint.py,sha256=VLyMic2ptBRcMyunGXl-6Auxs1jglIO5fYgRGPhH25s,4816
-geo_activity_playground/webui/columns.py,sha256=FP0YfX-WFQk1JEXhrywv3NUEVq-x7Hv0or35X3Ltf9c,1525
+geo_activity_playground/webui/columns.py,sha256=C9Bg4J2Z8xbSZKdNParm1IKoR9nHStyroiBZDFdoZT4,1525
 geo_activity_playground/webui/flasher.py,sha256=Covc1D9cO_jjokRWnvyiXCc2tfp3aZ8XkNqFdA1AXtk,500
 geo_activity_playground/webui/plot_util.py,sha256=5Uesjj-xcMskQX2z9viDZYHSxLGrH2a5dHA1ogsJW9U,261
 geo_activity_playground/webui/search_util.py,sha256=gH2cOM1FTAozZUlSQ4C1dR1xlV-8e82pD1PPi_pPBNY,2647
@@ -175,8 +175,8 @@ geo_activity_playground/webui/templates/summary/vega-chart.html.j2,sha256=mw8Hti
 geo_activity_playground/webui/templates/time_zone_fixer/index.html.j2,sha256=s9r6BJMXmd7kLSyjkvH4xLi6e01S5bpGRcMgMMJyCAE,1760
 geo_activity_playground/webui/templates/upload/index.html.j2,sha256=5W2gpm4eSvidOyJOCSZZbvTZaTkSWNrOWux3-oIm0zI,784
 geo_activity_playground/webui/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-1.9.2.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-1.9.2.dist-info/METADATA,sha256=yulIhsXBd3Osqgumn4RYD31XflfkZdwaojp6Y54ZTAU,1937
-geo_activity_playground-1.9.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-geo_activity_playground-1.9.2.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-1.9.2.dist-info/RECORD,,
+geo_activity_playground-1.9.4.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-1.9.4.dist-info/METADATA,sha256=TWDOnevm__CRkjcmlnfI73azWUZey8R5clp-0w3kgi8,1937
+geo_activity_playground-1.9.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+geo_activity_playground-1.9.4.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-1.9.4.dist-info/RECORD,,