Skip to content

Commit 32dbdce

Browse files
[formrecognizer] arch board feedback renames (#12207)
* renames requested_on -> training_started_on and completed_on -> training_completed_on * update docstring
1 parent 230afcf commit 32dbdce

17 files changed

+86
-85
lines changed

sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
- Remove `RecognizedReceipts` Class.
77
- `begin_recognize_receipts` and `begin_recognize_receipts_from_url` now return `RecognizedForm`.
8+
- `requested_on` renamed to `training_started_on` and `completed_on` renamed to `training_completed_on` on `CustomFormModel`
9+
and `CustomFormModelInfo`
810

911
## 1.0.0b3 (2020-06-10)
1012

sdk/formrecognizer/azure-ai-formrecognizer/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ model = poller.result()
260260
# Custom model information
261261
print("Model ID: {}".format(model.model_id))
262262
print("Status: {}".format(model.status))
263-
print("Requested on: {}".format(model.requested_on))
264-
print("Completed on: {}".format(model.completed_on))
263+
print("Training started on: {}".format(model.training_started_on))
264+
print("Training completed on: {}".format(model.training_completed_on))
265265

266266
print("Recognized fields:")
267267
# looping through the submodels, which contains the fields they were trained on
@@ -309,8 +309,8 @@ model_id = "<model id from the Train a Model sample>"
309309
custom_model = form_training_client.get_custom_model(model_id=model_id)
310310
print("Model ID: {}".format(custom_model.model_id))
311311
print("Status: {}".format(custom_model.status))
312-
print("Requested on: {}".format(custom_model.requested_on))
313-
print("Completed on: {}".format(custom_model.completed_on))
312+
print("Training started on: {}".format(custom_model.training_started_on))
313+
print("Training completed on: {}".format(custom_model.training_completed_on))
314314

315315
# Finally, we will delete this model by ID
316316
form_training_client.delete_model(model_id=custom_model.model_id)

sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_models.py

+20-21
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,9 @@ class CustomFormModel(object):
517517
Status indicating the model's readiness for use,
518518
:class:`~azure.ai.formrecognizer.CustomFormModelStatus`.
519519
Possible values include: 'creating', 'ready', 'invalid'.
520-
:ivar ~datetime.datetime requested_on:
521-
The date and time (UTC) when model training was requested.
522-
:ivar ~datetime.datetime completed_on:
520+
:ivar ~datetime.datetime training_started_on:
521+
The date and time (UTC) when model training was started.
522+
:ivar ~datetime.datetime training_completed_on:
523523
Date and time (UTC) when model training completed.
524524
:ivar list[~azure.ai.formrecognizer.CustomFormSubmodel] submodels:
525525
A list of submodels that are part of this model, each of
@@ -533,8 +533,8 @@ class CustomFormModel(object):
533533
def __init__(self, **kwargs):
534534
self.model_id = kwargs.get("model_id", None)
535535
self.status = kwargs.get("status", None)
536-
self.requested_on = kwargs.get("requested_on", None)
537-
self.completed_on = kwargs.get("completed_on", None)
536+
self.training_started_on = kwargs.get("training_started_on", None)
537+
self.training_completed_on = kwargs.get("training_completed_on", None)
538538
self.submodels = kwargs.get("submodels", None)
539539
self.errors = kwargs.get("errors", None)
540540
self.training_documents = kwargs.get("training_documents", [])
@@ -544,8 +544,8 @@ def _from_generated(cls, model):
544544
return cls(
545545
model_id=model.model_info.model_id,
546546
status=model.model_info.status,
547-
requested_on=model.model_info.created_date_time,
548-
completed_on=model.model_info.last_updated_date_time,
547+
training_started_on=model.model_info.created_date_time,
548+
training_completed_on=model.model_info.last_updated_date_time,
549549
submodels=CustomFormSubmodel._from_generated_unlabeled(model)
550550
if model.keys else CustomFormSubmodel._from_generated_labeled(model),
551551
errors=FormRecognizerError._from_generated(model.train_result.errors) if model.train_result else None,
@@ -554,11 +554,10 @@ def _from_generated(cls, model):
554554
)
555555

556556
def __repr__(self):
557-
return "CustomFormModel(model_id={}, status={}, requested_on={}, completed_on={}, submodels={}, " \
558-
"errors={}, training_documents={})".format(
559-
self.model_id, self.status, self.requested_on, self.completed_on, repr(self.submodels),
560-
repr(self.errors), repr(self.training_documents)
561-
)[:1024]
557+
return "CustomFormModel(model_id={}, status={}, training_started_on={}, training_completed_on={}, " \
558+
"submodels={}, errors={}, training_documents={})".format(
559+
self.model_id, self.status, self.training_started_on, self.training_completed_on,
560+
repr(self.submodels), repr(self.errors), repr(self.training_documents))[:1024]
562561

563562

564563
class CustomFormSubmodel(object):
@@ -698,17 +697,17 @@ class CustomFormModelInfo(object):
698697
:ivar str status:
699698
The status of the model, :class:`~azure.ai.formrecognizer.CustomFormModelStatus`.
700699
Possible values include: 'creating', 'ready', 'invalid'.
701-
:ivar ~datetime.datetime requested_on:
702-
Date and time (UTC) when model training was requested.
703-
:ivar ~datetime.datetime completed_on:
700+
:ivar ~datetime.datetime training_started_on:
701+
Date and time (UTC) when model training was started.
702+
:ivar ~datetime.datetime training_completed_on:
704703
Date and time (UTC) when model training completed.
705704
"""
706705

707706
def __init__(self, **kwargs):
708707
self.model_id = kwargs.get("model_id", None)
709708
self.status = kwargs.get("status", None)
710-
self.requested_on = kwargs.get("requested_on", None)
711-
self.completed_on = kwargs.get("completed_on", None)
709+
self.training_started_on = kwargs.get("training_started_on", None)
710+
self.training_completed_on = kwargs.get("training_completed_on", None)
712711

713712
@classmethod
714713
def _from_generated(cls, model, model_id=None):
@@ -717,13 +716,13 @@ def _from_generated(cls, model, model_id=None):
717716
return cls(
718717
model_id=model_id if model_id else model.model_id,
719718
status=model.status,
720-
requested_on=model.created_date_time,
721-
completed_on=model.last_updated_date_time
719+
training_started_on=model.created_date_time,
720+
training_completed_on=model.last_updated_date_time
722721
)
723722

724723
def __repr__(self):
725-
return "CustomFormModelInfo(model_id={}, status={}, requested_on={}, completed_on={})".format(
726-
self.model_id, self.status, self.requested_on, self.completed_on
724+
return "CustomFormModelInfo(model_id={}, status={}, training_started_on={}, training_completed_on={})".format(
725+
self.model_id, self.status, self.training_started_on, self.training_completed_on
727726
)[:1024]
728727

729728

sdk/formrecognizer/azure-ai-formrecognizer/samples/async_samples/sample_manage_custom_models_async.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ async def manage_custom_models(self):
6565
custom_model = await form_training_client.get_custom_model(model_id=first_model.model_id)
6666
print("Model ID: {}".format(custom_model.model_id))
6767
print("Status: {}".format(custom_model.status))
68-
print("Requested on: {}".format(custom_model.requested_on))
69-
print("Completed on: {}".format(custom_model.completed_on))
68+
print("Training started on: {}".format(custom_model.training_started_on))
69+
print("Training completed on: {}".format(custom_model.training_completed_on))
7070
# [END get_custom_model_async]
7171

7272
# Finally, we will delete this model by ID

sdk/formrecognizer/azure-ai-formrecognizer/samples/async_samples/sample_train_model_with_labels_async.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ async def train_model_with_labels(self):
5151
# Custom model information
5252
print("Model ID: {}".format(model.model_id))
5353
print("Status: {}".format(model.status))
54-
print("Requested on: {}".format(model.requested_on))
55-
print("Completed on: {}".format(model.completed_on))
54+
print("Training started on: {}".format(model.training_started_on))
55+
print("Training completed on: {}".format(model.training_completed_on))
5656

5757
print("Recognized fields:")
5858
# looping through the submodels, which contains the fields they were trained on

sdk/formrecognizer/azure-ai-formrecognizer/samples/async_samples/sample_train_model_without_labels_async.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ async def train_model_without_labels(self):
4848
# Custom model information
4949
print("Model ID: {}".format(model.model_id))
5050
print("Status: {}".format(model.status))
51-
print("Requested on: {}".format(model.requested_on))
52-
print("Completed on: {}".format(model.completed_on))
51+
print("Training started on: {}".format(model.training_started_on))
52+
print("Training completed on: {}".format(model.training_completed_on))
5353

5454
print("Recognized fields:")
5555
# Looping through the submodels, which contains the fields they were trained on

sdk/formrecognizer/azure-ai-formrecognizer/samples/sample_manage_custom_models.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ def manage_custom_models(self):
6161
custom_model = form_training_client.get_custom_model(model_id=first_model.model_id)
6262
print("Model ID: {}".format(custom_model.model_id))
6363
print("Status: {}".format(custom_model.status))
64-
print("Requested on: {}".format(custom_model.requested_on))
65-
print("Completed on: {}".format(custom_model.completed_on))
64+
print("Training started on: {}".format(custom_model.training_started_on))
65+
print("Training completed on: {}".format(custom_model.training_completed_on))
6666
# [END get_custom_model]
6767

6868
# Finally, we will delete this model by ID

sdk/formrecognizer/azure-ai-formrecognizer/samples/sample_train_model_with_labels.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ def train_model_with_labels(self):
4646
# Custom model information
4747
print("Model ID: {}".format(model.model_id))
4848
print("Status: {}".format(model.status))
49-
print("Requested on: {}".format(model.requested_on))
50-
print("Completed on: {}".format(model.completed_on))
49+
print("Training started on: {}".format(model.training_started_on))
50+
print("Training completed on: {}".format(model.training_completed_on))
5151

5252
print("Recognized fields:")
5353
# looping through the submodels, which contains the fields they were trained on

sdk/formrecognizer/azure-ai-formrecognizer/samples/sample_train_model_without_labels.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ def train_model_without_labels(self):
4444
# Custom model information
4545
print("Model ID: {}".format(model.model_id))
4646
print("Status: {}".format(model.status))
47-
print("Requested on: {}".format(model.requested_on))
48-
print("Completed on: {}".format(model.completed_on))
47+
print("Training started on: {}".format(model.training_started_on))
48+
print("Training completed on: {}".format(model.training_completed_on))
4949

5050
print("Recognized fields:")
5151
# Looping through the submodels, which contains the fields they were trained on

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_copy_model.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ def test_copy_model_successful(self, client, container_sas_url, location, resour
4646
copied_model = client.get_custom_model(copy.model_id)
4747

4848
self.assertEqual(copy.status, "ready")
49-
self.assertIsNotNone(copy.requested_on)
50-
self.assertIsNotNone(copy.completed_on)
49+
self.assertIsNotNone(copy.training_started_on)
50+
self.assertIsNotNone(copy.training_completed_on)
5151
self.assertEqual(target["modelId"], copy.model_id)
5252
self.assertNotEqual(target["modelId"], model.model_id)
5353
self.assertIsNotNone(copied_model)
@@ -103,9 +103,9 @@ def callback(response, _, headers):
103103

104104
actual = raw_response[0]
105105
copy = raw_response[1]
106-
self.assertEqual(copy.requested_on, actual.created_date_time)
106+
self.assertEqual(copy.training_started_on, actual.created_date_time)
107107
self.assertEqual(copy.status, actual.status)
108-
self.assertEqual(copy.completed_on, actual.last_updated_date_time)
108+
self.assertEqual(copy.training_completed_on, actual.last_updated_date_time)
109109
self.assertEqual(copy.model_id, target["modelId"])
110110

111111
@GlobalFormRecognizerAccountPreparer()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_copy_model_async.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ async def test_copy_model_successful(self, client, container_sas_url, location,
4747
copied_model = await client.get_custom_model(copy.model_id)
4848

4949
self.assertEqual(copy.status, "ready")
50-
self.assertIsNotNone(copy.requested_on)
51-
self.assertIsNotNone(copy.completed_on)
50+
self.assertIsNotNone(copy.training_started_on)
51+
self.assertIsNotNone(copy.training_completed_on)
5252
self.assertEqual(target["modelId"], copy.model_id)
5353
self.assertNotEqual(target["modelId"], model.model_id)
5454
self.assertIsNotNone(copied_model)
@@ -104,9 +104,9 @@ def callback(response, _, headers):
104104

105105
actual = raw_response[0]
106106
copy = raw_response[1]
107-
self.assertEqual(copy.requested_on, actual.created_date_time)
107+
self.assertEqual(copy.training_started_on, actual.created_date_time)
108108
self.assertEqual(copy.status, actual.status)
109-
self.assertEqual(copy.completed_on, actual.last_updated_date_time)
109+
self.assertEqual(copy.training_completed_on, actual.last_updated_date_time)
110110
self.assertEqual(copy.model_id, target["modelId"])
111111

112112
@GlobalFormRecognizerAccountPreparer()

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ def test_mgmt_model_labeled(self, client, container_sas_url):
8787

8888
self.assertEqual(labeled_model_from_train.model_id, labeled_model_from_get.model_id)
8989
self.assertEqual(labeled_model_from_train.status, labeled_model_from_get.status)
90-
self.assertEqual(labeled_model_from_train.requested_on, labeled_model_from_get.requested_on)
91-
self.assertEqual(labeled_model_from_train.completed_on, labeled_model_from_get.completed_on)
90+
self.assertEqual(labeled_model_from_train.training_started_on, labeled_model_from_get.training_started_on)
91+
self.assertEqual(labeled_model_from_train.training_completed_on, labeled_model_from_get.training_completed_on)
9292
self.assertEqual(labeled_model_from_train.errors, labeled_model_from_get.errors)
9393
for a, b in zip(labeled_model_from_train.training_documents, labeled_model_from_get.training_documents):
9494
self.assertEqual(a.document_name, b.document_name)
@@ -104,8 +104,8 @@ def test_mgmt_model_labeled(self, client, container_sas_url):
104104
for model in models_list:
105105
self.assertIsNotNone(model.model_id)
106106
self.assertIsNotNone(model.status)
107-
self.assertIsNotNone(model.requested_on)
108-
self.assertIsNotNone(model.completed_on)
107+
self.assertIsNotNone(model.training_started_on)
108+
self.assertIsNotNone(model.training_completed_on)
109109

110110
client.delete_model(labeled_model_from_train.model_id)
111111

@@ -123,8 +123,8 @@ def test_mgmt_model_unlabeled(self, client, container_sas_url):
123123

124124
self.assertEqual(unlabeled_model_from_train.model_id, unlabeled_model_from_get.model_id)
125125
self.assertEqual(unlabeled_model_from_train.status, unlabeled_model_from_get.status)
126-
self.assertEqual(unlabeled_model_from_train.requested_on, unlabeled_model_from_get.requested_on)
127-
self.assertEqual(unlabeled_model_from_train.completed_on, unlabeled_model_from_get.completed_on)
126+
self.assertEqual(unlabeled_model_from_train.training_started_on, unlabeled_model_from_get.training_started_on)
127+
self.assertEqual(unlabeled_model_from_train.training_completed_on, unlabeled_model_from_get.training_completed_on)
128128
self.assertEqual(unlabeled_model_from_train.errors, unlabeled_model_from_get.errors)
129129
for a, b in zip(unlabeled_model_from_train.training_documents, unlabeled_model_from_get.training_documents):
130130
self.assertEqual(a.document_name, b.document_name)
@@ -139,8 +139,8 @@ def test_mgmt_model_unlabeled(self, client, container_sas_url):
139139
for model in models_list:
140140
self.assertIsNotNone(model.model_id)
141141
self.assertIsNotNone(model.status)
142-
self.assertIsNotNone(model.requested_on)
143-
self.assertIsNotNone(model.completed_on)
142+
self.assertIsNotNone(model.training_started_on)
143+
self.assertIsNotNone(model.training_completed_on)
144144

145145
client.delete_model(unlabeled_model_from_train.model_id)
146146

sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt_async.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ async def test_mgmt_model_labeled(self, client, container_sas_url):
9797

9898
self.assertEqual(labeled_model_from_train.model_id, labeled_model_from_get.model_id)
9999
self.assertEqual(labeled_model_from_train.status, labeled_model_from_get.status)
100-
self.assertEqual(labeled_model_from_train.requested_on, labeled_model_from_get.requested_on)
101-
self.assertEqual(labeled_model_from_train.completed_on, labeled_model_from_get.completed_on)
100+
self.assertEqual(labeled_model_from_train.training_started_on, labeled_model_from_get.training_started_on)
101+
self.assertEqual(labeled_model_from_train.training_completed_on, labeled_model_from_get.training_completed_on)
102102
self.assertEqual(labeled_model_from_train.errors, labeled_model_from_get.errors)
103103
for a, b in zip(labeled_model_from_train.training_documents, labeled_model_from_get.training_documents):
104104
self.assertEqual(a.document_name, b.document_name)
@@ -114,8 +114,8 @@ async def test_mgmt_model_labeled(self, client, container_sas_url):
114114
async for model in models_list:
115115
self.assertIsNotNone(model.model_id)
116116
self.assertIsNotNone(model.status)
117-
self.assertIsNotNone(model.requested_on)
118-
self.assertIsNotNone(model.completed_on)
117+
self.assertIsNotNone(model.training_started_on)
118+
self.assertIsNotNone(model.training_completed_on)
119119

120120
await client.delete_model(labeled_model_from_train.model_id)
121121

@@ -131,8 +131,8 @@ async def test_mgmt_model_unlabeled(self, client, container_sas_url):
131131

132132
self.assertEqual(unlabeled_model_from_train.model_id, unlabeled_model_from_get.model_id)
133133
self.assertEqual(unlabeled_model_from_train.status, unlabeled_model_from_get.status)
134-
self.assertEqual(unlabeled_model_from_train.requested_on, unlabeled_model_from_get.requested_on)
135-
self.assertEqual(unlabeled_model_from_train.completed_on, unlabeled_model_from_get.completed_on)
134+
self.assertEqual(unlabeled_model_from_train.training_started_on, unlabeled_model_from_get.training_started_on)
135+
self.assertEqual(unlabeled_model_from_train.training_completed_on, unlabeled_model_from_get.training_completed_on)
136136
self.assertEqual(unlabeled_model_from_train.errors, unlabeled_model_from_get.errors)
137137
for a, b in zip(unlabeled_model_from_train.training_documents, unlabeled_model_from_get.training_documents):
138138
self.assertEqual(a.document_name, b.document_name)
@@ -147,8 +147,8 @@ async def test_mgmt_model_unlabeled(self, client, container_sas_url):
147147
async for model in models_list:
148148
self.assertIsNotNone(model.model_id)
149149
self.assertIsNotNone(model.status)
150-
self.assertIsNotNone(model.requested_on)
151-
self.assertIsNotNone(model.completed_on)
150+
self.assertIsNotNone(model.training_started_on)
151+
self.assertIsNotNone(model.training_completed_on)
152152

153153
await client.delete_model(unlabeled_model_from_train.model_id)
154154

0 commit comments

Comments
 (0)