Skip to content

Allow underscores and hypens in the OpenAI key check #3494

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

Closed
wants to merge 10 commits into from
Closed

Allow underscores and hypens in the OpenAI key check #3494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aa237c8
Support new project keys
thienlnam Sep 8, 2024
be5b239
Add tests / change to just support underscore
thienlnam Sep 8, 2024
a03112d
Only allow underscore in the last part of the key
thienlnam Sep 8, 2024
6b7053a
Update test_utils.py
thienlnam Sep 8, 2024
d94b9ff
Update test_utils.py
thienlnam Sep 8, 2024
fa67458
Merge branch 'main' into jack-fixErrorValidOpenAIKey
thienlnam Sep 9, 2024
5d71c8b
Try adding ggignore
thienlnam Sep 10, 2024
62dceaf
Merge remote-tracking branch 'upstream/main' into jack-fixErrorValidO…
thienlnam Sep 10, 2024
8932b01
Remove the ggignore
thienlnam Sep 10, 2024
e0bbcad
Allow hypen, update tests
thienlnam Sep 10, 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
2 changes: 1 addition & 1 deletion autogen/oai/openai_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,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-([A-Za-z0-9]+(-+[A-Za-z0-9]+)*-)?[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))


Expand Down
10 changes: 8 additions & 2 deletions test/oai/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,17 @@ def test_is_valid_api_key():
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-None-sajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")
assert is_valid_api_key("sk-svcacct-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")
assert is_valid_api_key("sk-svcacct-asajsdjsd22372X23kjdfdf_f2329ffUUDSDS12121212212")
assert is_valid_api_key("sk-proj-asajsdjsd22372X23kjdfdf_f2329ffUUDSDS12121212212")
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-mhsJPwdSvNpTPo7V7nXXX--sAUco3WfNB7D77JY6wNmIFWXXXXXXXXXXXXXXXXXXX4NE")
assert is_valid_api_key("sk-aut0-gen--asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")
assert is_valid_api_key("sk-abc_def-ghijklmnopqrstuvwxyz0123456789ABCDEFGH")
assert is_valid_api_key("sk--aut0-gen-asajsdjsd22372X23kjdfdfdf2329ffUUDSDS12121212212")
assert is_valid_api_key(MOCK_OPEN_AI_API_KEY)


Expand Down