From 0bdbe23e6794c0f96b97698e7984b846d5ac99fb Mon Sep 17 00:00:00 2001 From: zhiren Date: Fri, 25 Jul 2025 15:29:46 -0400 Subject: [PATCH 1/5] fixup dataset download issue --- app/configs/config.py | 2 +- .../dataset_manager/dataset_download.py | 4 ++-- ...ettestdataset20240827_1753462346.8685582.zip | Bin 0 -> 383 bytes pyproject.toml | 2 +- ...t20240827_2.1_2025-07-25 12:53:38.495100.zip | Bin 0 -> 33521 bytes 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 datasettestdataset20240827_1753462346.8685582.zip create mode 100644 testdataset20240827_2.1_2025-07-25 12:53:38.495100.zip diff --git a/app/configs/config.py b/app/configs/config.py index 634d8337..b05e1d06 100644 --- a/app/configs/config.py +++ b/app/configs/config.py @@ -86,7 +86,7 @@ def url_v2_download_pre(self) -> str: @computed_field def url_dataset_v2download(self) -> str: - return f'{self.api_url}/portal/download/core/v2/dataset' + return f'{self.api_url}/portal/v2/dataset' @computed_field def url_dataset(self) -> str: diff --git a/app/services/dataset_manager/dataset_download.py b/app/services/dataset_manager/dataset_download.py index 63afbfc8..63a08733 100644 --- a/app/services/dataset_manager/dataset_download.py +++ b/app/services/dataset_manager/dataset_download.py @@ -27,7 +27,7 @@ class SrvDatasetDownloadManager(BaseAuthClient, metaclass=MetaService): def __init__(self, output_path, dataset_code, dataset_geid): - super().__init__(AppConfig.Connections.url_dataset) + super().__init__(AppConfig.Connections.url_dataset_v2download) self.user = UserConfig() self.output = output_path @@ -134,7 +134,7 @@ def avoid_duplicate_file_name(self, filename) -> str: def download_dataset(self) -> None: pre_result = self.pre_dataset_download() self.hash_code = pre_result.get('result').get('payload').get('hash_code') - self.download_url = AppConfig.Connections.url_fileops_core + f'v1/download/{self.hash_code}' + self.download_url = AppConfig.Connections.url_fileops_core + f'/v1/download/{self.hash_code}' # format the naming for the default filename self.default_filename = pre_result.get('result').get('target_names')[0] self.default_filename = self.default_filename.split('/')[-1] diff --git a/datasettestdataset20240827_1753462346.8685582.zip b/datasettestdataset20240827_1753462346.8685582.zip new file mode 100644 index 0000000000000000000000000000000000000000..22bcd34d8f8cb3042d89cf0251bc38b0e037781a GIT binary patch literal 383 zcmWIWW@Zs#0D<1NpHW~2lwbwYDTyVC`T zsl~;qc_o>NIeNv(8L7F6dRfK!d8?lVF)%Hia%9qxM^`5Oc=BgTh^jX0(n(hy39Xnh zv2kK&W9!77llWF$nsnq#(t=AbB1%4ybh;>m60p5&EBFwlw3-PxA!+%E*3+i>47VMsfXklRZ->3}If-fin Syjj^m%9(($4oJTSaTow24tu@; literal 0 HcmV?d00001 diff --git a/pyproject.toml b/pyproject.toml index 7b5a640a..69d95428 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "app" -version = "3.20.0" +version = "3.20.1" description = "This service is designed to support pilot platform" authors = ["Indoc Systems"] diff --git a/testdataset20240827_2.1_2025-07-25 12:53:38.495100.zip b/testdataset20240827_2.1_2025-07-25 12:53:38.495100.zip new file mode 100644 index 0000000000000000000000000000000000000000..7de3e09c92ffdf6ce86285a5f33b4ae8a35de407 GIT binary patch literal 33521 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 X1NxbN2LM3-d<=f((a=5q`1Jn(GsG^X literal 0 HcmV?d00001 From ddd127e19f00631e8c3d1fea1e00f5b19f4c15af Mon Sep 17 00:00:00 2001 From: zhiren Date: Fri, 25 Jul 2025 15:30:46 -0400 Subject: [PATCH 2/5] remove testing data --- ...ettestdataset20240827_1753462346.8685582.zip | Bin 383 -> 0 bytes ...t20240827_2.1_2025-07-25 12:53:38.495100.zip | Bin 33521 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 datasettestdataset20240827_1753462346.8685582.zip delete mode 100644 testdataset20240827_2.1_2025-07-25 12:53:38.495100.zip diff --git a/datasettestdataset20240827_1753462346.8685582.zip b/datasettestdataset20240827_1753462346.8685582.zip deleted file mode 100644 index 22bcd34d8f8cb3042d89cf0251bc38b0e037781a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmWIWW@Zs#0D<1NpHW~2lwbwYDTyVC`T zsl~;qc_o>NIeNv(8L7F6dRfK!d8?lVF)%Hia%9qxM^`5Oc=BgTh^jX0(n(hy39Xnh zv2kK&W9!77llWF$nsnq#(t=AbB1%4ybh;>m60p5&EBFwlw3-PxA!+%E*3+i>47VMsfXklRZ->3}If-fin Syjj^m%9(($4oJTSaTow24tu@; diff --git a/testdataset20240827_2.1_2025-07-25 12:53:38.495100.zip b/testdataset20240827_2.1_2025-07-25 12:53:38.495100.zip deleted file mode 100644 index 7de3e09c92ffdf6ce86285a5f33b4ae8a35de407..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33521 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 X1NxbN2LM3-d<=f((a=5q`1Jn(GsG^X From 142427053f599a4c9a24598808e952fee9860b04 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 25 Jul 2025 19:37:50 +0000 Subject: [PATCH 3/5] Updated docs/compatible_version.ndjson with PR #248 --- README.md | 3 ++- docs/compatible_version.ndjson | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f59bba9..8544334b 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,8 @@ Command line tool that allows the user to execute data operations on the platfor | 3.19.5 | 2.15.2 | 2.15.2 | | 3.19.6 | 2.15.2 | 2.15.2 | | 3.19.7 | 2.15.2 | 2.15.2 | -| 3.20.0 | 2.15.2 | 2.15.2 | +| 3.20.0 | 2.16.0 | 2.15.2 | +| 3.20.1 | 2.16 | 2.16 | ## Build Instructions diff --git a/docs/compatible_version.ndjson b/docs/compatible_version.ndjson index 2b3b5912..327c42bb 100644 --- a/docs/compatible_version.ndjson +++ b/docs/compatible_version.ndjson @@ -15,3 +15,4 @@ {"Cli Version": "3.19.6", "Pilot Release Version": "2.15.2", "Compatible Version": "2.15.2"} {"Cli Version": "3.19.7", "Pilot Release Version": "2.15.2", "Compatible Version": "2.15.2"} {"Cli Version": "3.20.0", "Pilot Release Version": "2.16.0", "Compatible Version": "2.15.2"} +{"Cli Version": "3.20.1", "Pilot Release Version": "2.16", "Compatible Version": "2.16"} From df2d91e5999fdf9a1b5b323a8f785aa3fa1de498 Mon Sep 17 00:00:00 2001 From: zhiren Date: Mon, 28 Jul 2025 15:14:52 -0400 Subject: [PATCH 4/5] change the env name --- app/configs/app_config.py | 2 +- app/configs/config.py | 2 +- app/services/dataset_manager/dataset_download.py | 4 ++-- tests/app/services/dataset_manager/test_dataset_download.py | 4 ++-- tests/conftest.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/configs/app_config.py b/app/configs/app_config.py index da5d7ae1..b9f19999 100644 --- a/app/configs/app_config.py +++ b/app/configs/app_config.py @@ -49,7 +49,7 @@ class Connections: url_fileops_core = ConfigClass.url_fileops_core url_status = ConfigClass.url_status url_v2_download_pre = ConfigClass.url_v2_download_pre - url_dataset_v2download = ConfigClass.url_dataset_v2download + url_dataset_download_v2 = ConfigClass.url_dataset_download_v2 url_dataset = ConfigClass.url_dataset url_validation = ConfigClass.url_validation url_keycloak = ConfigClass.url_keycloak diff --git a/app/configs/config.py b/app/configs/config.py index b05e1d06..d0bef0bc 100644 --- a/app/configs/config.py +++ b/app/configs/config.py @@ -85,7 +85,7 @@ def url_v2_download_pre(self) -> str: return f'{self.url_bff}/v1/project/%s/files/download' @computed_field - def url_dataset_v2download(self) -> str: + def url_dataset_download_v2(self) -> str: return f'{self.api_url}/portal/v2/dataset' @computed_field diff --git a/app/services/dataset_manager/dataset_download.py b/app/services/dataset_manager/dataset_download.py index 63a08733..4aa3c26c 100644 --- a/app/services/dataset_manager/dataset_download.py +++ b/app/services/dataset_manager/dataset_download.py @@ -27,7 +27,7 @@ class SrvDatasetDownloadManager(BaseAuthClient, metaclass=MetaService): def __init__(self, output_path, dataset_code, dataset_geid): - super().__init__(AppConfig.Connections.url_dataset_v2download) + super().__init__(AppConfig.Connections.url_dataset_download_v2) self.user = UserConfig() self.output = output_path @@ -58,7 +58,7 @@ def pre_dataset_download(self) -> Dict[str, Any]: payload = {'dataset_code': self.dataset_code, 'session_id': self.session_id, 'operator': self.user.username} try: - self.endpoint = AppConfig.Connections.url_dataset_v2download + self.endpoint = AppConfig.Connections.url_dataset_download_v2 response = self._post('download/pre', json=payload) except HTTPStatusError as e: response = e.response diff --git a/tests/app/services/dataset_manager/test_dataset_download.py b/tests/app/services/dataset_manager/test_dataset_download.py index 20471b41..7f655818 100644 --- a/tests/app/services/dataset_manager/test_dataset_download.py +++ b/tests/app/services/dataset_manager/test_dataset_download.py @@ -12,7 +12,7 @@ def test_dateset_pre_download_success(httpx_mock, mocker): httpx_mock.add_response( method='POST', - url=AppConfig.Connections.url_dataset_v2download + '/download/pre', + url=AppConfig.Connections.url_dataset_download_v2 + '/download/pre', json={'result': {'payload': {'hash_code': 'hash_code'}, 'target_names': ['test.txt']}}, status_code=200, ) @@ -104,7 +104,7 @@ def test_download_dataset(httpx_mock, mocker): httpx_mock.add_response( method='POST', - url=AppConfig.Connections.url_dataset_v2download + '/download/pre', + url=AppConfig.Connections.url_dataset_download_v2 + '/download/pre', json={'result': {'payload': {'hash_code': 'hash_code'}, 'target_names': ['test.txt']}}, status_code=200, ) diff --git a/tests/conftest.py b/tests/conftest.py index f9845784..d39b4f62 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -25,7 +25,7 @@ def mock_settings(monkeypatch, mocker): monkeypatch.setattr(AppConfig.Connections, 'url_authn', 'http://service_auth') monkeypatch.setattr(AppConfig.Connections, 'url_bff', 'http://bff_cli') monkeypatch.setattr(AppConfig.Connections, 'url_dataset', 'http://url_dataset') - monkeypatch.setattr(AppConfig.Connections, 'url_dataset_v2download', 'http://url_dataset_download_v2') + monkeypatch.setattr(AppConfig.Connections, 'url_dataset_download_v2', 'http://url_dataset_download_v2') monkeypatch.setattr(AppConfig.Connections, 'url_fileops_core', 'http://url_dataset_download_core') monkeypatch.setattr(AppConfig.Connections, 'url_fileops_greenroom', 'http://upload_gr') monkeypatch.setattr(AppConfig.Connections, 'url_keycloak_realm', 'http://url_keycloak_realm') From ecce2f3b174ad0f94536748eb5ccf4dd65d65eec Mon Sep 17 00:00:00 2001 From: zhiren Date: Mon, 28 Jul 2025 15:19:00 -0400 Subject: [PATCH 5/5] update matrix --- docs/compatible_version.ndjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/compatible_version.ndjson b/docs/compatible_version.ndjson index 327c42bb..7bddc8da 100644 --- a/docs/compatible_version.ndjson +++ b/docs/compatible_version.ndjson @@ -15,4 +15,4 @@ {"Cli Version": "3.19.6", "Pilot Release Version": "2.15.2", "Compatible Version": "2.15.2"} {"Cli Version": "3.19.7", "Pilot Release Version": "2.15.2", "Compatible Version": "2.15.2"} {"Cli Version": "3.20.0", "Pilot Release Version": "2.16.0", "Compatible Version": "2.15.2"} -{"Cli Version": "3.20.1", "Pilot Release Version": "2.16", "Compatible Version": "2.16"} +{"Cli Version": "3.20.1", "Pilot Release Version": "2.16.0", "Compatible Version": "2.16.0"}