Skip to content

[formrecognizer] Add proper defaults on DocumentTableCell #21213

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

Merged
catalinaperalta merged 6 commits into from
Oct 18, 2021
Merged

[formrecognizer] Add proper defaults on DocumentTableCell #21213

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
780dfc0
add proper defaults on document table cell
catalinaperalta Oct 12, 2021
69977e6
default kind field
catalinaperalta Oct 15, 2021
1bdb8dd
set default in _from_generated and improve init
catalinaperalta Oct 16, 2021
5afa0ed
revert changes to init, fix test comment
catalinaperalta Oct 18, 2021
6fa5408
set content default for kind
catalinaperalta Oct 18, 2021
460aa66
update testcase to account for default scenarios
catalinaperalta Oct 18, 2021
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
12 changes: 6 additions & 6 deletions sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3120,11 +3120,11 @@ def __init__(self, **kwargs):
@classmethod
def _from_generated(cls, cell):
return cls(
kind=cell.kind,
kind=cell.kind if cell.kind else "content",
row_index=cell.row_index,
column_index=cell.column_index,
row_span=cell.row_span,
column_span=cell.column_span,
row_span=cell.row_span if cell.row_span else 1,
column_span=cell.column_span if cell.column_span else 1,
content=cell.content,
bounding_regions=[
BoundingRegion._from_generated(region)
Expand Down Expand Up @@ -3184,11 +3184,11 @@ def from_dict(cls, data):
:rtype: DocumentTableCell
"""
return cls(
kind=data.get("kind", None),
kind=data.get("kind", "content"),
row_index=data.get("row_index", None),
column_index=data.get("column_index", None),
row_span=data.get("row_span", None),
column_span=data.get("column_span", None),
row_span=data.get("row_span", 1),
column_span=data.get("column_span", 1),
content=data.get("content", None),
bounding_regions=[BoundingRegion.from_dict(v) for v in data.get("bounding_regions")] # type: ignore
if len(data.get("bounding_regions", [])) > 0
Expand Down
51 changes: 51 additions & 0 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_to_dict_v3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,57 @@ def test_document_table_cell_to_dict(self):

assert d == final

def test_document_table_cell_to_dict_use_defaults(self):
# NOTE: kind, column_span, and row_span are not included on purpose to test that the proper defaults are set.
model = _models.DocumentTableCell(
row_index=2,
column_index=3,
content="cell content",
bounding_regions=[
_models.BoundingRegion(
bounding_box=[_models.Point(1, 2), _models.Point(3, 4)],
page_number=1,
),
],
spans=[
_models.DocumentSpan(
offset=5,
length=2,
),
],
)

d = model.to_dict()

final = {
"kind": "content",
"row_index": 2,
"column_index": 3,
"row_span": 1,
"column_span": 1,
"content": "cell content",
"bounding_regions": [
{
"page_number": 1,
"bounding_box": [
{"x": 1, "y": 2},
{
"x": 3,
"y": 4,
},
],
},
],
"spans": [
{
"offset": 5,
"length": 2,
},
],
}

assert d == final

def test_model_operation_info_to_dict(self):
model = _models.ModelOperationInfo(
operation_id="id123",
Expand Down