Skip to content

Add adaptor configuration #49

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

Merged
merged 2 commits into from
Oct 8, 2022
Merged

Add adaptor configuration #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da7f24c
Read adaptor_configuration from database if present
alexamici Oct 8, 2022
d355ca1
Test fix
alexamici Oct 8, 2022
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
5 changes: 2 additions & 3 deletions cads_processing_api_service/adaptors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ def make_system_request(
except AttributeError:
entry_point = FALLBACK_ENTRY_POINT

try:
config = resource.config
except AttributeError:
config = resource.adaptor_configuration
if config is None:
config = FALLBACK_CONFIG.copy()
config["collection_id"] = process_id

Expand Down
5 changes: 4 additions & 1 deletion tests/test_20_adaptors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ def test_make_system_request_default() -> None:

exp_setup_code = adaptors.FALLBACK_SETUP_CODE
exp_entry_point = adaptors.FALLBACK_ENTRY_POINT
exp_kwargs = {"request": inputs, "config": adaptors.FALLBACK_CONFIG}
exp_kwargs = {
"request": inputs,
"config": adaptors.FALLBACK_CONFIG | {"collection_id": process_id},
}
exp_metadata = {"X-Forward-Process-ID": process_id}

request = adaptors.make_system_request(process_id, execution_content, resource)
Expand Down