mlrun 1.3.3rc1__py3-none-any.whl → 1.4.0__py3-none-any.whl

mlrun/api/utils/projects/remotes/leader.py

@@ -1,4 +1,4 @@
-# Copyright 2018 Iguazio
+# Copyright 2023 Iguazio
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ import abc
 import datetime
 import typing
 
-import mlrun.api.schemas
+import mlrun.common.schemas
 
 
 class Member(abc.ABC):
@@ -24,7 +24,7 @@ class Member(abc.ABC):
     def create_project(
         self,
         session: str,
-        project: mlrun.api.schemas.Project,
+        project: mlrun.common.schemas.Project,
         wait_for_completion: bool = True,
     ) -> bool:
         pass
@@ -34,7 +34,7 @@ class Member(abc.ABC):
         self,
         session: str,
         name: str,
-        project: mlrun.api.schemas.Project,
+        project: mlrun.common.schemas.Project,
     ):
         pass
 
@@ -43,7 +43,7 @@ class Member(abc.ABC):
         self,
         session: str,
         name: str,
-        deletion_strategy: mlrun.api.schemas.DeletionStrategy = mlrun.api.schemas.DeletionStrategy.default(),
+        deletion_strategy: mlrun.common.schemas.DeletionStrategy = mlrun.common.schemas.DeletionStrategy.default(),
         wait_for_completion: bool = True,
     ) -> bool:
         pass
@@ -54,7 +54,7 @@ class Member(abc.ABC):
         session: str,
         updated_after: typing.Optional[datetime.datetime] = None,
     ) -> typing.Tuple[
-        typing.List[mlrun.api.schemas.Project], typing.Optional[datetime.datetime]
+        typing.List[mlrun.common.schemas.Project], typing.Optional[datetime.datetime]
     ]:
         pass
 
@@ -63,13 +63,13 @@ class Member(abc.ABC):
         self,
         session: str,
         name: str,
-    ) -> mlrun.api.schemas.Project:
+    ) -> mlrun.common.schemas.Project:
         pass
 
     @abc.abstractmethod
     def format_as_leader_project(
-        self, project: mlrun.api.schemas.Project
-    ) -> mlrun.api.schemas.IguazioProject:
+        self, project: mlrun.common.schemas.Project
+    ) -> mlrun.common.schemas.IguazioProject:
         pass
 
     @abc.abstractmethod
@@ -77,5 +77,5 @@ class Member(abc.ABC):
         self,
         session: str,
         name: str,
-    ) -> mlrun.api.schemas.ProjectOwner:
+    ) -> mlrun.common.schemas.ProjectOwner:
         pass

mlrun/api/utils/projects/remotes/nop_follower.py

@@ -1,4 +1,4 @@
-# Copyright 2018 Iguazio
+# Copyright 2023 Iguazio
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,18 +17,19 @@ import typing
 import mergedeep
 import sqlalchemy.orm
 
-import mlrun.api.schemas
+import mlrun.api.utils.helpers
 import mlrun.api.utils.projects.remotes.follower
+import mlrun.common.schemas
 import mlrun.errors
 
 
 class Member(mlrun.api.utils.projects.remotes.follower.Member):
     def __init__(self) -> None:
         super().__init__()
-        self._projects: typing.Dict[str, mlrun.api.schemas.Project] = {}
+        self._projects: typing.Dict[str, mlrun.common.schemas.Project] = {}
 
     def create_project(
-        self, session: sqlalchemy.orm.Session, project: mlrun.api.schemas.Project
+        self, session: sqlalchemy.orm.Session, project: mlrun.common.schemas.Project
     ):
         if project.metadata.name in self._projects:
             raise mlrun.errors.MLRunConflictError("Project already exists")
@@ -39,7 +40,7 @@ class Member(mlrun.api.utils.projects.remotes.follower.Member):
         self,
         session: sqlalchemy.orm.Session,
         name: str,
-        project: mlrun.api.schemas.Project,
+        project: mlrun.common.schemas.Project,
     ):
         # deep copy so we won't accidentally get changes from tests
         self._projects[name] = project.copy(deep=True)
@@ -49,25 +50,25 @@ class Member(mlrun.api.utils.projects.remotes.follower.Member):
         session: sqlalchemy.orm.Session,
         name: str,
         project: dict,
-        patch_mode: mlrun.api.schemas.PatchMode = mlrun.api.schemas.PatchMode.replace,
+        patch_mode: mlrun.common.schemas.PatchMode = mlrun.common.schemas.PatchMode.replace,
     ):
         existing_project_dict = self._projects[name].dict()
         strategy = patch_mode.to_mergedeep_strategy()
         mergedeep.merge(existing_project_dict, project, strategy=strategy)
-        self._projects[name] = mlrun.api.schemas.Project(**existing_project_dict)
+        self._projects[name] = mlrun.common.schemas.Project(**existing_project_dict)
 
     def delete_project(
         self,
         session: sqlalchemy.orm.Session,
         name: str,
-        deletion_strategy: mlrun.api.schemas.DeletionStrategy = mlrun.api.schemas.DeletionStrategy.default(),
+        deletion_strategy: mlrun.common.schemas.DeletionStrategy = mlrun.common.schemas.DeletionStrategy.default(),
     ):
         if name in self._projects:
             del self._projects[name]
 
     def get_project(
         self, session: sqlalchemy.orm.Session, name: str
-    ) -> mlrun.api.schemas.Project:
+    ) -> mlrun.common.schemas.Project:
         # deep copy so we won't accidentally get changes from tests
         return self._projects[name].copy(deep=True)
 
@@ -75,11 +76,11 @@ class Member(mlrun.api.utils.projects.remotes.follower.Member):
         self,
         session: sqlalchemy.orm.Session,
         owner: str = None,
-        format_: mlrun.api.schemas.ProjectsFormat = mlrun.api.schemas.ProjectsFormat.full,
+        format_: mlrun.common.schemas.ProjectsFormat = mlrun.common.schemas.ProjectsFormat.full,
         labels: typing.List[str] = None,
-        state: mlrun.api.schemas.ProjectState = None,
+        state: mlrun.common.schemas.ProjectState = None,
         names: typing.Optional[typing.List[str]] = None,
-    ) -> mlrun.api.schemas.ProjectsOutput:
+    ) -> mlrun.common.schemas.ProjectsOutput:
         if owner or labels or state:
             raise NotImplementedError(
                 "Filtering by owner, labels or state is not supported"
@@ -93,13 +94,18 @@ class Member(mlrun.api.utils.projects.remotes.follower.Member):
                 for project_name, project in self._projects.items()
                 if project_name in names
             ]
-        if format_ == mlrun.api.schemas.ProjectsFormat.full:
-            return mlrun.api.schemas.ProjectsOutput(projects=projects)
-        elif format_ == mlrun.api.schemas.ProjectsFormat.minimal:
-            return mlrun.api.schemas.ProjectsOutput(projects=projects)
-        elif format_ == mlrun.api.schemas.ProjectsFormat.name_only:
+        if format_ == mlrun.common.schemas.ProjectsFormat.full:
+            return mlrun.common.schemas.ProjectsOutput(projects=projects)
+        elif format_ == mlrun.common.schemas.ProjectsFormat.minimal:
+            return mlrun.common.schemas.ProjectsOutput(
+                projects=[
+                    mlrun.api.utils.helpers.minimize_project_schema(project)
+                    for project in projects
+                ]
+            )
+        elif format_ == mlrun.common.schemas.ProjectsFormat.name_only:
             project_names = [project.metadata.name for project in projects]
-            return mlrun.api.schemas.ProjectsOutput(projects=project_names)
+            return mlrun.common.schemas.ProjectsOutput(projects=project_names)
         else:
             raise NotImplementedError(
                 f"Provided format is not supported. format={format_}"
@@ -110,12 +116,12 @@ class Member(mlrun.api.utils.projects.remotes.follower.Member):
         session: sqlalchemy.orm.Session,
         owner: str = None,
         labels: typing.List[str] = None,
-        state: mlrun.api.schemas.ProjectState = None,
+        state: mlrun.common.schemas.ProjectState = None,
         names: typing.Optional[typing.List[str]] = None,
-    ) -> mlrun.api.schemas.ProjectSummariesOutput:
+    ) -> mlrun.common.schemas.ProjectSummariesOutput:
         raise NotImplementedError("Listing project summaries is not supported")
 
     def get_project_summary(
         self, session: sqlalchemy.orm.Session, name: str
-    ) -> mlrun.api.schemas.ProjectSummary:
+    ) -> mlrun.common.schemas.ProjectSummary:
         raise NotImplementedError("Get project summary is not supported")

mlrun/api/utils/projects/remotes/nop_leader.py

@@ -1,4 +1,4 @@
-# Copyright 2018 Iguazio
+# Copyright 2023 Iguazio
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
 import datetime
 import typing
 
-import mlrun.api.schemas
 import mlrun.api.utils.projects.remotes.leader
 import mlrun.api.utils.singletons.project_member
+import mlrun.common.schemas
 import mlrun.errors
 
 
@@ -26,12 +26,12 @@ class Member(mlrun.api.utils.projects.remotes.leader.Member):
         super().__init__()
         self.db_session = None
         self.project_owner_access_key = ""
-        self._project_role = mlrun.api.schemas.ProjectsRole.nop
+        self._project_role = mlrun.common.schemas.ProjectsRole.nop
 
     def create_project(
         self,
         session: str,
-        project: mlrun.api.schemas.Project,
+        project: mlrun.common.schemas.Project,
         wait_for_completion: bool = True,
     ) -> bool:
         self._update_state(project)
@@ -47,7 +47,7 @@ class Member(mlrun.api.utils.projects.remotes.leader.Member):
         self,
         session: str,
         name: str,
-        project: mlrun.api.schemas.Project,
+        project: mlrun.common.schemas.Project,
     ):
         self._update_state(project)
         mlrun.api.utils.singletons.project_member.get_project_member().store_project(
@@ -55,12 +55,13 @@ class Member(mlrun.api.utils.projects.remotes.leader.Member):
         )
 
     @staticmethod
-    def _update_state(project: mlrun.api.schemas.Project):
+    def _update_state(project: mlrun.common.schemas.Project):
         if (
             not project.status.state
-            or project.status.state in mlrun.api.schemas.ProjectState.terminal_states()
+            or project.status.state
+            in mlrun.common.schemas.ProjectState.terminal_states()
         ):
-            project.status.state = mlrun.api.schemas.ProjectState(
+            project.status.state = mlrun.common.schemas.ProjectState(
                 project.spec.desired_state
             )
 
@@ -68,7 +69,7 @@ class Member(mlrun.api.utils.projects.remotes.leader.Member):
         self,
         session: str,
         name: str,
-        deletion_strategy: mlrun.api.schemas.DeletionStrategy = mlrun.api.schemas.DeletionStrategy.default(),
+        deletion_strategy: mlrun.common.schemas.DeletionStrategy = mlrun.common.schemas.DeletionStrategy.default(),
         wait_for_completion: bool = True,
     ) -> bool:
         return mlrun.api.utils.singletons.project_member.get_project_member().delete_project(
@@ -80,7 +81,7 @@ class Member(mlrun.api.utils.projects.remotes.leader.Member):
         session: str,
         updated_after: typing.Optional[datetime.datetime] = None,
     ) -> typing.Tuple[
-        typing.List[mlrun.api.schemas.Project], typing.Optional[datetime.datetime]
+        typing.List[mlrun.common.schemas.Project], typing.Optional[datetime.datetime]
     ]:
         return (
             mlrun.api.utils.singletons.project_member.get_project_member()
@@ -93,7 +94,7 @@ class Member(mlrun.api.utils.projects.remotes.leader.Member):
         self,
         session: str,
         name: str,
-    ) -> mlrun.api.schemas.Project:
+    ) -> mlrun.common.schemas.Project:
         return (
             mlrun.api.utils.singletons.project_member.get_project_member().get_project(
                 self.db_session, name
@@ -101,16 +102,16 @@ class Member(mlrun.api.utils.projects.remotes.leader.Member):
         )
 
     def format_as_leader_project(
-        self, project: mlrun.api.schemas.Project
-    ) -> mlrun.api.schemas.IguazioProject:
-        return mlrun.api.schemas.IguazioProject(data=project.dict())
+        self, project: mlrun.common.schemas.Project
+    ) -> mlrun.common.schemas.IguazioProject:
+        return mlrun.common.schemas.IguazioProject(data=project.dict())
 
     def get_project_owner(
         self,
         session: str,
         name: str,
-    ) -> mlrun.api.schemas.ProjectOwner:
+    ) -> mlrun.common.schemas.ProjectOwner:
         project = self.get_project(session, name)
-        return mlrun.api.schemas.ProjectOwner(
+        return mlrun.common.schemas.ProjectOwner(
             username=project.spec.owner, access_key=self.project_owner_access_key
         )