Skip to content

Commit 890071e

Browse files
author
Yalin Li
authored
[FR] Fix failing live pipeline (#35006)
1 parent 768cf3b commit 890071e

File tree

6 files changed

+122
-108
lines changed

6 files changed

+122
-108
lines changed

‎sdk/formrecognizer/azure-ai-formrecognizer/assets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/formrecognizer/azure-ai-formrecognizer",
5-
"Tag": "python/formrecognizer/azure-ai-formrecognizer_9918a968ae"
5+
"Tag": "python/formrecognizer/azure-ai-formrecognizer_b624efa337"
66
}

‎sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2_and_later/async_samples/sample_analyze_addon_barcodes_async.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ async def analyze_barcodes():
8484
# Specify which add-on capabilities to enable.
8585
with open(path_to_sample_documents, "rb") as f:
8686
poller = await document_analysis_client.begin_analyze_document(
87-
"prebuilt-layout", document=f, features=[AnalysisFeature.barcode/QR code]
87+
"prebuilt-layout", document=f, features=[AnalysisFeature.BARCODES]
8888
)
8989
result = await poller.result()
9090

‎sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2_and_later/async_samples/sample_send_request_async.py‎

Lines changed: 70 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -35,53 +35,52 @@ async def sample_send_request():
3535
endpoint=endpoint, credential=AzureKeyCredential(key)
3636
)
3737

38-
# The `send_request` method can send custom HTTP requests that share the client's existing pipeline,
39-
# while adding convenience for endpoint construction and service API versioning.
40-
# Now let's use the `send_request` method to make a resource details fetching request.
41-
# The URL of the request can be relative (your endpoint is the default base URL),
42-
# and the API version of your client will automatically be used for the request.
43-
request = HttpRequest(method="GET", url="info")
4438
async with client:
39+
# The `send_request` method can send custom HTTP requests that share the client's existing pipeline,
40+
# while adding convenience for endpoint construction and service API versioning.
41+
# Now let's use the `send_request` method to make a resource details fetching request.
42+
# The URL of the request can be relative (your endpoint is the default base URL),
43+
# and the API version of your client will automatically be used for the request.
44+
request = HttpRequest(method="GET", url="info")
4545
response = await client.send_request(request)
46-
response.raise_for_status()
47-
response_body = response.json()
48-
print(
49-
f"Our resource has {response_body['customDocumentModels']['count']} custom models, "
50-
f"and we can have at most {response_body['customDocumentModels']['limit']} custom models."
51-
f"The quota limit for custom neural document models is {response_body['customNeuralDocumentModelBuilds']['quota']} and the resource has"
52-
f"used {response_body['customNeuralDocumentModelBuilds']['used']}. The resource quota will reset on {response_body['customNeuralDocumentModelBuilds']['quotaResetDateTime']}"
53-
)
46+
response.raise_for_status()
47+
response_body = response.json()
48+
print(
49+
f"Our resource has {response_body['customDocumentModels']['count']} custom models, "
50+
f"and we can have at most {response_body['customDocumentModels']['limit']} custom models."
51+
f"The quota limit for custom neural document models is {response_body['customNeuralDocumentModelBuilds']['quota']} and the resource has"
52+
f"used {response_body['customNeuralDocumentModelBuilds']['used']}. The resource quota will reset on {response_body['customNeuralDocumentModelBuilds']['quotaResetDateTime']}"
53+
)
5454

55-
# pass with absolute url and override the API version
56-
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/info?api-version=2022-08-31")
57-
async with client:
55+
# pass with absolute url and override the API version
56+
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/info?api-version=2022-08-31")
5857
response = await client.send_request(request)
59-
response.raise_for_status()
60-
response_body = response.json()
61-
print(
62-
f"Our resource has {response_body['customDocumentModels']['count']} custom models, "
63-
f"and we can have at most {response_body['customDocumentModels']['limit']} custom models."
64-
f"The quota limit for custom neural document models is {response_body['customNeuralDocumentModelBuilds']['quota']} and the resource has"
65-
f"used {response_body['customNeuralDocumentModelBuilds']['used']}. The resource quota will reset on {response_body['customNeuralDocumentModelBuilds']['quotaResetDateTime']}"
66-
)
58+
response.raise_for_status()
59+
response_body = response.json()
60+
print(
61+
f"Our resource has {response_body['customDocumentModels']['count']} custom models, "
62+
f"and we can have at most {response_body['customDocumentModels']['limit']} custom models."
63+
)
6764

68-
# override the API version to v2.1
69-
request = HttpRequest(method="GET", url="v2.1/custom/models?op=summary")
70-
async with client:
65+
# override the API version to v2.1
66+
request = HttpRequest(method="GET", url="v2.1/custom/models?op=summary")
7167
response = await client.send_request(request)
72-
response.raise_for_status()
73-
response_body = response.json()
74-
print(f"Our account has {response_body['summary']['count']} custom models, "
75-
f"and we can have at most {response_body['summary']['limit']} custom models.")
68+
response.raise_for_status()
69+
response_body = response.json()
70+
print(
71+
f"Our account has {response_body['summary']['count']} custom models, "
72+
f"and we can have at most {response_body['summary']['limit']} custom models."
73+
)
7674

77-
# pass with absolute url and override the API version to v2.1
78-
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/v2.1/custom/models?op=summary")
79-
async with client:
75+
# pass with absolute url and override the API version to v2.1
76+
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/v2.1/custom/models?op=summary")
8077
response = await client.send_request(request)
81-
response.raise_for_status()
82-
response_body = response.json()
83-
print(f"Our account has {response_body['summary']['count']} custom models, "
84-
f"and we can have at most {response_body['summary']['limit']} custom models.")
78+
response.raise_for_status()
79+
response_body = response.json()
80+
print(
81+
f"Our account has {response_body['summary']['count']} custom models, "
82+
f"and we can have at most {response_body['summary']['limit']} custom models."
83+
)
8584

8685

8786
async def sample_send_request_v2():
@@ -92,42 +91,44 @@ async def sample_send_request_v2():
9291
client = FormTrainingClient(
9392
endpoint=endpoint, credential=AzureKeyCredential(key)
9493
)
95-
96-
# The `send_request` method can send custom HTTP requests that share the client's existing pipeline,
97-
# while adding convenience for endpoint construction and service API versioning.
98-
# Now let's use the `send_request` method to make a resource details fetching request.
99-
# The URL of the request can be relative (your endpoint is the default base URL),
100-
# and the API version of your client will automatically be used for the request.
101-
request = HttpRequest(method="GET", url="custom/models?op=summary")
94+
10295
async with client:
96+
# The `send_request` method can send custom HTTP requests that share the client's existing pipeline,
97+
# while adding convenience for endpoint construction and service API versioning.
98+
# Now let's use the `send_request` method to make a resource details fetching request.
99+
# The URL of the request can be relative (your endpoint is the default base URL),
100+
# and the API version of your client will automatically be used for the request.
101+
request = HttpRequest(method="GET", url="custom/models?op=summary")
103102
response = await client.send_request(request)
104-
response.raise_for_status()
105-
response_body = response.json()
106-
print(f"Our account has {response_body['summary']['count']} custom models, "
107-
f"and we can have at most {response_body['summary']['limit']} custom models.")
103+
response.raise_for_status()
104+
response_body = response.json()
105+
print(
106+
f"Our account has {response_body['summary']['count']} custom models, "
107+
f"and we can have at most {response_body['summary']['limit']} custom models."
108+
)
108109

109-
# pass with absolute url and override the API version
110-
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/v2.0/custom/models?op=summary")
111-
async with client:
110+
# pass with absolute url and override the API version
111+
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/v2.0/custom/models?op=summary")
112112
response = await client.send_request(request)
113-
response.raise_for_status()
114-
response_body = response.json()
115-
print(f"Our account has {response_body['summary']['count']} custom models, "
116-
f"and we can have at most {response_body['summary']['limit']} custom models.")
113+
response.raise_for_status()
114+
response_body = response.json()
115+
print(
116+
f"Our account has {response_body['summary']['count']} custom models, "
117+
f"and we can have at most {response_body['summary']['limit']} custom models."
118+
)
117119

118-
# override the API version to 2023-07-31
119-
# can only override the API version to 2022-08-31 or later with absolute url
120-
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/info?api-version=2023-07-31")
121-
async with client:
120+
# override the API version to 2023-07-31
121+
# can only override the API version to 2022-08-31 or later with absolute url
122+
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/info?api-version=2023-07-31")
122123
response = await client.send_request(request)
123-
response.raise_for_status()
124-
response_body = response.json()
125-
print(
126-
f"Our resource has {response_body['customDocumentModels']['count']} custom models, "
127-
f"and we can have at most {response_body['customDocumentModels']['limit']} custom models."
128-
f"The quota limit for custom neural document models is {response_body['customNeuralDocumentModelBuilds']['quota']} and the resource has"
129-
f"used {response_body['customNeuralDocumentModelBuilds']['used']}. The resource quota will reset on {response_body['customNeuralDocumentModelBuilds']['quotaResetDateTime']}"
130-
)
124+
response.raise_for_status()
125+
response_body = response.json()
126+
print(
127+
f"Our resource has {response_body['customDocumentModels']['count']} custom models, "
128+
f"and we can have at most {response_body['customDocumentModels']['limit']} custom models."
129+
f"The quota limit for custom neural document models is {response_body['customNeuralDocumentModelBuilds']['quota']} and the resource has"
130+
f"used {response_body['customNeuralDocumentModelBuilds']['used']}. The resource quota will reset on {response_body['customNeuralDocumentModelBuilds']['quotaResetDateTime']}"
131+
)
131132

132133

133134
async def main():

‎sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2_and_later/sample_send_request.py‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,27 @@ def sample_send_request():
5858
print(
5959
f"Our resource has {response_body['customDocumentModels']['count']} custom models, "
6060
f"and we can have at most {response_body['customDocumentModels']['limit']} custom models."
61-
f"The quota limit for custom neural document models is {response_body['customNeuralDocumentModelBuilds']['quota']} and the resource has"
62-
f"used {response_body['customNeuralDocumentModelBuilds']['used']}. The resource quota will reset on {response_body['customNeuralDocumentModelBuilds']['quotaResetDateTime']}"
6361
)
6462

6563
# override the API version to v2.1
6664
request = HttpRequest(method="GET", url="v2.1/custom/models?op=summary")
6765
response = client.send_request(request)
6866
response.raise_for_status()
6967
response_body = response.json()
70-
print(f"Our account has {response_body['summary']['count']} custom models, "
71-
f"and we can have at most {response_body['summary']['limit']} custom models.")
68+
print(
69+
f"Our account has {response_body['summary']['count']} custom models, "
70+
f"and we can have at most {response_body['summary']['limit']} custom models."
71+
)
7272

7373
# pass with absolute url and override the API version to v2.1
7474
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/v2.1/custom/models?op=summary")
7575
response = client.send_request(request)
7676
response.raise_for_status()
7777
response_body = response.json()
78-
print(f"Our account has {response_body['summary']['count']} custom models, "
79-
f"and we can have at most {response_body['summary']['limit']} custom models.")
78+
print(
79+
f"Our account has {response_body['summary']['count']} custom models, "
80+
f"and we can have at most {response_body['summary']['limit']} custom models."
81+
)
8082

8183

8284
def sample_send_request_v2():
@@ -97,16 +99,20 @@ def sample_send_request_v2():
9799
response = client.send_request(request)
98100
response.raise_for_status()
99101
response_body = response.json()
100-
print(f"Our account has {response_body['summary']['count']} custom models, "
101-
f"and we can have at most {response_body['summary']['limit']} custom models.")
102+
print(
103+
f"Our account has {response_body['summary']['count']} custom models, "
104+
f"and we can have at most {response_body['summary']['limit']} custom models."
105+
)
102106

103107
# pass with absolute url and override the API version
104108
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/v2.0/custom/models?op=summary")
105109
response = client.send_request(request)
106110
response.raise_for_status()
107111
response_body = response.json()
108-
print(f"Our account has {response_body['summary']['count']} custom models, "
109-
f"and we can have at most {response_body['summary']['limit']} custom models.")
112+
print(
113+
f"Our account has {response_body['summary']['count']} custom models, "
114+
f"and we can have at most {response_body['summary']['limit']} custom models."
115+
)
110116

111117
# override the API version to 2023-07-31
112118
request = HttpRequest(method="GET", url=f"{endpoint}/formrecognizer/info?api-version=2023-07-31")

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

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ class TestSendRequest(FormRecognizerTest):
2222
@recorded_by_proxy
2323
def test_get_resource_details(self, client, **kwargs):
2424
set_bodiless_matcher()
25+
resource_details = client.get_resource_details()
26+
2527
request = HttpRequest(
2628
method="GET",
2729
url="info",
@@ -31,8 +33,8 @@ def test_get_resource_details(self, client, **kwargs):
3133
received_info1 = result.json()
3234
assert received_info1
3335
assert received_info1["customDocumentModels"]
34-
assert received_info1["customDocumentModels"]["count"] == 0
35-
assert received_info1["customDocumentModels"]["limit"] == 250
36+
assert received_info1["customDocumentModels"]["count"] == resource_details.custom_document_models.count
37+
assert received_info1["customDocumentModels"]["limit"] == resource_details.custom_document_models.limit
3638

3739
request = HttpRequest(
3840
method="GET",
@@ -43,7 +45,7 @@ def test_get_resource_details(self, client, **kwargs):
4345
received_info2 = result.json()
4446
assert received_info2["customDocumentModels"]["count"] == received_info1["customDocumentModels"]["count"]
4547
assert received_info2["customDocumentModels"]["limit"] == received_info1["customDocumentModels"]["limit"]
46-
48+
4749
# test with absolute url
4850
request = HttpRequest(
4951
method="GET",
@@ -54,7 +56,7 @@ def test_get_resource_details(self, client, **kwargs):
5456
received_info3 = result.json()
5557
assert received_info3["customDocumentModels"]["count"] == received_info1["customDocumentModels"]["count"]
5658
assert received_info3["customDocumentModels"]["limit"] == received_info1["customDocumentModels"]["limit"]
57-
59+
5860
# test with v2 API version
5961
request = HttpRequest(
6062
method="GET",
@@ -64,9 +66,9 @@ def test_get_resource_details(self, client, **kwargs):
6466
result = client.send_request(request)
6567
received_info4 = result.json()
6668
assert received_info4
67-
assert received_info4["summary"]["count"] == 0
68-
assert received_info4["summary"]["limit"]
69-
69+
assert received_info4["summary"]["count"] == resource_details.custom_document_models.count
70+
assert received_info4["summary"]["limit"] == resource_details.custom_document_models.limit
71+
7072
# test with v2 API version with absolute url
7173
request = HttpRequest(
7274
method="GET",
@@ -83,6 +85,8 @@ def test_get_resource_details(self, client, **kwargs):
8385
@recorded_by_proxy
8486
def test_get_account_properties_v2(self, client):
8587
set_bodiless_matcher()
88+
account_properties = client.get_account_properties()
89+
8690
request = HttpRequest(
8791
method="GET",
8892
url="custom/models?op=summary",
@@ -92,9 +96,9 @@ def test_get_account_properties_v2(self, client):
9296
received_info1 = result.json()
9397
assert received_info1
9498
assert received_info1["summary"]
95-
assert received_info1["summary"]["count"] == 0
96-
assert received_info1["summary"]["limit"] == 250
97-
99+
assert received_info1["summary"]["count"] == account_properties.custom_model_count
100+
assert received_info1["summary"]["limit"] == account_properties.custom_model_limit
101+
98102
# test with absolute url
99103
request = HttpRequest(
100104
method="GET",
@@ -105,7 +109,7 @@ def test_get_account_properties_v2(self, client):
105109
received_info3 = result.json()
106110
assert received_info3["summary"]["count"] == received_info1["summary"]["count"]
107111
assert received_info3["summary"]["limit"] == received_info1["summary"]["limit"]
108-
112+
109113
# relative URLs can't override the API version on 2.x clients
110114
request = HttpRequest(
111115
method="GET",
@@ -116,7 +120,7 @@ def test_get_account_properties_v2(self, client):
116120
received_info4 = result.json()
117121
assert received_info4["error"]["code"] == "404"
118122
assert received_info4["error"]["message"] == "Resource not found"
119-
123+
120124
# test with v2 API version with absolute url
121125
request = HttpRequest(
122126
method="GET",
@@ -126,5 +130,5 @@ def test_get_account_properties_v2(self, client):
126130
result = client.send_request(request)
127131
received_info5 = result.json()
128132
assert received_info5
129-
assert received_info5["customDocumentModels"]["count"] == 0
130-
assert received_info5["customDocumentModels"]["limit"] == 250
133+
assert received_info5["customDocumentModels"]["count"] == account_properties.custom_model_count
134+
assert received_info5["customDocumentModels"]["limit"] == account_properties.custom_model_limit

0 commit comments

Comments
 (0)