Merge branch 'main' into patchwork

microsoft · Jul 6, 2024 · 79dbb7b · 79dbb7b
2 parents 0772fb9 + 82903f5
commit 79dbb7b
Show file tree

Hide file tree

Showing 6 changed files with 278 additions and 307 deletions.
diff --git 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))