Correctly validating new real-world OpenAI API Key format, relaxing negative tests.

Author: nstielau

autogen/oai/openai_utils.py

@@ -107,8 +107,8 @@ 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-([A-Za-z0-9]+(-+[A-Za-z0-9]+)*-)?[A-Za-z0-9]{32,}$")
-    return bool(re.fullmatch(api_key_re, api_key))
+    api_key_re = re.compile(r'^sk-(?!.*--)([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*)$')
+    return bool(re.match(api_key_re, api_key))
 
 
 def get_config_list(

test/oai/test_utils.py

@@ -428,8 +428,7 @@ def test_is_valid_api_key():
     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("sk-proj-asajsdjsd22372X23kjdfdfdf2329f212_gsirb23Yu7vv4vD4-B2iQkbC")
     assert is_valid_api_key(MOCK_OPEN_AI_API_KEY)