[DI] Update resource setup script (#36182)

Author: Yalin Li

sdk/documentintelligence/azure-ai-documentintelligence/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/documentintelligence/azure-ai-documentintelligence",
-  "Tag": "python/documentintelligence/azure-ai-documentintelligence_d341ce7992"
+  "Tag": "python/documentintelligence/azure-ai-documentintelligence_ea63c55a80"
 }

sdk/documentintelligence/azure-ai-documentintelligence/samples/aio/sample_analyze_custom_documents_async.py

@@ -23,7 +23,7 @@
     2) DOCUMENTINTELLIGENCE_API_KEY - your Document Intelligence API key.
     3) CUSTOM_BUILT_MODEL_ID - the ID of your custom built model.
         -OR-
-       DOCUMENTINTELLIGENCE_STORAGE_CONTAINER_SAS_URL - The shared access signature (SAS) Url of your Azure Blob Storage container with your training files.
+       DOCUMENTINTELLIGENCE_STORAGE_ADVANCED_CONTAINER_SAS_URL - The shared access signature (SAS) Url of your Azure Blob Storage container with your training files.
        A model will be built and used to run the sample.
 """
 
@@ -62,7 +62,7 @@ def print_table(header_names, table_data):
 
 async def analyze_custom_documents(custom_model_id):
     # For the Form_1.jpg, it should be the test file under the traning dataset which storage at the Azure Blob Storage path
-    # combined by DOCUMENTINTELLIGENCE_STORAGE_CONTAINER_SAS_URL and DOCUMENTINTELLIGENCE_STORAGE_PREFIX, 
+    # combined by DOCUMENTINTELLIGENCE_STORAGE_ADVANCED_CONTAINER_SAS_URL and DOCUMENTINTELLIGENCE_STORAGE_PREFIX, 
     # or it can also be a test file with the format similar to the training dataset. 
     # Put it here locally just for presenting documents visually in sample.
 
@@ -177,7 +177,7 @@ async def analyze_custom_documents(custom_model_id):
 
 async def main():
     model_id = None
-    if os.getenv("DOCUMENTINTELLIGENCE_STORAGE_CONTAINER_SAS_URL") and not os.getenv("CUSTOM_BUILT_MODEL_ID"):
+    if os.getenv("DOCUMENTINTELLIGENCE_STORAGE_ADVANCED_CONTAINER_SAS_URL") and not os.getenv("CUSTOM_BUILT_MODEL_ID"):
         import uuid
         from azure.core.credentials import AzureKeyCredential
         from azure.ai.documentintelligence.aio import DocumentIntelligenceAdministrationClient
@@ -193,7 +193,7 @@ async def main():
         if not endpoint or not key:
             raise ValueError("Please provide endpoint and API key to run the samples.")
 
-        blob_container_sas_url = os.getenv("DOCUMENTINTELLIGENCE_STORAGE_CONTAINER_SAS_URL")
+        blob_container_sas_url = os.getenv("DOCUMENTINTELLIGENCE_STORAGE_ADVANCED_CONTAINER_SAS_URL")
         blob_prefix = os.getenv("DOCUMENTINTELLIGENCE_STORAGE_PREFIX")
         if blob_container_sas_url is not None:
             request = BuildDocumentModelRequest(

sdk/documentintelligence/azure-ai-documentintelligence/samples/sample_analyze_custom_documents.py

@@ -23,7 +23,7 @@
     2) DOCUMENTINTELLIGENCE_API_KEY - your Document Intelligence API key.
     3) CUSTOM_BUILT_MODEL_ID - the ID of your custom built model.
         -OR-
-       DOCUMENTINTELLIGENCE_STORAGE_CONTAINER_SAS_URL - The shared access signature (SAS) Url of your Azure Blob Storage container with your training files.
+       DOCUMENTINTELLIGENCE_STORAGE_ADVANCED_CONTAINER_SAS_URL - The shared access signature (SAS) Url of your Azure Blob Storage container with your training files.
        A model will be built and used to run the sample.
 """
 
@@ -60,7 +60,7 @@ def print_table(header_names, table_data):
 
 def analyze_custom_documents(custom_model_id):
     # For the Form_1.jpg, it should be the test file under the traning dataset which storage at the Azure Blob Storage path
-    # combined by DOCUMENTINTELLIGENCE_STORAGE_CONTAINER_SAS_URL and DOCUMENTINTELLIGENCE_STORAGE_PREFIX, 
+    # combined by DOCUMENTINTELLIGENCE_STORAGE_ADVANCED_CONTAINER_SAS_URL and DOCUMENTINTELLIGENCE_STORAGE_PREFIX, 
     # or it can also be a test file with the format similar to the training dataset. 
     # Put it here locally just for presenting documents visually in sample.
 
@@ -181,7 +181,7 @@ def analyze_custom_documents(custom_model_id):
     try:
         load_dotenv(find_dotenv())
         model_id = None
-        if os.getenv("DOCUMENTINTELLIGENCE_STORAGE_CONTAINER_SAS_URL") and not os.getenv("CUSTOM_BUILT_MODEL_ID"):
+        if os.getenv("DOCUMENTINTELLIGENCE_STORAGE_ADVANCED_CONTAINER_SAS_URL") and not os.getenv("CUSTOM_BUILT_MODEL_ID"):
             import uuid
             from azure.core.credentials import AzureKeyCredential
             from azure.ai.documentintelligence import DocumentIntelligenceAdministrationClient
@@ -200,7 +200,7 @@ def analyze_custom_documents(custom_model_id):
             document_intelligence_admin_client = DocumentIntelligenceAdministrationClient(
                 endpoint=endpoint, credential=AzureKeyCredential(key)
             )
-            blob_container_sas_url = os.getenv("DOCUMENTINTELLIGENCE_STORAGE_CONTAINER_SAS_URL")
+            blob_container_sas_url = os.getenv("DOCUMENTINTELLIGENCE_STORAGE_ADVANCED_CONTAINER_SAS_URL")
             blob_prefix = os.getenv("DOCUMENTINTELLIGENCE_STORAGE_PREFIX")
             if blob_container_sas_url is not None:
                 request = BuildDocumentModelRequest(

sdk/documentintelligence/azure-ai-documentintelligence/tests/preparers.py

@@ -21,10 +21,9 @@
     documentintelligence_api_key="fakeZmFrZV9hY29jdW50X2tleQ==",
     documentintelligence_storage_container_sas_url="https://blob_sas_url",
     documentintelligence_testing_data_container_sas_url="https://blob_sas_url",
-    documentintelligence_multipage_storage_container_sas_url="https://blob_sas_url",
     documentintelligence_training_data_classifier_sas_url="https://blob_sas_url",
     documentintelligence_resource_id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgname/providers/Microsoft.CognitiveServices/accounts/documentintelligencename",
-    documentintelligence_region="region",
+    documentintelligence_resource_region="region",
 )
 
 

sdk/documentintelligence/azure-ai-documentintelligence/tests/test_dac_classify_document.py

@@ -79,7 +79,7 @@ def test_classify_document(self, documentintelligence_training_data_classifier_s
         )
         document = poller.result()
         assert document.model_id == classifier.classifier_id
-        assert len(document.pages) == 2
+        assert len(document.pages) == 4
         assert document.tables is None
         assert document.paragraphs is None
         assert document.styles is None

sdk/documentintelligence/azure-ai-documentintelligence/tests/test_dac_classify_document_async.py

@@ -82,7 +82,7 @@ async def test_classify_document(self, documentintelligence_training_data_classi
             )
             document = await poller.result()
             assert document.model_id == classifier.classifier_id
-            assert len(document.pages) == 2
+            assert len(document.pages) == 4
             assert document.tables is None
             assert document.paragraphs is None
             assert document.styles is None