geo-activity-playground 1.9.3__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/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(

{geo_activity_playground-1.9.3.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.3
+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.3.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
@@ -54,9 +54,9 @@ geo_activity_playground/heatmap_video.py,sha256=I8i1uVvbbPUXVtvLAROaLy58nQoUPnuM
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=j_M_FEEQocLWcnrgeLR9hEs3WNwhdLc88DaS5-UWjxs,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
@@ -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.3.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-1.9.3.dist-info/METADATA,sha256=AEO2ezh1z0d7ZOpfNpJkLS6z1wb7p2Ps8tjGPvG-Ha4,1937
-geo_activity_playground-1.9.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-geo_activity_playground-1.9.3.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-1.9.3.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,,