Skip to content

Bug fixing dreq_query #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tylov wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Bug fixing dreq_query #195

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4363be0
Bug fixing:
tylov Nov 20, 2025
f5ea797
Reverted most of the key mapping changes, only needed to enable the
tylov Nov 20, 2025
cf62e3e
Fixed wrong update of wrong variable from the commented code.
tylov Nov 20, 2025
71b9a2c
Proper fix instead of .update()
tylov Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions data_request_api/data_request_api/query/dreq_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ def create_dreq_tables_for_request(content, dreq_version, **kwargs):
-------
Dict 'base' whose keys are table names and values are DreqTable objects.
'''
base, content_type = _get_base_dict(content, dreq_version, purpose='request')
# base, content_type = _get_base_dict(content, dreq_version)
base, content_type = _get_base_dict(content, dreq_version, purpose='request', **kwargs)

# Config defaults
CONFIG = {'consolidate': True}
Expand Down Expand Up @@ -226,15 +225,15 @@ def create_dreq_tables_for_request(content, dreq_version, **kwargs):
return base


def create_dreq_tables_for_variables(content, dreq_version):
def create_dreq_tables_for_variables(content, dreq_version, **kwargs):
'''
For the "data" part of the data request content (Variables, Cell Methods etc),
render airtable export content as DreqTable objects.

For the "request" part of the data request, the corresponding function is create_dreq_tables_for_request().

'''
base, content_type = _get_base_dict(content, dreq_version, purpose='variables')
base, content_type = _get_base_dict(content, dreq_version, purpose='variables', **kwargs)

# Create objects representing data request tables
table_id2name = get_table_id2name(base)
Expand Down Expand Up @@ -1058,11 +1057,11 @@ def get_dimension_sizes(dreq_tables):
----------
dreq_tables: dict
Dict values are DreqTable objects for the required tables, e.g.:
dreq_tables = {
'coordinates and dimensions': base['Coordinates and Dimensions'],
'spatial shape': base['Spatial Shape'],
}
'''
if 'Coordinates and Dimensions' in dreq_tables:
dreq_tables['coordinates and dimensions'] = dreq_tables['Coordinates and Dimensions']
if 'Spatial Shape' in dreq_tables:
dreq_tables['spatial shape'] = dreq_tables['Spatial Shape']
dim_names = [dimension.name for dimension in dreq_tables['coordinates and dimensions'].records.values()]
assert len(set(dim_names)) == len(dim_names)
dim_names.sort(key=str.lower)
Expand Down
Loading