diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md index 4d96ae9573ca..4f2895f71e2b 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md +++ b/sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md @@ -6,6 +6,8 @@ - Added `TargetAuthorization` of type `dict[str, str]`. ### Breaking Changes +- Renamed `source` argument to `blob_container_url` on `begin_build_model()`. +- Changed argument order on `begin_build_model()`. `build_mode` is the first expected argument, followed by `blob_container_url`. - Renamed `begin_create_composed_model()` on `DocumentModelAdministrationClient` to `begin_compose_model()`. - Renamed `get_account_info()` on `DocumentModelAdministrationClient` to `get_resource_details()`. - Renamed `AccountInfo` model to `ResourceDetails`. diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/MIGRATION_GUIDE.md b/sdk/formrecognizer/azure-ai-formrecognizer/MIGRATION_GUIDE.md index 82c439bcc430..6d57c02d0828 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/MIGRATION_GUIDE.md +++ b/sdk/formrecognizer/azure-ai-formrecognizer/MIGRATION_GUIDE.md @@ -643,7 +643,7 @@ Train a custom model with `3.2.x`: ```python document_model_admin_client = DocumentModelAdministrationClient(endpoint, AzureKeyCredential(key)) poller = document_model_admin_client.begin_build_model( - container_sas_url, "template", model_id="my-model-id", description="my model description" + "template", container_sas_url, model_id="my-model-id", description="my model description" ) model = poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/README.md b/sdk/formrecognizer/azure-ai-formrecognizer/README.md index 88a5daf36748..e88132cf62b0 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/README.md +++ b/sdk/formrecognizer/azure-ai-formrecognizer/README.md @@ -423,7 +423,7 @@ document_model_admin_client = DocumentModelAdministrationClient(endpoint, creden container_sas_url = "" # training documents uploaded to blob storage poller = document_model_admin_client.begin_build_model( # For more information about build_mode, see: https://aka.ms/azsdk/formrecognizer/buildmode - source=container_sas_url, build_mode="template", model_id="my-first-model" + build_mode="template", blob_container_url=container_sas_url, model_id="my-first-model" ) model = poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_document_model_administration_client.py b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_document_model_administration_client.py index 1c6b6f00b168..2589ce44a62f 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_document_model_administration_client.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_document_model_administration_client.py @@ -93,11 +93,11 @@ def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, TokenCre @distributed_trace def begin_build_model( - self, source: str, build_mode: Union[str, DocumentBuildMode], **kwargs: Any + self, build_mode: Union[str, DocumentBuildMode], blob_container_url: str, **kwargs: Any ) -> DocumentModelAdministrationLROPoller[DocumentModelDetails]: """Build a custom model. - The request must include a `source` parameter that is an + The request must include a `blob_container_url` parameter that is an externally accessible Azure storage blob container URI (preferably a Shared Access Signature URI). Note that a container URI (without SAS) is accepted only when the container is public or has a managed identity configured, see more about configuring managed identities to work with Form Recognizer here: @@ -105,15 +105,15 @@ def begin_build_model( Models are built using documents that are of the following content type - 'application/pdf', 'image/jpeg', 'image/png', 'image/tiff', or 'image/bmp'. Other types of content in the container is ignored. - :param str source: An Azure Storage blob container's SAS URI. A container URI (without SAS) - can be used if the container is public or has a managed identity configured. For more information on - setting up a training data set, see: https://aka.ms/azsdk/formrecognizer/buildtrainingset. :param build_mode: The custom model build mode. Possible values include: "template", "neural". For more information about build modes, see: https://aka.ms/azsdk/formrecognizer/buildmode. + :param str blob_container_url: An Azure Storage blob container's SAS URI. A container URI (without SAS) + can be used if the container is public or has a managed identity configured. For more information on + setting up a training data set, see: https://aka.ms/azsdk/formrecognizer/buildtrainingset. :type build_mode: str or :class:`~azure.ai.formrecognizer.DocumentBuildMode` :keyword str model_id: A unique ID for your model. If not specified, a model ID will be created for you. :keyword str description: An optional description to add to the model. - :keyword str prefix: A case-sensitive prefix string to filter documents in the source path. + :keyword str prefix: A case-sensitive prefix string to filter documents in the blob container url path. For example, when using an Azure storage blob URI, use the prefix to restrict sub folders. `prefix` should end in '/' to avoid cases where filenames share the same prefix. :keyword tags: List of user defined key-value tag attributes associated with the model. @@ -164,7 +164,7 @@ def callback(raw_response, _, headers): # pylint: disable=unused-argument description=description, tags=tags, azure_blob_source=self._generated_models.AzureBlobContentSource( - container_url=source, + container_url=blob_container_url, prefix=kwargs.pop("prefix", None), ), ), diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_document_model_administration_client_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_document_model_administration_client_async.py index 78eb46dea277..2bd0906c23a4 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_document_model_administration_client_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_document_model_administration_client_async.py @@ -98,11 +98,11 @@ def __init__( @distributed_trace_async async def begin_build_model( - self, source: str, build_mode: Union[str, DocumentBuildMode], **kwargs: Any + self, build_mode: Union[str, DocumentBuildMode], blob_container_url: str, **kwargs: Any ) -> AsyncDocumentModelAdministrationLROPoller[DocumentModelDetails]: """Build a custom model. - The request must include a `source` parameter that is an + The request must include a `blob_container_url` parameter that is an externally accessible Azure storage blob container URI (preferably a Shared Access Signature URI). Note that a container URI (without SAS) is accepted only when the container is public or has a managed identity configured, see more about configuring managed identities to work with Form Recognizer here: @@ -110,15 +110,15 @@ async def begin_build_model( Models are built using documents that are of the following content type - 'application/pdf', 'image/jpeg', 'image/png', 'image/tiff', or 'image/bmp'. Other types of content in the container is ignored. - :param str source: An Azure Storage blob container's SAS URI. A container URI (without SAS) - can be used if the container is public or has a managed identity configured. For more information on - setting up a training data set, see: https://aka.ms/azsdk/formrecognizer/buildtrainingset. :param build_mode: The custom model build mode. Possible values include: "template", "neural". For more information about build modes, see: https://aka.ms/azsdk/formrecognizer/buildmode. + :param str blob_container_url: An Azure Storage blob container's SAS URI. A container URI (without SAS) + can be used if the container is public or has a managed identity configured. For more information on + setting up a training data set, see: https://aka.ms/azsdk/formrecognizer/buildtrainingset. :type build_mode: str or :class:`~azure.ai.formrecognizer.DocumentBuildMode` :keyword str model_id: A unique ID for your model. If not specified, a model ID will be created for you. :keyword str description: An optional description to add to the model. - :keyword str prefix: A case-sensitive prefix string to filter documents in the source path. + :keyword str prefix: A case-sensitive prefix string to filter documents in the blob container url path. For example, when using an Azure storage blob URI, use the prefix to restrict sub folders. `prefix` should end in '/' to avoid cases where filenames share the same prefix. :keyword tags: List of user defined key-value tag attributes associated with the model. @@ -169,7 +169,7 @@ def callback(raw_response, _, headers): # pylint: disable=unused-argument description=description, tags=tags, azure_blob_source=self._generated_models.AzureBlobContentSource( - container_url=source, + container_url=blob_container_url, prefix=kwargs.pop("prefix", None), ), ), diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_analyze_custom_documents_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_analyze_custom_documents_async.py index 1ef914b25585..2dbeaa715880 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_analyze_custom_documents_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_analyze_custom_documents_async.py @@ -126,7 +126,7 @@ async def main(): ) async with document_model_admin_client: poller = await document_model_admin_client.begin_build_model( - os.getenv("CONTAINER_SAS_URL"), DocumentBuildMode.TEMPLATE + DocumentBuildMode.TEMPLATE, os.getenv("CONTAINER_SAS_URL") ) model = await poller.result() model_id = model.model_id diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_build_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_build_model_async.py index 12e42fe25ae5..5cf43e4ac1af 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_build_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_build_model_async.py @@ -42,7 +42,7 @@ async def sample_build_model_async(): document_model_admin_client = DocumentModelAdministrationClient(endpoint, AzureKeyCredential(key)) async with document_model_admin_client: poller = await document_model_admin_client.begin_build_model( - container_sas_url, DocumentBuildMode.TEMPLATE, description="my model description" + DocumentBuildMode.TEMPLATE, container_sas_url, description="my model description" ) model = await poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_compose_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_compose_model_async.py index 45fb61ca2021..49a6cbc238ad 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_compose_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_compose_model_async.py @@ -55,16 +55,16 @@ async def sample_compose_model_async(): document_model_admin_client = DocumentModelAdministrationClient(endpoint=endpoint, credential=AzureKeyCredential(key)) async with document_model_admin_client: supplies_poller = await document_model_admin_client.begin_build_model( - po_supplies, DocumentBuildMode.TEMPLATE, description="Purchase order-Office supplies" + DocumentBuildMode.TEMPLATE, po_supplies, description="Purchase order-Office supplies" ) equipment_poller = await document_model_admin_client.begin_build_model( - po_equipment, DocumentBuildMode.TEMPLATE, description="Purchase order-Office Equipment" + DocumentBuildMode.TEMPLATE, po_equipment, description="Purchase order-Office Equipment" ) furniture_poller = await document_model_admin_client.begin_build_model( - po_furniture, DocumentBuildMode.TEMPLATE, description="Purchase order-Furniture" + DocumentBuildMode.TEMPLATE, po_furniture, description="Purchase order-Furniture" ) cleaning_supplies_poller = await document_model_admin_client.begin_build_model( - po_cleaning_supplies, DocumentBuildMode.TEMPLATE, description="Purchase order-Cleaning Supplies" + DocumentBuildMode.TEMPLATE, po_cleaning_supplies, description="Purchase order-Cleaning Supplies" ) supplies_model = await supplies_poller.result() equipment_model = await equipment_poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_copy_model_to_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_copy_model_to_async.py index b3b6e52d80a8..13e831ef5537 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_copy_model_to_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_copy_model_to_async.py @@ -90,7 +90,7 @@ async def main(): endpoint=endpoint, credential=AzureKeyCredential(key) ) async with document_model_admin_client: - model = await (await document_model_admin_client.begin_build_model(os.getenv("CONTAINER_SAS_URL"), DocumentBuildMode.TEMPLATE)).result() + model = await (await document_model_admin_client.begin_build_model(DocumentBuildMode.TEMPLATE, os.getenv("CONTAINER_SAS_URL"))).result() model_id = model.model_id await sample_copy_model_to_async(model_id) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_manage_models_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_manage_models_async.py index d0cecd4e092a..72ce262167c5 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_manage_models_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/async_samples/sample_manage_models_async.py @@ -56,7 +56,7 @@ async def sample_manage_models_async(): # [END list_models_async] # let's build a model to use for this sample - poller = await document_model_admin_client.begin_build_model(container_sas_url, DocumentBuildMode.TEMPLATE, description="model for sample") + poller = await document_model_admin_client.begin_build_model(DocumentBuildMode.TEMPLATE, container_sas_url, description="model for sample") model = await poller.result() # [START get_model_async] diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_analyze_custom_documents.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_analyze_custom_documents.py index a2d6653d1f89..e83a31f91469 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_analyze_custom_documents.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_analyze_custom_documents.py @@ -117,7 +117,7 @@ def analyze_custom_documents(custom_model_id): endpoint=endpoint, credential=AzureKeyCredential(key) ) model = document_model_admin_client.begin_build_model( - os.getenv("CONTAINER_SAS_URL"), DocumentBuildMode.TEMPLATE + DocumentBuildMode.TEMPLATE, os.getenv("CONTAINER_SAS_URL") ).result() model_id = model.model_id diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_build_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_build_model.py index 386238b43256..ad0353d48db3 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_build_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_build_model.py @@ -39,7 +39,7 @@ def sample_build_model(): document_model_admin_client = DocumentModelAdministrationClient(endpoint, AzureKeyCredential(key)) poller = document_model_admin_client.begin_build_model( - container_sas_url, DocumentBuildMode.TEMPLATE, description="my model description" + DocumentBuildMode.TEMPLATE, container_sas_url, description="my model description" ) model = poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_compose_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_compose_model.py index 58861d393364..2eb2d76e0cd1 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_compose_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_compose_model.py @@ -52,16 +52,16 @@ def sample_compose_model(): document_model_admin_client = DocumentModelAdministrationClient(endpoint=endpoint, credential=AzureKeyCredential(key)) supplies_poller = document_model_admin_client.begin_build_model( - po_supplies, DocumentBuildMode.TEMPLATE, description="Purchase order-Office supplies" + DocumentBuildMode.TEMPLATE, po_supplies, description="Purchase order-Office supplies" ) equipment_poller = document_model_admin_client.begin_build_model( - po_equipment, DocumentBuildMode.TEMPLATE, description="Purchase order-Office Equipment" + DocumentBuildMode.TEMPLATE, po_equipment, description="Purchase order-Office Equipment" ) furniture_poller = document_model_admin_client.begin_build_model( - po_furniture, DocumentBuildMode.TEMPLATE, description="Purchase order-Furniture" + DocumentBuildMode.TEMPLATE, po_furniture, description="Purchase order-Furniture" ) cleaning_supplies_poller = document_model_admin_client.begin_build_model( - po_cleaning_supplies, DocumentBuildMode.TEMPLATE, description="Purchase order-Cleaning Supplies" + DocumentBuildMode.TEMPLATE, po_cleaning_supplies, description="Purchase order-Cleaning Supplies" ) supplies_model = supplies_poller.result() equipment_model = equipment_poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_copy_model_to.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_copy_model_to.py index e998391afdf6..d81f03c7e6eb 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_copy_model_to.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_copy_model_to.py @@ -85,7 +85,7 @@ def sample_copy_model_to(custom_model_id): document_model_admin_client = DocumentModelAdministrationClient( endpoint=endpoint, credential=AzureKeyCredential(key) ) - model = document_model_admin_client.begin_build_model(os.getenv("CONTAINER_SAS_URL"), DocumentBuildMode.TEMPLATE).result() + model = document_model_admin_client.begin_build_model(DocumentBuildMode.TEMPLATE, os.getenv("CONTAINER_SAS_URL")).result() model_id = model.model_id sample_copy_model_to(model_id) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_manage_models.py b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_manage_models.py index f5c48cc32803..989beabd3ae8 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_manage_models.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/samples/v3.2-beta/sample_manage_models.py @@ -53,7 +53,7 @@ def sample_manage_models(): # [END list_models] # let's build a model to use for this sample - poller = document_model_admin_client.begin_build_model(container_sas_url, DocumentBuildMode.TEMPLATE, description="model for sample") + poller = document_model_admin_client.begin_build_model(DocumentBuildMode.TEMPLATE, container_sas_url, description="model for sample") model = poller.result() # [START get_model] diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py index 2b719ee6c710..026ad8a31e23 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py @@ -41,7 +41,7 @@ def test_custom_document_transform(self, client, formrecognizer_storage_containe set_bodiless_matcher() da_client = client.get_document_analysis_client() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = poller.result() responses = [] @@ -86,7 +86,7 @@ def test_custom_document_multipage_transform(self, client, formrecognizer_multip set_bodiless_matcher() da_client = client.get_document_analysis_client() - poller = client.begin_build_model(formrecognizer_multipage_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_multipage_storage_container_sas_url) model = poller.result() responses = [] @@ -131,7 +131,7 @@ def test_custom_document_selection_mark(self, client, formrecognizer_selection_m set_bodiless_matcher() da_client = client.get_document_analysis_client() - poller = client.begin_build_model(formrecognizer_selection_mark_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_selection_mark_storage_container_sas_url) model = poller.result() with open(self.selection_form_pdf, "rb") as fd: @@ -179,7 +179,7 @@ def test_pages_kwarg_specified(self, client, formrecognizer_storage_container_sa with open(self.form_jpg, "rb") as fd: my_file = fd.read() - build_poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + build_poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = build_poller.result() poller = da_client.begin_analyze_document(model.model_id, my_file, pages="1") @@ -197,7 +197,7 @@ def test_custom_document_signature_field(self, client, formrecognizer_storage_co with open(self.form_jpg, "rb") as fd: my_file = fd.read() - build_polling = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + build_polling = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = build_polling.result() poller = da_client.begin_analyze_document( @@ -221,7 +221,7 @@ def test_custom_document_blank_pdf(self, client, formrecognizer_storage_containe with open(self.blank_pdf, "rb") as fd: my_file = fd.read() - build_polling = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + build_polling = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = build_polling.result() poller = da_client.begin_analyze_document( diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py index adcec9d0c411..c6297bafbd35 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py @@ -59,7 +59,7 @@ def callback(raw_response, _, headers): my_file = fd.read() async with client: - build_polling = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + build_polling = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await build_polling.result() async with da_client: @@ -106,7 +106,7 @@ def callback(raw_response, _, headers): my_file = fd.read() async with client: - build_poller = await client.begin_build_model(formrecognizer_multipage_storage_container_sas_url, "template") + build_poller = await client.begin_build_model("template", formrecognizer_multipage_storage_container_sas_url) model = await build_poller.result() async with da_client: @@ -152,7 +152,7 @@ def callback(raw_response, _, headers): responses.append(document) async with client: - poller = await client.begin_build_model(formrecognizer_selection_mark_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_selection_mark_storage_container_sas_url) model = await poller.result() poller = await da_client.begin_analyze_document( @@ -190,7 +190,7 @@ async def test_pages_kwarg_specified(self, client, formrecognizer_storage_contai my_file = fd.read() async with client: - build_poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + build_poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await build_poller.result() async with da_client: @@ -210,7 +210,7 @@ async def test_custom_document_signature_field(self, client, formrecognizer_stor my_file = fd.read() async with client: - build_polling = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + build_polling = await client.begin_build_model("template", formrecognizer_storage_container_sas_url, ) model = await build_polling.result() async with da_client: @@ -236,7 +236,7 @@ async def test_custom_document_blank_pdf(self, client, formrecognizer_storage_co my_file = fd.read() async with client: - build_polling = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + build_polling = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await build_polling.result() async with da_client: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py index dfdd130085f7..6312bd42e426 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py @@ -41,7 +41,7 @@ def test_custom_document_selection_mark(self, client, formrecognizer_selection_m set_bodiless_matcher() da_client = client.get_document_analysis_client() - poller = client.begin_build_model(formrecognizer_selection_mark_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_selection_mark_storage_container_sas_url) model = poller.result() responses = [] @@ -83,7 +83,7 @@ def test_label_tables_variable_rows(self, client, formrecognizer_table_variable_ set_bodiless_matcher() da_client = client.get_document_analysis_client() - build_poller = client.begin_build_model(formrecognizer_table_variable_rows_container_sas_url, "template") + build_poller = client.begin_build_model("template", formrecognizer_table_variable_rows_container_sas_url) model = build_poller.result() responses = [] @@ -124,7 +124,7 @@ def test_label_tables_fixed_rows(self, client, formrecognizer_table_fixed_rows_c set_bodiless_matcher() da_client = client.get_document_analysis_client() - build_poller = client.begin_build_model(formrecognizer_table_fixed_rows_container_sas_url, "template") + build_poller = client.begin_build_model("template", formrecognizer_table_fixed_rows_container_sas_url) model = build_poller.result() responses = [] diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py index 9e4a900619db..954c0f1effdb 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py @@ -54,7 +54,7 @@ def callback(raw_response, _, headers): responses.append(document) async with client: - poller = await client.begin_build_model(formrecognizer_selection_mark_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_selection_mark_storage_container_sas_url) model = await poller.result() @@ -99,7 +99,7 @@ def callback(raw_response, _, headers): async with client: build_poller = await client.begin_build_model( - formrecognizer_table_variable_rows_container_sas_url, "template") + "template", formrecognizer_table_variable_rows_container_sas_url) model = await build_poller.result() poller = await da_client.begin_analyze_document_from_url( @@ -142,7 +142,7 @@ def callback(raw_response, _, headers): responses.append(document) async with client: - build_poller = await client.begin_build_model(formrecognizer_table_fixed_rows_container_sas_url, "template") + build_poller = await client.begin_build_model("template", formrecognizer_table_fixed_rows_container_sas_url) model = await build_poller.result() poller = await da_client.begin_analyze_document_from_url( diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py index b6a5ba1a5cd6..3519b7b2f99e 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py @@ -27,10 +27,10 @@ def test_compose_model(self, client, formrecognizer_storage_container_sas_url, * model_id_1 = str(uuid.uuid4()) model_id_2 = str(uuid.uuid4()) composed_id = str(uuid.uuid4()) - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template", model_id=model_id_1, description="model1") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url, model_id=model_id_1, description="model1") model_1 = poller.result() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template", model_id=model_id_2, description="model2") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url, model_id=model_id_2, description="model2") model_2 = poller.result() poller = client.begin_compose_model([model_1.model_id, model_2.model_id], model_id=composed_id, description="my composed model", tags={"testkey": "testvalue"}) @@ -55,10 +55,10 @@ def test_compose_model(self, client, formrecognizer_storage_container_sas_url, * @recorded_by_proxy def test_compose_model_transform(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template", description="model1") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url, description="model1") model_1 = poller.result() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template", description="model2") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url, description="model2") model_2 = poller.result() raw_response = [] @@ -87,10 +87,10 @@ def callback(response, _, headers): def test_compose_continuation_token(self, **kwargs): client = kwargs.pop("client") formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_1 = poller.result() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_2 = poller.result() initial_poller = client.begin_compose_model([model_1.model_id, model_2.model_id]) @@ -107,10 +107,10 @@ def test_compose_continuation_token(self, **kwargs): @recorded_by_proxy def test_poller_metadata(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_1 = poller.result() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_2 = poller.result() poller = client.begin_compose_model([model_1.model_id, model_2.model_id]) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py index d3ea60a4f5ca..8b75e5389359 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py @@ -29,10 +29,10 @@ async def test_compose_model(self, client, formrecognizer_storage_container_sas_ model_id_2 = str(uuid.uuid4()) composed_id = str(uuid.uuid4()) async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template", model_id=model_id_1, description="model1") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url, model_id=model_id_1, description="model1") model_1 = await poller.result() - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template", model_id=model_id_2, description="model2") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url, model_id=model_id_2, description="model2") model_2 = await poller.result() poller = await client.begin_compose_model([model_1.model_id, model_2.model_id], model_id=composed_id, description="my composed model", tags={"testkey": "testvalue"}) @@ -67,10 +67,10 @@ def callback(response, _, headers): raw_response.append(document_model) async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template", description="model1") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url, description="model1") model_1 = await poller.result() - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template", description="model2") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url, description="model2") model_2 = await poller.result() poller = await client.begin_compose_model([model_1.model_id, model_2.model_id], description="my composed model", cls=callback) @@ -91,10 +91,10 @@ async def test_compose_continuation_token(self, **kwargs): client = kwargs.pop("client") formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_1 = await poller.result() - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_2 = await poller.result() initial_poller = await client.begin_compose_model([model_1.model_id, model_2.model_id]) @@ -112,10 +112,10 @@ async def test_compose_continuation_token(self, **kwargs): async def test_poller_metadata(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_1 = await poller.result() - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_2 = await poller.result() poller = await client.begin_compose_model([model_1.model_id, model_2.model_id]) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py index 3e0c336ae7a1..3b9daa6c1325 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py @@ -40,7 +40,7 @@ def test_copy_model_empty_model_id(self,**kwargs): @recorded_by_proxy def test_copy_model_successful(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = poller.result() target = client.get_copy_authorization(tags={"testkey": "testvalue"}) @@ -65,7 +65,7 @@ def test_copy_model_successful(self, client, formrecognizer_storage_container_sa @recorded_by_proxy def test_copy_model_with_model_id_and_desc(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = poller.result() model_id = str(uuid.uuid4()) @@ -93,7 +93,7 @@ def test_copy_model_with_model_id_and_desc(self, client, formrecognizer_storage_ @recorded_by_proxy def test_copy_model_fail_bad_model_id(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = poller.result() target = client.get_copy_authorization() @@ -108,7 +108,7 @@ def test_copy_model_fail_bad_model_id(self, client, formrecognizer_storage_conta @recorded_by_proxy def test_copy_model_transform(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = poller.result() target = client.get_copy_authorization() @@ -149,10 +149,10 @@ def test_copy_authorization(self, client, formrecognizer_region, formrecognizer_ @recorded_by_proxy def test_copy_model_with_composed_model(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller_1 = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller_1 = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_1 = poller_1.result() - poller_2 = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller_2 = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_2 = poller_2.result() composed_poller = client.begin_compose_model([model_1.model_id, model_2.model_id]) @@ -181,7 +181,7 @@ def test_copy_model_with_composed_model(self, client, formrecognizer_storage_con def test_copy_continuation_token(self, **kwargs): client = kwargs.pop("client") formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = poller.result() target = client.get_copy_authorization() @@ -199,7 +199,7 @@ def test_copy_continuation_token(self, **kwargs): @recorded_by_proxy def test_poller_metadata(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = poller.result() target = client.get_copy_authorization() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py index 83fc6e8bf3fb..45d1977f679d 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py @@ -45,7 +45,7 @@ async def test_copy_model_empty_model_id(self, **kwargs): async def test_copy_model_successful(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - training_poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + training_poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await training_poller.result() target = await client.get_copy_authorization(tags={"testkey": "testvalue"}) @@ -71,7 +71,7 @@ async def test_copy_model_successful(self, client, formrecognizer_storage_contai async def test_copy_model_with_model_id_and_desc(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await poller.result() model_id = str(uuid.uuid4()) @@ -100,7 +100,7 @@ async def test_copy_model_with_model_id_and_desc(self, client, formrecognizer_st async def test_copy_model_fail_bad_model_id(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await poller.result() target = await client.get_copy_authorization() @@ -125,7 +125,7 @@ def callback(response, _, headers): raw_response.append(document_model) async with client: - training_poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + training_poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await training_poller.result() target = await client.get_copy_authorization() @@ -157,10 +157,10 @@ async def test_copy_authorization(self, client, formrecognizer_region, formrecog async def test_copy_model_with_composed_model(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - poller_1 = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller_1 = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_1 = await poller_1.result() - poller_2 = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller_2 = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model_2 = await poller_2.result() composed_poller = await client.begin_compose_model([model_1.model_id, model_2.model_id]) @@ -190,7 +190,7 @@ async def test_copy_continuation_token(self, **kwargs): client = kwargs.pop("client") formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await poller.result() target = await client.get_copy_authorization() @@ -209,7 +209,7 @@ async def test_copy_continuation_token(self, **kwargs): async def test_poller_metadata(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) model = await poller.result() target = await client.get_copy_authorization() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py index cea5e84bd16b..40a9404c9bc3 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py @@ -100,7 +100,7 @@ def test_get_model_prebuilt(self, client, **kwargs): @recorded_by_proxy def test_mgmt_model(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template", description="mgmt model") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url, description="mgmt model") model = poller.result() model_from_get = client.get_model(model.model_id) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py index d651f59e97a3..f1c79faa6663 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py @@ -110,7 +110,7 @@ async def test_mgmt_model(self, client, formrecognizer_storage_container_sas_url set_bodiless_matcher() async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template", description="mgmt model") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url, description="mgmt model") model = await poller.result() model_from_get = await client.get_model(model.model_id) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py index 7b71953952f6..9be4aa4956e4 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py @@ -31,10 +31,10 @@ def check_poll_value(poll): else: assert poll == 0 check_poll_value(client._client._config.polling_interval) - poller = client.begin_build_model(source=formrecognizer_storage_container_sas_url, build_mode="template", polling_interval=6) + poller = client.begin_build_model(blob_container_url=formrecognizer_storage_container_sas_url, build_mode="template", polling_interval=6) poller.wait() assert poller._polling_method._timeout == 6 - poller2 = client.begin_build_model(source=formrecognizer_storage_container_sas_url, build_mode="template") + poller2 = client.begin_build_model(blob_container_url=formrecognizer_storage_container_sas_url, build_mode="template") poller2.wait() check_poll_value(poller2._polling_method._timeout) # goes back to client default client.close() @@ -45,7 +45,7 @@ def check_poll_value(poll): def test_build_model_encoded_url(self, client): with pytest.raises(HttpResponseError): poller = client.begin_build_model( - source="https://fakeuri.com/blank%20space", build_mode="template" + blob_container_url="https://fakeuri.com/blank%20space", build_mode="template" ) assert "https://fakeuri.com/blank%20space" in poller._polling_method._initial_response.http_request.body poller.wait() @@ -56,7 +56,7 @@ def test_build_model_auth_bad_key(self, formrecognizer_test_endpoint, formrecogn set_bodiless_matcher() client = DocumentModelAdministrationClient(formrecognizer_test_endpoint, AzureKeyCredential("xxxx")) with pytest.raises(ClientAuthenticationError): - poller = client.begin_build_model("xx", build_mode="template") + poller = client.begin_build_model(build_mode="template", blob_container_url="xx") @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() @@ -65,8 +65,8 @@ def test_build_model(self, client, formrecognizer_storage_container_sas_url, **k set_bodiless_matcher() model_id = str(uuid.uuid4()) poller = client.begin_build_model( - formrecognizer_storage_container_sas_url, build_mode="template", + blob_container_url=formrecognizer_storage_container_sas_url, model_id=model_id, description="a v3 model", tags={"testkey": "testvalue"} @@ -93,7 +93,7 @@ def test_build_model(self, client, formrecognizer_storage_container_sas_url, **k def test_build_model_multipage(self, client, formrecognizer_multipage_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_multipage_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_multipage_storage_container_sas_url) model = poller.result() assert model.model_id @@ -115,7 +115,7 @@ def test_build_model_multipage(self, client, formrecognizer_multipage_storage_co def test_build_model_nested_schema(self, client, formrecognizer_table_variable_rows_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_table_variable_rows_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_table_variable_rows_container_sas_url) model = poller.result() assert model.model_id @@ -143,7 +143,7 @@ def callback(response, _, headers): raw_response.append(model_info) raw_response.append(document_model) - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template", cls=callback) + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url, cls=callback) model = poller.result() raw_model = raw_response[0] @@ -170,7 +170,7 @@ def callback(response, _, headers): raw_response.append(model_info) raw_response.append(document_model) - poller = client.begin_build_model(formrecognizer_multipage_storage_container_sas_url, "template", cls=callback) + poller = client.begin_build_model("template", formrecognizer_multipage_storage_container_sas_url, cls=callback) model = poller.result() raw_model = raw_response[0] @@ -192,7 +192,7 @@ def callback(response, _, headers): raw_response.append(model_info) raw_response.append(document_model) - poller = client.begin_build_model(formrecognizer_table_variable_rows_container_sas_url, "template", cls=callback) + poller = client.begin_build_model("template", formrecognizer_table_variable_rows_container_sas_url, cls=callback) model = poller.result() raw_model = raw_response[0] @@ -211,7 +211,7 @@ def callback(response, _, headers): def test_build_model_azure_blob_path_filter(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() with pytest.raises(HttpResponseError) as e: - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template", prefix="testfolder") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url, prefix="testfolder") model = poller.result() @pytest.mark.live_test_only @@ -220,9 +220,9 @@ def test_build_model_azure_blob_path_filter(self, client, formrecognizer_storage def test_build_model_continuation_token(self, **kwargs): client = kwargs.pop("client") formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") - initial_poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + initial_poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) cont_token = initial_poller.continuation_token() - poller = client.begin_build_model(None, "template", continuation_token=cont_token) + poller = client.begin_build_model("template", None, continuation_token=cont_token) result = poller.result() assert result initial_poller.wait() # necessary so azure-devtools doesn't throw assertion error @@ -232,7 +232,7 @@ def test_build_model_continuation_token(self, **kwargs): @recorded_by_proxy def test_build_model_poller_metadata(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() - poller = client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = client.begin_build_model("template", formrecognizer_storage_container_sas_url) poller.result() assert isinstance(poller, DocumentModelAdministrationLROPoller) details = poller.details diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py index 02ceee7c7ad3..ae865ceffb44 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py @@ -34,10 +34,10 @@ def check_poll_value(poll): else: assert poll == 0 check_poll_value(client._client._config.polling_interval) - poller = await client.begin_build_model(source=formrecognizer_storage_container_sas_url, build_mode="template", polling_interval=6) + poller = await client.begin_build_model(blob_container_url=formrecognizer_storage_container_sas_url, build_mode="template", polling_interval=6) await poller.wait() assert poller._polling_method._timeout == 6 - poller2 = await client.begin_build_model(source=formrecognizer_storage_container_sas_url, build_mode="template") + poller2 = await client.begin_build_model(blob_container_url=formrecognizer_storage_container_sas_url, build_mode="template") await poller2.wait() check_poll_value(poller2._polling_method._timeout) # goes back to client default await client.close() @@ -49,7 +49,7 @@ async def test_build_model_encoded_url(self, client): with pytest.raises(HttpResponseError): async with client: poller = await client.begin_build_model( - source="https://fakeuri.com/blank%20space", + blob_container_url="https://fakeuri.com/blank%20space", build_mode="template", ) assert "https://fakeuri.com/blank%20space" in poller._polling_method._initial_response.http_request.body @@ -62,7 +62,7 @@ async def test_build_model_auth_bad_key(self, formrecognizer_test_endpoint, form client = DocumentModelAdministrationClient(formrecognizer_test_endpoint, AzureKeyCredential("xxxx")) with pytest.raises(ClientAuthenticationError): async with client: - poller = await client.begin_build_model("xx", "template") + poller = await client.begin_build_model("template", "xx") result = await poller.result() @FormRecognizerPreparer() @@ -73,8 +73,8 @@ async def test_build_model(self, client, formrecognizer_storage_container_sas_ur model_id = str(uuid.uuid4()) async with client: poller = await client.begin_build_model( - formrecognizer_storage_container_sas_url, "template", + formrecognizer_storage_container_sas_url, model_id=model_id, description="a v3 model", tags={"testkey": "testvalue"} @@ -101,7 +101,7 @@ async def test_build_model(self, client, formrecognizer_storage_container_sas_ur async def test_build_model_multipage(self, client, formrecognizer_multipage_storage_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - poller = await client.begin_build_model(formrecognizer_multipage_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_multipage_storage_container_sas_url) model = await poller.result() assert model.model_id @@ -123,7 +123,7 @@ async def test_build_model_multipage(self, client, formrecognizer_multipage_stor async def test_build_model_nested_schema(self, client, formrecognizer_table_variable_rows_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - poller = await client.begin_build_model(formrecognizer_table_variable_rows_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_table_variable_rows_container_sas_url) model = await poller.result() assert model.model_id @@ -152,7 +152,7 @@ def callback(response, _, headers): raw_response.append(document_model) async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template", cls=callback) + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url, cls=callback) model = await poller.result() raw_model = raw_response[0] @@ -180,7 +180,7 @@ def callback(response, _, headers): raw_response.append(document_model) async with client: - poller = await client.begin_build_model(formrecognizer_multipage_storage_container_sas_url, "template", cls=callback) + poller = await client.begin_build_model("template", formrecognizer_multipage_storage_container_sas_url, cls=callback) model = await poller.result() raw_model = raw_response[0] @@ -203,7 +203,7 @@ def callback(response, _, headers): raw_response.append(document_model) async with client: - poller = await client.begin_build_model(formrecognizer_table_variable_rows_container_sas_url, "template", cls=callback) + poller = await client.begin_build_model("template", formrecognizer_table_variable_rows_container_sas_url, cls=callback) model = await poller.result() raw_model = raw_response[0] @@ -223,7 +223,7 @@ async def test_build_model_azure_blob_path_filter(self, client, formrecognizer_s set_bodiless_matcher() with pytest.raises(HttpResponseError) as e: async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template", prefix="testfolder") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url, prefix="testfolder") model = await poller.result() @pytest.mark.live_test_only @@ -233,9 +233,9 @@ async def test_build_model_continuation_token(self, **kwargs): client = kwargs.pop("client") formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") async with client: - initial_poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + initial_poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) cont_token = initial_poller.continuation_token() - poller = await client.begin_build_model(None, "template", continuation_token=cont_token) + poller = await client.begin_build_model("template", None, continuation_token=cont_token) result = await poller.result() assert result await initial_poller.wait() # necessary so azure-devtools doesn't throw assertion error @@ -246,7 +246,7 @@ async def test_build_model_continuation_token(self, **kwargs): async def test_build_model_poller_metadata(self, client, formrecognizer_storage_container_sas_url, **kwargs): set_bodiless_matcher() async with client: - poller = await client.begin_build_model(formrecognizer_storage_container_sas_url, "template") + poller = await client.begin_build_model("template", formrecognizer_storage_container_sas_url) await poller.result() assert isinstance(poller, AsyncDocumentModelAdministrationLROPoller) details = poller.details