Skip to content

Pushing to prod PR#532 onward #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5a7e901
Docs — Custom reporting (#533)
validbeck Nov 22, 2024
b2724b6
Merge remote-tracking branch 'origin/main' into staging
github-actions[bot] Nov 22, 2024
5dab143
Merge pull request #541 from validmind/update-staging-11976383952
github-actions[bot] Nov 22, 2024
71060ac
Added quick instructions on submitting feedback within the platform (…
validbeck Nov 22, 2024
2805bc3
Merge remote-tracking branch 'origin/main' into staging
github-actions[bot] Nov 22, 2024
96f4240
Merge pull request #542 from validmind/update-staging-11978314154
github-actions[bot] Nov 22, 2024
741dda1
Live execution of `intro_for_model_developers_EXECUTED.ipynb` (#528)
validbeck Nov 26, 2024
414b6f8
Merge remote-tracking branch 'origin/main' into staging
github-actions[bot] Nov 26, 2024
4993eaf
Merge pull request #545 from validmind/update-staging-12021778852
github-actions[bot] Nov 26, 2024
6ee0dcc
removing output templates notebook from highlighted code samples for …
johnwalz97 Nov 26, 2024
9415877
Merge remote-tracking branch 'origin/main' into staging
github-actions[bot] Nov 26, 2024
f959aa8
Merge pull request #546 from validmind/update-staging-12021879755
github-actions[bot] Nov 26, 2024
74222b4
Making changes for Mehdi :) (#538)
validbeck Nov 26, 2024
d41a2e3
Merge remote-tracking branch 'origin/main' into staging
github-actions[bot] Nov 26, 2024
c8a9d35
Merge pull request #547 from validmind/update-staging-12022756723
github-actions[bot] Nov 26, 2024
0a1a57c
Add login button to docs site (#544) (#549)
github-actions[bot] Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
OPENAI_API_KEY=ADD_YOUR_KEY_HERE
OPENAI_API_KEY=ADD_YOUR_KEY_HERE

# API INFO TO RUN /notebooks/tutorials/intro_for_model_developers_EXECUTED.ipynb
PLATFORM_API_KEY=ADD_YOUR_API_KEY_HERE
PLATFORM_API_SECRET=ADD_YOUR_API_SECRET_HERE
37 changes: 37 additions & 0 deletions .github/actions/demo-notebook/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Execute demo notebook
description: Installs python3, validmind, checks dependencies then executes ONLY the Intro for Model Developers notebook with development heap tracking

inputs: {}

runs:
using: "composite"
steps:
- name: Install python3 for Jupyter Notebooks
shell: bash
run: |
python3 -m pip install jupyter
python -m pip install --upgrade pip

- name: Install validmind for notebook execution
shell: bash
run: |
pip install validmind
pip install validmind[llm]
pip install fairlearn aequitas
pip install shap==0.44.1

- name: Check dependencies
shell: bash
run: |
pip install pycairo
pip check

- name: Execute ONLY the Intro for Model Developers notebook with heap development
shell: bash
run: |
cd site
quarto render --profile exe-demo notebooks/tutorials/intro_for_model_developers_EXECUTED.ipynb &> render_errors.log || {
echo "Execute for intro_for_model_developers_EXECUTED.ipynb failed";
cat render_errors.log;
exit 1;
}
21 changes: 21 additions & 0 deletions .github/actions/fetch-quarto/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Fetch Quarto
description: Checks out repo then downloads & installs the latest version of Quarto

inputs: {}

runs:
using: "composite"
steps:
- name: Get latest Quarto release URL
id: get-quarto-url
shell: bash
run: |
API_URL="https://api.github.com/repos/quarto-dev/quarto-cli/releases/latest"
DOWNLOAD_URL=$(curl -s $API_URL | jq -r '.assets[] | select(.name | endswith("linux-amd64.deb")).browser_download_url')
echo "DOWNLOAD_URL=$DOWNLOAD_URL" >> $GITHUB_ENV

- name: Download and install Quarto
shell: bash
run: |
wget ${{ env.DOWNLOAD_URL }} -O quarto-latest-linux-amd64.deb
sudo dpkg -i quarto-latest-linux-amd64.deb
37 changes: 37 additions & 0 deletions .github/actions/prod-notebook/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Execute prod notebook
description: Installs python3, validmind, checks dependencies then executes ONLY the Intro for Model Developers notebook with production heap tracking

inputs: {}

runs:
using: "composite"
steps:
- name: Install python3 for Jupyter Notebooks
shell: bash
run: |
python3 -m pip install jupyter
python -m pip install --upgrade pip

- name: Install validmind for notebook execution
shell: bash
run: |
pip install validmind
pip install validmind[llm]
pip install fairlearn aequitas
pip install shap==0.44.1

- name: Check dependencies
shell: bash
run: |
pip install pycairo
pip check

- name: Execute ONLY the Intro for Model Developers notebook with heap production
shell: bash
run: |
cd site
quarto render --profile exe-prod notebooks/tutorials/intro_for_model_developers_EXECUTED.ipynb &> render_errors.log || {
echo "Execute for intro_for_model_developers_EXECUTED.ipynb failed";
cat render_errors.log;
exit 1;
}
37 changes: 37 additions & 0 deletions .github/actions/staging-notebook/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Execute staging notebook
description: Installs python3, validmind, checks dependencies then executes ONLY the Intro for Model Developers notebook with staging heap tracking

inputs: {}

runs:
using: "composite"
steps:
- name: Install python3 for Jupyter Notebooks
shell: bash
run: |
python3 -m pip install jupyter
python -m pip install --upgrade pip

- name: Install validmind for notebook execution
shell: bash
run: |
pip install validmind
pip install validmind[llm]
pip install fairlearn aequitas
pip install shap==0.44.1

- name: Check dependencies
shell: bash
run: |
pip install pycairo
pip check

- name: Execute ONLY the Intro for Model Developers notebook with heap staging
shell: bash
run: |
cd site
quarto render --profile exe-staging notebooks/tutorials/intro_for_model_developers_EXECUTED.ipynb &> render_errors.log || {
echo "Execute for intro_for_model_developers_EXECUTED.ipynb failed";
cat render_errors.log;
exit 1;
}
35 changes: 22 additions & 13 deletions .github/workflows/deploy-docs-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,10 @@ jobs:
- name: Check out repository
uses: actions/checkout@v2

- name: Get latest Quarto release URL
id: get-quarto-url
run: |
API_URL="https://api.github.com/repos/quarto-dev/quarto-cli/releases/latest"
DOWNLOAD_URL=$(curl -s $API_URL | jq -r '.assets[] | select(.name | endswith("linux-amd64.deb")).browser_download_url')
echo "DOWNLOAD_URL=$DOWNLOAD_URL" >> $GITHUB_ENV

- name: Download and install Quarto
run: |
wget ${{ env.DOWNLOAD_URL }} -O quarto-latest-linux-amd64.deb
sudo dpkg -i quarto-latest-linux-amd64.deb
- name: Fetch Quarto
uses: ./.github/actions/fetch-quarto

- name: Render docs site
- name: Render prod docs site
run: |
cd site
quarto render --profile production &> render_errors.log || {
Expand All @@ -39,9 +30,27 @@ jobs:
exit 1;
}

# See if site/notebooks/ has updates
- name: Filter changed files
uses: dorny/paths-filter@v2
id: filter
with:
filters: |
notebooks:
- 'site/notebooks/**'

# If yes then execute the prod notebook
- name: Execute prod Intro for Model Developers notebook
if: steps.filter.outputs.notebooks == 'true'
uses: ./.github/actions/prod-notebook
id: execute-prod-notebook
env:
PLATFORM_API_KEY: ${{ secrets.PLATFORM_API_KEY }}
PLATFORM_API_SECRET: ${{ secrets.PLATFORM_API_SECRET }}

# Prod bucket is in us-east-1
- name: Configure AWS credentials
run: aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }} && aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }} && aws configure set default.region us-east-1

- name: Deploy docs site
- name: Deploy docs prod site
run: aws s3 sync site/_site s3://docs-ci-cd-prod/site --delete && aws cloudfront create-invalidation --distribution-id E2I9R40IH01NW3 --paths "/*" --no-cli-pager
35 changes: 22 additions & 13 deletions .github/workflows/deploy-docs-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,10 @@ jobs:
- name: Check out repository
uses: actions/checkout@v2

- name: Get latest Quarto release URL
id: get-quarto-url
run: |
API_URL="https://api.github.com/repos/quarto-dev/quarto-cli/releases/latest"
DOWNLOAD_URL=$(curl -s $API_URL | jq -r '.assets[] | select(.name | endswith("linux-amd64.deb")).browser_download_url')
echo "DOWNLOAD_URL=$DOWNLOAD_URL" >> $GITHUB_ENV

- name: Download and install Quarto
run: |
wget ${{ env.DOWNLOAD_URL }} -O quarto-latest-linux-amd64.deb
sudo dpkg -i quarto-latest-linux-amd64.deb
- name: Fetch Quarto
uses: ./.github/actions/fetch-quarto

- name: Render docs site
- name: Render staging docs site
run: |
cd site
quarto render --profile staging &> render_errors.log || {
Expand All @@ -39,9 +30,27 @@ jobs:
exit 1;
}

# See if site/notebooks/ has updates
- name: Filter changed files
uses: dorny/paths-filter@v2
id: filter
with:
filters: |
notebooks:
- 'site/notebooks/**'

# If yes then execute the staging notebook
- name: Execute staging Intro for Model Developers notebook
if: steps.filter.outputs.notebooks == 'true'
uses: ./.github/actions/staging-notebook
id: execute-staging-notebook
env:
PLATFORM_API_KEY: ${{ secrets.PLATFORM_API_KEY }}
PLATFORM_API_SECRET: ${{ secrets.PLATFORM_API_SECRET }}

# Staging bucket is in us-west-2
- name: Configure AWS credentials
run: aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID_STAGING }} && aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY_STAGING }} && aws configure set default.region us-west-2

- name: Deploy docs site
- name: Deploy docs staging site
run: aws s3 sync site/_site s3://docs-ci-cd-staging/site --delete && aws cloudfront create-invalidation --distribution-id E2FB73KGY63MV6 --paths "/*" --no-cli-pager
35 changes: 22 additions & 13 deletions .github/workflows/validate-docs-site.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,35 @@ jobs:
- name: Check out repository
uses: actions/checkout@v2

- name: Get latest Quarto release URL
id: get-quarto-url
run: |
API_URL="https://api.github.com/repos/quarto-dev/quarto-cli/releases/latest"
DOWNLOAD_URL=$(curl -s $API_URL | jq -r '.assets[] | select(.name | endswith("linux-amd64.deb")).browser_download_url')
echo "DOWNLOAD_URL=$DOWNLOAD_URL" >> $GITHUB_ENV

- name: Download and install Quarto
run: |
wget ${{ env.DOWNLOAD_URL }} -O quarto-latest-linux-amd64.deb
sudo dpkg -i quarto-latest-linux-amd64.deb
- name: Fetch Quarto
uses: ./.github/actions/fetch-quarto

- name: Render site
- name: Render demo docs site
run: |
cd site
quarto render --profile development &> render_errors.log || {
echo "Quarto render failed immediately";
cat render_errors.log;
exit 1;
}

# See if site/notebooks/ has updates
- name: Filter changed files
uses: dorny/paths-filter@v2
id: filter
with:
filters: |
notebooks:
- 'site/notebooks/**'

# If yes then execute the demo notebook
- name: Execute demo Intro for Model Developers notebook
if: steps.filter.outputs.notebooks == 'true'
uses: ./.github/actions/demo-notebook
id: execute-demo-notebook
env:
PLATFORM_API_KEY: ${{ secrets.PLATFORM_API_KEY }}
PLATFORM_API_SECRET: ${{ secrets.PLATFORM_API_SECRET }}

- name: Test for warnings or errors
run: |
Expand All @@ -48,7 +57,7 @@ jobs:
echo "No warnings or errors detected during Quarto render"
fi

# Demo bucket is in us-east-1
# Demo bucket is in us-east-1
- name: Configure AWS credentials
run: aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }} && aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }} && aws configure set default.region us-east-1

Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ site/.quarto/
site/.gitignore

# Rendered docs site
site/_site/
site/_site/
site/_freeze/
site/notebooks/tutorials/my_tests/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@ After you pull in the changes, commit them to this repo as part of the release n

<!-- September 16, 2024: Need to mention rendered Python `.html` docs and generated `.md` test descriptions -->

<!-- Testing simplified merge strategy -->
<!-- Testing conditional changes on site/notebooks/ -->
8 changes: 4 additions & 4 deletions internal/templates/_single-source.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<!-- VISIBLE IN USER GUIDES ONlY -->

:::: {.content-visible unless-format="revealjs"}
1. In the left sidebar, click **Model Inventory**.
1. In the left sidebar, click **{{< fa cubes >}} Model Inventory**.

1. Select a model by clicking on it or find your model by applying a filter or searching for it.^[[Working with the model inventory](/guide/model-inventory/working-with-model-inventory.qmd#search-filter-and-sort-models)]

1. In the expanded sidebar that appears for your model, click **Model Activity**.
1. In the expanded sidebar that appears for your model, click **{{< fa wifi >}} Model Activity**.

::::


<!-- VISIBLE IN TRAINING SLIDES ONLY -->

:::: {.content-hidden unless-format="revealjs"}
1. In the left sidebar, click **Model Inventory**.
1. In the left sidebar, click **{{< fa cubes >}} Model Inventory**.

1. Select a model by clicking on it or [find your model by applying a filter or searching for it](/guide/model-inventory/working-with-model-inventory.qmd#search-filter-and-sort-models).

1. In the expanded sidebar that appears for your model, click **Model Activity**.
1. In the expanded sidebar that appears for your model, click **{{< fa wifi >}} Model Activity**.

::::
Original file line number Diff line number Diff line change
Expand Up @@ -4490,7 +4490,7 @@ readers do not read off random characters that represent icons */
.fa-skull::before {
content: "\f54c"; }

.fa-tower-broadcast::before {
.fa-wifi::before {
content: "\f519"; }

.fa-broadcast-tower::before {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4490,7 +4490,7 @@ readers do not read off random characters that represent icons */
.fa-skull::before {
content: "\f54c"; }

.fa-tower-broadcast::before {
.fa-wifi::before {
content: "\f519"; }

.fa-broadcast-tower::before {
Expand Down
2 changes: 1 addition & 1 deletion site/_extensions/quarto-ext/fontawesome/assets/css/all.css
Original file line number Diff line number Diff line change
Expand Up @@ -5680,7 +5680,7 @@ readers do not read off random characters that represent icons */
.fa-tornado::before {
content: "\f76f"; }

.fa-tower-broadcast::before {
.fa-wifi::before {
content: "\f519"; }

.fa-broadcast-tower::before {
Expand Down
12 changes: 12 additions & 0 deletions site/_quarto-exe-demo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
format:
html:
page-layout: full
navbar: false
code-tools: true
include-in-header:
- environments/heap-development.html
include-after-body:
- https://unpkg.com/@jupyter-widgets/html-manager@*/dist/embed-amd.js
execute:
enabled: true
freeze: auto
Loading