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

bug: skip requirement comparison for pip reqs that is not a package #570

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

khorshuheng
Copy link
Collaborator

Description

While the SDK is processing the conda env, and additional merlin dependencies are required, such as merlin-pyfunc-server, the SDK will check the existing conda env to verify if the dependency is already present. If not, the additional requirement will be appended as part of the dependencies.

Unfortunately, this workflow assuems that every line under the pip configurations is a python package, which is not necessarily the case. For example, the user might specify trusted host or repository under the pip section.

Modifications

Skip comparing pip requirements that is not a package while attempting to check if extra merlin dependencies are present in the conda.yaml file.

Tests

Checklist

  • Added PR label
  • Added unit test, integration, and/or e2e tests
  • Tested locally
  • Updated documentation
  • Update Swagger spec if the PR introduce API changes
  • Regenerated Golang and Python client if the PR introduces API changes

Release Notes


@khorshuheng khorshuheng added the bug Something isn't working label Apr 8, 2024
Copy link
Contributor

@deadlycoconuts deadlycoconuts left a comment

Choose a reason for hiding this comment

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

Thanks for the quick fix! Just a tiny request, but could you include this new test case in the unit test examples here? You'll also need to add test case in the test params here. Thanks! 🙏

@khorshuheng khorshuheng force-pushed the skip-non-req-pip branch 3 times, most recently from 2d89f9b to 16e8395 Compare April 8, 2024 05:49
Copy link
Contributor

@leonlnj leonlnj left a comment

Choose a reason for hiding this comment

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

thanks!

@khorshuheng khorshuheng merged commit c8a5f22 into main Apr 8, 2024
35 checks passed
@khorshuheng khorshuheng deleted the skip-non-req-pip branch April 8, 2024 08:03
khorshuheng added a commit that referenced this pull request Apr 16, 2024
…570)

<!--  Thanks for sending a pull request!  Here are some tips for you:

1. Run unit tests and ensure that they are passing
2. If your change introduces any API changes, make sure to update the
e2e tests
3. Make sure documentation is updated for your PR!

-->
# Description
<!-- Briefly describe the motivation for the change. Please include
illustrations where appropriate. -->
While the SDK is processing the conda env, and additional merlin
dependencies are required, such as merlin-pyfunc-server, the SDK will
check the existing conda env to verify if the dependency is already
present. If not, the additional requirement will be appended as part of
the dependencies.

Unfortunately, this workflow assuems that every line under the `pip`
configurations is a python package, which is not necessarily the case.
For example, the user might specify trusted host or repository under the
pip section.

# Modifications
<!-- Summarize the key code changes. -->
Skip comparing pip requirements that is not a package while attempting
to check if extra merlin dependencies are present in the conda.yaml
file.

# Tests
<!-- Besides the existing / updated automated tests, what specific
scenarios should be tested? Consider the backward compatibility of the
changes, whether corner cases are covered, etc. Please describe the
tests and check the ones that have been completed. Eg:
- [x] Deploying new and existing standard models
- [ ] Deploying PyFunc models
-->

# Checklist
- [ ] Added PR label
- [ ] Added unit test, integration, and/or e2e tests
- [ ] Tested locally
- [ ] Updated documentation
- [ ] Update Swagger spec if the PR introduce API changes
- [ ] Regenerated Golang and Python client if the PR introduces API
changes

# Release Notes
<!--
Does this PR introduce a user-facing change?
If no, just write "NONE" in the release-note block below.
If yes, a release note is required. Enter your extended release note in
the block below.
If the PR requires additional action from users switching to the new
release, include the string "action required".

For more information about release notes, see kubernetes' guide here:
http://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note

```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants