From f06970af22d35b65c83738d0c3ff9a3e2dabc94f Mon Sep 17 00:00:00 2001 From: popenc Date: Mon, 28 Oct 2024 15:24:51 -0400 Subject: [PATCH 1/3] updated cts_calcs --- cts_calcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cts_calcs b/cts_calcs index 307aad0..dddbcc8 160000 --- a/cts_calcs +++ b/cts_calcs @@ -1 +1 @@ -Subproject commit 307aad0e26ff8cbdfee3fa3450ccd5f04420ff00 +Subproject commit dddbcc8f98d3ac6c8b0d50c93f50885bbb9d516b From 3a34d4637eb951b22b07ab91bad79208e27f7a70 Mon Sep 17 00:00:00 2001 From: popenc Date: Mon, 4 Nov 2024 08:31:19 -0500 Subject: [PATCH 2/3] EPI API testing --- tasks.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/tasks.py b/tasks.py index 091305a..a8e8a6d 100644 --- a/tasks.py +++ b/tasks.py @@ -562,15 +562,22 @@ def handle_epi_request(self, sessionid, request_post): ) return for _data_obj in _results.get('data', []): - _epi_prop = _data_obj.get('prop') - _cts_prop_name = self.epi_calc.props[self.epi_calc.epi_props.index(_epi_prop)] # map epi ws key to cts prop key - _method = _data_obj.get('method') - if _method: - # Use abbreviated method name for pchem table: - _epi_methods = self.epi_calc.propMap.get(_cts_prop_name).get('methods', {}) - _method = _epi_methods.get(_data_obj['method']) # use pchem table name for method - if _cts_prop_name in props: - _data_obj.update(_response_info) # data obj going to client needs some extra keys - _data_obj['prop'] = _cts_prop_name - _data_obj['method'] = _method - self.redis_conn.publish(sessionid, json.dumps(_data_obj)) \ No newline at end of file + + self.redis_conn.publish(sessionid, json.dumps(_data_obj)) + + # _epi_prop = _data_obj.get('prop') + + # logging.warning("_epi_prop: {}".format(_epi_prop)) + # epi_prop = self.epi_calc.epi_props.index(_epi_prop) + # logging.warning("epi_prop: {}".format(epi_prop)) + # _cts_prop_name = self.epi_calc.props[self.epi_calc.epi_props.index(_epi_prop)] # map epi ws key to cts prop key + # _method = _data_obj.get('method') + # if _method: + # # Use abbreviated method name for pchem table: + # _epi_methods = self.epi_calc.propMap.get(_cts_prop_name).get('methods', {}) + # _method = _epi_methods.get(_data_obj['method']) # use pchem table name for method + # if _cts_prop_name in props: + # _data_obj.update(_response_info) # data obj going to client needs some extra keys + # _data_obj['prop'] = _cts_prop_name + # _data_obj['method'] = _method + # self.redis_conn.publish(sessionid, json.dumps(_data_obj)) \ No newline at end of file From 8f2f0deb6ebd630246d9dd242c50655d30a40bf4 Mon Sep 17 00:00:00 2001 From: popenc Date: Mon, 4 Nov 2024 08:31:27 -0500 Subject: [PATCH 3/3] EPI API testing --- cts_calcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cts_calcs b/cts_calcs index dddbcc8..6f700c4 160000 --- a/cts_calcs +++ b/cts_calcs @@ -1 +1 @@ -Subproject commit dddbcc8f98d3ac6c8b0d50c93f50885bbb9d516b +Subproject commit 6f700c4430176cfca73418cb7dc0ea9342f1cbd9