[SDK] Create Unify Training Client #1719
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,21 +46,30 @@ def fix_test_files() -> None: | |
| for test_file in test_files: | ||
| print(f"Precessing file {test_file}") | ||
| if test_file.endswith(".py"): | ||
| with fileinput.FileInput( | ||
| os.path.join(test_folder_dir, test_file), inplace=True | ||
| ) as file: | ||
| for line in file: | ||
| print(_apply_regex(line), end="") | ||
|
|
||
|
|
||
| def add_imports() -> None: | ||
| with open(os.path.join(sdk_dir, "kubeflow/training/__init__.py"), "a") as f: | ||
| f.write("from kubeflow.training.api.training_client import TrainingClient\n") | ||
| with open(os.path.join(sdk_dir, "kubeflow/__init__.py"), "a") as f: | ||
| f.write("__path__ = __import__('pkgutil').extend_path(__path__, __name__)") | ||
|
|
||
| # Add Kubernetes models to proper deserialization of Training models. | ||
| with open(os.path.join(sdk_dir, "kubeflow/training/models/__init__.py"), "r") as f: | ||
| new_lines = [] | ||
| for line in f.readlines(): | ||
| new_lines.append(line) | ||
| if line.startswith("from __future__ import absolute_import"): | ||
| new_lines.append("\n") | ||
| new_lines.append("# Import Kubernetes models.\n") | ||
| new_lines.append("from kubernetes.client import *\n") | ||
| with open(os.path.join(sdk_dir, "kubeflow/training/models/__init__.py"), "w") as f: | ||
| f.writelines(new_lines) | ||
|
Comment on lines
+62
to
+72
There was a problem hiding this comment. It might be better to generate swagger.json containing kubernetes APIs, not importing them to Python SDK. For example, we can generate swagger.json with kubernetes core API in the following: $ openapi-gen --input-dirs github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1,github.com/kubeflow/common/pkg/apis/common/v1,k8s.io/api/core/v1 --report-filename=hack/violation_exception.list \
--output-package github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1 \
--go-header-file hack/boilerplate/boilerplate.go.txt \
--output-base "${TEMP_DIR}"WDYT? There was a problem hiding this comment. Makes sense, but in that case we are going to store all the Kubernetes models in our repo. There was a problem hiding this comment. Hmm... You're correct. There was a problem hiding this comment. I feel that we can keep the way as it is for this PR and create a separate issue. There was a problem hiding this comment. Sure, let's discuss the long term plan for it separately. |
||
|
|
||
|
|
||
| def _apply_regex(input_str: str) -> str: | ||
|
|
@@ -69,5 +78,5 @@ def _apply_regex(input_str: str) -> str: | |
| return input_str | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| main() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,8 @@ | ||
| { | ||
| "packageName": "kubeflow.training", | ||
| "projectName": "training", | ||
| "packageVersion": "1.5.0", | ||
| "typeMappings": { | ||
| "V1Time": "datetime" | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we removed all configuration files for ksonnet in this PR. So Can we remove this section?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to update these docs for the new E2Es, do we want to do it in the following PRs ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. I'm ok with either PR.