Skip to content

[formrecognizer] composed model #14029

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
kristapratico merged 20 commits into from
Oct 8, 2020
Merged

[formrecognizer] composed model #14029

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
549d69b
initial model compose
kristapratico Sep 25, 2020
dc7fe09
fix tests for composed model and repr
kristapratico Sep 25, 2020
9c404a3
mypy
kristapratico Sep 25, 2020
b2a8502
fix comments
kristapratico Sep 29, 2020
45a10d5
add fixmes
kristapratico Sep 29, 2020
58cbecb
set form_type on CustomFormSubmodel correctly
kristapratico Sep 30, 2020
380be3c
fix training tests
kristapratico Sep 30, 2020
82f80ff
merge master
kristapratico Oct 5, 2020
f5cd77d
remove error map/cont token from compose model
kristapratico Oct 5, 2020
f4537ac
add composed model tests
kristapratico Oct 6, 2020
3b598bd
adding more tests for new fields
kristapratico Oct 6, 2020
7cc601f
updating readmes/changelog
kristapratico Oct 6, 2020
f80ab2b
small fix
kristapratico Oct 6, 2020
3a9e729
update sample to be more consistent with .NET
kristapratico Oct 6, 2020
02208d0
add api version table to readme
kristapratico Oct 6, 2020
24b5380
add tests requested in feedback
kristapratico Oct 6, 2020
9307315
merge master
kristapratico Oct 6, 2020
5a70733
raise better error for multiapi
kristapratico Oct 7, 2020
6919fb9
some docs feedback
kristapratico Oct 7, 2020
f63c6d7
testing feedback
kristapratico Oct 8, 2020
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
Prev Previous commit
Next Next commit
fix training tests
  • Loading branch information
@kristapratico
kristapratico committed Sep 30, 2020
commit 380be3c41ec7b314717e07043b178692f8f6325b
8 changes: 4 additions & 4 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def test_training_transform(self, client, container_sas_url):

def callback(response, _, headers):
raw_model = client._deserialize(Model, response)
custom_model = CustomFormModel._from_generated(raw_model)
custom_model = CustomFormModel._from_generated(raw_model, client.api_version)
raw_response.append(raw_model)
raw_response.append(custom_model)

Expand All @@ -127,7 +127,7 @@ def test_training_multipage_transform(self, client, container_sas_url):

def callback(response, _, headers):
raw_model = client._deserialize(Model, response)
custom_model = CustomFormModel._from_generated(raw_model)
custom_model = CustomFormModel._from_generated(raw_model, client.api_version)
raw_response.append(raw_model)
raw_response.append(custom_model)

Expand Down Expand Up @@ -194,7 +194,7 @@ def test_training_with_labels_transform(self, client, container_sas_url):

def callback(response, _, headers):
raw_model = client._deserialize(Model, response)
custom_model = CustomFormModel._from_generated(raw_model)
custom_model = CustomFormModel._from_generated(raw_model, client.api_version)
raw_response.append(raw_model)
raw_response.append(custom_model)

Expand All @@ -213,7 +213,7 @@ def test_train_multipage_w_labels_transform(self, client, container_sas_url):

def callback(response, _, headers):
raw_model = client._deserialize(Model, response)
custom_model = CustomFormModel._from_generated(raw_model)
custom_model = CustomFormModel._from_generated(raw_model, client.api_version)
raw_response.append(raw_model)
raw_response.append(custom_model)

Expand Down
8 changes: 4 additions & 4 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_training_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ async def test_training_transform(self, client, container_sas_url):

def callback(response, _, headers):
raw_model = client._deserialize(Model, response)
custom_model = CustomFormModel._from_generated(raw_model)
custom_model = CustomFormModel._from_generated(raw_model, client.api_version)
raw_response.append(raw_model)
raw_response.append(custom_model)

Expand All @@ -138,7 +138,7 @@ async def test_training_multipage_transform(self, client, container_sas_url):

def callback(response, _, headers):
raw_model = client._deserialize(Model, response)
custom_model = CustomFormModel._from_generated(raw_model)
custom_model = CustomFormModel._from_generated(raw_model, client.api_version)
raw_response.append(raw_model)
raw_response.append(custom_model)

Expand Down Expand Up @@ -205,7 +205,7 @@ async def test_training_with_labels_transform(self, client, container_sas_url):

def callback(response, _, headers):
raw_model = client._deserialize(Model, response)
custom_model = CustomFormModel._from_generated(raw_model)
custom_model = CustomFormModel._from_generated(raw_model, client.api_version)
raw_response.append(raw_model)
raw_response.append(custom_model)

Expand All @@ -225,7 +225,7 @@ async def test_train_multipage_w_lbls_trnsfrm(self, client, container_sas_url):

def callback(response, _, headers):
raw_model = client._deserialize(Model, response)
custom_model = CustomFormModel._from_generated(raw_model)
custom_model = CustomFormModel._from_generated(raw_model, client.api_version)
raw_response.append(raw_model)
raw_response.append(custom_model)

Expand Down
2 changes: 1 addition & 1 deletion sdk/formrecognizer/azure-ai-formrecognizer/tests/testcase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def assertModelTransformCorrect(self, model, actual, unlabeled=False):
for a in actual.train_result.fields:
self.assertEqual(model.submodels[0].fields[a.field_name].name, a.field_name)
self.assertEqual(model.submodels[0].fields[a.field_name].accuracy, a.accuracy)
self.assertEqual(model.submodels[0].form_type, "form-"+model.model_id)
self.assertEqual(model.submodels[0].form_type, "custom:"+model.model_id)
self.assertEqual(model.submodels[0].accuracy, actual.train_result.average_model_accuracy)

def assertFormPagesTransformCorrect(self, pages, actual_read, page_result=None, **kwargs):
Expand Down