Added - Support for Rel 2.0 Enhancement: Oracle Cloud AI Services Document Understanding

Author: Sangeeta Saha

examples/aiDocument/main.tf

@@ -1,19 +1,20 @@
 provider "oci" {
+#   version = "6.21.0"
 }
 
 variable "tenancy_ocid" {
-  default = "ocid1.tenancy.oc1..aaaaaaaaikox5b3adi2w237m2fwomzxybp52i7byjrj5fxradayjqxum7bsq"
+  default = ""
 }
 
 variable "region" {
   default = "us-phoenix-1"
 }
 
 variable "model_model_version" {
-  default = "modelVersion"
+  default = "V1.0"
 }
 
-variable "compartment_id" { default = "ocid1.compartment.oc1..aaaaaaaa3jewat7ub6yf257bsxvfcfz5zt46fruduji37ekbsefwmcmzvgxq" }
+variable "compartment_id" { default = "" }
 
 variable defined_tag_namespace_name { default = "" }
 
@@ -22,17 +23,19 @@ resource "oci_ai_document_project" "test_project" {
   compartment_id = var.compartment_id
 }
 
-resource "oci_ai_document_model" "test_model1" {
+resource "oci_ai_document_model" "test_model" {
   #Required
   compartment_id = var.compartment_id
   model_type = "KEY_VALUE_EXTRACTION"
   project_id = oci_ai_document_project.test_project.id
+  inference_units = 1
+  language = "ENG"
 
   training_dataset {
-    bucket = "tf_test_bucket"
+    bucket = "canary_test"
     dataset_type = "OBJECT_STORAGE"
-    namespace = "axgexwaxnm7k"
-    object = "tf_test_dataset_1680065500556.jsonl"
+    namespace = "axylfvgphoea"
+    object = "canary-aadhar-dataset_1686632830312.jsonl"
   }
 
   #Optional
@@ -41,41 +44,61 @@ resource "oci_ai_document_model" "test_model1" {
   model_version              = var.model_model_version
 }
 
-resource "oci_ai_document_model" "test_model2" {
-  #Required
-  compartment_id = var.compartment_id
-  model_type = "KEY_VALUE_EXTRACTION"
-  project_id = oci_ai_document_project.test_project.id
+variable "object_locations" {
+  type = list(map(string))
+  default = [
+    {
+      bucket    = "canary_test"
+      namespace = "axylfvgphoea"
+      object    = "dus_test.pdf"
+    }
+  ]
+}
 
-  training_dataset {
-    bucket = "tf_test_bucket"
-    dataset_type = "OBJECT_STORAGE"
-    namespace = "axgexwaxnm7k"
-    object = "tf_test_aadhar_1686719828190.jsonl"
-  }
 
-  #Optional
-  display_name = "test_tf_model2"
-  is_quick_mode = "false"
-  model_version              = var.model_model_version
+variable "features" {
+  type = list(map(string))
+  default = [
+    {
+      feature_type = "KEY_VALUE_EXTRACTION"
+      selection_mark_detection = false
+    }
+  ]
 }
 
-resource "oci_ai_document_model" "test_compose_model" {
-  #Required
+resource "oci_ai_document_processor_job" "test_processor_job" {
   compartment_id = var.compartment_id
-  model_type = "KEY_VALUE_EXTRACTION"
-  project_id = oci_ai_document_project.test_project.id
-
-  component_models {
-    model_id = oci_ai_document_model.test_model1.id
+  display_name = "test_tf_processor_job"
+  input_location {
+
+    dynamic "object_locations" {
+      for_each = var.object_locations
+      content {
+        bucket    = object_locations.value["bucket"]
+        namespace = object_locations.value["namespace"]
+        object    = object_locations.value["object"]
+      }
+    }
+
+    source_type = "OBJECT_STORAGE_LOCATIONS"
   }
-
-  component_models {
-    model_id = oci_ai_document_model.test_model2.id
+  output_location {
+    bucket = "canary_test"
+    namespace = "axylfvgphoea"
+    prefix = "test"
   }
-
-  #Optional
-  display_name = "test_compose_model"
-  is_quick_mode = "false"
-  model_version              = var.model_model_version
-}
+  processor_config {
+
+    dynamic "features" {
+      for_each = var.features
+      content {
+        feature_type    = features.value["feature_type"]
+        selection_mark_detection = features.value["selection_mark_detection"]
+      }
+    }
+
+    processor_type = "GENERAL"
+    document_type = "INVOICE"
+    language = "ENG"
+  }
+}

internal/integrationtest/ai_document_model_test.go

@@ -0,0 +1,55 @@
+// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package integrationtest
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
+	"github.com/oracle/terraform-provider-oci/httpreplay"
+	"github.com/oracle/terraform-provider-oci/internal/acctest"
+
+	"github.com/oracle/terraform-provider-oci/internal/utils"
+)
+
+var (
+	AiDocumentModelTypeSingularDataSourceRepresentation = map[string]interface{}{
+		"model_type":     acctest.Representation{RepType: acctest.Required, Create: `PRE_TRAINED_DOCUMENT_CLASSIFICATION`},
+		"model_sub_type": acctest.Representation{RepType: acctest.Required, Create: `QR_BAR_CODE`},
+	}
+
+	AiDocumentModelTypeResourceConfig = ""
+)
+
+// issue-routing-tag: ai_document/default
+func TestAiDocumentModelTypeResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestAiDocumentModelTypeResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := acctest.ProviderTestConfig()
+
+	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	singularDatasourceName := "data.oci_ai_document_model_type.test_model_type"
+
+	acctest.SaveConfigContent("", "", "", t)
+
+	acctest.ResourceTest(t, nil, []resource.TestStep{
+		// verify singular datasource
+		{
+			Config: config +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_ai_document_model_type", "test_model_type", acctest.Required, acctest.Create, AiDocumentModelTypeSingularDataSourceRepresentation) +
+				compartmentIdVariableStr + AiDocumentModelTypeResourceConfig,
+			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(singularDatasourceName, "model_type", "PRE_TRAINED_DOCUMENT_CLASSIFICATION"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "model_sub_type", "QR_BAR_CODE"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "versions.#", "1"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "capabilities", "{\"V1.0\":{\"capability\":{\"description\":{\"details\":[\"document classification model\"]},\"supportedLanguages\":{\"details\":[\"en\"]},\"userDisplayedVersion\":{\"details\":[\"V1.0\"]}}}}"),
+			),
+		},
+	})
+}