From 5ebb4327d0ff0aa5df86236f4a93b2ecc1c0ea95 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 22:50:54 +0100 Subject: [PATCH 01/15] Test new dashboards --- .github/workflows/build-vizro-whl.yml | 12 ++++++++++++ tools/pycafe/create_pycafe_links.py | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/build-vizro-whl.yml b/.github/workflows/build-vizro-whl.yml index af9fb86ce..92b4a5e5f 100644 --- a/.github/workflows/build-vizro-whl.yml +++ b/.github/workflows/build-vizro-whl.yml @@ -36,3 +36,15 @@ jobs: name: pip path: vizro-core/dist/*.whl retention-days: 14 +# Comment out for testing + - name: Print PR Number + run: | + echo "Pull Request Number: ${{ github.event.workflow_run.pull_requests[0].number }}" + - name: Create PyCafe links + run: | + PR_NUMBER=${{ github.event.workflow_run.pull_requests[0].number || '' }} + if [ -n "$PR_NUMBER" ]; then + hatch run python ../tools/pycafe/create_pycafe_links.py --github-token ${{ github.token }} --repo-name ${{ github.repository }} --pr-number $PR_NUMBER --run-id ${{ github.run_id }} --commit-sha ${{ github.sha }} + else + hatch run python ../tools/pycafe/create_pycafe_links.py --github-token ${{ github.token }} --repo-name ${{ github.repository }} --run-id ${{ github.run_id }} --commit-sha ${{ github.sha }} + fi diff --git a/tools/pycafe/create_pycafe_links.py b/tools/pycafe/create_pycafe_links.py index 68c94e798..5ec22d756 100644 --- a/tools/pycafe/create_pycafe_links.py +++ b/tools/pycafe/create_pycafe_links.py @@ -147,6 +147,12 @@ def post_comment(urls: dict[str, str]): "isort==5.13.2", "plotly==5.24.1", ], + "vizro-ai/examples/dashboard_ui/": [ + "vizro-ai>=0.2.1", + "black", + "jupyter", + "openpyxl", + ], } urls = { directory: generate_link(directory, extra_requirements) From 1e662a33187fd56118af4d9b1e7094dc8ca1ef18 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:51:44 +0000 Subject: [PATCH 02/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/build-vizro-whl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-vizro-whl.yml b/.github/workflows/build-vizro-whl.yml index 92b4a5e5f..0bf8b3467 100644 --- a/.github/workflows/build-vizro-whl.yml +++ b/.github/workflows/build-vizro-whl.yml @@ -36,7 +36,7 @@ jobs: name: pip path: vizro-core/dist/*.whl retention-days: 14 -# Comment out for testing + # Comment out for testing - name: Print PR Number run: | echo "Pull Request Number: ${{ github.event.workflow_run.pull_requests[0].number }}" From 6f5b8432e68402250df679147e384ff628d0d5f5 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 22:53:27 +0100 Subject: [PATCH 03/15] Check without comment --- .github/workflows/build-vizro-whl.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-vizro-whl.yml b/.github/workflows/build-vizro-whl.yml index 92b4a5e5f..3ce787b06 100644 --- a/.github/workflows/build-vizro-whl.yml +++ b/.github/workflows/build-vizro-whl.yml @@ -36,7 +36,6 @@ jobs: name: pip path: vizro-core/dist/*.whl retention-days: 14 -# Comment out for testing - name: Print PR Number run: | echo "Pull Request Number: ${{ github.event.workflow_run.pull_requests[0].number }}" From 568609adf9c9943ed10275d46befc4f6fab48428 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 22:54:49 +0100 Subject: [PATCH 04/15] Change in core --- vizro-core/examples/scratch_dev/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vizro-core/examples/scratch_dev/app.py b/vizro-core/examples/scratch_dev/app.py index db0b4bb68..a04c0d2dd 100644 --- a/vizro-core/examples/scratch_dev/app.py +++ b/vizro-core/examples/scratch_dev/app.py @@ -28,7 +28,7 @@ page = vm.Page( - title="Test New ZZZZZZZ", + title="Test New Fo", components=[ vm.Graph( figure=px.bar( From a53a9b708c09c4f2cf28017f5a7f33f24f87d546 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 22:58:04 +0100 Subject: [PATCH 05/15] Fix requirements.txt --- tools/pycafe/create_pycafe_links.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/pycafe/create_pycafe_links.py b/tools/pycafe/create_pycafe_links.py index 5ec22d756..66f7b2771 100644 --- a/tools/pycafe/create_pycafe_links.py +++ b/tools/pycafe/create_pycafe_links.py @@ -152,6 +152,9 @@ def post_comment(urls: dict[str, str]): "black", "jupyter", "openpyxl", + "greenlet", # mock + "tiktoken @ https://py.cafe/files/maartenbreddels/tiktoken-demo/tiktoken-0.7.0-cp312-cp312-pyodide_2024_0_wasm32.whl", + "https://py.cafe/files/maartenbreddels/jiter-demo/jiter-0.6.1-cp312-cp312-pyodide_2024_0_wasm32.whl", ], } urls = { From f2ab354f9d241c97539108f3326ef0d309ac160b Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 23:05:28 +0100 Subject: [PATCH 06/15] Mock greenlet --- tools/pycafe/create_pycafe_links.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pycafe/create_pycafe_links.py b/tools/pycafe/create_pycafe_links.py index 66f7b2771..5984c504b 100644 --- a/tools/pycafe/create_pycafe_links.py +++ b/tools/pycafe/create_pycafe_links.py @@ -152,7 +152,7 @@ def post_comment(urls: dict[str, str]): "black", "jupyter", "openpyxl", - "greenlet", # mock + "greenlet # mock", "tiktoken @ https://py.cafe/files/maartenbreddels/tiktoken-demo/tiktoken-0.7.0-cp312-cp312-pyodide_2024_0_wasm32.whl", "https://py.cafe/files/maartenbreddels/jiter-demo/jiter-0.6.1-cp312-cp312-pyodide_2024_0_wasm32.whl", ], From 2b5b517716b4f58200a023cb478dc8bc9dfab0ea Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 23:15:26 +0100 Subject: [PATCH 07/15] Correct requirements.txt --- tools/pycafe/create_pycafe_links.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/pycafe/create_pycafe_links.py b/tools/pycafe/create_pycafe_links.py index 5984c504b..f031cbf8d 100644 --- a/tools/pycafe/create_pycafe_links.py +++ b/tools/pycafe/create_pycafe_links.py @@ -148,9 +148,8 @@ def post_comment(urls: dict[str, str]): "plotly==5.24.1", ], "vizro-ai/examples/dashboard_ui/": [ - "vizro-ai>=0.2.1", + "vizro-ai>=0.3.0", "black", - "jupyter", "openpyxl", "greenlet # mock", "tiktoken @ https://py.cafe/files/maartenbreddels/tiktoken-demo/tiktoken-0.7.0-cp312-cp312-pyodide_2024_0_wasm32.whl", From e353cc0d45e8674bab00cf4dde344bfad5b376b5 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 23:18:20 +0100 Subject: [PATCH 08/15] Add comment --- .github/workflows/build-vizro-whl.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-vizro-whl.yml b/.github/workflows/build-vizro-whl.yml index 3ce787b06..51146ecc4 100644 --- a/.github/workflows/build-vizro-whl.yml +++ b/.github/workflows/build-vizro-whl.yml @@ -36,6 +36,8 @@ jobs: name: pip path: vizro-core/dist/*.whl retention-days: 14 +# The below can be commented out in order to dry run the test creation of the PyCafe links +# Once satisfied, comment them again, because the actual links will be created by the pycafe-dashboards.yml workflow - name: Print PR Number run: | echo "Pull Request Number: ${{ github.event.workflow_run.pull_requests[0].number }}" From eeaf92ff4bbcd3f1a1fc786e7dd337e6c7097d5e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:18:41 +0000 Subject: [PATCH 09/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/build-vizro-whl.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-vizro-whl.yml b/.github/workflows/build-vizro-whl.yml index 51146ecc4..78bdea9a3 100644 --- a/.github/workflows/build-vizro-whl.yml +++ b/.github/workflows/build-vizro-whl.yml @@ -36,8 +36,8 @@ jobs: name: pip path: vizro-core/dist/*.whl retention-days: 14 -# The below can be commented out in order to dry run the test creation of the PyCafe links -# Once satisfied, comment them again, because the actual links will be created by the pycafe-dashboards.yml workflow + # The below can be commented out in order to dry run the test creation of the PyCafe links + # Once satisfied, comment them again, because the actual links will be created by the pycafe-dashboards.yml workflow - name: Print PR Number run: | echo "Pull Request Number: ${{ github.event.workflow_run.pull_requests[0].number }}" From 6139b7b5b3a91ae6d10fb3388ca3b16cab7b38ba Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 23:24:18 +0100 Subject: [PATCH 10/15] Add anthropic and mistral --- tools/pycafe/create_pycafe_links.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/pycafe/create_pycafe_links.py b/tools/pycafe/create_pycafe_links.py index f031cbf8d..b9e1d6ec8 100644 --- a/tools/pycafe/create_pycafe_links.py +++ b/tools/pycafe/create_pycafe_links.py @@ -151,6 +151,8 @@ def post_comment(urls: dict[str, str]): "vizro-ai>=0.3.0", "black", "openpyxl", + "langchain_anthropic", + "langchain_mistralai", "greenlet # mock", "tiktoken @ https://py.cafe/files/maartenbreddels/tiktoken-demo/tiktoken-0.7.0-cp312-cp312-pyodide_2024_0_wasm32.whl", "https://py.cafe/files/maartenbreddels/jiter-demo/jiter-0.6.1-cp312-cp312-pyodide_2024_0_wasm32.whl", From 5d74d98ff673d4bbcb13d3b826b2363ce6d8249d Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Mon, 4 Nov 2024 23:28:38 +0100 Subject: [PATCH 11/15] For now take out mistral AI --- tools/pycafe/create_pycafe_links.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pycafe/create_pycafe_links.py b/tools/pycafe/create_pycafe_links.py index b9e1d6ec8..80fd394b6 100644 --- a/tools/pycafe/create_pycafe_links.py +++ b/tools/pycafe/create_pycafe_links.py @@ -152,7 +152,7 @@ def post_comment(urls: dict[str, str]): "black", "openpyxl", "langchain_anthropic", - "langchain_mistralai", + "#langchain_mistralai", "greenlet # mock", "tiktoken @ https://py.cafe/files/maartenbreddels/tiktoken-demo/tiktoken-0.7.0-cp312-cp312-pyodide_2024_0_wasm32.whl", "https://py.cafe/files/maartenbreddels/jiter-demo/jiter-0.6.1-cp312-cp312-pyodide_2024_0_wasm32.whl", From 9784e081578fd53dddfaf9ce540d1c84a642ee67 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Tue, 5 Nov 2024 09:19:40 +0100 Subject: [PATCH 12/15] Typo --- vizro-core/examples/scratch_dev/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vizro-core/examples/scratch_dev/app.py b/vizro-core/examples/scratch_dev/app.py index a04c0d2dd..84e70e6aa 100644 --- a/vizro-core/examples/scratch_dev/app.py +++ b/vizro-core/examples/scratch_dev/app.py @@ -28,7 +28,7 @@ page = vm.Page( - title="Test New Fo", + title="Charts UI", components=[ vm.Graph( figure=px.bar( From c7fbde2cbb927297041ba213a28e3810b3cf075f Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Tue, 5 Nov 2024 14:42:14 +0100 Subject: [PATCH 13/15] Commenting before merge --- .github/workflows/build-vizro-whl.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-vizro-whl.yml b/.github/workflows/build-vizro-whl.yml index 78bdea9a3..b467d044e 100644 --- a/.github/workflows/build-vizro-whl.yml +++ b/.github/workflows/build-vizro-whl.yml @@ -38,14 +38,17 @@ jobs: retention-days: 14 # The below can be commented out in order to dry run the test creation of the PyCafe links # Once satisfied, comment them again, because the actual links will be created by the pycafe-dashboards.yml workflow - - name: Print PR Number - run: | - echo "Pull Request Number: ${{ github.event.workflow_run.pull_requests[0].number }}" - - name: Create PyCafe links - run: | - PR_NUMBER=${{ github.event.workflow_run.pull_requests[0].number || '' }} - if [ -n "$PR_NUMBER" ]; then - hatch run python ../tools/pycafe/create_pycafe_links.py --github-token ${{ github.token }} --repo-name ${{ github.repository }} --pr-number $PR_NUMBER --run-id ${{ github.run_id }} --commit-sha ${{ github.sha }} - else - hatch run python ../tools/pycafe/create_pycafe_links.py --github-token ${{ github.token }} --repo-name ${{ github.repository }} --run-id ${{ github.run_id }} --commit-sha ${{ github.sha }} - fi + # which is run from the main branch + ############### Start of PyCafe links creation ############### + # - name: Print PR Number + # run: | + # echo "Pull Request Number: ${{ github.event.workflow_run.pull_requests[0].number }}" + # - name: Create PyCafe links + # run: | + # PR_NUMBER=${{ github.event.workflow_run.pull_requests[0].number || '' }} + # if [ -n "$PR_NUMBER" ]; then + # hatch run python ../tools/pycafe/create_pycafe_links.py --github-token ${{ github.token }} --repo-name ${{ github.repository }} --pr-number $PR_NUMBER --run-id ${{ github.run_id }} --commit-sha ${{ github.sha }} + # else + # hatch run python ../tools/pycafe/create_pycafe_links.py --github-token ${{ github.token }} --repo-name ${{ github.repository }} --run-id ${{ github.run_id }} --commit-sha ${{ github.sha }} + # fi + ############### End of PyCafe links creation ############### \ No newline at end of file From 6ba2ac489c612c89226b42e9e1fdc6b9efcc959c Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Tue, 5 Nov 2024 14:46:20 +0100 Subject: [PATCH 14/15] Update requirements for VizroAI charts UI --- tools/pycafe/create_pycafe_links.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/pycafe/create_pycafe_links.py b/tools/pycafe/create_pycafe_links.py index 80fd394b6..87ac4d928 100644 --- a/tools/pycafe/create_pycafe_links.py +++ b/tools/pycafe/create_pycafe_links.py @@ -152,10 +152,11 @@ def post_comment(urls: dict[str, str]): "black", "openpyxl", "langchain_anthropic", - "#langchain_mistralai", + "langchain_mistralai", "greenlet # mock", "tiktoken @ https://py.cafe/files/maartenbreddels/tiktoken-demo/tiktoken-0.7.0-cp312-cp312-pyodide_2024_0_wasm32.whl", "https://py.cafe/files/maartenbreddels/jiter-demo/jiter-0.6.1-cp312-cp312-pyodide_2024_0_wasm32.whl", + "https://py.cafe/files/maartenbreddels/tokenizers-demo/tokenizers-0.20.2.dev0-cp312-cp312-pyodide_2024_0_wasm32.whl", ], } urls = { From c251a55b00d163409b7df1b9e2d0678baf926cd1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:51:31 +0000 Subject: [PATCH 15/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/build-vizro-whl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-vizro-whl.yml b/.github/workflows/build-vizro-whl.yml index b467d044e..4b1b00f6b 100644 --- a/.github/workflows/build-vizro-whl.yml +++ b/.github/workflows/build-vizro-whl.yml @@ -51,4 +51,4 @@ jobs: # else # hatch run python ../tools/pycafe/create_pycafe_links.py --github-token ${{ github.token }} --repo-name ${{ github.repository }} --run-id ${{ github.run_id }} --commit-sha ${{ github.sha }} # fi - ############### End of PyCafe links creation ############### \ No newline at end of file + ############### End of PyCafe links creation ###############