swap order

ibis-project · Jul 28, 2024 · 7b555a7 · 7b555a7
1 parent ddfb89d
commit 7b555a7
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/pages/1_pypi.py b/pages/1_pypi.py
@@ -116,20 +116,14 @@
 t = (
     downloads.mutate(
         timestamp=downloads["timestamp"].truncate("D"),
-        version=downloads["version"].split(".")[0],
     )
-    .group_by("timestamp", "version")
+    .group_by("timestamp")
     .agg(downloads=ibis._["downloads"].sum())
     .select(
         "timestamp",
-        "version",
         downloads=ibis._["downloads"]
         .sum()
-        .over(
-            ibis.window(
-                order_by="timestamp", group_by="version", preceding=28, following=0
-            )
-        ),
+        .over(ibis.window(order_by="timestamp", preceding=28, following=0)),
     )
     .filter((ibis._["timestamp"] >= datetime.now() - timedelta(days=days)))
     .order_by("timestamp")
@@ -139,30 +133,27 @@
     t,
     x="timestamp",
     y="downloads",
-    color="version",
-    category_orders={
-        "version": reversed(
-            sorted(
-                t.distinct(on="version")["version"].to_pyarrow().to_pylist(),
-                key=lambda x: int(x),
-            )
-        )
-    },
-    title="downloads (28 days rolling) by version",
+    title="downloads (28 days rolling)",
 )
 st.plotly_chart(c00, use_container_width=True)
 
 t = (
     downloads.mutate(
         timestamp=downloads["timestamp"].truncate("D"),
+        version=downloads["version"].split(".")[0],
     )
-    .group_by("timestamp")
+    .group_by("timestamp", "version")
     .agg(downloads=ibis._["downloads"].sum())
     .select(
         "timestamp",
+        "version",
         downloads=ibis._["downloads"]
         .sum()
-        .over(ibis.window(order_by="timestamp", preceding=28, following=0)),
+        .over(
+            ibis.window(
+                order_by="timestamp", group_by="version", preceding=28, following=0
+            )
+        ),
     )
     .filter((ibis._["timestamp"] >= datetime.now() - timedelta(days=days)))
     .order_by("timestamp")
@@ -172,7 +163,16 @@
     t,
     x="timestamp",
     y="downloads",
-    title="downloads (28 days rolling)",
+    color="version",
+    category_orders={
+        "version": reversed(
+            sorted(
+                t.distinct(on="version")["version"].to_pyarrow().to_pylist(),
+                key=lambda x: int(x),
+            )
+        )
+    },
+    title="downloads (28 days rolling) by version",
 )
 st.plotly_chart(c00, use_container_width=True)