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

Jump to bottom

Fix is_dollar_amount() to accept strings cast from single precision floats. Ensure no mixed dtypes before to_parquet() #107

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix is_dollar_amount() to accept strings cast from single precision floats. Ensure no mixed dtypes before to_parquet() #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions deepform/data/add_features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ def extend_and_write_docs(

logger.debug(f"Writing document index to {pq_index}...")
doc_index = pd.DataFrame(doc_results).set_index("slug", drop=True)

# Avoid mixed dtypes, which can cause errors in pyarrow while exporting to parquet
doc_index["gross_amount"] = doc_index.gross_amount.astype(str)
doc_index.to_parquet(pq_index)


Expand Down
4 changes: 3 additions & 1 deletion deepform/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ def default_similarity(lhs, rhs):

def is_dollar_amount(s):
try:
return num_digits(s) > 0 and bool(re.match(r"^\$?\d*(,\d\d\d)*(\.\d\d)?$", s))
return num_digits(s) > 0 and bool(
re.match(r"^\$?\d*(,\d\d\d)*(\.[\d]{1,2})?$", s)
)
except TypeError:
return False

Expand Down
3 changes: 3 additions & 0 deletions tests/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ def test_is_dollar_amount():
assert is_dollar_amount("3")
assert is_dollar_amount("04")
assert is_dollar_amount("9,000")
assert is_dollar_amount("10.0")
assert is_dollar_amount("$50.0")
assert not is_dollar_amount("")
assert not is_dollar_amount("$")
assert not is_dollar_amount(",")
Expand All @@ -43,6 +45,7 @@ def test_dollar_amount():
assert dollar_amount("3") == 3
assert dollar_amount("04") == 4
assert dollar_amount("9,000") == 9000
assert dollar_amount("1,300.0") == 1300.0
assert dollar_amount("") is None
assert dollar_amount("C") is None
assert dollar_amount("$x") is None
Expand Down