dimwit 0.2.5__tar.gz → 0.2.7__tar.gz

{dimwit-0.2.5 → dimwit-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimwit
-Version: 0.2.5
+Version: 0.2.7
 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.5 → dimwit-0.2.7}/dimwit/main.py

@@ -2,7 +2,7 @@ import datetime as dat
 import dateutil
 
 # Import matplotlib before pandas to avoid import ordering issues.
-import matplotlib.pyplot as plt  # noqa
+import matplotlib.pyplot as plt
 import pandas as pd
 import requests
 import numpy as np
@@ -274,7 +274,11 @@ def compute_rounded_matrix(ts, events, rounding_unit, rounding_size):
     return df.fillna(0)
 
 
-def pad_out_table(df, pad_t, unit):
+def zero_padded_df(num_rows, num_cols, index):
+    return pd.DataFrame([[0] * num_cols] * num_rows, index=index)
+
+
+def pad_out_table(df, pad_t, unit, pad_before=True, pad_after=True):
     # Pad out df with entries before and after boundary rows, to ensure correct
     # same- (or zero-) padding.
     pad_t_days = pd.Timedelta(pad_t, unit=unit)
@@ -283,16 +287,14 @@ def pad_out_table(df, pad_t, unit):
 
     # The index in df cannot yet be assumed to be dense - so use a date range
     # with the earliest and latest entries as reference points.
-    pad_before = pd.date_range(pad_before_start, periods=pad_t, freq=unit)
-    pad_after = pd.date_range(pad_after_start, periods=pad_t, freq=unit)
+    index_before = pd.date_range(pad_before_start, periods=pad_t, freq=unit)
+    index_after = pd.date_range(pad_after_start, periods=pad_t, freq=unit)
 
-    df = pd.concat(
-        [
-            pd.DataFrame([[0] * len(df.columns)] * pad_t, index=pad_before),
-            df,
-            pd.DataFrame([[0] * len(df.columns)] * pad_t, index=pad_after),
-        ]
-    )
+    num_rows, num_cols = pad_t, len(df.columns)
+    if pad_before:
+        df = pd.concat([zero_padded_df(num_rows, num_cols, index_before), df])
+    if pad_after:
+        df = pd.concat([zero_padded_df(num_rows, num_cols, index_after), df])
 
     return df
 
@@ -338,9 +340,12 @@ def get_aggregated_event_counts(ts, events, period):
     df = df.pivot_table(
         index="date", columns="categories", values="value", aggfunc="sum"
     )
-    if period not in ["weekly", "daily"]:
+    if period.lower() not in ["monthly", "weekly", "daily"]:
         raise Exception("Period argument not recognised")
 
+    if period == "monthly":
+        grouped_df = df.groupby([pd.Grouper(freq="ME")]).sum()
+
     if period == "weekly":
         df.index = df.index - pd.to_timedelta(7, unit="d")
         grouped_df = df.groupby([pd.Grouper(freq="W")]).sum()
@@ -364,3 +369,24 @@ def populate_with_events(ax, events, from_date):
             label=event_label,
         )
     return ax
+
+
+def plot_category(
+    title, df, categories, window_size, round_size, round_unit, from_date=None
+):
+    fig, ax = plt.subplots(1, 1, figsize=(12, 6))
+    ax.set_title(title)
+    for category in categories:
+        if from_date is not None:
+            ax = df[from_date:].plot(y=category, ax=ax)
+        else:
+            ax = df.plot(y=category, ax=ax)
+    ax.set_xlabel("Time")
+    ax.set_ylabel("Frequency")
+    ax.legend(
+        [
+            f"{category} ({str(round_size) + round_unit}, k={window_size})"
+            for category in categories
+        ],
+    )
+    return fig, ax

{dimwit-0.2.5 → dimwit-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dimwit"
-version = "0.2.5"
+version = "0.2.7"
 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"