dimwit 0.3.2__tar.gz → 0.3.3__tar.gz

{dimwit-0.3.2 → dimwit-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dimwit
-Version: 0.3.2
+Version: 0.3.3
 Summary: A package containing various functions and classes for fetching, transforming, and visualising data for personal metrics.
 Author-email: Daniel Soutar <danielsoutar144@gmail.com>
 Project-URL: repository, https://github.com/danielsoutar/dimwit

{dimwit-0.3.2 → dimwit-0.3.3}/dimwit/main.py

@@ -135,6 +135,29 @@ def get_notion_pages_from_db(
     return results
 
 
+# Sleep data compression format
+# All distinct years on first line, comma-separated.
+# All distinct months on second line, comma-separated.
+# The start and end days for each month. If there are gaps, parenthesised indices
+# indicate where they are. If a month change occurs, its last day is indicated.
+# Example: 25,(26),31,(7),24.
+# All distinct timezones on the 4th line. If >1, indicate the indices they start
+# from.
+# Example: +01:00,12+00:00
+# Finally each entry has the following:
+# (-/+) indicating if the entry starts and ends on the same day (+ = next day)
+# HH:MM>HH:MM|DURATION
+# 2025
+# 06
+# 19,23
+# +01:00
+# -02:40>06:50|4:10
+# -02:40>06:50|4:10
+# -02:40>06:50|4:10
+# -02:40>06:50|4:10
+# -02:40>06:50|4:10
+
+
 # This function compresses event-like data (could be generalised to arbitrary
 # data.)
 # Several optimisations are implemented vs baseline of '[datetime+TZ]: [DATA]':

dimwit-0.3.3/dimwit/running.py

@@ -0,0 +1,160 @@
+"""Trailing running volume by difficulty across a multi-block training plan."""
+
+from dataclasses import dataclass
+
+import datetime as dat
+import matplotlib.pyplot as plt
+import numpy as np
+from matplotlib.dates import DateFormatter
+from matplotlib.ticker import MultipleLocator
+
+
+RECOVERY, EASY, STEADY, THRESHOLD, HARD = range(5)
+DIFFICULTY_NAMES = ["Recovery", "Easy", "Steady", "Threshold", "Hard"]
+# Categorical hues (blue, aqua, yellow, red, violet), fixed order per level.
+DIFFICULTY_COLORS = ["#2a78d6", "#1baf7a", "#eda100", "#e34948", "#4a3aa7"]
+
+
+@dataclass
+class Run:
+    """One stretch of running at a single difficulty. A session may be several of these."""
+
+    running_time_mins: float
+    difficulty: int
+
+
+# A week is {weekday (Mon=0 .. Sun=6): [Run, ...]}.
+Week = dict
+
+
+@dataclass
+class Plan:
+    runs: dict  # {date: [Run, ...]}
+    sections: list  # [(start date, label), ...]
+    start: dat.date
+    end: dat.date  # exclusive
+
+
+def interval_session(
+    sets: float,
+    work_mins: float,
+    recovery_mins: float,
+    work_difficulty: int,
+    warm_cool_mins: float = 12.5,
+) -> list:
+    """Warm-up/cool-down (easy) + intervals + recovery jogs between sets, as separate runs."""
+    runs = [
+        Run(2 * warm_cool_mins, EASY),
+        Run(sets * work_mins, work_difficulty),
+    ]
+    if sets > 1:
+        runs.append(Run((sets - 1) * recovery_mins, RECOVERY))
+    return runs
+
+
+def easy_week(*mins: float, difficulty: int = EASY) -> Week:
+    """Runs on Mon/Wed/Fri, and a fourth on Sun if given."""
+    return {day: [Run(m, difficulty)] for day, m in zip((0, 2, 4, 6), mins)}
+
+
+def repeat_each_week(weeks: list, times: int = 2) -> list:
+    """Repeat each week `times` times in a row (weeks 1, 1, 2, 2, ...)."""
+    return [week for week in weeks for _ in range(times)]
+
+
+def build_plan(sections: list, start_date: dat.date) -> Plan:
+    """Lay consecutive `(label, weeks)` sections out from `start_date`, which must be a Monday."""
+    if start_date.weekday() != 0:
+        raise ValueError(f"start_date must be a Monday, got {start_date:%A}")
+
+    runs, section_starts, day = {}, [], start_date
+    for label, weeks in sections:
+        section_starts.append((day, label))
+        for w, week in enumerate(weeks):
+            for weekday, week_runs in week.items():
+                date = day + dat.timedelta(days=7 * w + weekday)
+                runs.setdefault(date, []).extend(week_runs)
+        day += dat.timedelta(days=7 * len(weeks))
+    return Plan(runs, section_starts, start_date, day)
+
+
+def trailing_volume(plan: Plan, window_days: int = 7) -> np.ndarray:
+    """(difficulty level, day) array of mins run at that level over the trailing window."""
+    n_days = (plan.end - plan.start).days
+    daily = np.zeros((len(DIFFICULTY_NAMES), n_days))
+    for date, runs in plan.runs.items():
+        for run in runs:
+            daily[run.difficulty, (date - plan.start).days] += run.running_time_mins
+    # Value at day t covers days t - window_days + 1 .. t.
+    return np.array([np.convolve(row, np.ones(window_days))[:n_days] for row in daily])
+
+
+def plot_volume_by_difficulty(
+    plan: Plan,
+    done_date: dat.date = None,
+    window_days: int = 7,
+    title: str = "Running duration over time",
+    figsize: tuple = (10, 5),
+):
+    """Stacked trailing volume by difficulty. `done_date` marks how far you've got."""
+    trailing = trailing_volume(plan, window_days)
+    n_days = trailing.shape[1]
+    days = [plan.start + dat.timedelta(days=i) for i in range(n_days)]
+
+    fig, ax = plt.subplots(figsize=figsize)
+    present = [d for d in range(len(DIFFICULTY_NAMES)) if trailing[d].any()]
+    ax.stackplot(
+        days,
+        [trailing[d] for d in present],
+        colors=[DIFFICULTY_COLORS[d] for d in present],
+        labels=[DIFFICULTY_NAMES[d] for d in present],
+        alpha=0.9,
+    )
+    top = ax.get_ylim()[1] * 0.95
+
+    # Weeks begin on plan.start (a Monday): labelled every 4 weeks, grid every week.
+    ax.set_xlim(days[0], days[-1])
+    major_days = list(range(0, n_days, 28))
+    if n_days - 1 - major_days[-1] >= 7:  # also label the last day, unless it would crowd a tick
+        major_days.append(n_days - 1)
+    ax.set_xticks([plan.start + dat.timedelta(days=d) for d in major_days])
+    ax.set_xticks(
+        [plan.start + dat.timedelta(days=7 * k) for k in range(n_days // 7 + 1)],
+        minor=True,
+    )
+    ax.xaxis.set_major_formatter(DateFormatter("%d %b"))
+    ax.yaxis.set_major_locator(MultipleLocator(25))
+    ax.set_axisbelow(False)
+    ax.grid(True, which="both", color="black", alpha=0.12, linewidth=0.6)
+
+    # Section labels; stagger any that start within 4 weeks of the previous one.
+    previous, height = None, 1.0
+    for i, (start, label) in enumerate(plan.sections):
+        if previous is not None and (start - previous).days < 28:
+            height = 0.85 if height == 1.0 else 1.0
+        else:
+            height = 1.0
+        if i:
+            ax.axvline(start, color="grey", linestyle="--", linewidth=1)
+        ax.text(start + dat.timedelta(days=1), top * height, label, va="top")
+        previous = start
+
+    if done_date is not None:
+        weeks_done = (done_date - plan.start).days // 7
+        ax.axvline(done_date, color="grey", linestyle=":", linewidth=1, alpha=0.5)
+        ax.text(
+            done_date + dat.timedelta(days=1),
+            top * 0.72,
+            f"{weeks_done} weeks done",
+            va="top",
+            color="grey",
+            fontsize=8,
+        )
+
+    ax.set_xlabel("Week commencing (grid lines weekly)")
+    ax.set_ylabel(f"Trailing {window_days}-day running (mins)")
+    ax.legend(loc="center left", bbox_to_anchor=(1.01, 0.5))
+    ax.set_title(title)
+    fig.tight_layout()
+
+    return fig, ax

{dimwit-0.3.2 → dimwit-0.3.3}/dimwit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dimwit
-Version: 0.3.2
+Version: 0.3.3
 Summary: A package containing various functions and classes for fetching, transforming, and visualising data for personal metrics.
 Author-email: Daniel Soutar <danielsoutar144@gmail.com>
 Project-URL: repository, https://github.com/danielsoutar/dimwit

{dimwit-0.3.2 → dimwit-0.3.3}/dimwit.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ dimwit/airflow.py
 dimwit/legacy.py
 dimwit/main.py
 dimwit/pomodoro.py
+dimwit/running.py
 dimwit/sleep.py
 dimwit/weight.py
 dimwit.egg-info/PKG-INFO

{dimwit-0.3.2 → dimwit-0.3.3}/pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
     "tqdm>=4.67.1",
 ]
 name = "dimwit"
-version = "0.3.2"
+version = "0.3.3"
 description = "A package containing various functions and classes for fetching, transforming, and visualising data for personal metrics."
 readme = "README.md"