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

Adding artifact name filter #455

Merged
merged 2 commits into from
Sep 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions mlrun/api/db/sqldb/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def list_artifacts(
arts = ArtifactList(
obj.struct
for obj in self._find_artifacts(
session, project, uids, labels, since, until
session, project, uids, labels, since, until, name
)
)
return arts
Expand Down Expand Up @@ -307,7 +307,7 @@ def _delete_artifact_labels(

def del_artifacts(self, session, name="", project="", tag="*", labels=None):
project = project or config.default_project
for obj in self._find_artifacts(session, project, tag, labels, None, None):
for obj in self._find_artifacts(session, project, tag, labels, name=name):
self.del_artifact(session, obj.key, "", project)

def store_function(
Expand Down Expand Up @@ -765,7 +765,9 @@ def _latest_uid_filter(self, session, query):
),
)

def _find_artifacts(self, session, project, uids, labels, since, until):
def _find_artifacts(
self, session, project, uids, labels=None, since=None, until=None, name=None
):
"""
TODO: refactor this method
basically uids should be list of strings (representing uids), but we also handle two special cases (mainly for
Expand All @@ -790,6 +792,9 @@ def _find_artifacts(self, session, project, uids, labels, since, until):
and_(Artifact.updated >= since, Artifact.updated <= until)
)

if name is not None:
query = query.filter(Artifact.key.ilike(f"%{name}%"))

return query

def _find_functions(self, session, name, project, uid=None, labels=None):
Expand Down
37 changes: 37 additions & 0 deletions tests/api/db/test_artifacts.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import pytest
from sqlalchemy.orm import Session

from mlrun.api.db.base import DBInterface
from tests.api.db.conftest import dbs


# running only on sqldb cause filedb is not really a thing anymore, will be removed soon
@pytest.mark.parametrize(
"db,db_session", [(dbs[0], dbs[0])], indirect=["db", "db_session"]
)
def test_list_artifact_name_filter(db: DBInterface, db_session: Session):
artifact_name_1 = "artifact_name_1"
artifact_name_2 = "artifact_name_2"
artifact_1 = {"metadata": {"name": artifact_name_1}, "status": {"bla": "blabla"}}
artifact_2 = {"metadata": {"name": artifact_name_2}, "status": {"bla": "blabla"}}
uid = "artifact_uid"

db.store_artifact(
db_session, artifact_name_1, artifact_1, uid,
)
db.store_artifact(
db_session, artifact_name_2, artifact_2, uid,
)
artifacts = db.list_artifacts(db_session)
assert len(artifacts) == 2

artifacts = db.list_artifacts(db_session, name=artifact_name_1)
assert len(artifacts) == 1
assert artifacts[0]["metadata"]["name"] == artifact_name_1

artifacts = db.list_artifacts(db_session, name=artifact_name_2)
assert len(artifacts) == 1
assert artifacts[0]["metadata"]["name"] == artifact_name_2

artifacts = db.list_artifacts(db_session, name="artifact_name")
assert len(artifacts) == 2