geo-activity-playground 0.24.2__py3-none-any.whl → 0.25.0__py3-none-any.whl

geo_activity_playground/webui/app.py

@@ -18,11 +18,12 @@ from .explorer.blueprint import make_explorer_blueprint
 from .heatmap.blueprint import make_heatmap_blueprint
 from .search_controller import SearchController
 from .square_planner.blueprint import make_square_planner_blueprint
-from .strava_controller import StravaController
+from .strava.blueprint import make_strava_blueprint
 from .summary.blueprint import make_summary_blueprint
 from .tile.blueprint import make_tile_blueprint
 from .upload.blueprint import make_upload_blueprint
 from geo_activity_playground.core.privacy_zones import PrivacyZone
+from geo_activity_playground.webui.strava.controller import StravaController
 
 
 def route_search(app: Flask, repository: ActivityRepository) -> None:
@@ -45,35 +46,10 @@ def route_start(app: Flask, repository: ActivityRepository) -> None:
         return render_template("home.html.j2", **entry_controller.render())
 
 
-def route_strava(app: Flask, host: str, port: int) -> None:
-    strava_controller = StravaController()
-
-    @app.route("/strava/connect")
-    def strava_connect():
-        return render_template(
-            "strava-connect.html.j2",
-            host=host,
-            port=port,
-            **strava_controller.action_connect()
-        )
-
-    @app.route("/strava/authorize")
-    def strava_authorize():
-        client_id = request.form["client_id"]
-        client_secret = request.form["client_secret"]
-        return redirect(
-            strava_controller.action_authorize(host, port, client_id, client_secret)
-        )
-
-    @app.route("/strava/callback")
-    def strava_callback():
-        code = request.args.get("code", type=str)
-        return render_template(
-            "strava-connect.html.j2",
-            host=host,
-            port=port,
-            **strava_controller.action_connect()
-        )
+def route_settings(app: Flask) -> None:
+    @app.route("/settings")
+    def settings():
+        return render_template("settings.html.j2")
 
 
 def get_secret_key():
@@ -99,7 +75,7 @@ def webui_main(
 
     route_search(app, repository)
     route_start(app, repository)
-    route_strava(app, host, port)
+    route_settings(app)
 
     app.config["UPLOAD_FOLDER"] = "Activities"
     app.secret_key = get_secret_key()
@@ -136,6 +112,10 @@ def webui_main(
         make_summary_blueprint(repository),
         url_prefix="/summary",
     )
+    app.register_blueprint(
+        make_strava_blueprint(host, port),
+        url_prefix="/strava",
+    )
     app.register_blueprint(make_tile_blueprint(), url_prefix="/tile")
     app.register_blueprint(
         make_upload_blueprint(repository, tile_visit_accessor, config),

geo_activity_playground/webui/entry_controller.py

@@ -13,12 +13,12 @@ class EntryController:
         self._repository = repository
 
     def render(self) -> dict:
-        result = {
-            "distance_last_30_days_plot": distance_last_30_days_meta_plot(
+        result = {"latest_activities": []}
+
+        if len(self._repository):
+            result["distance_last_30_days_plot"] = distance_last_30_days_meta_plot(
                 self._repository.meta
-            ),
-            "latest_activities": [],
-        }
+            )
 
         for activity in itertools.islice(
             self._repository.iter_activities(dropna=True), 15

geo_activity_playground/webui/heatmap/heatmap_controller.py

@@ -83,6 +83,12 @@ class HeatmapController:
             with work_tracker(
                 tile_count_cache_path.with_suffix(".json")
             ) as parsed_activities:
+                if parsed_activities - activity_ids:
+                    logger.warning(
+                        f"Resetting heatmap cache for {kind=}/{x=}/{y=}/{z=} because activities have been removed."
+                    )
+                    tile_counts = np.zeros(tile_pixels, dtype=np.int32)
+                    parsed_activities.clear()
                 for activity_id in activity_ids:
                     if activity_id in parsed_activities:
                         continue

geo_activity_playground/webui/strava/blueprint.py

@@ -0,0 +1,33 @@
+from flask import Blueprint
+from flask import redirect
+from flask import render_template
+from flask import request
+
+from .controller import StravaController
+
+
+def make_strava_blueprint(host: str, port: int) -> Blueprint:
+    strava_controller = StravaController(host, port)
+    blueprint = Blueprint("strava", __name__, template_folder="templates")
+
+    @blueprint.route("/setup")
+    def setup():
+        return render_template(
+            "strava/client-id.html.j2", **strava_controller.set_client_id()
+        )
+
+    @blueprint.route("/post-client-id", methods=["POST"])
+    def post_client_id():
+        client_id = request.form["client_id"]
+        client_secret = request.form["client_secret"]
+        url = strava_controller.save_client_id(client_id, client_secret)
+        return redirect(url)
+
+    @blueprint.route("/callback")
+    def strava_callback():
+        code = request.args.get("code", type=str)
+        return render_template(
+            "strava/connected.html.j2", **strava_controller.save_code(code)
+        )
+
+    return blueprint

geo_activity_playground/webui/strava/controller.py

@@ -0,0 +1,47 @@
+import json
+import urllib.parse
+from typing import Optional
+
+from geo_activity_playground.core.paths import strava_dynamic_config_path
+
+
+class StravaController:
+    def __init__(self, host: str, port: int) -> None:
+        self._host = host
+        self._port = port
+
+        self._client_secret: Optional[str] = None
+
+    def set_client_id(self) -> dict:
+        return {"host": self._host, "port": self._port}
+
+    def save_client_id(self, client_id: str, client_secret: str) -> str:
+        self._client_id = client_id
+        self._client_secret = client_secret
+
+        payload = {
+            "client_id": client_id,
+            "redirect_uri": f"http://{self._host}:{self._port}/strava/callback",
+            "response_type": "code",
+            "scope": "activity:read_all",
+        }
+
+        arg_string = "&".join(
+            f"{key}={urllib.parse.quote(value)}" for key, value in payload.items()
+        )
+        return f"https://www.strava.com/oauth/authorize?{arg_string}"
+
+    def save_code(self, code: str) -> dict:
+        self._code = code
+
+        with open(strava_dynamic_config_path(), "w") as f:
+            json.dump(
+                {
+                    "client_id": self._client_id,
+                    "client_secret": self._client_secret,
+                    "code": self._code,
+                },
+                f,
+            )
+
+        return {}

geo_activity_playground/webui/{templates/strava-connect.html.j2 → strava/templates/strava/client-id.html.j2}

@@ -6,21 +6,17 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        <form action="/strava/authorize" method="POST">
+        <form action="/strava/post-client-id" method="POST">
             <div class="mb-3">
                 <label for="client_id" class="form-label">Client ID</label>
-                <input type="text" class="form-control" id="client_id" name="client_id" placeholder="814722" />
+                <input type="text" class="form-control" id="client_id" name="client_id" value="131693" />
             </div>
             <div class="mb-3">
                 <label for="client_secret" class="form-label">Client Secret</label>
                 <input type="text" class="form-control" id="client_secret" name="client_secret"
-                    placeholder="ed9d766e135d95c79dbfca4379d09661a72ebdfd" />
+                    value="0ccc0100a2c218512a7ef0cea3b0e322fb4b4365" />
             </div>
 
-
-            <input type="hidden" name="redirect_uri" value="http://{{ host }}:{{ port }}/strava/callback" />
-            <input type="hidden" name="response_type" value="code" />
-            <input type="hidden" name="scope" value="activity:read_all" />
             <input type="submit" value="Connect to Strava" />
         </form>
     </div>

geo_activity_playground/webui/strava/templates/strava/connected.html.j2

@@ -0,0 +1,14 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Strava Connect</h1>
+
+<div class="row mb-3">
+    <div class="col-md-4">
+        <p>You're now connected to Strava. Please restart the webserver to start loading actvities.</p>
+    </div>
+</div>
+
+
+{% endblock %}

geo_activity_playground/webui/templates/home.html.j2

@@ -4,6 +4,7 @@
 <div class="row mb-3">
 </div>
 
+{% if latest_activities %}
 <div class="row mb-3">
     <div class="col-md-9">
         <h2>Last 30 days</h2>
@@ -63,5 +64,9 @@
     {% endfor %}
 </div>
 {% endfor %}
+{% else %}
+<p>You don't have activities yet. Either put some files into a directory <tt>Activities</tt> or <a
+        href="{{ url_for('strava.setup') }}">set up Strava API</a>.</p>
+{% endif %}
 
 {% endblock %}

geo_activity_playground/webui/templates/page.html.j2

@@ -90,6 +90,9 @@
                             <a class="nav-link active" aria-current="page"
                                 href="{{ url_for('upload.index') }}">Upload</a>
                         </li>
+                        <li class="nav-item">
+                            <a class="nav-link active" aria-current="page" href="{{ url_for('settings') }}">Settings</a>
+                        </li>
                     </ul>
                 </div>
             </div>

geo_activity_playground/webui/templates/settings.html.j2

@@ -0,0 +1,15 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row mb-3">
+    <div class="col">
+        <h1>Settings</h1>
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class="col">
+        <p><a href="{{ url_for('strava.setup') }}">Set up Strava API</a>.</p>
+    </div>
+</div>
+{% endblock %}

geo_activity_playground/webui/upload/controller.py

@@ -10,7 +10,9 @@ from flask import Response
 from werkzeug.utils import secure_filename
 
 from geo_activity_playground.core.activities import ActivityRepository
-from geo_activity_playground.core.activities import embellish_time_series
+from geo_activity_playground.core.activities import build_activity_meta
+from geo_activity_playground.core.enrichment import enrich_activities
+from geo_activity_playground.core.paths import _strava_dynamic_config_path
 from geo_activity_playground.explorer.tile_visits import compute_tile_evolution
 from geo_activity_playground.explorer.tile_visits import compute_tile_visits
 from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
@@ -94,22 +96,16 @@ def scan_for_activities(
     skip_strava: bool = False,
 ) -> None:
     if pathlib.Path("Activities").exists():
-        import_from_directory(
-            repository,
-            config.get("kind", {}),
-            config.get("metadata_extraction_regexes", []),
-        )
+        import_from_directory(config.get("metadata_extraction_regexes", []))
     if pathlib.Path("Strava Export").exists():
         import_from_strava_checkout(repository)
-    if "strava" in config and not skip_strava:
-        import_from_strava_api(repository)
+    if (_strava_dynamic_config_path.exists() or "strava" in config) and not skip_strava:
+        import_from_strava_api()
 
-    if len(repository) == 0:
-        logger.error(
-            f"No activities found. You need to either add activity files (GPX, FIT, …) to {pathlib.Path('Activities')} or set up the Strava API. Starting without any activities is unfortunately not supported."
-        )
-        sys.exit(1)
+    enrich_activities(config.get("kind", {}))
+    build_activity_meta()
+    repository.reload()
 
-    embellish_time_series(repository)
-    compute_tile_visits(repository, tile_visit_accessor)
-    compute_tile_evolution(tile_visit_accessor)
+    if len(repository) > 0:
+        compute_tile_visits(repository, tile_visit_accessor)
+        compute_tile_evolution(tile_visit_accessor)

{geo_activity_playground-0.24.2.dist-info → geo_activity_playground-0.25.0.dist-info}/METADATA

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

{geo_activity_playground-0.24.2.dist-info → geo_activity_playground-0.25.0.dist-info}/RECORD

@@ -1,39 +1,39 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/__main__.py,sha256=pAl5_cWjuNyGmE_zMoPtG7Gc7r7lNk3psn9CAxzP2fU,4131
+geo_activity_playground/__main__.py,sha256=NQDFaa1BSIdare1oIdYO0cESf0kPVnEIE3J24jlsX_E,4021
 geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/core/activities.py,sha256=giZYepqGK3NujGpcCrYvF0rYDyVMopIMdXrvWBvbRm4,11606
-geo_activity_playground/core/activity_parsers.py,sha256=pjYjnaAXsWfUNOoomYWOmmFZO5Qs076RWM-pqNdo7BA,10905
-geo_activity_playground/core/cache_migrations.py,sha256=tkGA0h69-m-0Ek7JjvfVOX45YXLXkh_ZvC2TKB_fvbA,4281
+geo_activity_playground/core/activities.py,sha256=I1lsn1gO_P9eHbZCZlkCO6Lvi5sqXq_-c-1aDv6uKMs,8081
 geo_activity_playground/core/config.py,sha256=YjqCiEmIAa-GM1-JfBctMEsl8-I56pZyyDdTyPduOzw,477
 geo_activity_playground/core/coordinates.py,sha256=tDfr9mlXhK6E_MMIJ0vYWVCoH0Lq8uyuaqUgaa8i0jg,966
+geo_activity_playground/core/enrichment.py,sha256=wRVhrUCsvs2CcVhN-BQwxk_W_0E0AFp1_hncGzWNNvo,6435
 geo_activity_playground/core/heatmap.py,sha256=bRLQHzmTEsQbX8XWeg85x_lRGk272UoYRiCnoxZ5da0,4189
-geo_activity_playground/core/paths.py,sha256=EX4yQQyAmWRxTYS0QvFCbGz9v1J0z_1QYfd5hjTmaRw,808
+geo_activity_playground/core/paths.py,sha256=ohJN_xNLh303uc0ATpL4iH01xANIE86pILRaQi4e-RQ,1893
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
 geo_activity_playground/core/similarity.py,sha256=Jo8jRViuORCxdIGvyaflgsQhwu9S_jn10a450FRL18A,3159
-geo_activity_playground/core/tasks.py,sha256=lcfLeYpla819v2BTf53zvT0xEB4I6OpSfqfF_xlsLwM,1817
+geo_activity_playground/core/tasks.py,sha256=wp3Q8P0u9Frbuel1Inll6Zgi8a3GUM7SCltE14o1VXw,2495
 geo_activity_playground/core/test_tiles.py,sha256=zce1FxNfsSpOQt66jMehdQRVoNdl-oiFydx6iVBHZXM,764
 geo_activity_playground/core/test_time_conversion.py,sha256=Sh6nZA3uCTOdZTZa3yOijtR0m74QtZu2mcWXsDNnyQI,984
 geo_activity_playground/core/tiles.py,sha256=VxPu9vdfKnxDxaYo5JSYmka9Dt3TDxg0zo3cYVJXVHc,3359
 geo_activity_playground/core/time_conversion.py,sha256=9J6aTlqJhWvsknQkoECNL-CIG-8BKs6ZatJJ9XJnTsg,367
 geo_activity_playground/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/explorer/grid_file.py,sha256=k6j6KBEk2a2BY-onE8SV5TJsERGGyOrlY4as__meWpA,3304
-geo_activity_playground/explorer/tile_visits.py,sha256=fkn2Pgk-pBmC0ywDa0g2T9f4L2sdi5GaqGMbs4tow_g,12157
+geo_activity_playground/explorer/tile_visits.py,sha256=CLZ8bCUKc5YoxvNa23hGF9JtlinIl9Wbk9u2xN4bJpw,13457
 geo_activity_playground/explorer/video.py,sha256=ROAmV9shfJyqTgnXVD41KFORiwnRgVpEWenIq4hMCRM,4389
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/importers/directory.py,sha256=6KUxMMJELq1WWQSbqAWt6ZVlZh7Np3LMJNkt6jPN5eI,4506
-geo_activity_playground/importers/strava_api.py,sha256=FJYamDBmHmB8uA9dNc0h0j7EgZPCofCspL2Wfq-PrTg,7869
-geo_activity_playground/importers/strava_checkout.py,sha256=nvZX7skevqMWdW9Gxzt4VhwCaI3wv2z5g-ODv6ZWxng,8078
+geo_activity_playground/importers/activity_parsers.py,sha256=m2SpvGlTZ8F3gG6YB24_ZFrlOAbtqbfWi-GIYspeUco,10593
+geo_activity_playground/importers/directory.py,sha256=YTYuroH-oYviL2a9B7No-6Fx4RrkhMqf60Yh-7dGats,5384
+geo_activity_playground/importers/strava_api.py,sha256=ihy_ezq_gYUy1V4jbtg41N6K0ilYVOEiPZE07lSiUHU,8444
+geo_activity_playground/importers/strava_checkout.py,sha256=mUKfCzBk0sMF6WEmAGelnwqGnonVO1UW_uZVAtxDJVQ,8576
 geo_activity_playground/importers/test_directory.py,sha256=ljXokx7q0OgtHvEdHftcQYEmZJUDVv3OOF5opklxdT4,724
 geo_activity_playground/importers/test_strava_api.py,sha256=4vX7wDr1a9aRh8myxNrIq6RwDBbP8ZeoXXPc10CAbW4,431
 geo_activity_playground/webui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/activity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/activity/blueprint.py,sha256=gGMes5ycXi2rMixVYs4NQgzTU1Vttgu50prYAe3--Hs,1749
-geo_activity_playground/webui/activity/controller.py,sha256=CoNi9dJlGS-pZMEh14eZqWkbbLRHvQ01PEk8jRXpmgU,16665
+geo_activity_playground/webui/activity/controller.py,sha256=BSmHwO2GLyMGiFRQ0BpTsHMKDWJbz5UHnwQ9HVULN4c,16679
 geo_activity_playground/webui/activity/templates/activity/day.html.j2,sha256=r3qKl9uTzOko4R-ZzyYAZt1j61JSevYP4g0Yi06HHPg,2702
 geo_activity_playground/webui/activity/templates/activity/lines.html.j2,sha256=5gB1aDjRgi_RventenRfC10_FtMT4ch_VuWvA9AMlBY,1121
 geo_activity_playground/webui/activity/templates/activity/name.html.j2,sha256=RDLEt6ip8_ngmdLgaC5jg92Dk-F2umGwKkd8cWmvVko,2400
-geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=40eEbOypq0ZzebPgUXZy6fWjcGuMtcF_IFMNvc1_CXY,5148
-geo_activity_playground/webui/app.py,sha256=MCkWkeBTLXyqIE-GLhgGRsQYAtUPf9mUh6csbkoOvw8,4575
+geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=NOsMPUBy1UQM_YebtT6RQxLSgSGvCMetqi_mspJmUjQ,5229
+geo_activity_playground/webui/app.py,sha256=a6RcsPH-n1Ru6RybkAPCRENL9KnPvxfPBJI9IzsEB5U,3980
 geo_activity_playground/webui/calendar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/calendar/blueprint.py,sha256=rlnhgU2DWAcdLMRq7m77NzrM_aDyp4s3kuuQHuzjHhg,782
 geo_activity_playground/webui/calendar/controller.py,sha256=QpSAkR2s1sbLSu6P_fNNTccgGglOzEH2PIv1XwKxeVY,2778
@@ -43,7 +43,7 @@ geo_activity_playground/webui/eddington/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 geo_activity_playground/webui/eddington/blueprint.py,sha256=evIvueLfDWVTxJ9pRguqmZ9-Pybd2WmBRst_-7vX2QA,551
 geo_activity_playground/webui/eddington/controller.py,sha256=L4YssL088UMamp4qgzEtilzhaKGZsyfVUScuw-fmTjE,2888
 geo_activity_playground/webui/eddington/templates/eddington/index.html.j2,sha256=XHKeUymQMS5x00PLOVlg-nSRCz_jHB2pvD8QunULWJ4,1839
-geo_activity_playground/webui/entry_controller.py,sha256=v8twD3LJ0SoVtvzJoDKnU8dTtMZAKvhNU2AEH2Z87OA,1886
+geo_activity_playground/webui/entry_controller.py,sha256=n9v4MriyL8kDR91LE9eeqc2tAvxyzFgoNMMXpr0qh4g,1906
 geo_activity_playground/webui/equipment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/equipment/blueprint.py,sha256=YbOAsjk05BMeUlD6wGfxE1amvlLsFjG4HMJn5SBrVRU,551
 geo_activity_playground/webui/equipment/controller.py,sha256=m1LNaGCNJnW97TlKT6x9NfQcMp6RKcZ8Q0I1FTUAvss,4037
@@ -54,7 +54,7 @@ geo_activity_playground/webui/explorer/controller.py,sha256=8d0FFrG55ZlPQ5seQC2D
 geo_activity_playground/webui/explorer/templates/explorer/index.html.j2,sha256=OxNt2_VwH-cmVXJrDNfeD-dNB9IrwBjdhhQEqkXxHj0,6529
 geo_activity_playground/webui/heatmap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/heatmap/blueprint.py,sha256=bjQu-HL3QN5UpJ6tHOifhcLGlPr_hIKvaRu78md4JqM,1470
-geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=fM92NfeJ_qhXkuAT01Btkzeb_SbAgExxql_OH1G31os,6477
+geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=i376qEqTJrhezGsdPyKR8VsRY2N0JdEra7_kY7NmwW8,6822
 geo_activity_playground/webui/heatmap/templates/heatmap/index.html.j2,sha256=YLeu6P4djl8G4qAXR6DhetseqrbOodN7aN4coocknc4,1875
 geo_activity_playground/webui/search_controller.py,sha256=PzMf7b8tiJKZIZoPvQ9A2hOrzoKV9cS3jq05w2fK94c,532
 geo_activity_playground/webui/square_planner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -72,24 +72,28 @@ geo_activity_playground/webui/static/favicon.ico,sha256=uVNZlrF22zn1lcCS_9wAoWLh
 geo_activity_playground/webui/static/mstile-150x150.png,sha256=j1ANUQJ1Xi1DR2sGqYZztob2ypfGw04eNtGpN9SxExA,11964
 geo_activity_playground/webui/static/safari-pinned-tab.svg,sha256=OzoEVGY0igWRXM1NiM3SRKugdICBN7aB_XuxaC3Mu9Q,8371
 geo_activity_playground/webui/static/site.webmanifest,sha256=4vYxdPMpwTdB8EmOvHkkYcjZ8Yrci3pOwwY3o_VwACA,440
-geo_activity_playground/webui/strava_controller.py,sha256=-DZ1Ae-0cWx5tia2dJpGfsBBoIya0QO7IC2qa1-7Q_U,779
+geo_activity_playground/webui/strava/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geo_activity_playground/webui/strava/blueprint.py,sha256=Q2Wfxlg7bR2vjWZ3UpckPl9jWHwNB8hfP7SLBufgiUY,1055
+geo_activity_playground/webui/strava/controller.py,sha256=vTspMZvhM2jt3PjnN4ey17mSRvbeoHktZ5_r9mxyfZY,1379
+geo_activity_playground/webui/strava/templates/strava/client-id.html.j2,sha256=fnxr1pSZgLxrdykqy33fYqoo8jVvdWSXBj8ZDIXq_jw,849
+geo_activity_playground/webui/strava/templates/strava/connected.html.j2,sha256=e0FB00AwxuKWDsENkSq6FW-822-gx1ubNMps-Sj5gsY,279
 geo_activity_playground/webui/summary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/summary/blueprint.py,sha256=kzQ6MDOycQKfDcVoEUmL7HYHJA_gu8DlzVHwO37-_jA,514
 geo_activity_playground/webui/summary/controller.py,sha256=i6A9-S9j9Hm67FcZPzJpqMgxRVsXbDmJiVLGiRtZIqk,8805
 geo_activity_playground/webui/summary/templates/summary/index.html.j2,sha256=rsII1eMY-xNugh8A9SecnEcDZqkEOWYIfiHAGroQYuM,4442
-geo_activity_playground/webui/templates/home.html.j2,sha256=23MLQJ1k447NMLcgOGgTSNiPXFvdC2bQvACkDZbGo5k,2182
-geo_activity_playground/webui/templates/page.html.j2,sha256=aeTYem0CpOOPvWa5KzVKH1BiPJlF0LHqChL1IhpAUO0,7292
+geo_activity_playground/webui/templates/home.html.j2,sha256=fp48MjBuO4QJfQz6YPOWH56IzStgaclx9XbwEKmUFHQ,2403
+geo_activity_playground/webui/templates/page.html.j2,sha256=Dal68Juf6dZeejnG79mESfyLX_cweFXMSmLF4J1Ybk4,7489
 geo_activity_playground/webui/templates/search.html.j2,sha256=FvNRoDfUlSzXjM_tqZY_fDhuhUDgbPaY73q56gdvF1A,1130
-geo_activity_playground/webui/templates/strava-connect.html.j2,sha256=vLMqTnTV-DZJ1FHRjpm4OMgbABMwZQvbs8Ru9baKeBg,1111
+geo_activity_playground/webui/templates/settings.html.j2,sha256=HSFmNameF7ejSd5PxGVuPNBV5HgjP61Q7th8ZR0AxOU,297
 geo_activity_playground/webui/tile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/tile/blueprint.py,sha256=cK0o2Z3BrLycgF9zw0F8s9qF-JaYDbF5Gog-GXDtUZ8,943
 geo_activity_playground/webui/tile/controller.py,sha256=PISh4vKs27b-LxFfTARtr5RAwHFresA1Kw1MDcERSRU,1221
 geo_activity_playground/webui/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/upload/blueprint.py,sha256=2l5q1LYtjgLF_3CAyPvCLx-wMebp14OJvgZBzGILdmQ,801
-geo_activity_playground/webui/upload/controller.py,sha256=QrHfqRxroLuzBBNNSheUx-qJ9ww1sXT1oPdpS7Jx_ro,4092
+geo_activity_playground/webui/upload/controller.py,sha256=FDqhCPUpK5uQMfu1xGZ19Sw7jeazL33btX0a8BV5sgo,3985
 geo_activity_playground/webui/upload/templates/upload/index.html.j2,sha256=hfXkEXaz_MkM46rU56423D6V6WtK-EAXPszSY-_-Tx8,1471
-geo_activity_playground-0.24.2.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.24.2.dist-info/METADATA,sha256=Rele9lf2wXKFJkEXlZYiRY8AMzjTwwN9RBvYY9ieAkc,1665
-geo_activity_playground-0.24.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-geo_activity_playground-0.24.2.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.24.2.dist-info/RECORD,,
+geo_activity_playground-0.25.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.25.0.dist-info/METADATA,sha256=d7EZsJfNeXv7cqVnCCJ_jOoxs5-a7Wlntgw7nZTrOKM,1665
+geo_activity_playground-0.25.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+geo_activity_playground-0.25.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.25.0.dist-info/RECORD,,

geo_activity_playground/core/cache_migrations.py

@@ -1,133 +0,0 @@
-import json
-import logging
-import pathlib
-import shutil
-
-import pandas as pd
-from tqdm import tqdm
-
-from geo_activity_playground.core.paths import activities_path
-from geo_activity_playground.core.paths import activity_timeseries_dir
-from geo_activity_playground.core.tasks import work_tracker_path
-
-logger = logging.getLogger(__name__)
-
-
-def delete_activities_per_tile() -> None:
-    paths = [
-        pathlib.Path("Cache/activities-per-tile.pickle"),
-        pathlib.Path("Cache/activities-per-tile-task.json"),
-    ]
-    for path in paths:
-        path.unlink(missing_ok=True)
-
-
-def delete_work_tracker(name: str):
-    work_tracker_path(name).unlink(missing_ok=True)
-
-
-def reset_time_series_embellishment() -> None:
-    pathlib.Path("Cache/work-tracker-embellish-time-series.pickle").unlink(
-        missing_ok=True
-    )
-
-
-def delete_tile_visits() -> None:
-    paths = [
-        pathlib.Path("Cache/activities-per-tile.pickle"),
-        pathlib.Path("Cache/tile-evolution-state.pickle"),
-        pathlib.Path("Cache/tile-history.pickle"),
-        pathlib.Path("Cache/tile-visits.pickle"),
-        pathlib.Path("Cache/work-tracker-parse-activity-files.pickle"),
-        pathlib.Path("Cache/work-tracker-tile-visits.pickle"),
-    ]
-    for path in paths:
-        path.unlink(missing_ok=True)
-
-
-def delete_heatmap_cache() -> None:
-    path = pathlib.Path("Cache/Heatmap")
-    if path.exists():
-        shutil.rmtree(path)
-
-
-def delete_activity_metadata() -> None:
-    delete_work_tracker("parse-activity-files")
-    activities_path().unlink(missing_ok=True)
-
-
-def convert_distances_to_km() -> None:
-    if activities_path().exists():
-        activities = pd.read_parquet(activities_path())
-        if not "distance_km" in activities.columns:
-            activities["distance_km"] = activities["distance"] / 1000
-        for col in ["distance", "distance/km"]:
-            if col in activities.columns:
-                del activities[col]
-        activities.to_parquet(activities_path())
-
-    for time_series_path in tqdm(
-        list(activity_timeseries_dir().glob("*.parquet")),
-        desc="Convert m to km",
-    ):
-        time_series = pd.read_parquet(time_series_path)
-        if "distance" in time_series.columns:
-            time_series["distance_km"] = time_series["distance"] / 1000
-        for col in ["distance", "distance/km"]:
-            if col in time_series.columns:
-                del time_series[col]
-        time_series.to_parquet(time_series_path)
-
-
-def add_consider_for_achievements() -> None:
-    activities_path = pathlib.Path("Cache/activities.parquet")
-    if activities_path.exists():
-        df = pd.read_parquet(activities_path)
-        if "consider_for_achievements" not in df.columns:
-            df["consider_for_achievements"] = True
-        else:
-            df.loc[
-                df["consider_for_achievements"].isna(), "consider_for_achievements"
-            ] = True
-        df.to_parquet("Cache/activities.parquet")
-
-
-def delete_everything() -> None:
-    if pathlib.Path("Cache").exists():
-        shutil.rmtree("Cache")
-
-
-def apply_cache_migrations() -> None:
-    logger.info("Apply cache migration if needed …")
-    cache_status_file = pathlib.Path("Cache/status.json")
-    if cache_status_file.exists():
-        with open(cache_status_file) as f:
-            cache_status = json.load(f)
-    else:
-        cache_status = {"num_applied_migrations": 0}
-
-    migrations = [
-        delete_activities_per_tile,
-        reset_time_series_embellishment,
-        delete_tile_visits,
-        delete_heatmap_cache,
-        delete_activity_metadata,
-        delete_activity_metadata,
-        convert_distances_to_km,
-        delete_activity_metadata,
-        delete_tile_visits,
-        delete_heatmap_cache,
-        add_consider_for_achievements,
-        delete_tile_visits,
-        delete_heatmap_cache,
-        delete_tile_visits,
-        delete_everything,
-    ]
-
-    for migration in migrations[cache_status["num_applied_migrations"] :]:
-        logger.info(f"Applying cache migration {migration.__name__} …")
-        migration()
-        cache_status["num_applied_migrations"] += 1
-        cache_status_file.parent.mkdir(exist_ok=True, parents=True)
-        with open(cache_status_file, "w") as f:
-            json.dump(cache_status, f)

geo_activity_playground/webui/strava_controller.py

@@ -1,27 +0,0 @@
-import urllib.parse
-from typing import Optional
-
-
-class StravaController:
-    def __init__(self) -> None:
-        self._client_secret: Optional[str] = None
-
-    def action_connect(self) -> dict:
-        return {}
-
-    def action_authorize(
-        self, host: str, port: int, client_id: str, client_secret: str
-    ) -> str:
-        self._client_secret = client_secret
-
-        payload = {
-            "client_id": client_id,
-            "redirect_uri": f"http://{host}:{port}/strava/callback",
-            "response_type": "code",
-            "scope": "activity:read_all",
-        }
-
-        arg_string = "&".join(
-            f"{key}={urllib.parse.quote(value)}" for key, value in payload.items()
-        )
-        return f"https://www.strava.com/oauth/authorize?{arg_string}"