truefoundry 0.5.8rc1__py3-none-any.whl → 0.5.8rc3__py3-none-any.whl

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/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/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/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

{truefoundry-0.5.8rc1.dist-info → truefoundry-0.5.8rc3.dist-info}/METADATA

@@ -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.dist-info → truefoundry-0.5.8rc3.dist-info}/RECORD

@@ -35,11 +35,11 @@ truefoundry/common/auth_service_client.py,sha256=N3YxKlx63r6cPZqbgb2lqBOPI69ShB7
 truefoundry/common/constants.py,sha256=WQjylPv7xTVYURv4zicJUHYL73Gv3c3i6Iw4oy9Lhg4,2744
 truefoundry/common/credential_file_manager.py,sha256=1yEk1Zm2xS4G0VDFwKSZ4w0VUrcPWQ1nJnoBaz9xyKA,4251
 truefoundry/common/credential_provider.py,sha256=_OhJ2XFlDaVsrUO-FyywxctcGGqDdC2pgcvwEKqQD0Q,4071
-truefoundry/common/entities.py,sha256=12olLKzRT092Jnze5busK68cwH8wwyL6ch77ohKOFPU,3723
+truefoundry/common/entities.py,sha256=Gx52dIwUARwGLE2hCSe9PJWfXh-ARCmdWwX6KtCxJng,3805
 truefoundry/common/exceptions.py,sha256=jkU0N7hV_P-EhXeud4I5vuB9glXXZSWPf8LcH04mSbw,459
 truefoundry/common/request_utils.py,sha256=e9qrAQ1MutU7JALDKcucmNd0KQEVBqgW3yx0w1zeHIU,5700
 truefoundry/common/servicefoundry_client.py,sha256=2fYhdVPSvLXz5C5tosOq86JD8WM3IRUIy1VO9deDxZI,3340
-truefoundry/common/session.py,sha256=BiTJ2WEzLkTvzpqy67xX3fXgiKH_ltzzmQdFG7xUtwI,2904
+truefoundry/common/session.py,sha256=xeBAPUNEJv2XVFQCRUGeBDTePh5zrKNSok8vmSxBjPw,2813
 truefoundry/common/storage_provider_utils.py,sha256=yURhMw8k0FLFvaviRHDiifhvc6GnuQwGMC9Qd2uM440,10934
 truefoundry/common/types.py,sha256=BMJFCsR1lPJAw66IQBSvLyV4I6o_x5oj78gVsUa9si8,188
 truefoundry/common/utils.py,sha256=E1kKw_hqlVMgwyPkER2SvVLIoQ-B_4TQCuM5IJXvgig,6046
@@ -93,7 +93,7 @@ truefoundry/deploy/lib/logs_utils.py,sha256=SQxRv3jDDmgHdOUMhlMaAPGYskybnBUMpst7
 truefoundry/deploy/lib/messages.py,sha256=nhp0bCYf_XpUM68hTq5lBY-__vtEyV2uP7NgnJXJ_Vg,925
 truefoundry/deploy/lib/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/model/entity.py,sha256=3YRdyvMYI1aUXUu2tB5b5lZWwpxKdAhjpT79gzTCZGo,8373
-truefoundry/deploy/lib/session.py,sha256=FBSq3bxf3my_613NzgtPoeeaAYLGZEoF0n7XccTFNf4,5141
+truefoundry/deploy/lib/session.py,sha256=GIt2eTU6jWQwMkvseDJccSWdUVyEr3WLY5AKHf8Uy18,4931
 truefoundry/deploy/lib/util.py,sha256=J7r8San2wKo48A7-BlH2-OKTlBO67zlPjLEhMsL8os0,1059
 truefoundry/deploy/lib/win32.py,sha256=1RcvPTdlOAJ48rt8rCbE2Ufha2ztRqBAE9dueNXArrY,5009
 truefoundry/deploy/python_deploy_codegen.py,sha256=qJHH1BJQII9e6PhkcRFYiE_3De7_VMMm8nM4AX5Eq1o,6513
@@ -349,7 +349,7 @@ truefoundry/ml/mlfoundry_api.py,sha256=PUBGDcjrZsJKQYy1PjT8NYGYxrTvhhHzQ-0jLSl7-
 truefoundry/ml/mlfoundry_run.py,sha256=M-0FkZYDxwv5EZUDtVqiV8JxC_3BWR80N7Kp4Yj7bPY,44291
 truefoundry/ml/model_framework.py,sha256=JGmzdG7o5P6CJr5EYTUOmuly53FfhpoNVqKrhfijAVg,18972
 truefoundry/ml/run_utils.py,sha256=0W208wSLUrbdfk2pjNcZlkUi9bNxG2JORqoe-5rVqHI,2423
-truefoundry/ml/session.py,sha256=eQo1zG5nd0-8Ok68uEBCQDPAWYeJkpzqHak-DQX1ENU,4553
+truefoundry/ml/session.py,sha256=IRXVoAAJTHik3md-pE4IpTPSGJvs5qdAyWBf0O9_TJo,4462
 truefoundry/ml/validation_utils.py,sha256=J5atNhcJLvKj64ralSV9Y5Fv1Rt4SE237ICdP9-7sP4,12149
 truefoundry/pydantic_v1.py,sha256=jSuhGtz0Mbk1qYu8jJ1AcnIDK4oxUsdhALc4spqstmM,345
 truefoundry/version.py,sha256=bqiT4Q-VWrTC6P4qfK43mez-Ppf-smWfrl6DcwV7mrw,137
@@ -363,7 +363,7 @@ truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=xcT0wQmQl
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=nSGPZu0Gyd_jz0KsEE-7w_BmnTD8CVF1S8cUJoxaCbc,13305
 truefoundry/workflow/task.py,sha256=34m55mALXx6ko9o5HkK6FDtMajdvJzBhOsHwDM2RcBA,1779
 truefoundry/workflow/workflow.py,sha256=WaTqUjhwfAXDWu4E5ehuwAxrCbDJkoAf1oWmR2E9Qy0,4575
-truefoundry-0.5.8rc1.dist-info/METADATA,sha256=w78rupDdfwn-65YZwSnGEBgIqFfc3B-kWigUjyUWY6I,2887
-truefoundry-0.5.8rc1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-truefoundry-0.5.8rc1.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
-truefoundry-0.5.8rc1.dist-info/RECORD,,
+truefoundry-0.5.8rc3.dist-info/METADATA,sha256=jWpi5FBYbnjWyjtakUC0pIyFydEUPuqSGitw0-VpCns,2887
+truefoundry-0.5.8rc3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+truefoundry-0.5.8rc3.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.5.8rc3.dist-info/RECORD,,