Skip to content

Commit

Permalink
Merge branch 'main' into richli/missingAmlOboCanaryToken
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Li committed Feb 10, 2025
2 parents ec0e8a1 + 6d1b72d commit 04538e8
Show file tree
Hide file tree
Showing 343 changed files with 1,856 additions and 2,809 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/assets-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ env:
docs_dir: docs

permissions:
# Required to clone repo
contents: read
# Required to clone repo and push commits to the wiki repo
contents: write

defaults:
run:
Expand Down Expand Up @@ -54,13 +54,12 @@ jobs:
with:
repository: Azure/azureml-assets.wiki
fetch-depth: 0
token: ${{ secrets.AZUREML_BOT_PAT }}
path: ${{ env.wiki_dir }}

- name: Use Python 3.10 or newer
uses: actions/setup-python@v4
with:
python-version: '>=3.10'
python-version: '3.12'

- name: Install dependencies
run: pip install -e $main_dir/$scripts_azureml_assets_dir -r $main_dir/$scripts_docs_dir/requirements.txt
Expand Down
21 changes: 10 additions & 11 deletions .github/workflows/assets-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ env:
asset_config_filename: asset.yaml

permissions:
# Required to clone repo
contents: read
# Required to clone repo and push commit to release branch
contents: write
# Required for OIDC login to Azure
id-token: write

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Use Python 3.10 or newer
uses: actions/setup-python@v4
with:
python-version: '>=3.10'
python-version: '3.12'

- name: Install dependencies
run: pip install -e $main_dir/$scripts_azureml_assets_dir
Expand All @@ -71,14 +71,14 @@ jobs:
working-directory: ${{ env.main_dir }}

- name: Upload changed assets
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: steps.find-updated-assets.outputs.updated_count > 0
with:
name: ${{ env.changed_assets_artifact }}
path: ${{ runner.temp }}/${{ env.changed_assets_artifact }}

- name: Upload non-testable assets
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: steps.find-updated-assets.outputs.updated_count > 0
with:
name: ${{ env.releasable_assets_artifact }}
Expand All @@ -102,7 +102,7 @@ jobs:
exit 1
- name: Upload list of assets
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.asset_list_artifact }}
path: ${{ runner.temp }}/${{ env.asset_list_artifact }}
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
steps:
- name: Download releasable assets
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.releasable_assets_artifact }}
path: ${{ runner.temp }}/${{ env.releasable_assets_artifact }}
Expand All @@ -198,13 +198,13 @@ jobs:
- name: Download releasable assets
if: needs.check-release-assets.outputs.has_releasable_assets != ''
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.releasable_assets_artifact }}
path: ${{ runner.temp }}/${{ env.releasable_assets_artifact }}

- name: Download list of assets
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.asset_list_artifact }}
path: ${{ runner.temp }}/${{ env.asset_list_artifact }}
Expand All @@ -220,13 +220,12 @@ jobs:
with:
ref: release
fetch-depth: 0
token: ${{ secrets.AZUREML_BOT_PAT }}
path: ${{ env.release_dir }}

- name: Use Python 3.10 or newer
uses: actions/setup-python@v4
with:
python-version: '>=3.10'
python-version: '3.12'

- name: Install dependencies
run: pip install -e $main_dir/$scripts_azureml_assets_dir
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/assets-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Use Python 3.10 or newer
uses: actions/setup-python@v4
with:
python-version: '>=3.10'
python-version: '3.12'

- name: Install dependencies
run: pip install -e $scripts_azureml_assets_dir
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Use Python 3.10 or newer
uses: actions/setup-python@v4
with:
python-version: '>=3.10'
python-version: '3.12'

- name: Install dependencies
run: pip install -e $scripts_azureml_assets_dir
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
run: python -u $scripts_test_dir/test_assets.py -i "${{ matrix.asset_config_path }}" -a $asset_config_filename -p $scripts_test_dir/requirements.txt -r $GITHUB_WORKSPACE/$pytest_reports

- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_reports }}
Expand All @@ -179,7 +179,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_reports }}
path: ${{ env.pytest_reports }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/assets-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Use Python 3.10 or newer
uses: actions/setup-python@v4
with:
python-version: '>=3.10'
python-version: '3.12'

- name: Log in to Azure
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/batch-score-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
RESOURCE_GROUP: ${{ env.resource_group }}
WORKSPACE_NAME: ${{ env.workspace }}
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_report_folder }}
Expand All @@ -91,7 +91,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/batch-score-oss-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
RESOURCE_GROUP: ${{ env.resource_group }}
WORKSPACE_NAME: ${{ env.workspace }}
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_report_folder }}
Expand All @@ -91,7 +91,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/environments-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Use Python 3.10 or newer
uses: actions/setup-python@v4
with:
python-version: '>=3.10'
python-version: '3.12'

- name: Install dependencies
run: pip install -e $scripts_azureml_assets_dir
Expand All @@ -89,7 +89,7 @@ jobs:
run: python -u $scripts_environment_dir/validate_build_logs.py -l '${{ runner.temp }}'/$build_logs_artifact_name

- name: Upload build logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.build_logs_artifact_name }}
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/model-monitoring-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,19 @@ jobs:
RESOURCE_GROUP: ${{ env.resource_group }}
WORKSPACE_NAME: ${{ env.workspace }}
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
name: ${{ env.pytest_report_folder }}-${{ matrix.group }}
path: ${{ env.pytest_report_folder }}-${{ matrix.group }}
report:
name: Publish test results
if: always()
runs-on: ubuntu-latest
needs: run-momo-tests
strategy:
matrix:
group: [1, 2, 3, 4, 5, 6]

permissions:
# Required for EnricoMi/publish-unit-test-result-action
Expand All @@ -152,15 +155,15 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
name: ${{ env.pytest_report_folder }}-${{ matrix.group }}
path: ${{ env.pytest_report_folder }}-${{ matrix.group }}
continue-on-error: true

- name: Publish test results
if: steps.download-artifact.outputs.download-path != ''
uses: EnricoMi/publish-unit-test-result-action@v2
with:
check_name: Test Results for ${{ github.workflow }}
junit_files: ${{ env.pytest_report_folder }}/**/*.xml
check_name: Test Results for ${{ github.workflow }} - Group ${{ matrix.group }}
junit_files: ${{ env.pytest_report_folder }}-${{ matrix.group }}/**/*.xml
4 changes: 2 additions & 2 deletions .github/workflows/model-monitoring-gsq-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
RESOURCE_GROUP: ${{ env.resource_group }}
WORKSPACE_NAME: ${{ env.workspace }}
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_report_folder }}
Expand All @@ -107,7 +107,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ langchain-openai
semantic-kernel
pytest
keyring
# Temporary fix version for security patch
tornado>=6.4.2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: batch_output_formatter
version: 0.0.14
version: 0.0.15
display_name: Batch Output Formatter
is_deterministic: True
type: command
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ is_deterministic: False
name: batch_resource_manager
display_name: Batch Inference Resource Manager
description: Resource Manager for batch inference.
version: 0.0.7
version: 0.0.8

inputs:
wait_input:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type: command
name: benchmark_embedding_model
display_name: Benchmark Embedding Model
description: Component for benchmarking an embedding model via MTEB.
version: 0.0.3
version: 0.0.4

inputs:
endpoint_url:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type: command
name: benchmark_result_aggregator
display_name: Benchmark result aggregator
description: Aggregate quality metrics, performance metrics and all of the metadata from the pipeline. Also add them to the root run.
version: 0.0.13
version: 0.0.14
is_deterministic: false

inputs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type: command
name: compute_performance_metrics
display_name: Compute Performance Metrics
description: Performs performance metric post processing using data from a model inference run.
version: 0.0.10
version: 0.0.11
is_deterministic: true

inputs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type: command
name: dataset_downloader
display_name: Dataset Downloader
description: Downloads the dataset onto blob store.
version: 0.0.10
version: 0.0.11

inputs:
dataset_name:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type: command
name: dataset_preprocessor
display_name: Dataset Preprocessor
description: Dataset Preprocessor
version: 0.0.10
version: 0.0.11
is_deterministic: true

inputs:
Expand Down
2 changes: 1 addition & 1 deletion assets/aml-benchmark/components/dataset_sampler/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type: command
name: dataset_sampler
display_name: Dataset Sampler
description: Samples a dataset containing JSONL file(s).
version: 0.0.10
version: 0.0.11

inputs:
dataset:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type: command
name: inference_postprocessor
display_name: Inference Postprocessor
description: Inference Postprocessor
version: 0.0.11
version: 0.0.12
is_deterministic: true

inputs:
Expand Down
2 changes: 1 addition & 1 deletion assets/aml-benchmark/components/prompt_crafter/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ display_name: Prompt Crafter
description: This component is used to create prompts from a given dataset. From a
given jinja prompt template, it will generate prompts. It can also create
few-shot prompts given a few-shot dataset and the number of shots.
version: 0.0.13
version: 0.0.14
is_deterministic: true

inputs:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi5.0-ubuntu24.04:{{latest-image-tag}}

RUN apt-get update && apt-get -y upgrade

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
$schema: https://azuremlschemas.azureedge.net/latest/commandComponent.schema.json

name: mlflow_model_local_validation
version: 0.0.16
version: 0.0.17
type: command

is_deterministic: True

display_name: MLFlow model local validation
description: Validates if a MLFLow model can be loaded on a compute and is usable for inferencing.

environment: azureml://registries/azureml/environments/python-sdk-v2/versions/23
environment: azureml://registries/azureml/environments/python-sdk-v2/versions/25

code: ../../src/
command: >-
Expand Down
Loading

0 comments on commit 04538e8

Please sign in to comment.