Skip to content
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

Separate skypilot flavors into different folders #2332

Merged

Conversation

safoinme
Copy link
Contributor

@safoinme safoinme commented Jan 22, 2024

Describe changes

I implemented/fixed _ to achieve _.

Pre-requisites

Please ensure you have done the following:

  • I have read the CONTRIBUTING.md document.
  • If my change requires a change to docs, I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have based my new branch on develop and the open PR is targeting develop. If your branch wasn't based on develop read Contribution guide on rebasing branch to develop.
  • If my changes require changes to the dashboard, these changes are communicated/requested.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Other (add details above)

Summary by CodeRabbit

  • New Features

    • Introduced Skypilot integrations for remote orchestration of ZenML pipelines on AWS, Azure, and GCP VMs.
  • Refactor

    • Reorganized Skypilot integration structure to streamline the setup and configuration process.
  • Chores

    • Removed deprecated Skypilot integration sub-modules and classes to align with the new integration approach.
  • Documentation

    • Updated references to reflect the new Skypilot integration structure for AWS, Azure, and GCP.

Copy link
Contributor

coderabbitai bot commented Jan 22, 2024

Important

Auto Review Skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository.

To trigger a single review, invoke the @coderabbitai review command.

Walkthrough

The changes involve a reorganization of the Skypilot integration within the ZenML codebase. Skypilot-specific modules have been removed or renamed, and their functionality has been redistributed across new modules named vm_aws, vm_azure, and vm_gcp. These modules now initialize the respective cloud provider integrations for remote orchestration of ZenML pipelines on virtual machines. The restructuring includes updates to import statements and the removal of Skypilot classes and checks from various __init__.py files.

Changes

Files Change Summary
src/zenml/integrations/__init__.py Updated import statements for Skypilot integrations with new module names (vm_aws, vm_gcp, vm_azure).
src/zenml/integrations/skypilot/... Removed Skypilot integration sub-module and associated classes/checks.
src/zenml/integrations/vm_aws/..., src/zenml/integrations/vm_azure/..., src/zenml/integrations/vm_gcp/... Initialized Skypilot cloud integrations for AWS, Azure, and GCP; added orchestrator flavors and settings; updated import statements.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit-tests for this file.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit tests for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

@github-actions github-actions bot added the internal To filter out internal PRs and issues label Jan 22, 2024
@strickvl
Copy link
Contributor

@coderabbitai review

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Status

Actionable comments generated: 0

Configuration used: .coderabbit.yaml

Commits Files that changed from the base of the PR and between ad11197 and 58470d8.
Files selected for processing (19)
  • src/zenml/integrations/init.py (1 hunks)
  • src/zenml/integrations/skypilot/init.py (1 hunks)
  • src/zenml/integrations/skypilot/flavors/init.py (1 hunks)
  • src/zenml/integrations/skypilot/orchestrators/init.py (1 hunks)
  • src/zenml/integrations/vm_aws/init.py (1 hunks)
  • src/zenml/integrations/vm_aws/flavors/init.py (1 hunks)
  • src/zenml/integrations/vm_aws/flavors/skypilot_orchestrator_aws_vm_flavor.py (2 hunks)
  • src/zenml/integrations/vm_aws/orchestrators/init.py (1 hunks)
  • src/zenml/integrations/vm_aws/orchestrators/skypilot_aws_vm_orchestrator.py (1 hunks)
  • src/zenml/integrations/vm_azure/init.py (1 hunks)
  • src/zenml/integrations/vm_azure/flavors/init.py (1 hunks)
  • src/zenml/integrations/vm_azure/flavors/skypilot_orchestrator_azure_vm_flavor.py (2 hunks)
  • src/zenml/integrations/vm_azure/orchestrators/init.py (1 hunks)
  • src/zenml/integrations/vm_azure/orchestrators/skypilot_azure_vm_orchestrator.py (1 hunks)
  • src/zenml/integrations/vm_gcp/init.py (1 hunks)
  • src/zenml/integrations/vm_gcp/flavors/init.py (1 hunks)
  • src/zenml/integrations/vm_gcp/flavors/skypilot_orchestrator_gcp_vm_flavor.py (3 hunks)
  • src/zenml/integrations/vm_gcp/orchestrators/init.py (1 hunks)
  • src/zenml/integrations/vm_gcp/orchestrators/skypilot_gcp_vm_orchestrator.py (1 hunks)
Files skipped from review due to trivial changes (2)
  • src/zenml/integrations/skypilot/orchestrators/init.py
  • src/zenml/integrations/vm_aws/orchestrators/skypilot_aws_vm_orchestrator.py
Additional comments: 17
src/zenml/integrations/skypilot/__init__.py (1)
  • 13-13: The file src/zenml/integrations/skypilot/__init__.py has been emptied of its contents, which is consistent with the PR's objective to reorganize the skypilot integration. This change is expected as part of the reorganization.
src/zenml/integrations/skypilot/flavors/__init__.py (1)
  • 13-13: The file src/zenml/integrations/skypilot/flavors/__init__.py has also been cleared, aligning with the PR's goal to restructure the skypilot integration.
src/zenml/integrations/vm_azure/flavors/__init__.py (1)
  • 16-26: The __init__.py file under src/zenml/integrations/vm_azure/flavors/ has been populated with imports and an __all__ list for the Skypilot Azure orchestrator flavor. This is in line with the PR's objective to separate skypilot flavors into different folders.
src/zenml/integrations/vm_aws/orchestrators/__init__.py (1)
  • 16-25: The __init__.py file under src/zenml/integrations/vm_aws/orchestrators/ has been updated to include imports and an __all__ list for the Skypilot AWS orchestrator. This change is consistent with the PR's intent to reorganize the skypilot integration.
src/zenml/integrations/vm_aws/flavors/__init__.py (1)
  • 16-26: The __init__.py file under src/zenml/integrations/vm_aws/flavors/ now contains imports and an __all__ list for the Skypilot AWS orchestrator flavor, which aligns with the PR's restructuring goals.
src/zenml/integrations/vm_gcp/orchestrators/__init__.py (1)
  • 16-26: The __init__.py file in src/zenml/integrations/vm_gcp/orchestrators/ has been updated with imports and an __all__ list for the Skypilot GCP orchestrator, which is in accordance with the PR's objectives.
src/zenml/integrations/vm_gcp/flavors/__init__.py (1)
  • 16-26: The __init__.py file under src/zenml/integrations/vm_gcp/flavors/ includes imports and an __all__ list for the Skypilot GCP orchestrator flavor, which is consistent with the PR's reorganization efforts.
src/zenml/integrations/vm_azure/orchestrators/__init__.py (1)
  • 16-26: The __init__.py file in src/zenml/integrations/vm_azure/orchestrators/ has been populated with imports and an __all__ list for the Skypilot Azure orchestrator, aligning with the PR's restructuring goals.
src/zenml/integrations/vm_gcp/__init__.py (1)
  • 27-49: The __init__.py file for the vm_gcp module has been updated with a class definition for SkypilotGCPIntegration. This change is part of the PR's objective to reorganize the skypilot integration into separate cloud provider directories.
src/zenml/integrations/vm_aws/__init__.py (1)
  • 27-51: The __init__.py file for the vm_aws module now contains a class definition for SkypilotAWSIntegration. This update is consistent with the PR's goal to restructure the skypilot integration.
src/zenml/integrations/vm_azure/__init__.py (1)
  • 29-52: The __init__.py file in the vm_azure module has been updated with a class definition for SkypilotAzureIntegration, which is in line with the PR's objectives to reorganize the skypilot integration.
src/zenml/integrations/vm_azure/orchestrators/skypilot_azure_vm_orchestrator.py (1)
  • 23-26: The import statements in skypilot_azure_vm_orchestrator.py have been updated to reflect the new module structure. This change is part of the PR's reorganization efforts.
src/zenml/integrations/vm_gcp/orchestrators/skypilot_gcp_vm_orchestrator.py (1)
  • 26-29: The import statements in skypilot_gcp_vm_orchestrator.py have been updated to reflect the new module structure. This change is part of the PR's reorganization efforts.
src/zenml/integrations/vm_aws/flavors/skypilot_orchestrator_aws_vm_flavor.py (1)
  • 15-31: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [22-118]

The file skypilot_orchestrator_aws_vm_flavor.py has been updated with new import paths and class definitions that align with the new module structure. This is consistent with the PR's restructuring goals.

src/zenml/integrations/vm_azure/flavors/skypilot_orchestrator_azure_vm_flavor.py (1)
  • 15-31: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [22-118]

The file skypilot_orchestrator_azure_vm_flavor.py has been updated with new import paths and class definitions that align with the new module structure. This is consistent with the PR's restructuring goals.

src/zenml/integrations/__init__.py (1)
  • 61-63: The import statements in the __init__.py file of the integrations module have been updated to reflect the new module names for Skypilot integrations (vm_aws, vm_gcp, vm_azure). This change is part of the PR's reorganization efforts.
src/zenml/integrations/vm_gcp/flavors/skypilot_orchestrator_gcp_vm_flavor.py (1)
  • 31-37: > 📝 NOTE

This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [25-123]

The file skypilot_orchestrator_gcp_vm_flavor.py has been updated with new import paths and class definitions that align with the new module structure. This is consistent with the PR's restructuring goals.

@strickvl strickvl added the enhancement New feature or request label Jan 22, 2024
Copy link
Contributor

@htahir1 htahir1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming we've tested at least one of the flavors

Comment on lines 61 to 63
from zenml.integrations.vm_aws import SkypilotAWSIntegration # noqa
from zenml.integrations.vm_gcp import SkypilotGCPIntegration # noqa
from zenml.integrations.vm_azure import SkypilotAzureIntegration # noqa
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we going back to the vm_ prefix? Didn't we just change the integation names over to skypilot_aws? They should be consistent, I think.

src/zenml/integrations/vm_aws/__init__.py Outdated Show resolved Hide resolved
src/zenml/integrations/vm_azure/__init__.py Outdated Show resolved Hide resolved
src/zenml/integrations/vm_azure/__init__.py Outdated Show resolved Hide resolved
src/zenml/integrations/vm_azure/flavors/__init__.py Outdated Show resolved Hide resolved
src/zenml/integrations/vm_azure/flavors/__init__.py Outdated Show resolved Hide resolved
src/zenml/integrations/vm_gcp/__init__.py Outdated Show resolved Hide resolved
src/zenml/integrations/vm_gcp/__init__.py Outdated Show resolved Hide resolved
src/zenml/integrations/vm_gcp/flavors/__init__.py Outdated Show resolved Hide resolved
@safoinme safoinme merged commit 36424ad into develop Jan 22, 2024
34 checks passed
@safoinme safoinme deleted the fix/create-separate-integration-for-skypilot-flavors branch January 22, 2024 15:38
kabinja pushed a commit to kabinja/zenml that referenced this pull request Jan 29, 2024
* separate skypilot flavors into different folders

* Apply suggestions from code review

Co-authored-by: Alex Strick van Linschoten <strickvl@users.noreply.github.com>

* Update Skypilot integration package

* Update import path for Skypilot GCP orchestrator flavor

* Imported SKYPILOT_AZURE_ORCHESTRATOR_FLAVOR from zenml.integrations.skypilot_azure.

---------

Co-authored-by: Alex Strick van Linschoten <strickvl@users.noreply.github.com>
adtygan pushed a commit to adtygan/zenml that referenced this pull request Mar 21, 2024
* separate skypilot flavors into different folders

* Apply suggestions from code review

Co-authored-by: Alex Strick van Linschoten <strickvl@users.noreply.github.com>

* Update Skypilot integration package

* Update import path for Skypilot GCP orchestrator flavor

* Imported SKYPILOT_AZURE_ORCHESTRATOR_FLAVOR from zenml.integrations.skypilot_azure.

---------

Co-authored-by: Alex Strick van Linschoten <strickvl@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request internal To filter out internal PRs and issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants