Skip to content

ODM-12136: tmp fix api urls #607

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
natalyatodorova wants to merge 4 commits into from
Closed

ODM-12136: tmp fix api urls #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa3dbb0
!!ODM-12136: tmp fix api urls
natalyatodorova Feb 12, 2026
a3f9422
Merge branch 'develop' into feature/ODM-12136-substitute-jersey-with-…
natalyatodorova Feb 19, 2026
78907a9
fix import url
natalyatodorova Feb 24, 2026
d391c2c
Merge branch 'develop' into feature/ODM-12136-substitute-jersey-with-…
natalyatodorova Feb 24, 2026
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
6 changes: 3 additions & 3 deletions odm_sdk/scripts/import_ODM_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
# guard against possible mistakes in ETL source constants
assert set(SCHEME_TO_ETL_SOURCE.values()).issubset(ETL_SOURCES)

COMMON_URL_PREFIX = 'frontend/rs/genestack'
COMMON_URL_PREFIX = 'frontend/endpoint/rs/genestack'

TAGS = {"-sm": "samples",
"-lb": "libraries",
Expand Down Expand Up @@ -227,7 +227,7 @@ def _request_default_template(self):

def get_study(params):
response = requests.get(
url='{0}/frontend/rs/genestack/studyUser/{1}/studies/{2}'.format(
url='{0}/frontend/endpoint/rs/genestack/studyUser/{1}/studies/{2}'.format(
params.SERVER, params.APP_VERSION, params.study_accession),
headers=params.headers)
return response
Expand Down Expand Up @@ -450,7 +450,7 @@ def _async_import(kind, params, metadata_link=None, data_link=None, prev_version
_err("No data link is provided for {} import"
"".format(kind))
sys.exit(1)
url = "{}/{}/job/{}/import/{}/".format(
url = "{}/{}/job/{}/import/{}".format(
params.SERVER, COMMON_URL_PREFIX, params.APP_VERSION, kind.replace('_', '-'))
if params.ALLOW_DUPLICATES and kind != 'file':
url += '?allow_dups=true'
Expand Down
8 changes: 4 additions & 4 deletions odm_sdk/tests/test_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
DeprecatedAction, make_libraries_and_preparations_action, make_cell_action, make_signal_action, \
make_file_action, make_mapping_file_action, ETL_WAITING_TIMEOUT, ETL_SOURCES

JOB_API_PATH = "frontend/rs/genestack/job/default-released"
INTEGRATION_LINK_PATH = "frontend/rs/genestack/integrationCurator/default-released/integration/link"
JOB_API_PATH = "frontend/endpoint/rs/genestack/job/default-released"
INTEGRATION_LINK_PATH = "frontend/endpoint/rs/genestack/integrationCurator/default-released/integration/link"


@contextmanager
Expand Down Expand Up @@ -539,7 +539,7 @@ def test_linking_error_is_visible_to_a_user(self, m):
"status": "STARTING",
"createTime": "16-11-2022 08:40:14"
}
m.post(f"{srv}/{JOB_API_PATH}/import/study/", json=study_job)
m.post(f"{srv}/{JOB_API_PATH}/import/study", json=study_job)
study_job["status"] = "COMPLETED"
m.get(f"{srv}/{JOB_API_PATH}/{study_job_id}/info", json=study_job)
study_accession = "GSF020175"
Expand All @@ -559,7 +559,7 @@ def test_linking_error_is_visible_to_a_user(self, m):
"status": "STARTING",
"createTime": "16-11-2022 08:41:14"
}
m.post(f"{srv}/{JOB_API_PATH}/import/samples/", json=samples_job)
m.post(f"{srv}/{JOB_API_PATH}/import/samples", json=samples_job)
samples_job["status"] = "COMPLETED"
m.get(f"{srv}/{JOB_API_PATH}/{samples_job_id}/info", json=samples_job)
samples_group_accession = "GSF020176"
Expand Down