From 1754a895c1938d0c55184131d94c85ede925ae91 Mon Sep 17 00:00:00 2001
From: Scott Gigante <scottgigante@users.noreply.github.com>
Date: Tue, 28 Jan 2020 16:13:49 -0500
Subject: [PATCH 1/3] Update package.html

---
 pypistats/templates/package.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pypistats/templates/package.html b/pypistats/templates/package.html
index 0bfc76b..3072d34 100644
--- a/pypistats/templates/package.html
+++ b/pypistats/templates/package.html
@@ -66,6 +66,8 @@ <h1>{{ package }}</h1>
 <br>
 Downloads last month:
 {{ "{:,.0f}".format(recent['month']) }}
+<br>
+<input type="checkbox" name="smoothing" value="smoothing"> 7-day smoothing
 </p>
     <script>
 

From 9159c1c76db6fe82641d64d89b342981bb1370c5 Mon Sep 17 00:00:00 2001
From: Scott Gigante <scottgigante@users.noreply.github.com>
Date: Tue, 28 Jan 2020 16:37:06 -0500
Subject: [PATCH 2/3] Add smoothing functionality

---
 pypistats/views/general.py | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/pypistats/views/general.py b/pypistats/views/general.py
index 0c82c3c..002ec72 100644
--- a/pypistats/views/general.py
+++ b/pypistats/views/general.py
@@ -143,11 +143,12 @@ def package_page(package):
         else:
             metrics = ["downloads", "percentages"]
 
+        use_smoothing = 'smoothing' in request.form.getlist('smoothing')
         for metric in metrics:
             model_data.append({
                 "metric": metric,
                 "name": model.__tablename__,
-                "data": data_function[metric](records),
+                "data": data_function[metric](records, use_smoothing=use_smoothing),
             })
 
     # Build the plots
@@ -210,7 +211,23 @@ def package_page(package):
     )
 
 
-def get_download_data(records):
+def smooth_data(data, window=7):
+    # Ensure data is sorted by date
+    data["x"], data["y"] = zip(*[(x, y) for x, y in sorted(
+        zip(data["x"], data["y"]), key=lambda pair: pair[0])])
+    # Smooth data on a rolling window
+    smoothed_data = deepcopy(data)
+    for i in range(len(data["y"])):
+        window_data = []
+        window_start = max(0, i - window // 2)
+        window_end = min(len(data) - 1, i + window // 2)
+        for j in range(window_start, window_end + 1):
+            window_data.append(data["y"][j])
+        smoothed_data["y"][i] = sum(window_data) / len(window_data)
+    return smoothed_data
+
+
+def get_download_data(records, use_smoothing=False):
     """Organize the data for the absolute plots."""
     data = defaultdict(lambda: {"x": [], "y": []})
 
@@ -260,10 +277,16 @@ def get_download_data(records):
             if category not in date_categories:
                 data[category]["x"].append(str(records[-1].date))
                 data[category]["y"].append(0)
+
+    if use_smoothing:
+        # Smooth data using a 7-day window
+        for category in all_categories:
+            data[category] = smooth_data(data[category])
+
     return data
 
 
-def get_proportion_data(records):
+def get_proportion_data(records, use_smoothing=False):
     """Organize the data for the fill plots."""
     data = defaultdict(lambda: {"x": [], "y": [], "text": []})
 
@@ -309,6 +332,11 @@ def get_proportion_data(records):
                 data[category]["y"].append(value)
                 data[category]["text"].append("{0:.2f}%".format(value) + " = {:,}".format(date_categories[category]))
 
+    if use_smoothing:
+        # Smooth data using a 7-day window
+        for category in all_categories:
+            data[category] = smooth_data(data[category])
+
     return data
 
 

From 18c25096e5c226d386db999d164ebffc37e6ae47 Mon Sep 17 00:00:00 2001
From: Scott Gigante <scottgigante@gmail.com>
Date: Sun, 23 Aug 2020 23:01:09 -0400
Subject: [PATCH 3/3] test smoothing

---
 pypistats/templates/package.html | 11 ++++++++++-
 pypistats/views/general.py       | 11 +++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pypistats/templates/package.html b/pypistats/templates/package.html
index 3072d34..1d7ba52 100644
--- a/pypistats/templates/package.html
+++ b/pypistats/templates/package.html
@@ -67,7 +67,7 @@ <h1>{{ package }}</h1>
 Downloads last month:
 {{ "{:,.0f}".format(recent['month']) }}
 <br>
-<input type="checkbox" name="smoothing" value="smoothing"> 7-day smoothing
+<input type="checkbox" id="smoothing" {{ 'checked' if metadata['use_smoothing'] else ''}} onclick="return setSmoothing();"> 7-day smoothing
 </p>
     <script>
 
@@ -95,5 +95,14 @@ <h1>{{ package }}</h1>
                 }
             };
         })();
+
+        function setSmoothing() {
+            if (document.getElementById('smoothing').checked) {
+                window.location='{{ url_for('general.package_page', package=package) }}?smooth=true';
+            } else {
+                window.location='{{ url_for('general.package_page', package=package) }}';
+            }
+            return false;
+        }
     </script>
 {% endblock %}
diff --git a/pypistats/views/general.py b/pypistats/views/general.py
index 27243e0..3b3ed83 100644
--- a/pypistats/views/general.py
+++ b/pypistats/views/general.py
@@ -107,7 +107,7 @@ def package_page(package):
         recent[r.category] = r.downloads
 
     # PyPI metadata
-    metadata = None
+    metadata = dict()
     if package != "__all__":
         try:
             metadata = requests.get(f"https://pypi.python.org/pypi/{package}/json", timeout=5).json()
@@ -134,7 +134,7 @@ def package_page(package):
         else:
             metrics = ["downloads", "percentages"]
 
-        use_smoothing = 'smoothing' in request.form.getlist('smoothing')
+        use_smoothing = metadata['use_smoothing'] = request.args.get('smooth', None) is not None
         for metric in metrics:
             model_data.append({
                 "metric": metric,
@@ -197,12 +197,11 @@ def smooth_data(data, window=7):
         zip(data["x"], data["y"]), key=lambda pair: pair[0])])
     # Smooth data on a rolling window
     smoothed_data = deepcopy(data)
+    smoothed_data["y"] = list(smoothed_data["y"])
     for i in range(len(data["y"])):
-        window_data = []
         window_start = max(0, i - window // 2)
-        window_end = min(len(data) - 1, i + window // 2)
-        for j in range(window_start, window_end + 1):
-            window_data.append(data["y"][j])
+        window_end = min(len(data["y"]), i + window // 2 + 1)
+        window_data = data["y"][window_start:window_end]
         smoothed_data["y"][i] = sum(window_data) / len(window_data)
     return smoothed_data