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

ModelConfig is ModelVersion! #2044

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
4a77b19
rename file
avishniakov Nov 10, 2023
70a9b97
rename file
avishniakov Nov 10, 2023
5518513
rename file
avishniakov Nov 10, 2023
5252b58
Merge branch 'develop' into feature/OSS-2609-model-config-is-model-ve…
avishniakov Nov 10, 2023
7cd672c
big rebranding
avishniakov Nov 10, 2023
26e0b3a
big rebranding
avishniakov Nov 10, 2023
ed5bb8f
deprecate method
avishniakov Nov 10, 2023
8aafc95
redesign context to return ModelVersion
avishniakov Nov 10, 2023
0ff4b21
add `linked_artifact_ids` property
avishniakov Nov 10, 2023
0138546
add `__eq__`
avishniakov Nov 10, 2023
c924456
fix typo
avishniakov Nov 10, 2023
e62100b
add number and name props
avishniakov Nov 13, 2023
3b4f1d5
rename artifact types
avishniakov Nov 13, 2023
f53dc24
prevent reserved mv names creation
avishniakov Nov 13, 2023
77f1155
typo
avishniakov Nov 13, 2023
ef25311
more logging
avishniakov Nov 13, 2023
3a13ccd
prevent reserved mv names creation
avishniakov Nov 13, 2023
1a23383
handle reserved names properly
avishniakov Nov 13, 2023
a4ae3c8
rework client calls
avishniakov Nov 13, 2023
052c3b8
remove `version_description`
avishniakov Nov 13, 2023
5490aa9
remove `version_name`
avishniakov Nov 13, 2023
5dd7c81
`delete_new_version_on_failure` > `with_recovery`
avishniakov Nov 13, 2023
cd211aa
Merge branch 'develop' into feature/OSS-2609-OSS-2575-model-config-is…
avishniakov Nov 13, 2023
18ac906
fix alembic false alarms
avishniakov Nov 13, 2023
ccd70ca
Merge branch 'feature/OSS-2609-OSS-2575-model-config-is-model-version…
avishniakov Nov 13, 2023
c477414
output alembic branches
avishniakov Nov 13, 2023
245df6e
resolve branching
avishniakov Nov 13, 2023
f2374a7
update test signature
avishniakov Nov 13, 2023
5d2f115
Temporarily fix quickstart until the certificate is renewed
stefannica Nov 13, 2023
2cda9ce
add existing_type
avishniakov Nov 14, 2023
3c2178e
Merge branch 'develop' into feature/OSS-2609-OSS-2575-model-config-is…
avishniakov Nov 14, 2023
4bc517d
enforce tags update
avishniakov Nov 14, 2023
5618d2e
update template tag
avishniakov Nov 14, 2023
b37eb19
after merge mess
avishniakov Nov 14, 2023
b433135
resolve branching
avishniakov Nov 14, 2023
3a94629
finish renaming
avishniakov Nov 14, 2023
e198a56
revert `log_artifact_metadata`
avishniakov Nov 14, 2023
1419daa
tagging bugfix
avishniakov Nov 14, 2023
6c630e0
Merge branch 'develop' into feature/OSS-2609-OSS-2575-model-config-is…
avishniakov Nov 14, 2023
1526b01
rework client methods
avishniakov Nov 14, 2023
9497958
sunset recovery and `running`
avishniakov Nov 14, 2023
e0c1c27
nits from review
avishniakov Nov 14, 2023
cf295cc
rename files
avishniakov Nov 14, 2023
c1fe73d
rename vars
avishniakov Nov 14, 2023
f27a8ae
remove `ReservedNameError`
avishniakov Nov 14, 2023
18aea92
Merge branch 'develop' into feature/OSS-2609-OSS-2575-model-config-is…
avishniakov Nov 14, 2023
b688b93
resolve branching
avishniakov Nov 14, 2023
a921efe
Auto-update of E2E template
actions-user Nov 14, 2023
0cf2a6d
fixing bugs caught by tests
avishniakov Nov 15, 2023
4b07b33
Merge branch 'feature/OSS-2609-OSS-2575-model-config-is-model-version…
avishniakov Nov 15, 2023
3c05cc2
Merge branch 'develop' into feature/OSS-2609-OSS-2575-model-config-is…
avishniakov Nov 15, 2023
bb42c2c
fix branching
avishniakov Nov 15, 2023
9ad0778
properly refresh template
avishniakov Nov 15, 2023
a7f991c
overcome pagination issue in all_model_versions
avishniakov Nov 15, 2023
6f069b6
rename misleading method
avishniakov Nov 15, 2023
4185808
remove `all_model_versions`
avishniakov Nov 15, 2023
c526d44
update `list_models`
avishniakov Nov 15, 2023
5d5c9fc
improve docstring
avishniakov Nov 15, 2023
1ddb941
rephrase docstring
avishniakov Nov 15, 2023
a95c3ad
nits
avishniakov Nov 15, 2023
1e0249f
Auto-update of E2E template
actions-user Nov 15, 2023
ce5c34d
stick to unified list interface
avishniakov Nov 16, 2023
374ca2f
Merge branch 'feature/OSS-2609-OSS-2575-model-config-is-model-version…
avishniakov Nov 16, 2023
7f1642c
Feature/revamp model endpoints (#2035)
AlexejPenner Nov 16, 2023
d37b423
resolve mess after merge
avishniakov Nov 16, 2023
19cfbe9
Merge branch 'develop' into feature/OSS-2609-OSS-2575-model-config-is…
avishniakov Nov 16, 2023
886fc10
after merge clean-up
avishniakov Nov 16, 2023
6819991
update outdated tests
avishniakov Nov 16, 2023
72d7412
Merge branch 'develop' into feature/OSS-2609-OSS-2575-model-config-is…
avishniakov Nov 16, 2023
2fd2a36
Auto-update of E2E template
actions-user Nov 16, 2023
b518dcc
deep update of template
avishniakov Nov 17, 2023
7586b02
Revert "deep update of template"
avishniakov Nov 17, 2023
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
3 changes: 2 additions & 1 deletion .github/workflows/update-templates-to-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
python-version: ${{ inputs.python-version }}
stack-name: local
ref-zenml: ${{ github.ref }}
ref-template: '2023.11.01' # Make sure it is aligned with ZENML_PROJECT_TEMPLATES from src/zenml/cli/base.py
ref-template: '2023.11.14' # Make sure it is aligned with ZENML_PROJECT_TEMPLATES from src/zenml/cli/base.py

- name: Clean-up
run: |
Expand All @@ -76,6 +76,7 @@ jobs:

- name: Check-out fresh E2E template
run: |
rm -rf examples/e2e
mkdir -p examples/e2e
printf '[email protected]' | zenml init --path examples/e2e --template e2e_batch --template-with-defaults
bash scripts/format.sh
Expand Down
2 changes: 1 addition & 1 deletion examples/e2e/.copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier
_commit: 2023.11.01
_commit: 2023.11.14
_src_path: gh:zenml-io/template-e2e-batch
data_quality_checks: true
email: ''
Expand Down
16 changes: 0 additions & 16 deletions examples/e2e/artifacts/__init__.py

This file was deleted.

103 changes: 0 additions & 103 deletions examples/e2e/artifacts/materializer.py

This file was deleted.

77 changes: 0 additions & 77 deletions examples/e2e/artifacts/model_metadata.py

This file was deleted.

80 changes: 0 additions & 80 deletions examples/e2e/config.py

This file was deleted.

2 changes: 1 addition & 1 deletion examples/e2e/configs/deployer_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
notify_on_success: False

# configuration of the Model Control Plane
model_config:
model_version:
name: e2e_use_case
version: staging

Expand Down
2 changes: 1 addition & 1 deletion examples/e2e/configs/inference_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
notify_on_success: False

# configuration of the Model Control Plane
model_config:
model_version:
name: e2e_use_case
version: staging

Expand Down
3 changes: 1 addition & 2 deletions examples/e2e/configs/train_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ steps:
notify_on_success: False

# configuration of the Model Control Plane
model_config:
model_version:
name: e2e_use_case
license: apache
description: e2e_use_case E2E Batch Use Case
Expand All @@ -61,7 +61,6 @@ model_config:
- sklearn
- from template
- ZenML delivered
create_new_model_version: true

# pipeline level extra configurations
extra:
Expand Down
35 changes: 0 additions & 35 deletions examples/e2e/inference_config.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion examples/e2e/pipelines/training.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def e2e_use_case_training(
target=target,
)
after.append(step_name)
best_model = hp_tuning_select_best_model(after=after)
best_model = hp_tuning_select_best_model(step_names=after, after=after)

########## Training stage ##########
model = model_trainer(
Expand Down
Loading
Loading