From 5b5b4ad315d15e43c89dacab9a34f44332649316 Mon Sep 17 00:00:00 2001 From: Honglin Du <0mza987@gmail.com> Date: Fri, 5 Jan 2024 16:58:13 +0800 Subject: [PATCH 1/3] handle user name for non-msft tenant --- src/promptflow/promptflow/azure/_utils/gerneral.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/promptflow/promptflow/azure/_utils/gerneral.py b/src/promptflow/promptflow/azure/_utils/gerneral.py index 52fb515bbf6..145ca55ae8f 100644 --- a/src/promptflow/promptflow/azure/_utils/gerneral.py +++ b/src/promptflow/promptflow/azure/_utils/gerneral.py @@ -10,10 +10,10 @@ def is_arm_id(obj) -> bool: def get_user_alias_from_credential(credential): - token = credential.get_token("https://storage.azure.com/.default").token + token = credential.get_token("https://management.azure.com/.default").token decode_json = jwt.decode(token, options={"verify_signature": False, "verify_aud": False}) try: - email = decode_json["upn"] + email = decode_json.get("upn", decode_json.get("email", None)) return email.split("@")[0] except Exception: # use oid when failed to get upn, e.g. service principal From 6c9db4d1832898cb40ccc2a5db73aaf080459e00 Mon Sep 17 00:00:00 2001 From: Honglin Du <0mza987@gmail.com> Date: Fri, 5 Jan 2024 17:03:01 +0800 Subject: [PATCH 2/3] Add changelog --- src/promptflow/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/promptflow/CHANGELOG.md b/src/promptflow/CHANGELOG.md index df09ad4473b..3c9e2fc4ffb 100644 --- a/src/promptflow/CHANGELOG.md +++ b/src/promptflow/CHANGELOG.md @@ -13,6 +13,10 @@ - Fix unaligned inputs & outputs or pandas exception during get details against run in Azure. - Fix loose flow path validation for run schema. +### Improvements + +- [SDK/CLI] For `pfazure flow create` used by non-msft tenant user, use user name instead of user object id in the remote flow folder path. + ## 1.3.0 (2023.12.27) ### Features Added From cb54022a458b129569a53ef0a6fbfdbf3281d965 Mon Sep 17 00:00:00 2001 From: Honglin Du <0mza987@gmail.com> Date: Fri, 5 Jan 2024 17:38:13 +0800 Subject: [PATCH 3/3] Update changelog --- src/promptflow/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/promptflow/CHANGELOG.md b/src/promptflow/CHANGELOG.md index 3c9e2fc4ffb..02902a23c2b 100644 --- a/src/promptflow/CHANGELOG.md +++ b/src/promptflow/CHANGELOG.md @@ -15,7 +15,7 @@ ### Improvements -- [SDK/CLI] For `pfazure flow create` used by non-msft tenant user, use user name instead of user object id in the remote flow folder path. +- [SDK/CLI] For `pfazure flow create` used by non-msft tenant user, use user name instead of user object id in the remote flow folder path. (e.g. `Users//promptflow`). ## 1.3.0 (2023.12.27)