From 3fb495199e02a182d354bd5ddc6c18009a86da7a Mon Sep 17 00:00:00 2001 From: RodneyCodess Date: Thu, 25 Jun 2026 10:05:44 -0400 Subject: [PATCH 1/3] update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0bd4a248..497e2a83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,6 +95,6 @@ workflows: matrix: parameters: python_version: ["min-python", "max-python"] - lint: + linting: jobs: - lint \ No newline at end of file From d44404f68d706c522fb1aa586307735a5adddc21 Mon Sep 17 00:00:00 2001 From: RodneyCodess Date: Thu, 25 Jun 2026 11:07:40 -0400 Subject: [PATCH 2/3] update --- xdmod_data/warehouse.py | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/xdmod_data/warehouse.py b/xdmod_data/warehouse.py index ba016f76..2ee8569e 100644 --- a/xdmod_data/warehouse.py +++ b/xdmod_data/warehouse.py @@ -156,6 +156,53 @@ def get_data( params, response.text, ) + + def get_metrics_data( + self, + date_range, + realm, + metric, + group_by, + dataset_type, + aggregation_unit, + include_only, + exclude + ): + + _validator._assert_runtime_context(self.__in_runtime_context) + + if isinstance(metric, list): + raise NotImplementedError("metric as a list is not yet implemented") + + if isinstance(group_by, (list, dict)): + raise NotImplementedError("group_by as a list or dict is not yet implemented") + + if exclude: + raise NotImplementedError("exclude is not yet implemented") + + translated_params = { + 'duration': date_range, + 'realm': realm, + 'metric': metric, + 'dimension': group_by, + 'filters': include_only, + 'dataset_type': dataset_type, + 'aggregation_unit': aggregation_unit, + } + + params = _validator._validate_get_data_params( + self, + self.__descriptors, + translated_params, + ) + + response = self.__http_requester._request_data(params) + + return _response_processor._process_get_data_response( + self, + params, + response.text, + ) def get_raw_data( self, From bc3f56c1b438f4c2c7334461613e7413ba2b7e4f Mon Sep 17 00:00:00 2001 From: RodneyCodess Date: Wed, 1 Jul 2026 15:52:35 -0400 Subject: [PATCH 3/3] update --- xdmod_data/warehouse.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/xdmod_data/warehouse.py b/xdmod_data/warehouse.py index 2ee8569e..054a4388 100644 --- a/xdmod_data/warehouse.py +++ b/xdmod_data/warehouse.py @@ -1,5 +1,6 @@ import numpy as np import os +import warnings import pandas as pd from xdmod_data._descriptors import _Descriptors from xdmod_data._http_requester import _HttpRequester @@ -144,19 +145,14 @@ def get_data( ValueError If `duration` is an object but not of length 2. """ - _validator._assert_runtime_context(self.__in_runtime_context) - params = _validator._validate_get_data_params( - self, - self.__descriptors, - locals(), + warnings.warn( + "get_data() is deprecated and will be removed in xdmod-data 2.0.0. use get_metrics_data() instead.", + FutureWarning, ) - response = self.__http_requester._request_data(params) - return _response_processor._process_get_data_response( - self, - params, - response.text, + return self.get_metrics_data( + #..... ) - + def get_metrics_data( self, date_range, @@ -173,10 +169,10 @@ def get_metrics_data( if isinstance(metric, list): raise NotImplementedError("metric as a list is not yet implemented") - + if isinstance(group_by, (list, dict)): raise NotImplementedError("group_by as a list or dict is not yet implemented") - + if exclude: raise NotImplementedError("exclude is not yet implemented")