truefoundry 0.5.8rc1__tar.gz → 0.5.8rc3__tar.gz

{truefoundry-0.5.8rc1 → truefoundry-0.5.8rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: truefoundry
-Version: 0.5.8rc1
+Version: 0.5.8rc3
 Summary: TrueFoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.5.8rc1 → truefoundry-0.5.8rc3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.5.8rc1"
+version = "0.5.8rc3"
 description = "TrueFoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"

{truefoundry-0.5.8rc1 → truefoundry-0.5.8rc3}/truefoundry/common/entities.py

@@ -1,5 +1,4 @@
 import time
-from enum import Enum
 from typing import Optional
 
 import jwt
@@ -8,18 +7,12 @@ from typing_extensions import NotRequired, TypedDict
 from truefoundry.pydantic_v1 import BaseModel, Field, NonEmptyStr, validator
 
 
-class UserType(Enum):
-    user = "user"
-    serviceaccount = "serviceaccount"
-
-
 class UserInfo(BaseModel):
     class Config:
         allow_population_by_field_name = True
         allow_mutation = False
 
     user_id: NonEmptyStr
-    user_type: UserType = UserType.user
     email: Optional[str] = None
     tenant_name: NonEmptyStr = Field(alias="tenantName")
 
@@ -27,9 +20,16 @@ class UserInfo(BaseModel):
 class _DecodedToken(TypedDict):
     tenantName: str
     exp: int
-    username: str
+    username: NotRequired[str]
     email: NotRequired[str]
-    userType: UserType
+
+
+def _user_slug(decoded_token: _DecodedToken) -> str:
+    return (
+        decoded_token.get("username")
+        or decoded_token.get("email")
+        or "--user-slug-missing--"
+    )
 
 
 class Token(BaseModel):
@@ -55,19 +55,21 @@ class Token(BaseModel):
 
     @property
     def tenant_name(self) -> str:
+        assert self.decoded_value is not None
         return self.decoded_value["tenantName"]
 
     def is_going_to_be_expired(self, buffer_in_seconds: int = 120) -> bool:
+        assert self.decoded_value is not None
         exp = int(self.decoded_value["exp"])
         return (exp - time.time()) < buffer_in_seconds
 
     def to_user_info(self) -> UserInfo:
+        assert self.decoded_value is not None
         return UserInfo(
-            user_id=self.decoded_value["username"],
+            user_id=_user_slug(self.decoded_value),
             email=self.decoded_value["email"]
             if "email" in self.decoded_value
             else None,
-            user_type=UserType(self.decoded_value.get("userType", UserType.user.value)),
             tenant_name=self.tenant_name,
         )
 

{truefoundry-0.5.8rc1 → truefoundry-0.5.8rc3}/truefoundry/common/session.py

@@ -50,10 +50,9 @@ class Session:
 
             ACTIVE_SESSION = new_session
             logger.info(
-                "Logged in to %r as %r (%s)",
+                "Logged in to %r as %r",
                 new_session.tfy_host,
                 new_session.user_info.user_id,
-                new_session.user_info.email or new_session.user_info.user_type.value,
             )
 
             return ACTIVE_SESSION

{truefoundry-0.5.8rc1 → truefoundry-0.5.8rc3}/truefoundry/deploy/lib/session.py

@@ -57,10 +57,9 @@ def login(
                     return login(api_key=api_key, host=host, relogin=True)
 
             user_info = cred_file_content.to_token().to_user_info()
-            user_name_display_info = user_info.email or user_info.user_type.value
             output_hook.print_line(
                 relogin_error_message(
-                    f"Already logged in to {cred_file_content.host!r} as {user_info.user_id!r} ({user_name_display_info})",
+                    f"Already logged in to {cred_file_content.host!r} as {user_info.user_id!r}",
                     host=host,
                 )
             )
@@ -81,10 +80,9 @@ def login(
         cred_file.write(cred_file_content)
 
     user_info = token.to_user_info()
-    user_name_display_info = user_info.email or user_info.user_type.value
     output_hook.print_line(
         f"Successfully logged in to {cred_file_content.host!r} as "
-        f"{user_info.user_id!r} ({user_name_display_info})"
+        f"{user_info.user_id!r}"
     )
     return True
 

{truefoundry-0.5.8rc1 → truefoundry-0.5.8rc3}/truefoundry/ml/session.py

@@ -75,10 +75,9 @@ class MLFoundrySession(Session):
 
             ACTIVE_SESSION = new_session
             logger.info(
-                "Logged in to %r as %r (%s)",
+                "Logged in to %r as %r",
                 new_session.tfy_host,
                 new_session.user_info.user_id,
-                new_session.user_info.email or new_session.user_info.user_type.value,
             )
 
             return ACTIVE_SESSION