Skip to content

Commit

Permalink
[pull] main from kubeflow:main (#100)
Browse files Browse the repository at this point in the history 
* build(deps): bump github.com/docker/docker from 27.1.0+incompatible to 27.1.1+incompatible (kubeflow#225)

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.1.0+incompatible to 27.1.1+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v27.1.0...v27.1.1)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: onboard CSI on dependabot (kubeflow#218)

Signed-off-by: Matteo Mortari <matteo.mortari@gmail.com>

* build(deps-dev): bump pytest from 8.3.1 to 8.3.2 in /clients/python (kubeflow#227)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.1 to 8.3.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@8.3.1...8.3.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump huggingface-hub from 0.24.0 to 0.24.3 in /clients/python (kubeflow#228)

Bumps [huggingface-hub](https://github.com/huggingface/huggingface_hub) from 0.24.0 to 0.24.3.
- [Release notes](https://github.com/huggingface/huggingface_hub/releases)
- [Commits](huggingface/huggingface_hub@v0.24.0...v0.24.3)

---
updated-dependencies:
- dependency-name: huggingface-hub
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ruff from 0.5.4 to 0.5.5 in /clients/python (kubeflow#229)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.5.4 to 0.5.5.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@0.5.4...0.5.5)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* test: show s3_uri_from format in pure REST test (kubeflow#219)

Signed-off-by: Matteo Mortari <matteo.mortari@gmail.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Matteo Mortari <matteo.mortari@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matteo Mortari <matteo.mortari@gmail.com>
  • Loading branch information
@pull @dependabot @tarilabs
3 people committed Aug 1, 2024
1 parent d7e71fd commit bdc3654
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 29 deletions.
3 changes: 2 additions & 1 deletion .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ updates:
directories:
- "/"
- "/clients/ui/bff/"
- "/csi"
schedule:
interval: "weekly"
- package-ecosystem: "pip"
Expand All @@ -26,4 +27,4 @@ updates:
- package-ecosystem: "npm"
directory: "/clients/ui/frontend/"
schedule:
interval: "weekly"
interval: "weekly"
50 changes: 25 additions & 25 deletions clients/python/poetry.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ require (
github.com/containerd/log v0.1.0 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/docker v27.1.0+incompatible
github.com/docker/docker v27.1.1+incompatible
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/docker v27.1.0+incompatible h1:rEHVQc4GZ0MIQKifQPHSFGV/dVgaZafgRf8fCPtDYBs=
github.com/docker/docker v27.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
Expand Down
6 changes: 6 additions & 0 deletions test/robot/MRkeywords.resource
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,9 @@ I get ArtifactsByModelVersionID
Fail Not Implemented
END
RETURN ${result}


I use util s3_uri_from
[Arguments] ${path} ${bucket} ${endpoint} ${region}
${result}= s3_uri_from path=${path} bucket=${bucket} endpoint=${endpoint} region=${region}
RETURN ${result}
7 changes: 7 additions & 0 deletions test/robot/ModelRegistry.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from model_registry.core import ModelRegistryAPIClient
from model_registry.types import ModelArtifact, ModelVersion, RegisteredModel
from robot.libraries.BuiltIn import BuiltIn
import model_registry.utils


def write_to_console(s):
Expand Down Expand Up @@ -33,6 +34,12 @@ async def upsert_model_artifact(
write_to_console(p)
return (await self.api.upsert_model_artifact(p, model_version_id)).id

def s3_uri_from(self, path, bucket, endpoint, region) -> str:
"""
Expose util to RobotFramework
"""
return model_registry.utils.s3_uri_from(path=path, bucket=bucket, endpoint=endpoint, region=region)


async def test():
demo_instance = ModelRegistry()
Expand Down
29 changes: 29 additions & 0 deletions test/robot/UserStory.robot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,32 @@ As a MLOps engineer I would like to store an owner for the RegisteredModel
${r} Then I get RegisteredModelByID id=${rId}
And Should be equal ${r["description"]} Lorem ipsum dolor sit amet
And Should be equal ${r["owner"]} My owner

As a MLOps engineer I want to track a Model from an S3 bucket Data Connection
${data_connection_name} Set Variable aws-connection-my-data-connection
${s3_bucket} Set Variable my-bucket
${s3_path} Set Variable my-path
${s3_endpoint} Set Variable https://minio-api.acme.org
${s3_region} Set Variable us-east-1

Set To Dictionary ${registered_model} description=The Model name=${name}
Set To Dictionary ${model_version} description=The Version name=v1.0
${art_uri} I use util s3_uri_from path=${s3_path} bucket=${s3_bucket} endpoint=${s3_endpoint} region=${s3_region}
Set To Dictionary ${model_artifact} description=The Artifact uri=${art_uri} modelFormatName=onnx modelFormatVersion=1 storageKey=${data_connection_name} storagePath=${s3_path}
Log to console ${model_artifact}

${rId} Given I create a RegisteredModel payload=${registered_model}
${vId} And I create a child ModelVersion registeredModelID=${rId} payload=&{model_version}
${aId} And I create a child ModelArtifact modelversionId=${vId} payload=&{model_artifact}
${r} Then I get RegisteredModelByID id=${rId}
And Should be equal ${r["description"]} The Model
${r} Then I get ModelVersionByID id=${vId}
And Should be equal ${r["description"]} The Version
And Should be equal ${r["name"]} v1.0
${r} Then I get ModelArtifactByID id=${aId}
And Should be equal ${r["description"]} The Artifact
And Should be equal ${r["uri"]} s3://my-bucket/my-path?endpoint=https://minio-api.acme.org&defaultRegion=us-east-1
And Should be equal ${r["modelFormatName"]} onnx
And Should be equal ${r["modelFormatVersion"]} 1
And Should be equal ${r["storageKey"]} aws-connection-my-data-connection
And Should be equal ${r["storagePath"]} my-path

0 comments on commit bdc3654

Please sign in to comment.