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

Jump to bottom

[Core] Throw an error when the OAI_CONFIG_LIST is missing. #1082

Merged
merged 8 commits into from
Jan 3, 2024
Merged

[Core] Throw an error when the OAI_CONFIG_LIST is missing. #1082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
60d25f4
Throw an explicit and proper error when someone asks to load the OAI_…
afourney Dec 28, 2023
115cb1b
Updated to use pytest.raises. Added docstring. Updated some tests to …
afourney Dec 28, 2023
1bc8c21
Fixed wrong indentation in config_list_from_json, and updated test_ut…
afourney Dec 28, 2023
9275f39
Attempting to fix merge conflict.
afourney Jan 2, 2024
96d944c
Read key location from global constants.
afourney Jan 2, 2024
664fb32
Added missingpath.
afourney Jan 2, 2024
2dce1f5
Moved config_list_from_json to inside a skip check.
afourney Jan 2, 2024
57d11fe
Fixed conflict.
afourney Jan 2, 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
10 changes: 3 additions & 7 deletions autogen/oai/openai_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,9 @@ def config_list_from_json(
config_list = json.loads(json_str)
else:
config_list_path = os.path.join(file_location, env_or_file)
try:
with open(config_list_path) as json_file:
config_list = json.load(json_file)
except FileNotFoundError:
logging.warning(f"The specified config_list file '{config_list_path}' does not exist.")
return []
return filter_config(config_list, filter_dict)
with open(config_list_path) as json_file:
sonichi marked this conversation as resolved.
Show resolved Hide resolved
config_list = json.load(json_file)
return filter_config(config_list, filter_dict)
sonichi marked this conversation as resolved.
Show resolved Hide resolved


def get_config(
Expand Down
7 changes: 7 additions & 0 deletions test/oai/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ def test_config_list_from_json():
del os.environ["config_list_test"]
os.remove(json_file)

# Test that an error is thrown when the config list is missing
try:
autogen.config_list_from_json("OAI_CONFIG_LIST.missing", file_location=KEY_LOC)
assert False # We should not be able to get here, since the file should be missing
except FileNotFoundError:
pass
sonichi marked this conversation as resolved.
Show resolved Hide resolved


def test_config_list_openai_aoai():
# Testing the functionality for loading configurations for different API types
Expand Down
Loading