chore(modelarmor): refactored sanitization test cases and snippets args inconsistencies

model_armor/snippets/create_template.py

@@ -20,14 +20,14 @@
 
 def create_model_armor_template(
     project_id: str,
-    location: str,
+    location_id: str,
     template_id: str,
 ) -> modelarmor_v1.Template:
     """Create a new Model Armor template.
 
     Args:
         project_id (str): Google Cloud project ID.
-        location (str): Google Cloud location.
+        location_id (str): Google Cloud location.
         template_id (str): ID for the template to create.
 
     Returns:
@@ -40,14 +40,14 @@ def create_model_armor_template(
 
     # TODO(Developer): Uncomment these variables.
     # project_id = "your-google-cloud-project-id"
-    # location = "us-central1"
+    # location_id = "us-central1"
     # template_id = "template_id"
 
     # Create the Model Armor client.
     client = modelarmor_v1.ModelArmorClient(
         transport="rest",
         client_options=ClientOptions(
-            api_endpoint=f"modelarmor.{location}.rep.googleapis.com"
+            api_endpoint=f"modelarmor.{location_id}.rep.googleapis.com"
         ),
     )
 
@@ -68,7 +68,7 @@ def create_model_armor_template(
 
     # Prepare the request for creating the template.
     request = modelarmor_v1.CreateTemplateRequest(
-        parent=f"projects/{project_id}/locations/{location}",
+        parent=f"projects/{project_id}/locations/{location_id}",
         template_id=template_id,
         template=template,
     )

model_armor/snippets/create_template_with_advanced_sdp.py

@@ -43,8 +43,8 @@ def create_model_armor_template_with_advanced_sdp(
             returned as SdpFinding in SdpInsepctionResult e.g.
             `organizations/{organization}/inspectTemplates/{inspect_template}`,
             `projects/{project}/inspectTemplates/{inspect_template}`
-            `organizations/{organization}/locations/{location}/inspectTemplates/{inspect_template}`
-            `projects/{project}/locations/{location}/inspectTemplates/{inspect_template}`
+            `organizations/{organization}/locations/{location_id}/inspectTemplates/{inspect_template}`
+            `projects/{project}/locations/{location_id}/inspectTemplates/{inspect_template}`
         deidentify_template (str):
             Optional. Optional Sensitive Data Protection Deidentify
             template resource name.
@@ -56,8 +56,8 @@ def create_model_armor_template_with_advanced_sdp(
             e.g.
             `organizations/{organization}/deidentifyTemplates/{deidentify_template}`,
             `projects/{project}/deidentifyTemplates/{deidentify_template}`
-            `organizations/{organization}/locations/{location}/deidentifyTemplates/{deidentify_template}`
-            `projects/{project}/locations/{location}/deidentifyTemplates/{deidentify_template}`
+            `organizations/{organization}/locations/{location_id}/deidentifyTemplates/{deidentify_template}`
+            `projects/{project}/locations/{location_id}/deidentifyTemplates/{deidentify_template}`
     Example:
         # Create template with advance SDP configuration
         create_model_armor_template_with_advanced_sdp(

model_armor/snippets/create_template_with_metadata.py

@@ -76,7 +76,8 @@ def create_model_armor_template_with_metadata(
         # For more details on template metadata, please refer to the following doc:
         # https://cloud.google.com/security-command-center/docs/reference/model-armor/rest/v1/projects.locations.templates#templatemetadata
         template_metadata=modelarmor_v1.Template.TemplateMetadata(
-            ignore_partial_invocation_failures=True, log_sanitize_operations=True
+            log_sanitize_operations=True,
+            log_template_operations=True,
         ),
     )
 

model_armor/snippets/delete_template.py

@@ -18,14 +18,14 @@
 
 def delete_model_armor_template(
     project_id: str,
-    location: str,
+    location_id: str,
     template_id: str,
 ) -> None:
     """Delete a model armor template.
 
     Args:
         project_id (str): Google Cloud project ID.
-        location (str): Google Cloud location.
+        location_id (str): Google Cloud location.
         template_id (str): ID for the template to be deleted.
     """
     # [START modelarmor_delete_template]
@@ -35,20 +35,20 @@ def delete_model_armor_template(
 
     # TODO(Developer): Uncomment these variables.
     # project_id = "YOUR_PROJECT_ID"
-    # location = "us-central1"
+    # location_id = "us-central1"
     # template_id = "template_id"
 
     # Create the Model Armor client.
     client = modelarmor_v1.ModelArmorClient(
         transport="rest",
         client_options=ClientOptions(
-            api_endpoint=f"modelarmor.{location}.rep.googleapis.com"
+            api_endpoint=f"modelarmor.{location_id}.rep.googleapis.com"
         ),
     )
 
     # Build the request for deleting the template.
     request = modelarmor_v1.DeleteTemplateRequest(
-        name=f"projects/{project_id}/locations/{location}/templates/{template_id}",
+        name=f"projects/{project_id}/locations/{location_id}/templates/{template_id}",
     )
 
     # Delete the template.

model_armor/snippets/get_template.py

@@ -20,7 +20,7 @@
 
 def get_model_armor_template(
     project_id: str,
-    location: str,
+    location_id: str,
     template_id: str,
 ) -> modelarmor_v1.Template:
     """Get model armor template.
@@ -40,20 +40,20 @@ def get_model_armor_template(
 
     # TODO(Developer): Uncomment these variables.
     # project_id = "YOUR_PROJECT_ID"
-    # location = "us-central1"
+    # location_id = "us-central1"
     # template_id = "template_id"
 
     # Create the Model Armor client.
     client = modelarmor_v1.ModelArmorClient(
         transport="rest",
         client_options=ClientOptions(
-            api_endpoint=f"modelarmor.{location}.rep.googleapis.com"
+            api_endpoint=f"modelarmor.{location_id}.rep.googleapis.com"
         ),
     )
 
     # Initialize request arguments.
     request = modelarmor_v1.GetTemplateRequest(
-        name=f"projects/{project_id}/locations/{location}/templates/{template_id}",
+        name=f"projects/{project_id}/locations/{location_id}/templates/{template_id}",
     )
 
     # Get the template.

model_armor/snippets/list_templates.py

@@ -20,7 +20,7 @@
 
 def list_model_armor_templates(
     project_id: str,
-    location: str,
+    location_id: str,
 ) -> pagers.ListTemplatesPager:
     """List model armor templates.
 
@@ -37,19 +37,19 @@ def list_model_armor_templates(
 
     # TODO(Developer): Uncomment these variables.
     # project_id = "YOUR_PROJECT_ID"
-    # location = "us-central1"
+    # location_id = "us-central1"
 
     # Create the Model Armor client.
     client = modelarmor_v1.ModelArmorClient(
         transport="rest",
         client_options=ClientOptions(
-            api_endpoint=f"modelarmor.{location}.rep.googleapis.com"
+            api_endpoint=f"modelarmor.{location_id}.rep.googleapis.com"
         ),
     )
 
     # Initialize request argument(s).
     request = modelarmor_v1.ListTemplatesRequest(
-        parent=f"projects/{project_id}/locations/{location}"
+        parent=f"projects/{project_id}/locations/{location_id}"
     )
 
     # Get list of templates.

model_armor/snippets/list_templates_with_filter.py

@@ -29,7 +29,7 @@ def list_model_armor_templates_with_filter(
     Args:
         project_id (str): Google Cloud project ID.
         location_id (str): Google Cloud location.
-        template_id (str): Model Armour Template ID(s) to filter from list.
+        template_id (str): Model Armor Template ID(s) to filter from list.
 
     Returns:
         List[str]: A list of template names.

model_armor/snippets/requirements.txt

@@ -1,2 +1,2 @@
-google-cloud-modelarmor==0.1.1
-google-cloud-dlp==3.27.0
+google-cloud-modelarmor==0.2.5
+google-cloud-dlp==3.30.0

model_armor/snippets/sanitize_user_prompt.py

@@ -43,7 +43,7 @@ def sanitize_user_prompt(
 
     # TODO(Developer): Uncomment these variables.
     # project_id = "YOUR_PROJECT_ID"
-    # location = "us-central1"
+    # location_id = "us-central1"
     # template_id = "template_id"
     # user_prompt = "Prompt entered by the user"