Skip to content
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

fix: load datasets with repeated items #92

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: load datasets with repeated items #92

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17bb1df
compare all items in series are equal
chrislawson-au Feb 17, 2023
0e97ea5
unnesting
chrislawson-au Feb 18, 2023
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
62 changes: 32 additions & 30 deletions finstmt/findata/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,38 +69,40 @@ def from_series(
if item_config.extract_names is None:
# Not an extractable item, must be a calculated item
continue
if name in item_config.extract_names:
# Got a match for series name to allowed names
if item_config.key in data_dict:
# Multiple matches for data item.
# First see if data is the same, then just skip
if for_lookup[name] == data_dict[item_config.key]:
continue
# Data is not the same, so take the one which is earliest in extract_names
current_match_idx = item_config.extract_names.index(name)
existing_match_idx = item_config.extract_names.index(
extracted_name_dict[item_config.key]
if name not in item_config.extract_names:
# No match for series name to allowed names
continue
# Got a match for series name to allowed names
if item_config.key in data_dict:
# Multiple matches for data item.
# First see if data is the same, then just skip
if (for_lookup[name] == data_dict[item_config.key]).all():
continue
# Data is not the same, so take the one which is earliest in extract_names
current_match_idx = item_config.extract_names.index(name)
existing_match_idx = item_config.extract_names.index(
extracted_name_dict[item_config.key]
)
current_match_is_preferred = (
current_match_idx < existing_match_idx
)
if current_match_is_preferred:
warnings.warn(
f"Previously had {item_config.key} "
f'extracted from "{original_name_dict[item_config.key]}". Replacing with '
f'value from "{orig_name}"'
)
current_match_is_preferred = (
current_match_idx < existing_match_idx
else:
warnings.warn(
f'Found {item_config.key} from "{orig_name}" but already '
f"had extracted from "
f'"{original_name_dict[item_config.key]}" which has higher priority, '
f'keeping value from "{original_name_dict[item_config.key]}"'
)
if current_match_is_preferred:
warnings.warn(
f"Previously had {item_config.key} "
f'extracted from "{original_name_dict[item_config.key]}". Replacing with '
f'value from "{orig_name}"'
)
else:
warnings.warn(
f'Found {item_config.key} from "{orig_name}" but already '
f"had extracted from "
f'"{original_name_dict[item_config.key]}" which has higher priority, '
f'keeping value from "{original_name_dict[item_config.key]}"'
)
continue
data_dict[item_config.key] = for_lookup[name]
extracted_name_dict[item_config.key] = name
original_name_dict[item_config.key] = orig_name
continue
data_dict[item_config.key] = for_lookup[name]
extracted_name_dict[item_config.key] = name
original_name_dict[item_config.key] = orig_name
if name not in extracted_name_dict.values():
unextracted_names.append(orig_name)
if not data_dict:
Expand Down