Merge pull request #18 from aaronweeden/improve-validation-performance

Improve performance of validation of filters and raw fields.

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Update tests and testing instructions ([\#14](https://github.com/ubccr/xdmod-data/pull/14)).
 - Remove limit on number of results returned from `get_filter_values()` ([\#21](https://github.com/ubccr/xdmod-data/pull/21)).
 - Add a "Feedback / Feature Requests" section to the README ([\#22](https://github.com/ubccr/xdmod-notebooks/pull/22)).
+- Improve performance of validation of filters and raw fields ([\#18](https://github.com/ubccr/xdmod-data/pull/18)).
 
 ## v1.0.0 (2023-07-21)
 - Initial release.

xdmod_data/__version__.py

@@ -1,2 +1,2 @@
 __title__ = 'xdmod-data'
-__version__ = '1.0.0'
+__version__ = '1.0.1-beta.1'

xdmod_data/_validator.py

@@ -179,10 +179,14 @@ def __validate_filters(data_warehouse, descriptors, realm, filters):
             if isinstance(filter_values, str):
                 filter_values = [filter_values]
             result[dimension_id] = []
+            valid_filter_values = data_warehouse.get_filter_values(
+                realm,
+                dimension,
+            )
             for filter_value in filter_values:
                 new_filter_value = __find_value_in_df(
                     'Filter value',
-                    data_warehouse.get_filter_values(realm, dimension),
+                    valid_filter_values,
                     filter_value,
                 )
                 result[dimension_id].append(new_filter_value)
@@ -214,12 +218,9 @@ def __find_str_in_sequence(value, sequence, label):
 def __validate_raw_fields(data_warehouse, realm, fields):
     try:
         results = []
+        valid_raw_fields = data_warehouse.describe_raw_fields(realm)
         for field in fields:
-            new_field = __find_value_in_df(
-                'Field',
-                data_warehouse.describe_raw_fields(realm),
-                field,
-            )
+            new_field = __find_value_in_df('Field', valid_raw_fields, field)
             results.append(new_field)
         return results
     except TypeError: