Skip to content

Commit b9211fb

Browse files
catalinaperaltacatalinaperalta
authored
[formrecognizer] Fix v2 custom forms tests (Azure#20923)
* fix v2 custom forms tests * update prebuilt document pages tests
1 parent 77820ae commit b9211fb

File tree

8 files changed

+506
-240
lines changed

8 files changed

+506
-240
lines changed

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_document.test_document_specify_pages.yaml‎

Lines changed: 204 additions & 99 deletions
Large diffs are not rendered by default.

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_document_async.test_document_specify_pages.yaml‎

Lines changed: 224 additions & 63 deletions
Large diffs are not rendered by default.

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/test_custom_forms.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ def test_analyze_document_empty_model_id(self, formrecognizer_test_endpoint, for
3535

3636
@FormRecognizerPreparer()
3737
@FormTrainingClientPreparer()
38-
def test_custom_form_unlabeled(self, client, formrecognizer_storage_container_sas_url):
38+
def test_custom_form_unlabeled(self, client, formrecognizer_storage_container_sas_url_v2):
3939
fr_client = client.get_form_recognizer_client()
4040

41-
poller = client.begin_training(formrecognizer_storage_container_sas_url, use_training_labels=False)
41+
poller = client.begin_training(formrecognizer_storage_container_sas_url_v2, use_training_labels=False)
4242
model = poller.result()
4343

4444
with open(self.form_jpg, "rb") as stream:
@@ -54,10 +54,10 @@ def test_custom_form_unlabeled(self, client, formrecognizer_storage_container_sa
5454

5555
@FormRecognizerPreparer()
5656
@FormTrainingClientPreparer()
57-
def test_custom_form_multipage_unlabeled(self, client, formrecognizer_multipage_storage_container_sas_url):
57+
def test_custom_form_multipage_unlabeled(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
5858
fr_client = client.get_form_recognizer_client()
5959

60-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url, use_training_labels=False)
60+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_v2, use_training_labels=False)
6161
model = poller.result()
6262

6363
with open(self.multipage_invoice_pdf, "rb") as stream:
@@ -76,11 +76,11 @@ def test_custom_form_multipage_unlabeled(self, client, formrecognizer_multipage_
7676

7777
@FormRecognizerPreparer()
7878
@FormTrainingClientPreparer()
79-
def test_custom_form_labeled(self, client, formrecognizer_storage_container_sas_url):
79+
def test_custom_form_labeled(self, client, formrecognizer_storage_container_sas_url_v2):
8080
fr_client = client.get_form_recognizer_client()
8181

8282
poller = client.begin_training(
83-
formrecognizer_storage_container_sas_url,
83+
formrecognizer_storage_container_sas_url_v2,
8484
use_training_labels=True,
8585
model_name="labeled"
8686
)
@@ -97,11 +97,11 @@ def test_custom_form_labeled(self, client, formrecognizer_storage_container_sas_
9797

9898
@FormRecognizerPreparer()
9999
@FormTrainingClientPreparer()
100-
def test_custom_form_multipage_labeled(self, client, formrecognizer_multipage_storage_container_sas_url):
100+
def test_custom_form_multipage_labeled(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
101101
fr_client = client.get_form_recognizer_client()
102102

103103
poller = client.begin_training(
104-
formrecognizer_multipage_storage_container_sas_url,
104+
formrecognizer_multipage_storage_container_sas_url_v2,
105105
use_training_labels=True
106106
)
107107
model = poller.result()
@@ -122,10 +122,10 @@ def test_custom_form_multipage_labeled(self, client, formrecognizer_multipage_st
122122

123123
@FormRecognizerPreparer()
124124
@FormTrainingClientPreparer()
125-
def test_custom_form_unlabeled_transform(self, client, formrecognizer_storage_container_sas_url):
125+
def test_custom_form_unlabeled_transform(self, client, formrecognizer_storage_container_sas_url_v2):
126126
fr_client = client.get_form_recognizer_client()
127127

128-
poller = client.begin_training(formrecognizer_storage_container_sas_url, use_training_labels=False)
128+
poller = client.begin_training(formrecognizer_storage_container_sas_url_v2, use_training_labels=False)
129129
model = poller.result()
130130

131131
responses = []
@@ -175,10 +175,10 @@ def callback(raw_response, _, headers):
175175

176176
@FormRecognizerPreparer()
177177
@FormTrainingClientPreparer()
178-
def test_custom_form_multipage_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url):
178+
def test_custom_form_multipage_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
179179
fr_client = client.get_form_recognizer_client()
180180

181-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url, use_training_labels=False)
181+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_v2, use_training_labels=False)
182182
model = poller.result()
183183

184184
responses = []
@@ -304,10 +304,10 @@ def callback(raw_response, _, headers):
304304
@FormRecognizerPreparer()
305305
@FormTrainingClientPreparer()
306306
@pytest.mark.live_test_only
307-
def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url):
307+
def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url_v2):
308308
fr_client = client.get_form_recognizer_client()
309309

310-
poller = client.begin_training(formrecognizer_storage_container_sas_url, use_training_labels=False)
310+
poller = client.begin_training(formrecognizer_storage_container_sas_url_v2, use_training_labels=False)
311311
model = poller.result()
312312

313313
with open(self.form_jpg, "rb") as fd:
@@ -328,10 +328,10 @@ def test_custom_form_continuation_token(self, client, formrecognizer_storage_con
328328

329329
@FormRecognizerPreparer()
330330
@FormTrainingClientPreparer()
331-
def test_custom_form_multipage_vendor_set_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2):
331+
def test_custom_form_multipage_vendor_set_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2_v2):
332332
fr_client = client.get_form_recognizer_client()
333333

334-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_2, use_training_labels=False)
334+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_2_v2, use_training_labels=False)
335335
model = poller.result()
336336

337337
responses = []
@@ -367,10 +367,10 @@ def callback(raw_response, _, headers):
367367

368368
@FormRecognizerPreparer()
369369
@FormTrainingClientPreparer()
370-
def test_custom_form_multipage_vendor_set_labeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2):
370+
def test_custom_form_multipage_vendor_set_labeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2_v2):
371371
fr_client = client.get_form_recognizer_client()
372372

373-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_2, use_training_labels=True)
373+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_2_v2, use_training_labels=True)
374374
model = poller.result()
375375

376376
responses = []

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/test_custom_forms_async.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ async def test_analyze_document_empty_model_id(self, formrecognizer_test_endpoin
3939

4040
@FormRecognizerPreparer()
4141
@FormTrainingClientPreparer()
42-
async def test_custom_form_unlabeled(self, client, formrecognizer_storage_container_sas_url):
42+
async def test_custom_form_unlabeled(self, client, formrecognizer_storage_container_sas_url_v2):
4343
fr_client = client.get_form_recognizer_client()
4444

4545
with open(self.form_jpg, "rb") as fd:
4646
myfile = fd.read()
4747

4848
async with client:
49-
training_poller = await client.begin_training(formrecognizer_storage_container_sas_url, use_training_labels=False)
49+
training_poller = await client.begin_training(formrecognizer_storage_container_sas_url_v2, use_training_labels=False)
5050
model = await training_poller.result()
5151

5252
async with fr_client:
@@ -57,13 +57,13 @@ async def test_custom_form_unlabeled(self, client, formrecognizer_storage_contai
5757

5858
@FormRecognizerPreparer()
5959
@FormTrainingClientPreparer()
60-
async def test_custom_form_multipage_unlabeled(self, client, formrecognizer_multipage_storage_container_sas_url):
60+
async def test_custom_form_multipage_unlabeled(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
6161
fr_client = client.get_form_recognizer_client()
6262
with open(self.multipage_invoice_pdf, "rb") as fd:
6363
myfile = fd.read()
6464

6565
async with client:
66-
training_poller = await client.begin_training(formrecognizer_multipage_storage_container_sas_url, use_training_labels=False)
66+
training_poller = await client.begin_training(formrecognizer_multipage_storage_container_sas_url_v2, use_training_labels=False)
6767
model = await training_poller.result()
6868

6969
async with fr_client:
@@ -82,14 +82,14 @@ async def test_custom_form_multipage_unlabeled(self, client, formrecognizer_mult
8282

8383
@FormRecognizerPreparer()
8484
@FormTrainingClientPreparer()
85-
async def test_custom_form_multipage_labeled(self, client, formrecognizer_multipage_storage_container_sas_url):
85+
async def test_custom_form_multipage_labeled(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
8686
fr_client = client.get_form_recognizer_client()
8787
with open(self.multipage_invoice_pdf, "rb") as fd:
8888
myfile = fd.read()
8989

9090
async with client:
9191
training_poller = await client.begin_training(
92-
formrecognizer_multipage_storage_container_sas_url,
92+
formrecognizer_multipage_storage_container_sas_url_v2,
9393
use_training_labels=True
9494
)
9595
model = await training_poller.result()
@@ -108,7 +108,7 @@ async def test_custom_form_multipage_labeled(self, client, formrecognizer_multip
108108

109109
@FormRecognizerPreparer()
110110
@FormTrainingClientPreparer()
111-
async def test_custom_forms_multipage_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url):
111+
async def test_custom_forms_multipage_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
112112
fr_client = client.get_form_recognizer_client()
113113

114114
responses = []
@@ -123,7 +123,7 @@ def callback(raw_response, _, headers):
123123
myfile = fd.read()
124124

125125
async with client:
126-
training_poller = await client.begin_training(formrecognizer_multipage_storage_container_sas_url, use_training_labels=False)
126+
training_poller = await client.begin_training(formrecognizer_multipage_storage_container_sas_url_v2, use_training_labels=False)
127127
model = await training_poller.result()
128128

129129
async with fr_client:
@@ -244,13 +244,13 @@ def callback(raw_response, _, headers):
244244
@FormRecognizerPreparer()
245245
@FormTrainingClientPreparer()
246246
@pytest.mark.live_test_only
247-
async def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url):
247+
async def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url_v2):
248248
fr_client = client.get_form_recognizer_client()
249249
with open(self.form_jpg, "rb") as fd:
250250
myfile = fd.read()
251251

252252
async with client:
253-
poller = await client.begin_training(formrecognizer_storage_container_sas_url, use_training_labels=False)
253+
poller = await client.begin_training(formrecognizer_storage_container_sas_url_v2, use_training_labels=False)
254254
model = await poller.result()
255255

256256
async with fr_client:
@@ -271,7 +271,7 @@ async def test_custom_form_continuation_token(self, client, formrecognizer_stora
271271

272272
@FormRecognizerPreparer()
273273
@FormTrainingClientPreparer()
274-
async def test_custom_form_multipage_vendor_set_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2):
274+
async def test_custom_form_multipage_vendor_set_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2_v2):
275275
fr_client = client.get_form_recognizer_client()
276276

277277
responses = []
@@ -286,7 +286,7 @@ def callback(raw_response, _, headers):
286286
myfile = fd.read()
287287

288288
async with client:
289-
poller = await client.begin_training(formrecognizer_multipage_storage_container_sas_url_2, use_training_labels=False)
289+
poller = await client.begin_training(formrecognizer_multipage_storage_container_sas_url_2_v2, use_training_labels=False)
290290
model = await poller.result()
291291

292292
async with fr_client:
@@ -312,7 +312,7 @@ def callback(raw_response, _, headers):
312312

313313
@FormRecognizerPreparer()
314314
@FormTrainingClientPreparer()
315-
async def test_custom_form_multipage_vendor_set_labeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2):
315+
async def test_custom_form_multipage_vendor_set_labeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2_v2):
316316
fr_client = client.get_form_recognizer_client()
317317

318318
responses = []
@@ -327,7 +327,7 @@ def callback(raw_response, _, headers):
327327
responses.append(form)
328328

329329
async with client:
330-
poller = await client.begin_training(formrecognizer_multipage_storage_container_sas_url_2, use_training_labels=True)
330+
poller = await client.begin_training(formrecognizer_multipage_storage_container_sas_url_2_v2, use_training_labels=True)
331331
model = await poller.result()
332332

333333
async with fr_client:

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/test_custom_forms_from_url.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ def test_document_analysis_empty_model_id(self, formrecognizer_test_endpoint, fo
3636

3737
@FormRecognizerPreparer()
3838
@FormTrainingClientPreparer()
39-
def test_form_multipage_unlabeled(self, client, formrecognizer_multipage_storage_container_sas_url):
40-
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url, "multipage-training-data", "multipage_invoice1.pdf")
39+
def test_form_multipage_unlabeled(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
40+
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url_v2, "multipage-training-data", "multipage_invoice1.pdf")
4141
fr_client = client.get_form_recognizer_client()
4242

43-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url, use_training_labels=False)
43+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_v2, use_training_labels=False)
4444
model = poller.result()
4545

4646
poller = fr_client.begin_recognize_custom_forms_from_url(
@@ -57,12 +57,12 @@ def test_form_multipage_unlabeled(self, client, formrecognizer_multipage_storage
5757

5858
@FormRecognizerPreparer()
5959
@FormTrainingClientPreparer()
60-
def test_form_multipage_labeled(self, client, formrecognizer_multipage_storage_container_sas_url):
61-
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url, "multipage-training-data", "multipage_invoice1.pdf")
60+
def test_form_multipage_labeled(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
61+
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url_v2, "multipage-training-data", "multipage_invoice1.pdf")
6262
fr_client = client.get_form_recognizer_client()
6363

6464
poller = client.begin_training(
65-
formrecognizer_multipage_storage_container_sas_url,
65+
formrecognizer_multipage_storage_container_sas_url_v2,
6666
use_training_labels=True
6767
)
6868
model = poller.result()
@@ -79,10 +79,10 @@ def test_form_multipage_labeled(self, client, formrecognizer_multipage_storage_c
7979

8080
@FormRecognizerPreparer()
8181
@FormTrainingClientPreparer()
82-
def test_custom_form_multipage_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url):
82+
def test_custom_form_multipage_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
8383
fr_client = client.get_form_recognizer_client()
84-
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url, "multipage-training-data", "multipage_invoice1.pdf")
85-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url, use_training_labels=False)
84+
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url_v2, "multipage-training-data", "multipage_invoice1.pdf")
85+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_v2, use_training_labels=False)
8686
model = poller.result()
8787

8888
responses = []
@@ -116,10 +116,10 @@ def callback(raw_response, _, headers):
116116

117117
@FormRecognizerPreparer()
118118
@FormTrainingClientPreparer()
119-
def test_custom_form_multipage_labeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url):
119+
def test_custom_form_multipage_labeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_v2):
120120
fr_client = client.get_form_recognizer_client()
121-
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url, "multipage-training-data", "multipage_invoice1.pdf")
122-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url, use_training_labels=True)
121+
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url_v2, "multipage-training-data", "multipage_invoice1.pdf")
122+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_v2, use_training_labels=True)
123123
model = poller.result()
124124

125125
responses = []
@@ -155,10 +155,10 @@ def callback(raw_response, _, headers):
155155
@FormRecognizerPreparer()
156156
@FormTrainingClientPreparer()
157157
@pytest.mark.live_test_only
158-
def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url):
158+
def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url_v2):
159159
fr_client = client.get_form_recognizer_client()
160160

161-
training_poller = client.begin_training(formrecognizer_storage_container_sas_url, use_training_labels=False)
161+
training_poller = client.begin_training(formrecognizer_storage_container_sas_url_v2, use_training_labels=False)
162162
model = training_poller.result()
163163

164164
initial_poller = fr_client.begin_recognize_custom_forms_from_url(
@@ -178,10 +178,10 @@ def test_custom_form_continuation_token(self, client, formrecognizer_storage_con
178178

179179
@FormRecognizerPreparer()
180180
@FormTrainingClientPreparer()
181-
def test_custom_form_multipage_vendor_set_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2):
181+
def test_custom_form_multipage_vendor_set_unlabeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2_v2):
182182
fr_client = client.get_form_recognizer_client()
183-
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url_2, "multipage-vendor-forms", "multi1.pdf")
184-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_2, use_training_labels=False)
183+
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url_2_v2, "multipage-vendor-forms", "multi1.pdf")
184+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_2_v2, use_training_labels=False)
185185
model = poller.result()
186186

187187
responses = []
@@ -215,10 +215,10 @@ def callback(raw_response, _, headers):
215215

216216
@FormRecognizerPreparer()
217217
@FormTrainingClientPreparer()
218-
def test_custom_form_multipage_vendor_set_labeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2):
218+
def test_custom_form_multipage_vendor_set_labeled_transform(self, client, formrecognizer_multipage_storage_container_sas_url_2_v2):
219219
fr_client = client.get_form_recognizer_client()
220-
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url_2, "multipage-vendor-forms", "multi1.pdf")
221-
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_2, use_training_labels=True)
220+
blob_sas_url = self.get_blob_url(formrecognizer_multipage_storage_container_sas_url_2_v2, "multipage-vendor-forms", "multi1.pdf")
221+
poller = client.begin_training(formrecognizer_multipage_storage_container_sas_url_2_v2, use_training_labels=True)
222222
model = poller.result()
223223

224224
responses = []

0 commit comments

Comments
 (0)