geo-activity-playground 1.7.0__py3-none-any.whl → 1.8.0__py3-none-any.whl

geo_activity_playground/explorer/tile_visits.py

@@ -60,15 +60,15 @@ logger = logging.getLogger(__name__)
 
 class TileInfo(TypedDict):
     activity_ids: set[int]
-    first_time: datetime.datetime
+    first_time: pd.Timestamp
     first_id: int
-    last_time: datetime.datetime
+    last_time: pd.Timestamp
     last_id: int
 
 
 class TileHistoryRow(TypedDict):
     activity_id: int
-    time: datetime.datetime
+    time: pd.Timestamp
     tile_x: int
     tile_y: int
 
@@ -254,6 +254,10 @@ def _process_activity(
 
                 first_time = tile_visit.get("first_time", None)
                 last_time = tile_visit.get("last_time", None)
+                if first_time.tz is None:
+                    first_time = first_time.tz_localize("UTC")
+                if last_time.tz is None:
+                    last_time = last_time.tz_localize("UTC")
                 try:
                     if first_time is None or time < first_time:
                         tile_visit["first_id"] = activity_id

geo_activity_playground/importers/strava_api.py

@@ -7,6 +7,7 @@ import zoneinfo
 from typing import Optional
 
 import pandas as pd
+import sqlalchemy
 from stravalib import Client
 from stravalib.exc import Fault
 from stravalib.exc import ObjectNotFound
@@ -121,8 +122,21 @@ def try_import_strava(
                 and strava_activity.start_date is not None
                 and str(strava_activity.start_date) > strava_end
             ):
+                logger.info(f"Reached {strava_end}, stopping.")
                 break
 
+            if (
+                existing_activity := DB.session.scalar(
+                    sqlalchemy.select(Activity).where(
+                        Activity.upstream_id == strava_activity.id
+                    )
+                )
+            ) is not None:
+                logger.info(
+                    f"Strava activity {strava_activity.id} already exists in database as {existing_activity.id}, skipping."
+                )
+                continue
+
             cache_file = (
                 pathlib.Path("Cache")
                 / "Strava Activity Metadata"

{geo_activity_playground-1.7.0.dist-info → geo_activity_playground-1.8.0.dist-info}/METADATA

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

{geo_activity_playground-1.7.0.dist-info → geo_activity_playground-1.8.0.dist-info}/RECORD

@@ -48,14 +48,14 @@ geo_activity_playground/core/tiles.py,sha256=LBn2V6WAvMxZeXSIQ8ruZL71iyvOXoFZMz7
 geo_activity_playground/core/time_conversion.py,sha256=f5CByqyWSthCplrbXZThSFbt3eY-t1g-2H5lkfBlgc0,1556
 geo_activity_playground/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/explorer/grid_file.py,sha256=YNL_c4O1-kxaajATJwj4ZLywCL5Hpj9qy2h-F7rk8Yg,3260
-geo_activity_playground/explorer/tile_visits.py,sha256=QlotWptXgv_uvtBr4qSdGpC4as6PR5Idharv_utwNyU,16943
+geo_activity_playground/explorer/tile_visits.py,sha256=2MgM6laZeg9q749jZfW6tO5Wk5reAAwV2XqL4xgafFw,17135
 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=NAK_Fv_zy75WuNa1bgYgzjc7Dnsj1oVah6DW0faLCG4,11403
 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/strava_api.py,sha256=0lUmC6u829vJpaIs7plQq4mOPgc7yQI65vN9qhAEqVs,9015
+geo_activity_playground/importers/strava_api.py,sha256=RBKjeFJlDMqVBamr47y9wfO1w-0reE8turYe7aDxLWI,9556
 geo_activity_playground/importers/strava_checkout.py,sha256=joJI_uic9fYtu7E5Odh6GUq_LyiLqQ72Ucy_Mbjr-X0,9289
 geo_activity_playground/importers/test_csv_parser.py,sha256=nOTVTdlzIY0TDcbWp7xNyNaIO6Mkeu55hVziVl22QE4,1092
 geo_activity_playground/importers/test_directory.py,sha256=_fn_-y98ZyElbG0BRxAmGFdtGobUShPU86SdEOpuv-A,691
@@ -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=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
 geo_activity_playground/webui/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-1.7.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-1.7.0.dist-info/METADATA,sha256=HCy1RVSW8KTPYzUWo9XW5ozzP9HV87ueYQO3Aq6mXjY,1937
-geo_activity_playground-1.7.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-geo_activity_playground-1.7.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-1.7.0.dist-info/RECORD,,
+geo_activity_playground-1.8.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-1.8.0.dist-info/METADATA,sha256=taxTIecFczAWSZpQtPSiIc3LcyS9jUBEwCPOJQMaR3s,1937
+geo_activity_playground-1.8.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+geo_activity_playground-1.8.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-1.8.0.dist-info/RECORD,,