Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 3 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5522a9
Correctly validating new real-world OpenAI API Key format, relaxing n…
nstielau Aug 8, 2024
bdfbcd6
Merge branch 'main' into open_ai_api_key_regex_fix
nstielau Aug 8, 2024
1f7f7c3
Merge branch 'main' into open_ai_api_key_regex_fix
nstielau Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autogen/oai/openai_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,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(
Expand Down
3 changes: 1 addition & 2 deletions test/oai/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down