Merge pull request #145 from kubeflow/main

[pull] main from kubeflow:main

README.md

@@ -39,6 +39,7 @@ Model registry provides a central repository for model developers to store and m
    - [playground](https://petstore.swagger.io/?url=https://raw.githubusercontent.com/kubeflow/model-registry/main/api/openapi/model-registry.yaml)
  - [license scanning](https://github.com/kubeflow/model-registry/issues/323)
  - [monitoring image quality](https://github.com/kubeflow/model-registry/issues/327)
+8. [UI](.clients/ui/README.md)
 
 ## Pre-requisites:
 - go >= 1.21

clients/python/Makefile

@@ -21,11 +21,11 @@ deploy-latest-mr:
 
 .PHONY: test-e2e
 test-e2e: deploy-latest-mr
-	poetry run pytest --e2e -s
+	poetry run pytest --e2e -s -rA
 
 .PHONY: test
 test:
-	poetry run pytest -s
+	poetry run pytest -s -rA
 
 .PHONY: lint
 lint:

clients/python/noxfile.py

@@ -61,6 +61,7 @@ def tests(session: Session) -> None:
     )
     session.run(
         "pytest",
+        "-rA",
         *session.posargs,
     )
 
@@ -81,6 +82,7 @@ def e2e_tests(session: Session) -> None:
         session.run(
             "pytest",
             "--e2e",
+            "-rA",
             "--cov",
             "--cov-config=pyproject.toml",
             *session.posargs,

clients/python/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "model-registry"
-version = "0.2.10"
+version = "0.2.11"
 description = "Client for Kubeflow Model Registry"
 authors = ["Isabella Basso do Amaral <idoamara@redhat.com>"]
 license = "Apache-2.0"
@@ -44,7 +44,7 @@ sphinx-autobuild = ">=2021.3.14,<2025.0.0"
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.4.2,<9.0.0"
 coverage = { extras = ["toml"], version = "^7.3.2" }
-pytest-cov = ">=4.1,<6.0"
+pytest-cov = ">=4.1,<7.0"
 ruff = ">=0.5.2,<0.8.0"
 mypy = "^1.7.0"
 pytest-asyncio = ">=0.23.7,<0.25.0"

clients/python/src/model_registry/__init__.py

@@ -1,6 +1,6 @@
 """Main package for the Kubeflow model registry."""
 
-__version__ = "0.2.10"
+__version__ = "0.2.11"
 
 from ._client import ModelRegistry
 

clients/python/tests/test_client.py

@@ -230,6 +230,39 @@ async def test_update_preserves_model_info(client: ModelRegistry):
     assert updated_ma.model_format_version == model_fmt_version
 
 
+@pytest.mark.e2e
+async def test_update_existing_model_artifact(client: ModelRegistry):
+    """Updating uri (or other properties) by re-using and call to update
+
+    reported via slack
+    """
+    name = "test_model"
+    version = "1.0.0"
+    rm = client.register_model(
+        name,
+        "s3",
+        model_format_name="test_format",
+        model_format_version="test_version",
+        version=version,
+    )
+    assert rm.id
+    mv = client.get_model_version(name, version)
+    assert mv
+    assert mv.id
+    ma = client.get_model_artifact(name, version)
+    assert ma
+    assert ma.id
+
+    something_else = "https://something.else/model.onnx"
+    ma.uri = something_else
+    response = client.update(ma)
+    assert response
+    assert response.uri == something_else
+
+    ma = client.get_model_artifact(name, version)
+    assert ma.uri == something_else
+
+
 @pytest.mark.e2e
 async def test_get(client: ModelRegistry):
     name = "test_model"

clients/ui/.env

@@ -0,0 +1,5 @@
+
+############### Default settings ###############
+CONTAINER_TOOL=docker
+IMG_BFF=kubeflow/model-registry-bff:dev-latest
+IMG_FRONTEND=kubeflow/model-registry-ui:dev-latest

clients/ui/.gitignore

@@ -0,0 +1,8 @@
+# editor
+.idea/
+.vscode/
+
+# misc
+.DS_Store
+
+.env*.local

clients/ui/Makefile

@@ -0,0 +1,79 @@
+DEFAULT_ENV_FILE := .env
+ifneq ("$(wildcard $(DEFAULT_ENV_FILE))","")
+include ${DEFAULT_ENV_FILE}
+export $(shell sed 's/=.*//' ${DEFAULT_ENV_FILE})
+endif
+
+DEV_ENV_FILE := .env.development
+ifneq ("$(wildcard $(DEV_ENV_FILE))","")
+include ${DEV_ENV_FILE}
+export $(shell sed 's/=.*//' ${DEV_ENV_FILE})
+endif
+
+ENV_FILE := .env.local
+ifneq ("$(wildcard $(ENV_FILE))","")
+include ${ENV_FILE}
+export $(shell sed 's/=.*//' ${ENV_FILE})
+endif
+
+.PHONY: all
+all: build
+
+.PHONY: help
+help: ## Display this help.
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+
+
+############ Dev Environment ############
+
+.PHONY: dev-install-dependencies
+dev-install-dependencies:
+	cd frontend && npm install
+
+.PHONY: dev-bff
+dev-bff:
+	cd bff && make run PORT=4000 MOCK_K8S_CLIENT=true MOCK_MR_CLIENT=true
+
+.PHONY: dev-frontend
+dev-frontend:
+	cd frontend && npm run start:dev
+
+.PHONY: dev-start
+dev-start: 
+	make -j 2 dev-bff dev-frontend
+
+############ Build ############
+
+.PHONY: build-bff
+build-bff:
+	$(CONTAINER_TOOL) build -t ${IMG_BFF} ./bff
+
+.PHONY: build-frontend
+build-frontend:
+	$(CONTAINER_TOOL) build -t ${IMG_FRONTEND} ./frontend
+
+.PHONY: build
+build: build-bff build-frontend
+
+############ Push ############
+
+.PHONY: push-bff
+push-bff:
+	${CONTAINER_TOOL} push ${IMG_BFF}
+
+.PHONY: push-frontend
+push-frontend:
+	${CONTAINER_TOOL} push ${IMG_FRONTEND}
+
+.PHONY: push
+push: push-bff push-frontend
+
+############ Deployment ############
+
+.PHONY: docker-compose
+docker-compose:
+	$(CONTAINER_TOOL) compose -f docker-compose.yaml up
+
+.PHONY: kind-deployment
+kind-deployment:
+	./scripts/deploy_kind_cluster.sh