dimwit 0.2.0__tar.gz → 0.2.2__tar.gz

{dimwit-0.2.0 → dimwit-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimwit
-Version: 0.2.0
+Version: 0.2.2
 Summary: A package containing various functions and classes for fetching, transforming, and visualising data for personal metrics.
 Home-page: https://github.com/danielsoutar/dimwit
 Author: Daniel Soutar

{dimwit-0.2.0 → dimwit-0.2.2}/dimwit/main.py

@@ -107,56 +107,82 @@ def get_notion_pages_from_db(
     return results
 
 
-def extract_airflow_entry(timestamps, data, idx, page):
+def check_page_valid(page, idx):
     properties = page["properties"]
     if properties is None:
         raise Exception(f"Found empty entry at position {idx} (0-based index)")
-    ts = dateutil.parser.isoparse(properties["date"]["date"]["start"])
-    vals = [
-        properties["recording_1"]["number"],
-        properties["recording_2"]["number"],
-        properties["recording_3"]["number"],
-    ]
+
+
+def get_notion_date(page, property):
+    properties = page["properties"]
+    return dateutil.parser.isoparse(properties[property]["date"]["start"])
+
+
+def get_notion_number(page, property):
+    return page["properties"][property]["number"]
+
+
+def get_notion_multi_select(page, property):
+    items = page["properties"][property]["multi_select"]
+    return [item["name"] for item in items]
+
+
+def get_notion_text(page, property):
+    properties = page["properties"]
+    return properties[property]["rich_text"][0]["text"]["content"]
+
+
+def extract_airflow_entry(timestamps, data, idx, page):
+    check_page_valid(page, idx)
+    ts = get_notion_date(page, "date")
+    vals = [get_notion_number(page, f"recording_{i}") for i in [1, 2, 3]]
     timestamps.append(ts)
     data.append(vals)
     return None
 
 
 def extract_categorical_entry(timestamps, data, idx, page):
-    properties = page["properties"]
-    if properties is None:
-        raise Exception(f"Found empty entry at position {idx} (0-based index)")
-    ts = dateutil.parser.isoparse(properties["date"]["date"]["start"])
-    for item in properties["category"]["multi_select"]:
+    check_page_valid(page, idx)
+    ts = get_notion_date(page, "date")
+    categories = get_notion_multi_select(page, "category")
+    for category in categories:
         timestamps.append(ts)
-        data.append(item["name"])
+        data.append(category)
     return None
 
 
 def extract_weight_entry(timestamps, data, idx, page):
-    properties = page["properties"]
-    if properties is None:
-        raise Exception(f"Found empty entry at position {idx} (0-based index)")
-    ts = dateutil.parser.isoparse(properties["date"]["date"]["start"])
-    weight = properties["weight"]["number"]
-    categories = properties["category"]["multi_select"]
+    check_page_valid(page, idx)
+    ts = get_notion_date(page, "date")
+    weight = get_notion_number(page, "weight")
+    categories = get_notion_multi_select(page, "category")
     timestamps.append(ts)
-    data.append((weight, *[item["name"] for item in categories]))
+    data.append((weight, *categories))
     return None
 
 
 def extract_sleep_entry(timestamps, data, idx, page):
-    properties = page["properties"]
-    if properties is None:
-        raise Exception(f"Found empty entry at position {idx} (0-based index)")
-    start = dateutil.parser.isoparse(properties["start_date"]["date"]["start"])
-    end = dateutil.parser.isoparse(properties["end_date"]["date"]["start"])
+    check_page_valid(page, idx)
+    start = get_notion_date(page, "start_date")
+    end = get_notion_date(page, "end_date")
+    duration = get_notion_text(page, "duration")
     timestamps.append((start, end))
-    duration = properties["duration"]["rich_text"][0]["text"]["content"]
     data.append(duration)
     return None
 
 
+def extract_pomodoro_entry(timestamps, data, idx, page):
+    check_page_valid(page, idx)
+    ts = get_notion_date(page, "date")
+    pomodoro_length = get_notion_number(page, "pomodoro_length")
+    break_length = get_notion_number(page, "break_length")
+    score = get_notion_number(page, "score")
+    comment = get_notion_text(page, "comment")
+    timestamps.append(ts)
+    data.append((pomodoro_length, break_length, score, comment))
+    return None
+
+
 def get_all_entries(pages, add_data_entry):
     timestamps, data = [], []
 
@@ -246,10 +272,10 @@ def compute_rounded_matrix(ts, events, rounding_unit, rounding_size):
     return df.fillna(0)
 
 
-def pad_out_table(df, pad_t):
+def pad_out_table(df, pad_t, unit):
     # Pad out df with entries before and after boundary rows, to ensure correct
     # copy-on padding.
-    time_diff = pd.Timedelta(pad_t, unit="d")
+    time_diff = pd.Timedelta(pad_t, unit=unit)
     pad_before = [df.index[i] - time_diff for i in range(pad_t - 1)]
     pad_after = [df.index[-(pad_t - i)] + time_diff for i in range(pad_t)]
     df = pd.concat(
@@ -263,6 +289,9 @@ def pad_out_table(df, pad_t):
     return df
 
 
+# TODO: Enable different window sizes for different columns.
+# Either this means returning a set of Series objects, or padding values in a
+# single dataframe.
 def compute_moving_average_matrix(
     ts, events, rounding_unit, rounding_size, window_size
 ):
@@ -274,7 +303,7 @@ def compute_moving_average_matrix(
     df_needs_padding = window_size > 1
     if df_needs_padding:
         pad_t = (window_size - 1) // 2
-        df = pad_out_table(df, pad_t)
+        df = pad_out_table(df, pad_t, rounding_unit)
 
     window_string = str(rounding_size) + rounding_unit
     dense_series = []

{dimwit-0.2.0 → dimwit-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dimwit"
-version = "0.2.0"
+version = "0.2.2"
 description = "A package containing various functions and classes for fetching, transforming, and visualising data for personal metrics."
 authors = ["Daniel Soutar <danielsoutar144@gmail.com>"]
 readme = "README.md"