geo-activity-playground 0.38.1__py3-none-any.whl → 0.39.0__py3-none-any.whl

geo_activity_playground/explorer/tile_visits.py

@@ -4,7 +4,6 @@ import itertools
 import logging
 import pathlib
 import pickle
-from typing import Any
 from typing import Iterator
 from typing import Optional
 from typing import TypedDict
@@ -12,15 +11,14 @@ from typing import TypedDict
 import pandas as pd
 from tqdm import tqdm
 
-from geo_activity_playground.core.activities import ActivityRepository
-from geo_activity_playground.core.config import Config
-from geo_activity_playground.core.paths import atomic_open
-from geo_activity_playground.core.paths import tiles_per_time_series
-from geo_activity_playground.core.tasks import try_load_pickle
-from geo_activity_playground.core.tasks import work_tracker_path
-from geo_activity_playground.core.tasks import WorkTracker
-from geo_activity_playground.core.tiles import adjacent_to
-from geo_activity_playground.core.tiles import interpolate_missing_tile
+from ..core.activities import ActivityRepository
+from ..core.config import Config
+from ..core.paths import atomic_open
+from ..core.tasks import try_load_pickle
+from ..core.tasks import work_tracker_path
+from ..core.tasks import WorkTracker
+from ..core.tiles import adjacent_to
+from ..core.tiles import interpolate_missing_tile
 
 
 logger = logging.getLogger(__name__)

geo_activity_playground/heatmap_video.py

@@ -9,13 +9,13 @@ from PIL import Image
 from PIL import ImageDraw
 from tqdm import tqdm
 
-from geo_activity_playground.core.activities import ActivityRepository
-from geo_activity_playground.core.config import ConfigAccessor
-from geo_activity_playground.core.raster_map import convert_to_grayscale
-from geo_activity_playground.core.raster_map import map_image_from_tile_bounds
-from geo_activity_playground.core.raster_map import OSM_TILE_SIZE
-from geo_activity_playground.core.raster_map import tile_bounds_around_center
-from geo_activity_playground.core.tiles import compute_tile_float
+from .core.activities import ActivityRepository
+from .core.config import ConfigAccessor
+from .core.raster_map import convert_to_grayscale
+from .core.raster_map import map_image_from_tile_bounds
+from .core.raster_map import OSM_TILE_SIZE
+from .core.raster_map import tile_bounds_around_center
+from .core.tiles import compute_tile_float
 
 
 def main_heatmap_video(options) -> None:
@@ -25,7 +25,6 @@ def main_heatmap_video(options) -> None:
     os.chdir(options.basedir)
 
     repository = ActivityRepository()
-    repository.reload()
     assert len(repository) > 0
     config_accessor = ConfigAccessor()
 

geo_activity_playground/importers/activity_parsers.py

@@ -13,8 +13,8 @@ import pandas as pd
 import tcxreader.tcxreader
 import xmltodict
 
-from geo_activity_playground.core.activities import ActivityMeta
-from geo_activity_playground.core.time_conversion import convert_to_datetime_ns
+from ..core.datamodel import ActivityMeta
+from ..core.time_conversion import convert_to_datetime_ns
 
 logger = logging.getLogger(__name__)
 

geo_activity_playground/importers/directory.py

@@ -1,6 +1,5 @@
 import hashlib
 import logging
-import multiprocessing
 import pathlib
 import pickle
 import re
@@ -9,15 +8,15 @@ from typing import Optional
 
 from tqdm import tqdm
 
-from geo_activity_playground.core.activities import ActivityMeta
-from geo_activity_playground.core.config import Config
-from geo_activity_playground.core.paths import activity_extracted_dir
-from geo_activity_playground.core.paths import activity_extracted_meta_dir
-from geo_activity_playground.core.paths import activity_extracted_time_series_dir
-from geo_activity_playground.core.tasks import stored_object
-from geo_activity_playground.core.tasks import WorkTracker
-from geo_activity_playground.importers.activity_parsers import ActivityParseError
-from geo_activity_playground.importers.activity_parsers import read_activity
+from ..core.config import Config
+from ..core.datamodel import ActivityMeta
+from ..core.paths import activity_extracted_dir
+from ..core.paths import activity_extracted_meta_dir
+from ..core.paths import activity_extracted_time_series_dir
+from ..core.tasks import stored_object
+from ..core.tasks import WorkTracker
+from .activity_parsers import ActivityParseError
+from .activity_parsers import read_activity
 
 logger = logging.getLogger(__name__)
 

geo_activity_playground/importers/strava_api.py

@@ -11,15 +11,15 @@ from stravalib.exc import ObjectNotFound
 from stravalib.exc import RateLimitExceeded
 from tqdm import tqdm
 
-from geo_activity_playground.core.activities import ActivityMeta
-from geo_activity_playground.core.config import Config
-from geo_activity_playground.core.paths import activity_extracted_meta_dir
-from geo_activity_playground.core.paths import activity_extracted_time_series_dir
-from geo_activity_playground.core.paths import strava_api_dir
-from geo_activity_playground.core.paths import strava_last_activity_date_path
-from geo_activity_playground.core.tasks import get_state
-from geo_activity_playground.core.tasks import set_state
-from geo_activity_playground.core.time_conversion import convert_to_datetime_ns
+from ..core.config import Config
+from ..core.datamodel import ActivityMeta
+from ..core.paths import activity_extracted_meta_dir
+from ..core.paths import activity_extracted_time_series_dir
+from ..core.paths import strava_api_dir
+from ..core.paths import strava_last_activity_date_path
+from ..core.tasks import get_state
+from ..core.tasks import set_state
+from ..core.time_conversion import convert_to_datetime_ns
 
 
 logger = logging.getLogger(__name__)

geo_activity_playground/importers/strava_checkout.py

@@ -6,25 +6,24 @@ import shutil
 import sys
 import traceback
 from typing import Optional
-from typing import Union
 
 import dateutil.parser
 import numpy as np
 import pandas as pd
 from tqdm import tqdm
 
-from geo_activity_playground.core.activities import ActivityMeta
-from geo_activity_playground.core.paths import activity_extracted_meta_dir
-from geo_activity_playground.core.paths import activity_extracted_time_series_dir
-from geo_activity_playground.core.paths import strava_last_activity_date_path
-from geo_activity_playground.core.tasks import get_state
-from geo_activity_playground.core.tasks import set_state
-from geo_activity_playground.core.tasks import work_tracker_path
-from geo_activity_playground.core.tasks import WorkTracker
-from geo_activity_playground.core.time_conversion import convert_to_datetime_ns
-from geo_activity_playground.importers.activity_parsers import ActivityParseError
-from geo_activity_playground.importers.activity_parsers import read_activity
-from geo_activity_playground.importers.csv_parser import parse_csv
+from ..core.datamodel import ActivityMeta
+from ..core.paths import activity_extracted_meta_dir
+from ..core.paths import activity_extracted_time_series_dir
+from ..core.paths import strava_last_activity_date_path
+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 ..core.time_conversion import convert_to_datetime_ns
+from .activity_parsers import ActivityParseError
+from .activity_parsers import read_activity
+from .csv_parser import parse_csv
 
 
 logger = logging.getLogger(__name__)

geo_activity_playground/importers/test_csv_parser.py

@@ -1,8 +1,8 @@
 import pytest
 
-from geo_activity_playground.importers.csv_parser import _parse_cell
-from geo_activity_playground.importers.csv_parser import _parse_line
-from geo_activity_playground.importers.csv_parser import parse_csv
+from .csv_parser import _parse_cell
+from .csv_parser import _parse_line
+from .csv_parser import parse_csv
 
 
 def test_parse_csv() -> None:

geo_activity_playground/importers/test_directory.py

@@ -1,6 +1,6 @@
 import pathlib
 
-from geo_activity_playground.importers.directory import _get_metadata_from_path
+from .directory import _get_metadata_from_path
 
 
 def test_get_metadata_from_path() -> None:

geo_activity_playground/importers/test_strava_api.py

@@ -1,6 +1,6 @@
 import datetime
 
-from geo_activity_playground.importers.strava_api import round_to_next_quarter_hour
+from .strava_api import round_to_next_quarter_hour
 
 
 def test_round_to_next_quarter_hour() -> None:

geo_activity_playground/webui/app.py

@@ -1,46 +1,46 @@
 import datetime
 import importlib
 import json
+import os
 import pathlib
 import secrets
 import shutil
 import urllib.parse
 
 from flask import Flask
-from flask import render_template
 from flask import request
+from flask_alembic import Alembic
 
 from ..core.activities import ActivityRepository
-from ..core.config import Config
 from ..core.config import ConfigAccessor
+from ..core.config import import_old_config
+from ..core.config import import_old_strava_config
+from ..core.datamodel import DB
+from ..core.heart_rate import HeartRateZoneComputer
+from ..core.raster_map import GrayscaleImageTransform
+from ..core.raster_map import IdentityImageTransform
+from ..core.raster_map import PastelImageTransform
+from ..core.raster_map import TileGetter
 from ..explorer.tile_visits import TileVisitAccessor
-from .activity.blueprint import make_activity_blueprint
-from .activity.controller import ActivityController
-from .auth_blueprint import make_auth_blueprint
 from .authenticator import Authenticator
-from .calendar.blueprint import make_calendar_blueprint
-from .calendar.controller import CalendarController
-from .eddington_blueprint import make_eddington_blueprint
-from .entry_controller import EntryController
-from .equipment_blueprint import make_equipment_blueprint
-from .explorer.blueprint import make_explorer_blueprint
-from .explorer.controller import ExplorerController
-from .heatmap.blueprint import make_heatmap_blueprint
-from .search_blueprint import make_search_blueprint
-from .settings.blueprint import make_settings_blueprint
-from .square_planner_blueprint import make_square_planner_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.webui.search_util import SearchQueryHistory
-
-
-def route_start(app: Flask, repository: ActivityRepository, config: Config) -> None:
-    entry_controller = EntryController(repository, config)
-
-    @app.route("/")
-    def index():
-        return render_template("home.html.j2", **entry_controller.render())
+from .blueprints.activity_blueprint import make_activity_blueprint
+from .blueprints.auth_blueprint import make_auth_blueprint
+from .blueprints.bubble_chart_blueprint import make_bubble_chart_blueprint
+from .blueprints.calendar_blueprint import make_calendar_blueprint
+from .blueprints.eddington_blueprint import register_eddington_blueprint
+from .blueprints.entry_views import register_entry_views
+from .blueprints.equipment_blueprint import make_equipment_blueprint
+from .blueprints.explorer_blueprint import make_explorer_blueprint
+from .blueprints.heatmap_blueprint import make_heatmap_blueprint
+from .blueprints.search_blueprint import make_search_blueprint
+from .blueprints.settings_blueprint import make_settings_blueprint
+from .blueprints.square_planner_blueprint import make_square_planner_blueprint
+from .blueprints.summary_blueprint import make_summary_blueprint
+from .blueprints.tile_blueprint import make_tile_blueprint
+from .blueprints.upload_blueprint import make_upload_blueprint
+from .blueprints.upload_blueprint import scan_for_activities
+from .flasher import FlaskFlasher
+from .search_util import SearchQueryHistory
 
 
 def get_secret_key():
@@ -56,15 +56,39 @@ def get_secret_key():
 
 
 def web_ui_main(
-    repository: ActivityRepository,
-    tile_visit_accessor: TileVisitAccessor,
-    config_accessor: ConfigAccessor,
+    basedir: pathlib.Path,
+    skip_reload: bool,
     host: str,
     port: int,
 ) -> None:
-    repository.reload()
+    os.chdir(basedir)
 
     app = Flask(__name__)
+
+    app.config["SQLALCHEMY_DATABASE_URI"] = (
+        f"sqlite:///{basedir.absolute()}/database.sqlite"
+    )
+    app.config["ALEMBIC"] = {"script_location": "../alembic/versions"}
+    DB.init_app(app)
+
+    alembic = Alembic()
+    alembic.init_app(app)
+
+    with app.app_context():
+        alembic.upgrade()
+        DB.session.commit()
+        # DB.create_all()
+
+    repository = ActivityRepository()
+    tile_visit_accessor = TileVisitAccessor()
+    config_accessor = ConfigAccessor()
+    import_old_config(config_accessor)
+    import_old_strava_config(config_accessor)
+
+    if not skip_reload:
+        with app.app_context():
+            scan_for_activities(repository, tile_visit_accessor, config_accessor())
+
     app.config["UPLOAD_FOLDER"] = "Activities"
     app.secret_key = get_secret_key()
 
@@ -82,67 +106,51 @@ def web_ui_main(
 
     authenticator = Authenticator(config_accessor())
     search_query_history = SearchQueryHistory(config_accessor, authenticator)
-
     config = config_accessor()
-    activity_controller = ActivityController(repository, tile_visit_accessor, config)
-    calendar_controller = CalendarController(repository)
-    explorer_controller = ExplorerController(
-        repository, tile_visit_accessor, config_accessor
-    )
-
-    route_start(app, repository, config_accessor())
-
-    app.register_blueprint(make_auth_blueprint(authenticator), url_prefix="/auth")
-    app.register_blueprint(
-        make_activity_blueprint(activity_controller, repository, authenticator),
-        url_prefix="/activity",
-    )
-    app.register_blueprint(
-        make_calendar_blueprint(calendar_controller), url_prefix="/calendar"
-    )
-    app.register_blueprint(
-        make_eddington_blueprint(repository, search_query_history),
-        url_prefix="/eddington",
-    )
-    app.register_blueprint(
-        make_equipment_blueprint(repository, config), url_prefix="/equipment"
-    )
-    app.register_blueprint(
-        make_explorer_blueprint(explorer_controller, authenticator),
-        url_prefix="/explorer",
-    )
-    app.register_blueprint(
-        make_heatmap_blueprint(
+    tile_getter = TileGetter(config.map_tile_url)
+    image_transforms = {
+        "color": IdentityImageTransform(),
+        "grayscale": GrayscaleImageTransform(),
+        "pastel": PastelImageTransform(),
+    }
+    flasher = FlaskFlasher()
+    heart_rate_zone_computer = HeartRateZoneComputer(config)
+
+    register_entry_views(app, repository, config)
+
+    blueprints = {
+        "/activity": make_activity_blueprint(
+            repository,
+            authenticator,
+            tile_visit_accessor,
+            config,
+            heart_rate_zone_computer,
+        ),
+        "/auth": make_auth_blueprint(authenticator),
+        "/bubble-chart": make_bubble_chart_blueprint(repository),
+        "/calendar": make_calendar_blueprint(repository),
+        "/eddington": register_eddington_blueprint(repository, search_query_history),
+        "/equipment": make_equipment_blueprint(repository, config),
+        "/explorer": make_explorer_blueprint(
+            authenticator, repository, tile_visit_accessor, config_accessor
+        ),
+        "/heatmap": make_heatmap_blueprint(
             repository, tile_visit_accessor, config_accessor(), search_query_history
         ),
-        url_prefix="/heatmap",
-    )
-    app.register_blueprint(
-        make_settings_blueprint(config_accessor, authenticator),
-        url_prefix="/settings",
-    )
-    app.register_blueprint(
-        make_square_planner_blueprint(tile_visit_accessor),
-        url_prefix="/square-planner",
-    )
-    app.register_blueprint(
-        make_search_blueprint(
+        "/settings": make_settings_blueprint(config_accessor, authenticator, flasher),
+        "/square-planner": make_square_planner_blueprint(tile_visit_accessor),
+        "/search": make_search_blueprint(
             repository, search_query_history, authenticator, config_accessor
         ),
-        url_prefix="/search",
-    )
-    app.register_blueprint(
-        make_summary_blueprint(repository, config, search_query_history),
-        url_prefix="/summary",
-    )
-
-    app.register_blueprint(make_tile_blueprint(config), url_prefix="/tile")
-    app.register_blueprint(
-        make_upload_blueprint(
+        "/summary": make_summary_blueprint(repository, config, search_query_history),
+        "/tile": make_tile_blueprint(image_transforms, tile_getter),
+        "/upload": make_upload_blueprint(
             repository, tile_visit_accessor, config_accessor(), authenticator
         ),
-        url_prefix="/upload",
-    )
+    }
+
+    for url_prefix, blueprint in blueprints.items():
+        app.register_blueprint(blueprint, url_prefix=url_prefix)
 
     base_dir = pathlib.Path("Open Street Map Tiles")
     dir_for_source = base_dir / urllib.parse.quote_plus(config_accessor().map_tile_url)

geo_activity_playground/webui/authenticator.py

@@ -6,7 +6,7 @@ from flask import redirect
 from flask import session
 from flask import url_for
 
-from geo_activity_playground.core.config import Config
+from ..core.config import Config
 
 
 class Authenticator: