Add email in User model (#1062)

requirements.min.txt

@@ -8,7 +8,7 @@ nltk==3.6.7
 scipy==1.10.0
 requests==2.31.0
 PyYAML==5.4
-pydantic==1.10.14
+pydantic==1.10.12
 litestar==2.5.1
 typing-inspect==0.9.0
 uvicorn==0.22.0

setup.py

@@ -59,7 +59,7 @@
         "scipy>=1.10.0",
         "requests>=2.31.0",
         "PyYAML>=5.4",
-        "pydantic>=1.10.14",
+        "pydantic>=1.10.12",
         "litestar>=2.6.3",
         "typing-inspect>=0.9.0",
         "uvicorn>=0.22.0",

src/evidently/ui/api/models.py

@@ -120,7 +120,8 @@ def from_team(cls, team: Team):
 class UserModel(BaseModel):
     id: UserID
     name: str
+    email: str
 
     @classmethod
     def from_user(cls, user: User):
-        return TeamModel(id=user.id, name=user.name)
+        return UserModel(id=user.id, name=user.name, email=user.email)

src/evidently/ui/base.py

@@ -103,6 +103,7 @@ class Team(BaseModel):
 class User(BaseModel):
     id: UserID = Field(default_factory=uuid.uuid4)
     name: str
+    email: str = ""
 
 
 def _default_dashboard():
@@ -406,10 +407,10 @@ def delete_team(self, user_id: UserID, team_id: TeamID):
         self._delete_team(team_id)
 
     @abstractmethod
-    def _list_team_users(self, team_id: TeamID) -> List[User]:
+    def _list_team_users(self, team_id: TeamID) -> List[UserID]:
         raise NotImplementedError
 
-    def list_team_users(self, user_id: UserID, team_id: TeamID) -> List[User]:
+    def list_team_users(self, user_id: UserID, team_id: TeamID) -> List[UserID]:
         if not self.check_team_permission(user_id, team_id, TeamPermission.READ):
             raise TeamNotFound()
         return self._list_team_users(team_id)

src/evidently/ui/storage/common.py

@@ -73,7 +73,7 @@ def _list_user_teams(self, user_id: UserID, include_virtual: bool) -> List[Team]
     def _delete_team(self, team_id: TeamID):
         pass
 
-    def _list_team_users(self, team_id: TeamID) -> List[User]:
+    def _list_team_users(self, team_id: TeamID) -> List[UserID]:
         return []