From c83de187a0536c70c08821834300bf7014731948 Mon Sep 17 00:00:00 2001 From: Alexis TRESCARTE Date: Wed, 1 Jun 2022 10:52:29 +0200 Subject: [PATCH 1/7] change get_data with name --- .../memory_base/memory_base.py | 3 ++- tests_integration/mocks.py | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/braincube_connector/memory_base/memory_base.py b/braincube_connector/memory_base/memory_base.py index e57f3a8..4913feb 100644 --- a/braincube_connector/memory_base/memory_base.py +++ b/braincube_connector/memory_base/memory_base.py @@ -150,7 +150,8 @@ def get_data( datasource = data.collect_data(int_var_ids, self, filters) if label_type == "name": - mapping = {var_id: self.get_variable(var_id).get_name() for var_id in int_var_ids} + vars_infos = self.get_variable_list() + mapping = {v.get_bcid(): v.get_name() for v in vars_infos} datasource = { mapping[data_key]: data_value for data_key, data_value in datasource.items() } diff --git a/tests_integration/mocks.py b/tests_integration/mocks.py index d588d50..e4652ba 100644 --- a/tests_integration/mocks.py +++ b/tests_integration/mocks.py @@ -49,6 +49,33 @@ "status": 200, "json": {"name": "mb1", "order": "mb1/d101",}, }, + { + "method": "GET", + "url": "https://api.test.com/braincube/demo/braincube/mb/1/variables/summary", + "status": 200, + "json": { + "items": [ + { + "bcId": 101, + "tag": "tag_101", + "local": "local_101", + "standard": "standard_101", + }, + { + "bcId": 102, + "tag": "tag_102", + "local": "local_102", + "standard": "standard_102", + }, + { + "bcId": 103, + "tag": "tag_103", + "local": "local_103", + "standard": "standard_103", + }, + ] + } + }, { "method": "POST", "url": "https://api.test.com/braincube/demo/braindata/mb1/LF", From 922cb59515a9ba887c5dbcb4b865bc619b4101eb Mon Sep 17 00:00:00 2001 From: Alexis TRESCARTE Date: Wed, 1 Jun 2022 15:59:32 +0200 Subject: [PATCH 2/7] fix pagination error --- tests_integration/mocks.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests_integration/mocks.py b/tests_integration/mocks.py index e4652ba..cb847d1 100644 --- a/tests_integration/mocks.py +++ b/tests_integration/mocks.py @@ -51,7 +51,7 @@ }, { "method": "GET", - "url": "https://api.test.com/braincube/demo/braincube/mb/1/variables/summary", + "url": "https://api.test.com/braincube/demo/braincube/mb/1/variables/summary?offset=0&size=150", "status": 200, "json": { "items": [ @@ -76,6 +76,12 @@ ] } }, + { + "method": "GET", + "url": "https://api.test.com/braincube/demo/braincube/mb/1/variables/summary?offset=150&size=150", + "status": 200, + "json": {"items": []} + }, { "method": "POST", "url": "https://api.test.com/braincube/demo/braindata/mb1/LF", From 0043ab71cdb820a368f2bac11ec0ee177b472f8d Mon Sep 17 00:00:00 2001 From: Alexis TRESCARTE Date: Wed, 1 Jun 2022 16:04:17 +0200 Subject: [PATCH 3/7] run black --- tests_integration/mocks.py | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/tests_integration/mocks.py b/tests_integration/mocks.py index cb847d1..16a7cdf 100644 --- a/tests_integration/mocks.py +++ b/tests_integration/mocks.py @@ -55,32 +55,17 @@ "status": 200, "json": { "items": [ - { - "bcId": 101, - "tag": "tag_101", - "local": "local_101", - "standard": "standard_101", - }, - { - "bcId": 102, - "tag": "tag_102", - "local": "local_102", - "standard": "standard_102", - }, - { - "bcId": 103, - "tag": "tag_103", - "local": "local_103", - "standard": "standard_103", - }, + {"bcId": 101, "tag": "tag_101", "local": "local_101", "standard": "standard_101",}, + {"bcId": 102, "tag": "tag_102", "local": "local_102", "standard": "standard_102",}, + {"bcId": 103, "tag": "tag_103", "local": "local_103", "standard": "standard_103",}, ] - } + }, }, { "method": "GET", "url": "https://api.test.com/braincube/demo/braincube/mb/1/variables/summary?offset=150&size=150", "status": 200, - "json": {"items": []} + "json": {"items": []}, }, { "method": "POST", From c387ea5fffc889db297f69683b2a3fad6e304912 Mon Sep 17 00:00:00 2001 From: Alexis TRESCARTE Date: Wed, 1 Jun 2022 16:09:42 +0200 Subject: [PATCH 4/7] run flake8 --- braincube_connector/memory_base/memory_base.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/braincube_connector/memory_base/memory_base.py b/braincube_connector/memory_base/memory_base.py index 4913feb..7762741 100644 --- a/braincube_connector/memory_base/memory_base.py +++ b/braincube_connector/memory_base/memory_base.py @@ -150,8 +150,11 @@ def get_data( datasource = data.collect_data(int_var_ids, self, filters) if label_type == "name": - vars_infos = self.get_variable_list() - mapping = {v.get_bcid(): v.get_name() for v in vars_infos} + mapping = { + collected_variable.get_bcid(): collected_variable.get_name() + for collected_variable + in self.get_variable_list() + } datasource = { mapping[data_key]: data_value for data_key, data_value in datasource.items() } From 0694f313939a6eac585d91ec36885622d8a4a359 Mon Sep 17 00:00:00 2001 From: Alexis TRESCARTE Date: Wed, 1 Jun 2022 16:16:14 +0200 Subject: [PATCH 5/7] resolve mypy issue --- braincube_connector/memory_base/memory_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/braincube_connector/memory_base/memory_base.py b/braincube_connector/memory_base/memory_base.py index 7762741..0442aed 100644 --- a/braincube_connector/memory_base/memory_base.py +++ b/braincube_connector/memory_base/memory_base.py @@ -151,7 +151,7 @@ def get_data( if label_type == "name": mapping = { - collected_variable.get_bcid(): collected_variable.get_name() + int(collected_variable.get_bcid()): collected_variable.get_name() for collected_variable in self.get_variable_list() } From 3e4c11b6189097d85ed30b7844da5005ead299e9 Mon Sep 17 00:00:00 2001 From: Alexis TRESCARTE Date: Thu, 2 Jun 2022 14:17:48 +0200 Subject: [PATCH 6/7] update unit test get_data --- braincube_connector/memory_base/memory_base.py | 1 + tests/test_memory_base/test_memory_base.py | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/braincube_connector/memory_base/memory_base.py b/braincube_connector/memory_base/memory_base.py index 0442aed..6cf160b 100644 --- a/braincube_connector/memory_base/memory_base.py +++ b/braincube_connector/memory_base/memory_base.py @@ -149,6 +149,7 @@ def get_data( int_var_ids = [int(var_id) for var_id in var_ids] datasource = data.collect_data(int_var_ids, self, filters) + test = self.get_variable_list() if label_type == "name": mapping = { int(collected_variable.get_bcid()): collected_variable.get_name() diff --git a/tests/test_memory_base/test_memory_base.py b/tests/test_memory_base/test_memory_base.py index 3abdaab..035572e 100644 --- a/tests/test_memory_base/test_memory_base.py +++ b/tests/test_memory_base/test_memory_base.py @@ -157,10 +157,11 @@ def test_get_rule_list(mocker, monkeypatch, mb_obj, mock_request_entity): ) def test_get_data(mocker, mb_obj, create_mock_var, label_type, dataframe, expected_data): mocker.patch( - "braincube_connector.memory_base.memory_base.MemoryBase.get_variable", - lambda memory_base_object, bcid: create_mock_var( - bcid=bcid, metadata={"standard": "name_standard_{0}".format(bcid)} - ), + "braincube_connector.memory_base.memory_base.MemoryBase.get_variable_list", + return_value=[ + create_mock_var(bcid=1, metadata={"standard": "name_standard_1"}), + create_mock_var(bcid=2, metadata={"standard": "name_standard_2"}), + ] ) mocker.patch( From 169b44f702b4fdef52a16e83018e0910b5e5b362 Mon Sep 17 00:00:00 2001 From: Alexis TRESCARTE Date: Thu, 2 Jun 2022 14:20:18 +0200 Subject: [PATCH 7/7] run black & lint --- braincube_connector/memory_base/memory_base.py | 4 +--- tests/test_memory_base/test_memory_base.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/braincube_connector/memory_base/memory_base.py b/braincube_connector/memory_base/memory_base.py index 6cf160b..14ad72a 100644 --- a/braincube_connector/memory_base/memory_base.py +++ b/braincube_connector/memory_base/memory_base.py @@ -149,12 +149,10 @@ def get_data( int_var_ids = [int(var_id) for var_id in var_ids] datasource = data.collect_data(int_var_ids, self, filters) - test = self.get_variable_list() if label_type == "name": mapping = { int(collected_variable.get_bcid()): collected_variable.get_name() - for collected_variable - in self.get_variable_list() + for collected_variable in self.get_variable_list() } datasource = { mapping[data_key]: data_value for data_key, data_value in datasource.items() diff --git a/tests/test_memory_base/test_memory_base.py b/tests/test_memory_base/test_memory_base.py index 035572e..a2b337e 100644 --- a/tests/test_memory_base/test_memory_base.py +++ b/tests/test_memory_base/test_memory_base.py @@ -161,7 +161,7 @@ def test_get_data(mocker, mb_obj, create_mock_var, label_type, dataframe, expect return_value=[ create_mock_var(bcid=1, metadata={"standard": "name_standard_1"}), create_mock_var(bcid=2, metadata={"standard": "name_standard_2"}), - ] + ], ) mocker.patch(