dev/try-out-pr

.gitignore

@@ -1,144 +0,0 @@
-# npm node_modules
-node_modules/
-
-# Ipynb
-ipynb_checkpoints
-*/.ipynb_checkpoints/*
-
-# IPython
-profile_default/
-ipython_config.py
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# macOS
-*.DS_Store
-.DS_Store
-.AppleDouble
-.LSOverride
-.Trashes
-
-# PyInstaller
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask
-instance/
-.webassets-cache
-
-# Scrapy
-.scrapy
-
-# PyBuilder
-.pybuilder/
-target/
-
-# IntelliJ
-.idea/
-*.iml
-out/
-.idea_modules/
-
-# Vscode
-.vscode/
-
-# PEP 582
-__pypackages__/
-
-# Celery
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder
-.spyderproject
-.spyproject
-
-# Rope
-.ropeproject
-
-# Mkdocs
-/site
-
-# Mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre
-.pyre/
-
-# Pytype
-.pytype/
-
-# Cython
-cython_debug/
-
-# Ruff
-.ruff_cache/

Dockerfile

@@ -1,9 +1,18 @@
-FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
+# read the doc: https://huggingface.co/docs/hub/spaces-sdks-docker
+# you will also find guides on how best to write your Dockerfile
+
+FROM python:3.12
+
+RUN useradd -m -u 1000 user
 
 WORKDIR /app
 
-COPY requirements.txt .
-RUN uv pip sync --system requirements.txt
-COPY . .
+COPY --chown=user ./requirements.txt requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r requirements.txt
+
+COPY --chown=user . /app
+
+EXPOSE 7860
 
-ENTRYPOINT ["gunicorn", "app:app", "--workers", "4", "--bind", "0.0.0.0:7860"]
+CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:7860", "app:server"]

app.py

@@ -3,8 +3,6 @@
 from typing import Optional
 
 import pandas as pd
-from dash import html, get_asset_url
-import dash_bootstrap_components as dbc
 import vizro.models as vm
 import vizro.plotly.express as px
 from vizro import Vizro
@@ -158,7 +156,7 @@ def create_variable_analysis():
     page_variable = vm.Page(
         title="Variable Analysis",
         description="Analyzing population, GDP per capita and life expectancy on country and continent level",
-        layout=vm.Grid(
+        layout=vm.Layout(
             grid=[
                 # fmt: off
                 [0, 1, 1, 1],
@@ -275,7 +273,7 @@ def create_relation_analysis():
     page_relation_analysis = vm.Page(
         title="Relationship Analysis",
         description="Investigating the interconnection between population, GDP per capita and life expectancy",
-        layout=vm.Grid(
+        layout=vm.Layout(
             grid=[[0, 0, 0, 0, 0]] + [[1, 1, 1, 1, 1]] * 4,
             row_min_height="100px",
             row_gap="24px",
@@ -318,7 +316,7 @@ def create_continent_summary():
     page_summary = vm.Page(
         title="Continent Summary",
         description="Summarizing the main findings for each continent",
-        layout=vm.Grid(grid=[[i] for i in range(5)], row_min_height="190px", row_gap="25px"),
+        layout=vm.Layout(grid=[[i] for i in range(5)], row_min_height="190px", row_gap="25px"),
         components=[
             vm.Card(
                 text="""
@@ -431,7 +429,7 @@ def create_benchmark_analysis():
     page_country = vm.Page(
         title="Benchmark Analysis",
         description="Discovering how the metrics differ for each country and export data for further investigation",
-        layout=vm.Grid(grid=[[0, 1]] * 5 + [[2, -1]]),
+        layout=vm.Layout(grid=[[0, 1]] * 5 + [[2, -1]]),
         components=[
             vm.AgGrid(
                 title="Click on a cell in country column:",
@@ -473,7 +471,7 @@ def create_home_page():
     page_home = vm.Page(
         title="Homepage",
         description="Vizro demo app for studying gapminder data",
-        layout=vm.Grid(grid=[[0, 1], [2, 3]]),
+        layout=vm.Layout(grid=[[0, 1], [2, 3]]),
         components=[
             vm.Card(
                 text="""
@@ -546,15 +544,7 @@ dashboard = vm.Dashboard(
 )
 
 app = Vizro().build(dashboard)
-app.dash.layout.children.append(
-    dbc.NavLink(
-        ["Made with ", html.Img(src=get_asset_url("images/logo.svg"), id="banner", alt="Vizro logo"), "vizro"],
-        href="https://github.com/mckinsey/vizro",
-        target="_blank",
-        external_link=True,
-        className="anchor-container",
-    )
-)
+server = app.dash.server
 
 if __name__ == "__main__":  
     app.run()

assets/css/custom.css

@@ -5,31 +5,6 @@ img[src*="#my-image"] {
   width: 100px;
 }
 
-#header {
-  padding-left: 0;
-}
-
-.anchor-container {
-  align-items: center;
-  background: var(--text-primary);
-  border-top-left-radius: 8px;
-  bottom: 0;
-  color: var(--text-primary-inverted) !important;
-  display: flex;
-  font-size: 0.8rem;
-  font-weight: 500;
-  height: 24px;
-  padding: 0 12px;
-  position: fixed;
-  right: 0;
-}
-
-.anchor-container:focus,
-.anchor-container:hover {
-  background: var(--text-secondary);
-  color: var(--text-primary-inverted);
-}
-
-img#banner {
-  height: 16px;
+#page-header {
+  padding-left: 8px;
 }

requirements.in

@@ -1,3 +1,2 @@
 gunicorn
-vizro==0.1.44
-numpy!=2.0.2  # there is an issue with this specific version that the whl can't be built
+vizro

requirements.txt

@@ -2,10 +2,6 @@
 #    uv pip compile requirements.in -o requirements.txt
 annotated-types==0.7.0
     # via pydantic
-autoflake==2.3.1
-    # via vizro
-black==24.10.0
-    # via vizro
 blinker==1.8.2
     # via flask
 cachelib==0.9.0
@@ -15,21 +11,24 @@ certifi==2024.7.4
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
-    # via
-    #   black
-    #   flask
-dash==3.1.1
+    # via flask
+dash==2.17.1
     # via
     #   dash-ag-grid
     #   dash-bootstrap-components
-    #   dash-mantine-components
     #   vizro
-dash-ag-grid==32.3.0
+dash-ag-grid==31.2.0
     # via vizro
-dash-bootstrap-components==2.0.3
+dash-bootstrap-components==1.6.0
     # via vizro
-dash-mantine-components==2.1.0
+dash-core-components==2.0.0
+    # via dash
+dash-html-components==2.0.0
+    # via dash
+dash-mantine-components==0.12.1
     # via vizro
+dash-table==5.0.0
+    # via dash
 flask==3.0.3
     # via
     #   dash
@@ -50,38 +49,24 @@ markupsafe==2.1.5
     # via
     #   jinja2
     #   werkzeug
-mypy-extensions==1.0.0
-    # via black
-narwhals==2.0.1
-    # via plotly
 nest-asyncio==1.6.0
     # via dash
-numpy==2.3.2
+numpy==2.1.0
     # via
-    #   -r requirements.in
     #   pandas
+    #   vizro
 packaging==24.1
     # via
-    #   black
     #   gunicorn
     #   plotly
-    #   vizro
 pandas==2.2.2
     # via vizro
-pathspec==0.12.1
-    # via black
-platformdirs==4.3.6
-    # via black
-plotly==6.2.0
-    # via
-    #   dash
-    #   vizro
+plotly==5.23.0
+    # via dash
 pydantic==2.8.2
     # via vizro
 pydantic-core==2.20.1
     # via pydantic
-pyflakes==3.2.0
-    # via autoflake
 python-dateutil==2.9.0.post0
     # via pandas
 pytz==2024.1
@@ -90,12 +75,18 @@ requests==2.32.3
     # via dash
 retrying==1.3.4
     # via dash
+ruff==0.6.1
+    # via vizro
 setuptools==73.0.1
-    # via dash
+    # via
+    #   dash
+    #   vizro
 six==1.16.0
     # via
     #   python-dateutil
     #   retrying
+tenacity==9.0.0
+    # via plotly
 typing-extensions==4.12.2
     # via
     #   dash
@@ -105,12 +96,13 @@ tzdata==2024.1
     # via pandas
 urllib3==2.2.2
     # via requests
-vizro==0.1.44
+vizro==0.1.20
     # via -r requirements.in
 werkzeug==3.0.4
     # via
     #   dash
     #   flask
+    #   vizro
 wrapt==1.16.0
     # via vizro
 zipp==3.20.0