Merge pull request #9 from vizzu-streamlit/container-width

Add use_container_width argument
vizzu-streamlit · Aug 22, 2023 · db79713 · db79713
2 parents 6d4e1c1 + 628d786
commit db79713
Show file tree

Hide file tree

Showing 12 changed files with 121 additions and 135 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -10,4 +10,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
-      - uses: pre-commit/[email protected]
+        with:
+          python-version: "3.8"
+      - uses: pre-commit/[email protected]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,6 +14,7 @@ repos:
         args:
           - --ignore-missing-imports
           - --follow-imports=silent
+          - --python-version=3.8
         additional_dependencies:
           - types-all
   - repo: https://github.com/pre-commit/pre-commit-hooks

diff --git a/1-tutorial.py b/1-tutorial.py
@@ -6,34 +6,29 @@
 chart = VizzuChart()
 
 # Generate some data and add it to the chart
-df = pd.DataFrame({
-	"cat": ["x", "y", "z"], 
-	"val": [1, 2, 3]})
+df = pd.DataFrame({"cat": ["x", "y", "z"], "val": [1, 2, 3]})
 data = Data()
 data.add_data_frame(df)
 chart.animate(data)
 
-st.subheader('Visit [intro-to-vizzu-in.streamlit.app](https://intro-to-vizzu-in.streamlit.app/) to follow along')
+st.subheader(
+    "Visit [intro-to-vizzu-in.streamlit.app](https://intro-to-vizzu-in.streamlit.app/) "
+    "to follow along"
+)
 
 # Add some configuration to tell Vizzu how to display the data
-chart.animate(Config({
-	"x": "cat", 
-	"y": "val", 
-	"title": "Look at my plot!"}))
+chart.animate(Config({"x": "cat", "y": "val", "title": "Look at my plot!"}))
 
 if st.checkbox("Swap"):
-    chart.animate(Config({
-	"x": "val", 
-	"y": "cat", 
-	"title": "Swapped!"}))
+    chart.animate(Config({"x": "val", "y": "cat", "title": "Swapped!"}))
 
 # Show the chart in the app!
 output = chart.show()
 
 if output is not None and "marker" in output:
     st.write("value of clicked bar:", output["marker"]["values"]["val"])
 
-st.caption('Data shown on the chart')
+st.caption("Data shown on the chart")
 st.dataframe(df)
 
 st.write(

diff --git a/3-drilldown.py b/3-drilldown.py
diff --git a/filters.py b/filters.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pandas as pd
 import streamlit as st
 from streamlit_vizzu import Config, Data, Style, VizzuChart

diff --git a/football-transfers/football_transfers.py b/football-transfers/football_transfers.py
@@ -4,7 +4,9 @@
 
 from streamlit_vizzu import VizzuChart
 
-data_frame = pd.read_csv("football-transfers/football_transfers_cleaned.csv", dtype={"year": str})
+data_frame = pd.read_csv(
+    "football-transfers/football_transfers_cleaned.csv", dtype={"year": str}
+)
 
 data = Data()
 data.add_data_frame(data_frame)
@@ -16,35 +18,38 @@
 year = st.slider("Pick a year", min_value=1992, max_value=2022, value=2010)
 compare_by = st.radio("Compare by", ["Fees earned", "Fees spent", "Balance"], index=2)
 if compare_by == "Fees earned":
-	compare_title = "Transfer fees earned in "
-	x = "fee[m€]"
-	filter = f"record.year == '{year}' && record.transfer_movement == 'out'"
+    compare_title = "Transfer fees earned in "
+    x = "fee[m€]"
+    filter = f"record.year == '{year}' && record.transfer_movement == 'out'"
 elif compare_by == "Fees spent":
-	compare_title = "Transfer fees spent in "
-	x = "fee[m€]"
-	filter = f"record.year == '{year}' && record.transfer_movement == 'in' && record.club_name =='Arsenal FC'"
+    compare_title = "Transfer fees spent in "
+    x = "fee[m€]"
+    filter = (
+        f"record.year == '{year}' && record.transfer_movement == 'in' "
+        "&& record.club_name =='Arsenal FC'"
+    )
 else:
-	compare_title = "Balance of transfer fees in "
-	x = "fee_real[m€]"
-	filter = f"record.year == '{year}'" 
+    compare_title = "Balance of transfer fees in "
+    x = "fee_real[m€]"
+    filter = f"record.year == '{year}'"
 
 
 chart.animate(
-    Data.filter(filter),	
+    Data.filter(filter),
     Config(
-        {"x": [x,"player_name"], 
-		"y": "club_name", 
-		"color": "club_name",
-		"lightness":"player_name",
-		#"sort": "byValue",
-		"title": f"{compare_title}{year}"}
+        {
+            "x": [x, "player_name"],
+            "y": "club_name",
+            "color": "club_name",
+            "lightness": "player_name",
+            # "sort": "byValue",
+            "title": f"{compare_title}{year}",
+        }
     ),
     Style(
         {
             "plot": {
-                "xAxis": {
-					"label": {
-						"numberScale": "shortScaleSymbolUS"}},
+                "xAxis": {"label": {"numberScale": "shortScaleSymbolUS"}},
                 "marker": {
                     "colorPalette": (
                         "#b74c20FF #c47f58FF #1c9761FF #ea4549FF #875792FF #3562b6FF "

diff --git a/football-transfers/pages/2-bug.py b/football-transfers/pages/2-bug.py
@@ -4,7 +4,9 @@
 
 from streamlit_vizzu import VizzuChart
 
-data_frame = pd.read_csv("football-transfers/football_transfers_cleaned.csv", dtype={"year": str})
+data_frame = pd.read_csv(
+    "football-transfers/football_transfers_cleaned.csv", dtype={"year": str}
+)
 
 data = Data()
 data.add_data_frame(data_frame)
@@ -17,25 +19,28 @@
 
 compare_title = "Transfer fees spent in "
 x = "fee[m€]"
-filter = f"record.year == '{year}' && record.transfer_movement == 'in' && record.club_name =='Arsenal FC'"
+filter = (
+    f"record.year == '{year}' && record.transfer_movement == 'in' "
+    "&& record.club_name =='Arsenal FC'"
+)
 
 
 chart.animate(
-    Data.filter(filter),	
+    Data.filter(filter),
     Config(
-        {"x": x, 
-		"y": "player_name", 
-		"color": "player_name",
-		"sort": "byValue",
-		"label": x,
-		"title": f"{compare_title}{year}"}
+        {
+            "x": x,
+            "y": "player_name",
+            "color": "player_name",
+            "sort": "byValue",
+            "label": x,
+            "title": f"{compare_title}{year}",
+        }
     ),
     Style(
         {
             "plot": {
-                "xAxis": {
-					"label": {
-						"numberScale": "shortScaleSymbolUS"}},
+                "xAxis": {"label": {"numberScale": "shortScaleSymbolUS"}},
                 "marker": {
                     "colorPalette": (
                         "#b74c20FF #c47f58FF #1c9761FF #ea4549FF #875792FF #3562b6FF "

diff --git a/pages/2-slider.py b/pages/2-slider.py
@@ -18,18 +18,18 @@
 chart.animate(
     Data.filter(f"record.Year <= '{year}'"),
     Config.groupedBar(
-        {"x": "Revenue[$]", 
-		"y": "Format", 
-		"groupedBy": "Format", 
-		"sort": "byValue",
-		"title": f"Music Revenues up to {year}"}
+        {
+            "x": "Revenue[$]",
+            "y": "Format",
+            "groupedBy": "Format",
+            "sort": "byValue",
+            "title": f"Music Revenues up to {year}",
+        }
     ),
     Style(
         {
             "plot": {
-                "xAxis": {
-					"label": {
-						"numberScale": "shortScaleSymbolUS"}},
+                "xAxis": {"label": {"numberScale": "shortScaleSymbolUS"}},
                 "marker": {
                     "colorPalette": (
                         "#b74c20FF #c47f58FF #1c9761FF #ea4549FF #875792FF #3562b6FF "

diff --git a/pages/3-drilldown.py b/pages/3-drilldown.py
@@ -8,28 +8,26 @@
 data = Data()
 data.add_data_frame(data_frame)
 
-style = Style({
-	"plot": {
-		"xAxis": {
-			"label": {
-				"angle": "-1.1"}},
-		"yAxis": {
-			"label": {
-				"numberScale": "shortScaleSymbolUS"}},
-		"marker": {
-			"colorPalette": (
-				"#b74c20FF #c47f58FF #1c9761FF #ea4549FF #875792FF #3562b6FF "
-				"#ee7c34FF #efae3aFF"
-			),
-			"label": {
-				"numberFormat": "prefixed",
-				"maxFractionDigits": "1",
-				"numberScale": "shortScaleSymbolUS",
-			},
-		},
-		"paddingLeft": "8em",
-	}
-})
+style = Style(
+    {
+        "plot": {
+            "xAxis": {"label": {"angle": "-1.1"}},
+            "yAxis": {"label": {"numberScale": "shortScaleSymbolUS"}},
+            "marker": {
+                "colorPalette": (
+                    "#b74c20FF #c47f58FF #1c9761FF #ea4549FF #875792FF #3562b6FF "
+                    "#ee7c34FF #efae3aFF"
+                ),
+                "label": {
+                    "numberFormat": "prefixed",
+                    "maxFractionDigits": "1",
+                    "numberScale": "shortScaleSymbolUS",
+                },
+            },
+            "paddingLeft": "8em",
+        }
+    }
+)
 
 chart.animate(data, style)
 
@@ -38,26 +36,30 @@
 
 if bar_clicked is None:
     chart.animate(
-		Data.filter(),
+        Data.filter(),
         Config(
-        {"x": "Year", 
-		"y": "Revenue[$]",
-		"sort" : "none",
-		"color": None,
-		"label": None,
-		"title": "Music Revenues"}
-    ),style,
-    delay="0")
+            {
+                "x": "Year",
+                "y": "Revenue[$]",
+                "sort": "none",
+                "color": None,
+                "label": None,
+                "title": "Music Revenues",
+            }
+        ),
+        style,
+        delay="0",
+    )
 else:
     chart.animate(Data.filter(f"record['Year'] == '{bar_clicked}'"))
     chart.animate(
         Config.groupedColumn(
             {
                 "x": "Format",
                 "y": "Revenue[$]",
-				"groupedBy": "Format",
-				"sort":"byValue",
-                "title": f"Drilldown for Year {bar_clicked}"
+                "groupedBy": "Format",
+                "sort": "byValue",
+                "title": f"Drilldown for Year {bar_clicked}",
             }
         )
     )

diff --git a/pages/4-explorer.py b/pages/4-explorer.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pandas as pd
 import streamlit as st
 
@@ -20,7 +22,7 @@
 
 col1, col2, col3, col4, col5 = st.columns(5)
 
-measure: str = col1.radio("Measure", ["Sales", "Revenue [$]"]) 
+measure: str = col1.radio("Measure", ["Sales", "Revenue [$]"])
 compare_by = col2.radio("Compare by", ["Product", "Region", "Both"])
 coords = col3.radio("Coordinate system", ["Cartesian (desktop)", "Polar (mobile)"])
 order = col4.radio("Order items", ["Alphabetically", "By value"])

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="streamlit-vizzu",
-    version="0.1.3",
+    version="0.1.4",
     author="Zachary Blackwoood",
     author_email="[email protected]",
     description=(