fix: [google-cloud-documentai] Resolve AttributeError 'Credentials' object has no attribute 'universe_domain' (#12259)

gcf-owl-bot[bot] · ohmayr · web-flow · commit 81d36fcb9602 · 2024-02-02T19:07:08.000-05:00
- [ ] Regenerate this pull request now. fix: Add google-auth as a direct dependency fix: Add staticmethod decorator to methods added in v1.14.0 chore: Update gapic-generator-python to v1.14.1 PiperOrigin-RevId: 603728206 Source-Link: googleapis/googleapis@9063da8 Source-Link: googleapis/googleapis-gen@891c67d Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRvY3VtZW50YWkvLk93bEJvdC55YW1sIiwiaCI6Ijg5MWM2N2QwYTg1NWIwODA4NWViMzAxZGFiYjE0MDY0ZWY0YjJjNmQifQ== BEGIN_NESTED_COMMIT feat: [google-cloud-documentai] expose model_type in v1 processor, so that user can see the model_type after get or list processor version PiperOrigin-RevId: 603727585 Source-Link: googleapis/googleapis@7a9a855 Source-Link: googleapis/googleapis-gen@9643051 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRvY3VtZW50YWkvLk93bEJvdC55YW1sIiwiaCI6Ijk2NDMwNTExNTA3NjJjM2UxNWQxY2Q0MjBkZGZiOTc4YTFiN2MyNGMifQ== END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: [google-cloud-documentai] add model_type in v1beta3 processor proto PiperOrigin-RevId: 603726122 Source-Link: googleapis/googleapis@c7fd8bd Source-Link: googleapis/googleapis-gen@23bc05e Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRvY3VtZW50YWkvLk93bEJvdC55YW1sIiwiaCI6IjIzYmMwNWU2OTlhZDU3MDEwMjc1ODkxMzdiZTQ0ZDRhNDMwOTE4MjkifQ== END_NESTED_COMMIT --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: omair <omairn@google.com>
diff --git a/packages/google-cloud-documentai/google/cloud/documentai/gapic_version.py b/packages/google-cloud-documentai/google/cloud/documentai/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.22.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/gapic_version.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.22.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/services/document_processor_service/client.py
@@ -497,6 +497,7 @@ def _read_environment_variables():
             )
         return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
 
+    @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):
         """Return the client cert source to be used by the client.
 
@@ -515,6 +516,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
                 client_cert_source = mtls.default_client_cert_source()
         return client_cert_source
 
+    @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
     ):
@@ -591,17 +593,18 @@ def _compare_universes(
         Raises:
             ValueError: when client_universe does not match the universe in credentials.
         """
-        if credentials:
-            credentials_universe = credentials.universe_domain
-            if client_universe != credentials_universe:
-                default_universe = DocumentProcessorServiceClient._DEFAULT_UNIVERSE
-                raise ValueError(
-                    "The configured universe domain "
-                    f"({client_universe}) does not match the universe domain "
-                    f"found in the credentials ({credentials_universe}). "
-                    "If you haven't configured the universe domain explicitly, "
-                    f"`{default_universe}` is the default."
-                )
+
+        default_universe = DocumentProcessorServiceClient._DEFAULT_UNIVERSE
+        credentials_universe = getattr(credentials, "universe_domain", default_universe)
+
+        if client_universe != credentials_universe:
+            raise ValueError(
+                "The configured universe domain "
+                f"({client_universe}) does not match the universe domain "
+                f"found in the credentials ({credentials_universe}). "
+                "If you haven't configured the universe domain explicitly, "
+                f"`{default_universe}` is the default."
+            )
         return True
 
     def _validate_universe_domain(self):
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py b/packages/google-cloud-documentai/google/cloud/documentai_v1/types/processor.py
@@ -67,6 +67,9 @@ class ProcessorVersion(proto.Message):
         deprecation_info (google.cloud.documentai_v1.types.ProcessorVersion.DeprecationInfo):
             If set, information about the eventual
             deprecation of this version.
+        model_type (google.cloud.documentai_v1.types.ProcessorVersion.ModelType):
+            Output only. The model type of this processor
+            version.
     """
 
     class State(proto.Enum):
@@ -106,6 +109,23 @@ class State(proto.Enum):
         FAILED = 7
         IMPORTING = 8
 
+    class ModelType(proto.Enum):
+        r"""The possible model types of the processor version.
+
+        Values:
+            MODEL_TYPE_UNSPECIFIED (0):
+                The processor version has unspecified model
+                type.
+            MODEL_TYPE_GENERATIVE (1):
+                The processor version has generative model
+                type.
+            MODEL_TYPE_CUSTOM (2):
+                The processor version has custom model type.
+        """
+        MODEL_TYPE_UNSPECIFIED = 0
+        MODEL_TYPE_GENERATIVE = 1
+        MODEL_TYPE_CUSTOM = 2
+
     class DeprecationInfo(proto.Message):
         r"""Information about the upcoming deprecation of this processor
         version.
@@ -174,6 +194,11 @@ class DeprecationInfo(proto.Message):
         number=13,
         message=DeprecationInfo,
     )
+    model_type: ModelType = proto.Field(
+        proto.ENUM,
+        number=15,
+        enum=ModelType,
+    )
 
 
 class ProcessorVersionAlias(proto.Message):
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta2/gapic_version.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta2/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.22.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta2/services/document_understanding_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta2/services/document_understanding_service/client.py
@@ -370,6 +370,7 @@ def _read_environment_variables():
             )
         return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
 
+    @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):
         """Return the client cert source to be used by the client.
 
@@ -388,6 +389,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
                 client_cert_source = mtls.default_client_cert_source()
         return client_cert_source
 
+    @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
     ):
@@ -464,17 +466,18 @@ def _compare_universes(
         Raises:
             ValueError: when client_universe does not match the universe in credentials.
         """
-        if credentials:
-            credentials_universe = credentials.universe_domain
-            if client_universe != credentials_universe:
-                default_universe = DocumentUnderstandingServiceClient._DEFAULT_UNIVERSE
-                raise ValueError(
-                    "The configured universe domain "
-                    f"({client_universe}) does not match the universe domain "
-                    f"found in the credentials ({credentials_universe}). "
-                    "If you haven't configured the universe domain explicitly, "
-                    f"`{default_universe}` is the default."
-                )
+
+        default_universe = DocumentUnderstandingServiceClient._DEFAULT_UNIVERSE
+        credentials_universe = getattr(credentials, "universe_domain", default_universe)
+
+        if client_universe != credentials_universe:
+            raise ValueError(
+                "The configured universe domain "
+                f"({client_universe}) does not match the universe domain "
+                f"found in the credentials ({credentials_universe}). "
+                "If you haven't configured the universe domain explicitly, "
+                f"`{default_universe}` is the default."
+            )
         return True
 
     def _validate_universe_domain(self):
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/gapic_version.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.22.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_processor_service/client.py
@@ -497,6 +497,7 @@ def _read_environment_variables():
             )
         return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
 
+    @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):
         """Return the client cert source to be used by the client.
 
@@ -515,6 +516,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
                 client_cert_source = mtls.default_client_cert_source()
         return client_cert_source
 
+    @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
     ):
@@ -591,17 +593,18 @@ def _compare_universes(
         Raises:
             ValueError: when client_universe does not match the universe in credentials.
         """
-        if credentials:
-            credentials_universe = credentials.universe_domain
-            if client_universe != credentials_universe:
-                default_universe = DocumentProcessorServiceClient._DEFAULT_UNIVERSE
-                raise ValueError(
-                    "The configured universe domain "
-                    f"({client_universe}) does not match the universe domain "
-                    f"found in the credentials ({credentials_universe}). "
-                    "If you haven't configured the universe domain explicitly, "
-                    f"`{default_universe}` is the default."
-                )
+
+        default_universe = DocumentProcessorServiceClient._DEFAULT_UNIVERSE
+        credentials_universe = getattr(credentials, "universe_domain", default_universe)
+
+        if client_universe != credentials_universe:
+            raise ValueError(
+                "The configured universe domain "
+                f"({client_universe}) does not match the universe domain "
+                f"found in the credentials ({credentials_universe}). "
+                "If you haven't configured the universe domain explicitly, "
+                f"`{default_universe}` is the default."
+            )
         return True
 
     def _validate_universe_domain(self):
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/services/document_service/client.py
@@ -440,6 +440,7 @@ def _read_environment_variables():
             )
         return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
 
+    @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):
         """Return the client cert source to be used by the client.
 
@@ -458,6 +459,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
                 client_cert_source = mtls.default_client_cert_source()
         return client_cert_source
 
+    @staticmethod
     def _get_api_endpoint(
         api_override, client_cert_source, universe_domain, use_mtls_endpoint
     ):
@@ -532,17 +534,18 @@ def _compare_universes(
         Raises:
             ValueError: when client_universe does not match the universe in credentials.
         """
-        if credentials:
-            credentials_universe = credentials.universe_domain
-            if client_universe != credentials_universe:
-                default_universe = DocumentServiceClient._DEFAULT_UNIVERSE
-                raise ValueError(
-                    "The configured universe domain "
-                    f"({client_universe}) does not match the universe domain "
-                    f"found in the credentials ({credentials_universe}). "
-                    "If you haven't configured the universe domain explicitly, "
-                    f"`{default_universe}` is the default."
-                )
+
+        default_universe = DocumentServiceClient._DEFAULT_UNIVERSE
+        credentials_universe = getattr(credentials, "universe_domain", default_universe)
+
+        if client_universe != credentials_universe:
+            raise ValueError(
+                "The configured universe domain "
+                f"({client_universe}) does not match the universe domain "
+                f"found in the credentials ({credentials_universe}). "
+                "If you haven't configured the universe domain explicitly, "
+                f"`{default_universe}` is the default."
+            )
         return True
 
     def _validate_universe_domain(self):
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/document_service.py
@@ -397,7 +397,7 @@ class ListDocumentsRequest(proto.Message):
 
             Currently support query strings are:
 
-            - ``SplitType=DATASET_SPLIT_TEST|DATASET_SPLIT_TRAIN|DATASET_SPLIT_UNASSIGNED``
+            -  ``SplitType=DATASET_SPLIT_TEST|DATASET_SPLIT_TRAIN|DATASET_SPLIT_UNASSIGNED``
             -  ``LabelingState=DOCUMENT_LABELED|DOCUMENT_UNLABELED|DOCUMENT_AUTO_LABELED``
             -  ``DisplayName=\"file_name.pdf\"``
             -  ``EntityType=abc/def``
diff --git a/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py b/packages/google-cloud-documentai/google/cloud/documentai_v1beta3/types/processor.py
@@ -67,6 +67,9 @@ class ProcessorVersion(proto.Message):
         deprecation_info (google.cloud.documentai_v1beta3.types.ProcessorVersion.DeprecationInfo):
             If set, information about the eventual
             deprecation of this version.
+        model_type (google.cloud.documentai_v1beta3.types.ProcessorVersion.ModelType):
+            Output only. The model type of this processor
+            version.
     """
 
     class State(proto.Enum):
@@ -106,6 +109,23 @@ class State(proto.Enum):
         FAILED = 7
         IMPORTING = 8
 
+    class ModelType(proto.Enum):
+        r"""The possible model types of the processor version.
+
+        Values:
+            MODEL_TYPE_UNSPECIFIED (0):
+                The processor version has unspecified model
+                type.
+            MODEL_TYPE_GENERATIVE (1):
+                The processor version has generative model
+                type.
+            MODEL_TYPE_CUSTOM (2):
+                The processor version has custom model type.
+        """
+        MODEL_TYPE_UNSPECIFIED = 0
+        MODEL_TYPE_GENERATIVE = 1
+        MODEL_TYPE_CUSTOM = 2
+
     class DeprecationInfo(proto.Message):
         r"""Information about the upcoming deprecation of this processor
         version.
@@ -174,6 +194,11 @@ class DeprecationInfo(proto.Message):
         number=13,
         message=DeprecationInfo,
     )
+    model_type: ModelType = proto.Field(
+        proto.ENUM,
+        number=15,
+        enum=ModelType,
+    )
 
 
 class ProcessorVersionAlias(proto.Message):
diff --git a/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1.json b/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-documentai",
-    "version": "2.22.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1beta2.json b/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1beta2.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-documentai",
-    "version": "2.22.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1beta3.json b/packages/google-cloud-documentai/samples/generated_samples/snippet_metadata_google.cloud.documentai.v1beta3.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-documentai",
-    "version": "2.22.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-documentai/setup.py b/packages/google-cloud-documentai/setup.py
@@ -40,6 +40,7 @@
 
 dependencies = [
     "google-api-core[grpc] >= 1.34.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
+    "google-auth >= 2.14.1, <3.0.0dev",
     "proto-plus >= 1.22.3, <2.0.0dev",
     "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
 ]
diff --git a/packages/google-cloud-documentai/testing/constraints-3.7.txt b/packages/google-cloud-documentai/testing/constraints-3.7.txt
@@ -5,5 +5,6 @@
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have google-cloud-foo==1.14.0
 google-api-core==1.34.0
+google-auth==2.14.1
 proto-plus==1.22.3
 protobuf==3.19.5
diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1/test_document_processor_service.py
diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta2/test_document_understanding_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta2/test_document_understanding_service.py
diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_processor_service.py
diff --git a/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py b/packages/google-cloud-documentai/tests/unit/gapic/documentai_v1beta3/test_document_service.py

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-__version__ = "2.22.0" # {x-release-please-version}`
	`16`	`+__version__ = "0.0.0" # {x-release-please-version}`