google-cloud-modelarmor 0.3.0__tar.gz → 0.4.0__tar.gz

{google_cloud_modelarmor-0.3.0/google_cloud_modelarmor.egg-info → google_cloud_modelarmor-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-modelarmor
-Version: 0.3.0
+Version: 0.4.0
 Summary: Google Cloud Modelarmor API client library
 Home-page: https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-modelarmor
 Author: Google LLC

{google_cloud_modelarmor-0.3.0 → google_cloud_modelarmor-0.4.0}/google/cloud/modelarmor/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.3.0"  # {x-release-please-version}
+__version__ = "0.4.0"  # {x-release-please-version}

google_cloud_modelarmor-0.4.0/google/cloud/modelarmor_v1/__init__.py

@@ -0,0 +1,222 @@
+# -*- coding: utf-8 -*-
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+import sys
+
+import google.api_core as api_core
+
+from google.cloud.modelarmor_v1 import gapic_version as package_version
+
+__version__ = package_version.__version__
+
+if sys.version_info >= (3, 8):  # pragma: NO COVER
+    from importlib import metadata
+else:  # pragma: NO COVER
+    # TODO(https://github.com/googleapis/python-api-core/issues/835): Remove
+    # this code path once we drop support for Python 3.7
+    import importlib_metadata as metadata
+
+from .services.model_armor import ModelArmorAsyncClient, ModelArmorClient
+from .types.service import (
+    AiPlatformFloorSetting,
+    ByteDataItem,
+    CreateTemplateRequest,
+    CsamFilterResult,
+    DataItem,
+    DeleteTemplateRequest,
+    DetectionConfidenceLevel,
+    FilterConfig,
+    FilterExecutionState,
+    FilterMatchState,
+    FilterResult,
+    FloorSetting,
+    GetFloorSettingRequest,
+    GetTemplateRequest,
+    InvocationResult,
+    ListTemplatesRequest,
+    ListTemplatesResponse,
+    MaliciousUriFilterResult,
+    MaliciousUriFilterSettings,
+    MessageItem,
+    MultiLanguageDetectionMetadata,
+    PiAndJailbreakFilterResult,
+    PiAndJailbreakFilterSettings,
+    RaiFilterResult,
+    RaiFilterSettings,
+    RaiFilterType,
+    RangeInfo,
+    SanitizationResult,
+    SanitizeModelResponseRequest,
+    SanitizeModelResponseResponse,
+    SanitizeUserPromptRequest,
+    SanitizeUserPromptResponse,
+    SdpAdvancedConfig,
+    SdpBasicConfig,
+    SdpDeidentifyResult,
+    SdpFilterResult,
+    SdpFilterSettings,
+    SdpFinding,
+    SdpFindingLikelihood,
+    SdpInspectResult,
+    Template,
+    UpdateFloorSettingRequest,
+    UpdateTemplateRequest,
+    VirusDetail,
+    VirusScanFilterResult,
+)
+
+if hasattr(api_core, "check_python_version") and hasattr(
+    api_core, "check_dependency_versions"
+):  # pragma: NO COVER
+    api_core.check_python_version("google.cloud.modelarmor_v1")  # type: ignore
+    api_core.check_dependency_versions("google.cloud.modelarmor_v1")  # type: ignore
+else:  # pragma: NO COVER
+    # An older version of api_core is installed which does not define the
+    # functions above. We do equivalent checks manually.
+    try:
+        import sys
+        import warnings
+
+        _py_version_str = sys.version.split()[0]
+        _package_label = "google.cloud.modelarmor_v1"
+        if sys.version_info < (3, 9):
+            warnings.warn(
+                "You are using a non-supported Python version "
+                + f"({_py_version_str}).  Google will not post any further "
+                + f"updates to {_package_label} supporting this Python version. "
+                + "Please upgrade to the latest Python version, or at "
+                + f"least to Python 3.9, and then update {_package_label}.",
+                FutureWarning,
+            )
+        if sys.version_info[:2] == (3, 9):
+            warnings.warn(
+                f"You are using a Python version ({_py_version_str}) "
+                + f"which Google will stop supporting in {_package_label} in "
+                + "January 2026. Please "
+                + "upgrade to the latest Python version, or at "
+                + "least to Python 3.10, before then, and "
+                + f"then update {_package_label}.",
+                FutureWarning,
+            )
+
+        def parse_version_to_tuple(version_string: str):
+            """Safely converts a semantic version string to a comparable tuple of integers.
+            Example: "4.25.8" -> (4, 25, 8)
+            Ignores non-numeric parts and handles common version formats.
+            Args:
+                version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
+            Returns:
+                Tuple of integers for the parsed version string.
+            """
+            parts = []
+            for part in version_string.split("."):
+                try:
+                    parts.append(int(part))
+                except ValueError:
+                    # If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
+                    # This is a simplification compared to 'packaging.parse_version', but sufficient
+                    # for comparing strictly numeric semantic versions.
+                    break
+            return tuple(parts)
+
+        def _get_version(dependency_name):
+            try:
+                version_string: str = metadata.version(dependency_name)
+                parsed_version = parse_version_to_tuple(version_string)
+                return (parsed_version, version_string)
+            except Exception:
+                # Catch exceptions from metadata.version() (e.g., PackageNotFoundError)
+                # or errors during parse_version_to_tuple
+                return (None, "--")
+
+        _dependency_package = "google.protobuf"
+        _next_supported_version = "4.25.8"
+        _next_supported_version_tuple = (4, 25, 8)
+        _recommendation = " (we recommend 6.x)"
+        (_version_used, _version_used_string) = _get_version(_dependency_package)
+        if _version_used and _version_used < _next_supported_version_tuple:
+            warnings.warn(
+                f"Package {_package_label} depends on "
+                + f"{_dependency_package}, currently installed at version "
+                + f"{_version_used_string}. Future updates to "
+                + f"{_package_label} will require {_dependency_package} at "
+                + f"version {_next_supported_version} or higher{_recommendation}."
+                + " Please ensure "
+                + "that either (a) your Python environment doesn't pin the "
+                + f"version of {_dependency_package}, so that updates to "
+                + f"{_package_label} can require the higher version, or "
+                + "(b) you manually update your Python environment to use at "
+                + f"least version {_next_supported_version} of "
+                + f"{_dependency_package}.",
+                FutureWarning,
+            )
+    except Exception:
+        warnings.warn(
+            "Could not determine the version of Python "
+            + "currently being used. To continue receiving "
+            + "updates for {_package_label}, ensure you are "
+            + "using a supported version of Python; see "
+            + "https://devguide.python.org/versions/"
+        )
+
+__all__ = (
+    "ModelArmorAsyncClient",
+    "AiPlatformFloorSetting",
+    "ByteDataItem",
+    "CreateTemplateRequest",
+    "CsamFilterResult",
+    "DataItem",
+    "DeleteTemplateRequest",
+    "DetectionConfidenceLevel",
+    "FilterConfig",
+    "FilterExecutionState",
+    "FilterMatchState",
+    "FilterResult",
+    "FloorSetting",
+    "GetFloorSettingRequest",
+    "GetTemplateRequest",
+    "InvocationResult",
+    "ListTemplatesRequest",
+    "ListTemplatesResponse",
+    "MaliciousUriFilterResult",
+    "MaliciousUriFilterSettings",
+    "MessageItem",
+    "ModelArmorClient",
+    "MultiLanguageDetectionMetadata",
+    "PiAndJailbreakFilterResult",
+    "PiAndJailbreakFilterSettings",
+    "RaiFilterResult",
+    "RaiFilterSettings",
+    "RaiFilterType",
+    "RangeInfo",
+    "SanitizationResult",
+    "SanitizeModelResponseRequest",
+    "SanitizeModelResponseResponse",
+    "SanitizeUserPromptRequest",
+    "SanitizeUserPromptResponse",
+    "SdpAdvancedConfig",
+    "SdpBasicConfig",
+    "SdpDeidentifyResult",
+    "SdpFilterResult",
+    "SdpFilterSettings",
+    "SdpFinding",
+    "SdpFindingLikelihood",
+    "SdpInspectResult",
+    "Template",
+    "UpdateFloorSettingRequest",
+    "UpdateTemplateRequest",
+    "VirusDetail",
+    "VirusScanFilterResult",
+)

{google_cloud_modelarmor-0.3.0/google/cloud/modelarmor_v1beta → google_cloud_modelarmor-0.4.0/google/cloud/modelarmor_v1}/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.3.0"  # {x-release-please-version}
+__version__ = "0.4.0"  # {x-release-please-version}

{google_cloud_modelarmor-0.3.0 → google_cloud_modelarmor-0.4.0}/google/cloud/modelarmor_v1/services/model_armor/client.py

@@ -151,6 +151,34 @@ class ModelArmorClient(metaclass=ModelArmorClientMeta):
     _DEFAULT_ENDPOINT_TEMPLATE = "modelarmor.{UNIVERSE_DOMAIN}"
     _DEFAULT_UNIVERSE = "googleapis.com"
 
+    @staticmethod
+    def _use_client_cert_effective():
+        """Returns whether client certificate should be used for mTLS if the
+        google-auth version supports should_use_client_cert automatic mTLS enablement.
+
+        Alternatively, read from the GOOGLE_API_USE_CLIENT_CERTIFICATE env var.
+
+        Returns:
+            bool: whether client certificate should be used for mTLS
+        Raises:
+            ValueError: (If using a version of google-auth without should_use_client_cert and
+            GOOGLE_API_USE_CLIENT_CERTIFICATE is set to an unexpected value.)
+        """
+        # check if google-auth version supports should_use_client_cert for automatic mTLS enablement
+        if hasattr(mtls, "should_use_client_cert"):  # pragma: NO COVER
+            return mtls.should_use_client_cert()
+        else:  # pragma: NO COVER
+            # if unsupported, fallback to reading from env var
+            use_client_cert_str = os.getenv(
+                "GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"
+            ).lower()
+            if use_client_cert_str not in ("true", "false"):
+                raise ValueError(
+                    "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be"
+                    " either `true` or `false`"
+                )
+            return use_client_cert_str == "true"
+
     @classmethod
     def from_service_account_info(cls, info: dict, *args, **kwargs):
         """Creates an instance of this client using the provided credentials
@@ -358,12 +386,8 @@ class ModelArmorClient(metaclass=ModelArmorClientMeta):
         )
         if client_options is None:
             client_options = client_options_lib.ClientOptions()
-        use_client_cert = os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false")
+        use_client_cert = ModelArmorClient._use_client_cert_effective()
         use_mtls_endpoint = os.getenv("GOOGLE_API_USE_MTLS_ENDPOINT", "auto")
-        if use_client_cert not in ("true", "false"):
-            raise ValueError(
-                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
-            )
         if use_mtls_endpoint not in ("auto", "never", "always"):
             raise MutualTLSChannelError(
                 "Environment variable `GOOGLE_API_USE_MTLS_ENDPOINT` must be `never`, `auto` or `always`"
@@ -371,7 +395,7 @@ class ModelArmorClient(metaclass=ModelArmorClientMeta):
 
         # Figure out the client cert source to use.
         client_cert_source = None
-        if use_client_cert == "true":
+        if use_client_cert:
             if client_options.client_cert_source:
                 client_cert_source = client_options.client_cert_source
             elif mtls.has_default_client_cert_source():
@@ -403,20 +427,14 @@ class ModelArmorClient(metaclass=ModelArmorClientMeta):
             google.auth.exceptions.MutualTLSChannelError: If GOOGLE_API_USE_MTLS_ENDPOINT
                 is not any of ["auto", "never", "always"].
         """
-        use_client_cert = os.getenv(
-            "GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"
-        ).lower()
+        use_client_cert = ModelArmorClient._use_client_cert_effective()
         use_mtls_endpoint = os.getenv("GOOGLE_API_USE_MTLS_ENDPOINT", "auto").lower()
         universe_domain_env = os.getenv("GOOGLE_CLOUD_UNIVERSE_DOMAIN")
-        if use_client_cert not in ("true", "false"):
-            raise ValueError(
-                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
-            )
         if use_mtls_endpoint not in ("auto", "never", "always"):
             raise MutualTLSChannelError(
                 "Environment variable `GOOGLE_API_USE_MTLS_ENDPOINT` must be `never`, `auto` or `always`"
             )
-        return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
+        return use_client_cert, use_mtls_endpoint, universe_domain_env
 
     @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):

google_cloud_modelarmor-0.4.0/google/cloud/modelarmor_v1beta/__init__.py

@@ -0,0 +1,222 @@
+# -*- coding: utf-8 -*-
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+import sys
+
+import google.api_core as api_core
+
+from google.cloud.modelarmor_v1beta import gapic_version as package_version
+
+__version__ = package_version.__version__
+
+if sys.version_info >= (3, 8):  # pragma: NO COVER
+    from importlib import metadata
+else:  # pragma: NO COVER
+    # TODO(https://github.com/googleapis/python-api-core/issues/835): Remove
+    # this code path once we drop support for Python 3.7
+    import importlib_metadata as metadata
+
+from .services.model_armor import ModelArmorAsyncClient, ModelArmorClient
+from .types.service import (
+    AiPlatformFloorSetting,
+    ByteDataItem,
+    CreateTemplateRequest,
+    CsamFilterResult,
+    DataItem,
+    DeleteTemplateRequest,
+    DetectionConfidenceLevel,
+    FilterConfig,
+    FilterExecutionState,
+    FilterMatchState,
+    FilterResult,
+    FloorSetting,
+    GetFloorSettingRequest,
+    GetTemplateRequest,
+    InvocationResult,
+    ListTemplatesRequest,
+    ListTemplatesResponse,
+    MaliciousUriFilterResult,
+    MaliciousUriFilterSettings,
+    MessageItem,
+    MultiLanguageDetectionMetadata,
+    PiAndJailbreakFilterResult,
+    PiAndJailbreakFilterSettings,
+    RaiFilterResult,
+    RaiFilterSettings,
+    RaiFilterType,
+    RangeInfo,
+    SanitizationResult,
+    SanitizeModelResponseRequest,
+    SanitizeModelResponseResponse,
+    SanitizeUserPromptRequest,
+    SanitizeUserPromptResponse,
+    SdpAdvancedConfig,
+    SdpBasicConfig,
+    SdpDeidentifyResult,
+    SdpFilterResult,
+    SdpFilterSettings,
+    SdpFinding,
+    SdpFindingLikelihood,
+    SdpInspectResult,
+    Template,
+    UpdateFloorSettingRequest,
+    UpdateTemplateRequest,
+    VirusDetail,
+    VirusScanFilterResult,
+)
+
+if hasattr(api_core, "check_python_version") and hasattr(
+    api_core, "check_dependency_versions"
+):  # pragma: NO COVER
+    api_core.check_python_version("google.cloud.modelarmor_v1beta")  # type: ignore
+    api_core.check_dependency_versions("google.cloud.modelarmor_v1beta")  # type: ignore
+else:  # pragma: NO COVER
+    # An older version of api_core is installed which does not define the
+    # functions above. We do equivalent checks manually.
+    try:
+        import sys
+        import warnings
+
+        _py_version_str = sys.version.split()[0]
+        _package_label = "google.cloud.modelarmor_v1beta"
+        if sys.version_info < (3, 9):
+            warnings.warn(
+                "You are using a non-supported Python version "
+                + f"({_py_version_str}).  Google will not post any further "
+                + f"updates to {_package_label} supporting this Python version. "
+                + "Please upgrade to the latest Python version, or at "
+                + f"least to Python 3.9, and then update {_package_label}.",
+                FutureWarning,
+            )
+        if sys.version_info[:2] == (3, 9):
+            warnings.warn(
+                f"You are using a Python version ({_py_version_str}) "
+                + f"which Google will stop supporting in {_package_label} in "
+                + "January 2026. Please "
+                + "upgrade to the latest Python version, or at "
+                + "least to Python 3.10, before then, and "
+                + f"then update {_package_label}.",
+                FutureWarning,
+            )
+
+        def parse_version_to_tuple(version_string: str):
+            """Safely converts a semantic version string to a comparable tuple of integers.
+            Example: "4.25.8" -> (4, 25, 8)
+            Ignores non-numeric parts and handles common version formats.
+            Args:
+                version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
+            Returns:
+                Tuple of integers for the parsed version string.
+            """
+            parts = []
+            for part in version_string.split("."):
+                try:
+                    parts.append(int(part))
+                except ValueError:
+                    # If it's a non-numeric part (e.g., '1.0.0b1' -> 'b1'), stop here.
+                    # This is a simplification compared to 'packaging.parse_version', but sufficient
+                    # for comparing strictly numeric semantic versions.
+                    break
+            return tuple(parts)
+
+        def _get_version(dependency_name):
+            try:
+                version_string: str = metadata.version(dependency_name)
+                parsed_version = parse_version_to_tuple(version_string)
+                return (parsed_version, version_string)
+            except Exception:
+                # Catch exceptions from metadata.version() (e.g., PackageNotFoundError)
+                # or errors during parse_version_to_tuple
+                return (None, "--")
+
+        _dependency_package = "google.protobuf"
+        _next_supported_version = "4.25.8"
+        _next_supported_version_tuple = (4, 25, 8)
+        _recommendation = " (we recommend 6.x)"
+        (_version_used, _version_used_string) = _get_version(_dependency_package)
+        if _version_used and _version_used < _next_supported_version_tuple:
+            warnings.warn(
+                f"Package {_package_label} depends on "
+                + f"{_dependency_package}, currently installed at version "
+                + f"{_version_used_string}. Future updates to "
+                + f"{_package_label} will require {_dependency_package} at "
+                + f"version {_next_supported_version} or higher{_recommendation}."
+                + " Please ensure "
+                + "that either (a) your Python environment doesn't pin the "
+                + f"version of {_dependency_package}, so that updates to "
+                + f"{_package_label} can require the higher version, or "
+                + "(b) you manually update your Python environment to use at "
+                + f"least version {_next_supported_version} of "
+                + f"{_dependency_package}.",
+                FutureWarning,
+            )
+    except Exception:
+        warnings.warn(
+            "Could not determine the version of Python "
+            + "currently being used. To continue receiving "
+            + "updates for {_package_label}, ensure you are "
+            + "using a supported version of Python; see "
+            + "https://devguide.python.org/versions/"
+        )
+
+__all__ = (
+    "ModelArmorAsyncClient",
+    "AiPlatformFloorSetting",
+    "ByteDataItem",
+    "CreateTemplateRequest",
+    "CsamFilterResult",
+    "DataItem",
+    "DeleteTemplateRequest",
+    "DetectionConfidenceLevel",
+    "FilterConfig",
+    "FilterExecutionState",
+    "FilterMatchState",
+    "FilterResult",
+    "FloorSetting",
+    "GetFloorSettingRequest",
+    "GetTemplateRequest",
+    "InvocationResult",
+    "ListTemplatesRequest",
+    "ListTemplatesResponse",
+    "MaliciousUriFilterResult",
+    "MaliciousUriFilterSettings",
+    "MessageItem",
+    "ModelArmorClient",
+    "MultiLanguageDetectionMetadata",
+    "PiAndJailbreakFilterResult",
+    "PiAndJailbreakFilterSettings",
+    "RaiFilterResult",
+    "RaiFilterSettings",
+    "RaiFilterType",
+    "RangeInfo",
+    "SanitizationResult",
+    "SanitizeModelResponseRequest",
+    "SanitizeModelResponseResponse",
+    "SanitizeUserPromptRequest",
+    "SanitizeUserPromptResponse",
+    "SdpAdvancedConfig",
+    "SdpBasicConfig",
+    "SdpDeidentifyResult",
+    "SdpFilterResult",
+    "SdpFilterSettings",
+    "SdpFinding",
+    "SdpFindingLikelihood",
+    "SdpInspectResult",
+    "Template",
+    "UpdateFloorSettingRequest",
+    "UpdateTemplateRequest",
+    "VirusDetail",
+    "VirusScanFilterResult",
+)

{google_cloud_modelarmor-0.3.0/google/cloud/modelarmor_v1 → google_cloud_modelarmor-0.4.0/google/cloud/modelarmor_v1beta}/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.3.0"  # {x-release-please-version}
+__version__ = "0.4.0"  # {x-release-please-version}

{google_cloud_modelarmor-0.3.0 → google_cloud_modelarmor-0.4.0}/google/cloud/modelarmor_v1beta/services/model_armor/client.py

@@ -151,6 +151,34 @@ class ModelArmorClient(metaclass=ModelArmorClientMeta):
     _DEFAULT_ENDPOINT_TEMPLATE = "modelarmor.{UNIVERSE_DOMAIN}"
     _DEFAULT_UNIVERSE = "googleapis.com"
 
+    @staticmethod
+    def _use_client_cert_effective():
+        """Returns whether client certificate should be used for mTLS if the
+        google-auth version supports should_use_client_cert automatic mTLS enablement.
+
+        Alternatively, read from the GOOGLE_API_USE_CLIENT_CERTIFICATE env var.
+
+        Returns:
+            bool: whether client certificate should be used for mTLS
+        Raises:
+            ValueError: (If using a version of google-auth without should_use_client_cert and
+            GOOGLE_API_USE_CLIENT_CERTIFICATE is set to an unexpected value.)
+        """
+        # check if google-auth version supports should_use_client_cert for automatic mTLS enablement
+        if hasattr(mtls, "should_use_client_cert"):  # pragma: NO COVER
+            return mtls.should_use_client_cert()
+        else:  # pragma: NO COVER
+            # if unsupported, fallback to reading from env var
+            use_client_cert_str = os.getenv(
+                "GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"
+            ).lower()
+            if use_client_cert_str not in ("true", "false"):
+                raise ValueError(
+                    "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be"
+                    " either `true` or `false`"
+                )
+            return use_client_cert_str == "true"
+
     @classmethod
     def from_service_account_info(cls, info: dict, *args, **kwargs):
         """Creates an instance of this client using the provided credentials
@@ -358,12 +386,8 @@ class ModelArmorClient(metaclass=ModelArmorClientMeta):
         )
         if client_options is None:
             client_options = client_options_lib.ClientOptions()
-        use_client_cert = os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false")
+        use_client_cert = ModelArmorClient._use_client_cert_effective()
         use_mtls_endpoint = os.getenv("GOOGLE_API_USE_MTLS_ENDPOINT", "auto")
-        if use_client_cert not in ("true", "false"):
-            raise ValueError(
-                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
-            )
         if use_mtls_endpoint not in ("auto", "never", "always"):
             raise MutualTLSChannelError(
                 "Environment variable `GOOGLE_API_USE_MTLS_ENDPOINT` must be `never`, `auto` or `always`"
@@ -371,7 +395,7 @@ class ModelArmorClient(metaclass=ModelArmorClientMeta):
 
         # Figure out the client cert source to use.
         client_cert_source = None
-        if use_client_cert == "true":
+        if use_client_cert:
             if client_options.client_cert_source:
                 client_cert_source = client_options.client_cert_source
             elif mtls.has_default_client_cert_source():
@@ -403,20 +427,14 @@ class ModelArmorClient(metaclass=ModelArmorClientMeta):
             google.auth.exceptions.MutualTLSChannelError: If GOOGLE_API_USE_MTLS_ENDPOINT
                 is not any of ["auto", "never", "always"].
         """
-        use_client_cert = os.getenv(
-            "GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"
-        ).lower()
+        use_client_cert = ModelArmorClient._use_client_cert_effective()
         use_mtls_endpoint = os.getenv("GOOGLE_API_USE_MTLS_ENDPOINT", "auto").lower()
         universe_domain_env = os.getenv("GOOGLE_CLOUD_UNIVERSE_DOMAIN")
-        if use_client_cert not in ("true", "false"):
-            raise ValueError(
-                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
-            )
         if use_mtls_endpoint not in ("auto", "never", "always"):
             raise MutualTLSChannelError(
                 "Environment variable `GOOGLE_API_USE_MTLS_ENDPOINT` must be `never`, `auto` or `always`"
             )
-        return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
+        return use_client_cert, use_mtls_endpoint, universe_domain_env
 
     @staticmethod
     def _get_client_cert_source(provided_cert_source, use_cert_flag):

{google_cloud_modelarmor-0.3.0 → google_cloud_modelarmor-0.4.0/google_cloud_modelarmor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-modelarmor
-Version: 0.3.0
+Version: 0.4.0
 Summary: Google Cloud Modelarmor API client library
 Home-page: https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-modelarmor
 Author: Google LLC