Skip to content

Support for Azure storage #571

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.

Sign up for GitHub

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

Open
tramora wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support for Azure storage #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions .github/workflows/dev-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ env:
DEFAULT_IMAGE_INCREMENT: 0
DEFAULT_SERVER_REVISION: main
DEFAULT_PYTHON_VERSIONS: 3.10 3.11 3.12 3.13 3.14
DEFAULT_KHIOPS_GCS_DRIVER_REVISION: 0.0.14
DEFAULT_KHIOPS_S3_DRIVER_REVISION: 0.0.14
DEFAULT_KHIOPS_GCS_DRIVER_REVISION: 0.0.16
DEFAULT_KHIOPS_S3_DRIVER_REVISION: 0.0.15
DEFAULT_KHIOPS_AZURE_DRIVER_REVISION: 0.0.6
on:
pull_request:
paths: [packaging/docker/khiopspydev/Dockerfile.*, .github/workflows/dev-docker.yml]
Expand Down Expand Up @@ -38,12 +39,16 @@ on:
description: Khiops Server Revision
khiops-gcs-driver-revision:
type: string
default: 0.0.14
default: 0.0.16
description: Driver version for Google Cloud Storage remote files
khiops-s3-driver-revision:
type: string
default: 0.0.14
default: 0.0.15
description: Driver version for AWS-S3 remote files
khiops-azure-driver-revision:
type: string
default: 0.0.6
description: Driver version for Azure remote files and blobs
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
Expand All @@ -67,6 +72,7 @@ jobs:
echo "IMAGE_URL=ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.khiopsdev-os }}" >> "$GITHUB_ENV"
echo "KHIOPS_GCS_DRIVER_REVISION=${{ inputs.khiops-gcs-driver-revision || env.DEFAULT_KHIOPS_GCS_DRIVER_REVISION }}" >> "$GITHUB_ENV"
echo "KHIOPS_S3_DRIVER_REVISION=${{ inputs.khiops-s3-driver-revision || env.DEFAULT_KHIOPS_S3_DRIVER_REVISION }}" >> "$GITHUB_ENV"
echo "KHIOPS_AZURE_DRIVER_REVISION=${{ inputs.khiops-azure-driver-revision || env.DEFAULT_KHIOPS_AZURE_DRIVER_REVISION }}" >> "$GITHUB_ENV"
- name: Checkout khiops-python sources
uses: actions/checkout@v4
- name: Set up Docker Buildx
Expand Down Expand Up @@ -105,6 +111,7 @@ jobs:
"PYTHON_VERSIONS=${{ inputs.python-versions || env.DEFAULT_PYTHON_VERSIONS }}"
"KHIOPS_GCS_DRIVER_REVISION=${{ env.KHIOPS_GCS_DRIVER_REVISION }}"
"KHIOPS_S3_DRIVER_REVISION=${{ env.KHIOPS_S3_DRIVER_REVISION }}"
"KHIOPS_AZURE_DRIVER_REVISION=${{ env.KHIOPS_AZURE_DRIVER_REVISION }}"
tags: ${{ env.DOCKER_IMAGE_TAGS }}
# Push only on manual request
push: ${{ inputs.push || false }}
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,21 +138,32 @@ jobs:
echo "Generated AWS configuration..."
cat ${GITHUB_WORKSPACE}/.aws/configuration
/scripts/run_fake_remote_file_servers.sh . # launch the servers in the background

# Set environment variables for the tests with GCS
GCS_BUCKET_NAME=data-test-khiops-driver-gcs/khiops_data
GCS_DRIVER_LOGLEVEL=info # set to debug for diagnosis

# Set environment variables for the tests with S3
S3_DRIVER_LOGLEVEL=info # set to debug for diagnosis
S3_BUCKET_NAME=s3-bucket
AWS_SHARED_CREDENTIALS_FILE=${{ github.workspace }}/.aws/credentials
AWS_CONFIG_FILE=${{ github.workspace }}/.aws/configuration

# Set environment variables for the tests with Azure
AZURE_STORAGE_CONNECTION_STRING='${{ secrets.AZURE_CONNECTION_STRING }}'
CLOUD_BLOB_URI_PREFIX=${{ vars.CLOUD_BLOB_URI_PREFIX }}
CLOUD_FILE_URI_PREFIX=${{ vars.CLOUD_FILE_URI_PREFIX }}

# Persist environment variables for subsequent steps
echo "GCS_BUCKET_NAME=${GCS_BUCKET_NAME}" >> "$GITHUB_ENV"
echo "GCS_DRIVER_LOGLEVEL=${GCS_DRIVER_LOGLEVEL}" >> "$GITHUB_ENV"
echo "S3_DRIVER_LOGLEVEL=${S3_DRIVER_LOGLEVEL}" >> "$GITHUB_ENV"
echo "S3_BUCKET_NAME=${S3_BUCKET_NAME}" >> "$GITHUB_ENV"
echo "AWS_SHARED_CREDENTIALS_FILE=${AWS_SHARED_CREDENTIALS_FILE}" >> "$GITHUB_ENV"
echo "AWS_CONFIG_FILE=${AWS_CONFIG_FILE}" >> "$GITHUB_ENV"
echo "AZURE_STORAGE_CONNECTION_STRING=${AZURE_STORAGE_CONNECTION_STRING}" >> "$GITHUB_ENV"
echo "CLOUD_BLOB_URI_PREFIX=${CLOUD_BLOB_URI_PREFIX}" >> "$GITHUB_ENV"
echo "CLOUD_FILE_URI_PREFIX=${CLOUD_FILE_URI_PREFIX}" >> "$GITHUB_ENV"
- name: Authenticate to GCP using "Workload Identity Federation"
if: env.SKIP_EXPENSIVE_TESTS != 'true'
# For integration tests on GCS we use a real Google account
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

### Added
- (`sklearn`) `keep_selected_variables_only` parameter to the predictors (`KhiopsClassifier` and `KhiopsRegressor`)
- (General) Support for Azure storage

### Changed
- (`core`) Rename `variable_part_dimensions` to `inner_variable_dimensions` in Coclustering results.
Expand Down
Loading
Loading