A programming framework for agentic AI
fix: support openai service account apikey format (#3078)
Shaun0a82b3eb76f4
diff --git a/autogen/oai/openai_utils.py b/autogen/oai/openai_utils.pyindex 0c8a0a413..749727d95 100644--- a/autogen/oai/openai_utils.py+++ b/autogen/oai/openai_utils.py@@ -96,7 +96,7 @@ def is_valid_api_key(api_key: str) -> bool:Returns:bool: A boolean that indicates if input is valid OpenAI API key."""- api_key_re = re.compile(r"^sk-(proj-)?[A-Za-z0-9]{32,}$")+ api_key_re = re.compile(r"^sk-([A-Za-z0-9]+(-+[A-Za-z0-9]+)*-)?[A-Za-z0-9]{32,}$")return bool(re.fullmatch(api_key_re, api_key))diff --git a/test/oai/test_utils.py b/test/oai/test_utils.pyindex 99f8d8d24..96956d07d 100755--- a/test/oai/test_utils.py+++ b/test/oai/test_utils.py@@ -424,6 +424,12 @@ def test_is_valid_api_key():assert is_valid_api_key("sk-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS")assert is_valid_api_key("sk-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS1212121221212sssXX")assert is_valid_api_key("sk-proj-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")+ assert is_valid_api_key("sk-0-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")+ assert is_valid_api_key("sk-aut0gen-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")+ assert is_valid_api_key("sk-aut0-gen-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")+ assert is_valid_api_key("sk-aut0--gen-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")+ assert not is_valid_api_key("sk-aut0-gen--asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")+ assert not is_valid_api_key("sk--aut0-gen-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")assert is_valid_api_key(MOCK_OPEN_AI_API_KEY)