google-cloud-modelarmor 0.7.2__tar.gz → 0.7.3__tar.gz

{google_cloud_modelarmor-0.7.2/google_cloud_modelarmor.egg-info → google_cloud_modelarmor-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-modelarmor
-Version: 0.7.2
+Version: 0.7.3
 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.7.2 → google_cloud_modelarmor-0.7.3}/google/cloud/modelarmor/__init__.py

@@ -34,6 +34,9 @@ from google.cloud.modelarmor_v1.types.service import (
     FilterExecutionState,
     FilterMatchState,
     FilterResult,
+    FilterVersionAlias,
+    FilterVersionConfig,
+    FilterVersionSelector,
     FloorSetting,
     GetFloorSettingRequest,
     GetTemplateRequest,
@@ -42,6 +45,7 @@ from google.cloud.modelarmor_v1.types.service import (
     ListTemplatesResponse,
     MaliciousUriFilterResult,
     MaliciousUriFilterSettings,
+    McpServerFloorSetting,
     MessageItem,
     Modality,
     MultiLanguageDetectionMetadata,
@@ -86,6 +90,8 @@ __all__ = (
     "DeleteTemplateRequest",
     "FilterConfig",
     "FilterResult",
+    "FilterVersionConfig",
+    "FilterVersionSelector",
     "FloorSetting",
     "GetFloorSettingRequest",
     "GetTemplateRequest",
@@ -93,6 +99,7 @@ __all__ = (
     "ListTemplatesResponse",
     "MaliciousUriFilterResult",
     "MaliciousUriFilterSettings",
+    "McpServerFloorSetting",
     "MessageItem",
     "MultiLanguageDetectionMetadata",
     "PiAndJailbreakFilterResult",
@@ -123,6 +130,7 @@ __all__ = (
     "DetectionConfidenceLevel",
     "FilterExecutionState",
     "FilterMatchState",
+    "FilterVersionAlias",
     "InvocationResult",
     "Modality",
     "RaiFilterType",

{google_cloud_modelarmor-0.7.2 → google_cloud_modelarmor-0.7.3}/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.7.2"  # {x-release-please-version}
+__version__ = "0.7.3"  # {x-release-please-version}

{google_cloud_modelarmor-0.7.2 → google_cloud_modelarmor-0.7.3}/google/cloud/modelarmor_v1/__init__.py

@@ -44,6 +44,9 @@ from .types.service import (
     FilterExecutionState,
     FilterMatchState,
     FilterResult,
+    FilterVersionAlias,
+    FilterVersionConfig,
+    FilterVersionSelector,
     FloorSetting,
     GetFloorSettingRequest,
     GetTemplateRequest,
@@ -52,6 +55,7 @@ from .types.service import (
     ListTemplatesResponse,
     MaliciousUriFilterResult,
     MaliciousUriFilterSettings,
+    McpServerFloorSetting,
     MessageItem,
     Modality,
     MultiLanguageDetectionMetadata,
@@ -98,6 +102,9 @@ __all__ = (
     "FilterExecutionState",
     "FilterMatchState",
     "FilterResult",
+    "FilterVersionAlias",
+    "FilterVersionConfig",
+    "FilterVersionSelector",
     "FloorSetting",
     "GetFloorSettingRequest",
     "GetTemplateRequest",
@@ -106,6 +113,7 @@ __all__ = (
     "ListTemplatesResponse",
     "MaliciousUriFilterResult",
     "MaliciousUriFilterSettings",
+    "McpServerFloorSetting",
     "MessageItem",
     "Modality",
     "ModelArmorClient",

{google_cloud_modelarmor-0.7.2/google/cloud/modelarmor_v1beta → google_cloud_modelarmor-0.7.3/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.7.2"  # {x-release-please-version}
+__version__ = "0.7.3"  # {x-release-please-version}

{google_cloud_modelarmor-0.7.2 → google_cloud_modelarmor-0.7.3}/google/cloud/modelarmor_v1/types/__init__.py

@@ -25,6 +25,9 @@ from .service import (
     FilterExecutionState,
     FilterMatchState,
     FilterResult,
+    FilterVersionAlias,
+    FilterVersionConfig,
+    FilterVersionSelector,
     FloorSetting,
     GetFloorSettingRequest,
     GetTemplateRequest,
@@ -33,6 +36,7 @@ from .service import (
     ListTemplatesResponse,
     MaliciousUriFilterResult,
     MaliciousUriFilterSettings,
+    McpServerFloorSetting,
     MessageItem,
     Modality,
     MultiLanguageDetectionMetadata,
@@ -75,6 +79,8 @@ __all__ = (
     "DeleteTemplateRequest",
     "FilterConfig",
     "FilterResult",
+    "FilterVersionConfig",
+    "FilterVersionSelector",
     "FloorSetting",
     "GetFloorSettingRequest",
     "GetTemplateRequest",
@@ -82,6 +88,7 @@ __all__ = (
     "ListTemplatesResponse",
     "MaliciousUriFilterResult",
     "MaliciousUriFilterSettings",
+    "McpServerFloorSetting",
     "MessageItem",
     "MultiLanguageDetectionMetadata",
     "PiAndJailbreakFilterResult",
@@ -112,6 +119,7 @@ __all__ = (
     "DetectionConfidenceLevel",
     "FilterExecutionState",
     "FilterMatchState",
+    "FilterVersionAlias",
     "InvocationResult",
     "Modality",
     "RaiFilterType",

{google_cloud_modelarmor-0.7.2 → google_cloud_modelarmor-0.7.3}/google/cloud/modelarmor_v1/types/service.py

@@ -19,6 +19,7 @@ from typing import MutableMapping, MutableSequence
 
 import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
 import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
+import google.type.date_pb2 as date_pb2  # type: ignore
 import proto  # type: ignore
 
 __protobuf__ = proto.module(
@@ -32,8 +33,11 @@ __protobuf__ = proto.module(
         "InvocationResult",
         "StreamingMode",
         "Modality",
+        "FilterVersionAlias",
+        "FilterVersionSelector",
         "Template",
         "FloorSetting",
+        "McpServerFloorSetting",
         "AiPlatformFloorSetting",
         "ListTemplatesRequest",
         "ListTemplatesResponse",
@@ -54,6 +58,7 @@ __protobuf__ = proto.module(
         "SanitizeModelResponseRequest",
         "SanitizeUserPromptResponse",
         "SanitizeModelResponseResponse",
+        "FilterVersionConfig",
         "SanitizationResult",
         "MultiLanguageDetectionMetadata",
         "FilterResult",
@@ -252,6 +257,88 @@ class Modality(proto.Enum):
     MODALITY_IMAGE = 2
 
 
+class FilterVersionAlias(proto.Enum):
+    r"""Enum for Filter Version Aliases.
+    These aliases provide a way to always point to a specific track
+    without needing to update the version in templates.
+
+    Values:
+        FILTER_VERSION_ALIAS_UNSPECIFIED (0):
+            The default value. If used, it will resolve to the
+            ``STABLE`` alias.
+        FILTER_VERSION_ALIAS_STABLE (1):
+            The ``STABLE`` alias points to the most recent stable model
+            version. Using this alias means no code changes are required
+            when a new model becomes the stable version.
+        FILTER_VERSION_ALIAS_LATEST (2):
+            The ``LATEST`` alias points to the newest model version
+            available. This version is subject to frequent revisions and
+            offers SLO guarantees but does not assure stability,
+            providing the most current security protections.
+        FILTER_VERSION_ALIAS_LEGACY (3):
+            The ``LEGACY`` alias could be used for sanitization
+            operations for a transition period. New templates cannot be
+            created with this version.
+        FILTER_VERSION_ALIAS_RETIRED (4):
+            The ``RETIRED`` alias could be used for versions that are no
+            longer available to be used. While new templates cannot be
+            created with this alias, any existing template or request
+            using ``RETIRED`` version will fall back to the current
+            ``STABLE`` version for sanitization operations.
+    """
+
+    FILTER_VERSION_ALIAS_UNSPECIFIED = 0
+    FILTER_VERSION_ALIAS_STABLE = 1
+    FILTER_VERSION_ALIAS_LATEST = 2
+    FILTER_VERSION_ALIAS_LEGACY = 3
+    FILTER_VERSION_ALIAS_RETIRED = 4
+
+
+class FilterVersionSelector(proto.Message):
+    r"""Represents the configuration for selecting a Filter Version.
+    Allows customers to choose to use either a specific version or a
+    predefined alias.
+
+    This message has `oneof`_ fields (mutually exclusive fields).
+    For each oneof, at most one member field can be set at the same time.
+    Setting any member of the oneof automatically clears all other
+    members.
+
+    .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
+    Attributes:
+        version (str):
+            Allows customers to pin to a specific, immutable Filter
+            Version. This provides stability, as this will not change
+            after a version upgrade. Expected format is a case-sensitive
+            string, e.g., "v1", "v2". Requests providing an invalid or
+            non-existent version string will be rejected with an
+            ``INVALID_ARGUMENT`` error.
+
+            This field is a member of `oneof`_ ``version_spec``.
+        alias (google.cloud.modelarmor_v1.types.FilterVersionAlias):
+            Allows customers to use a predefined alias
+            that dynamically points to a specific version
+            based on internal upgrades. This offers
+            flexibility and reduces the need for template
+            updates.
+
+            This field is a member of `oneof`_ ``version_spec``.
+    """
+
+    version: str = proto.Field(
+        proto.STRING,
+        number=1,
+        oneof="version_spec",
+    )
+    alias: "FilterVersionAlias" = proto.Field(
+        proto.ENUM,
+        number=2,
+        oneof="version_spec",
+        enum="FilterVersionAlias",
+    )
+
+
 class Template(proto.Message):
     r"""Message describing Template resource
 
@@ -274,6 +361,8 @@ class Template(proto.Message):
     class TemplateMetadata(proto.Message):
         r"""Message describing TemplateMetadata
 
+        .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
         Attributes:
             ignore_partial_invocation_failures (bool):
                 Optional. If true, partial detector failures
@@ -306,9 +395,26 @@ class Template(proto.Message):
             multi_language_detection (google.cloud.modelarmor_v1.types.Template.TemplateMetadata.MultiLanguageDetection):
                 Optional. Metadata for multi language
                 detection.
+            filter_version_selector (google.cloud.modelarmor_v1.types.FilterVersionSelector):
+                Optional. Specifies the configuration for the Filter version
+                to be used. If this field is populated, it takes precedence
+                over any values set in the deprecated ``filter_version``
+                fields within ``RaiFilterSettings``,
+                ``PiAndJailbreakFilterSettings``.
+
+                This field is a member of `oneof`_ ``_filter_version_selector``.
             modalities (MutableSequence[google.cloud.modelarmor_v1.types.Modality]):
                 Optional. Specifies the modalities to scan.
                 If empty, only text modality will be scanned.
+            data_residency_compliant (bool):
+                Optional. Indicates whether the template is
+                subject to data residency compliance. If true
+                (default for new templates), the template is
+                subject to data residency compliance. If false,
+                the template bypasses data residency compliance
+                checks.
+
+                This field is a member of `oneof`_ ``_data_residency_compliant``.
         """
 
         class EnforcementType(proto.Enum):
@@ -384,11 +490,22 @@ class Template(proto.Message):
                 message="Template.TemplateMetadata.MultiLanguageDetection",
             )
         )
+        filter_version_selector: "FilterVersionSelector" = proto.Field(
+            proto.MESSAGE,
+            number=10,
+            optional=True,
+            message="FilterVersionSelector",
+        )
         modalities: MutableSequence["Modality"] = proto.RepeatedField(
             proto.ENUM,
             number=11,
             enum="Modality",
         )
+        data_residency_compliant: bool = proto.Field(
+            proto.BOOL,
+            number=12,
+            optional=True,
+        )
 
     name: str = proto.Field(
         proto.STRING,
@@ -448,6 +565,10 @@ class FloorSetting(proto.Message):
             This field is a member of `oneof`_ ``_ai_platform_floor_setting``.
         floor_setting_metadata (google.cloud.modelarmor_v1.types.FloorSetting.FloorSettingMetadata):
             Optional. Metadata for FloorSetting
+        google_mcp_server_floor_setting (google.cloud.modelarmor_v1.types.McpServerFloorSetting):
+            Optional. Google MCP Server floor setting.
+
+            This field is a member of `oneof`_ ``_google_mcp_server_floor_setting``.
     """
 
     class IntegratedService(proto.Enum):
@@ -458,10 +579,14 @@ class FloorSetting(proto.Message):
                 Unspecified integrated service.
             AI_PLATFORM (1):
                 AI Platform.
+            GOOGLE_MCP_SERVER (2):
+                Google MCP Server (via Shim Service
+                Extension)
         """
 
         INTEGRATED_SERVICE_UNSPECIFIED = 0
         AI_PLATFORM = 1
+        GOOGLE_MCP_SERVER = 2
 
     class FloorSettingMetadata(proto.Message):
         r"""message describing FloorSetting Metadata
@@ -533,6 +658,56 @@ class FloorSetting(proto.Message):
         number=8,
         message=FloorSettingMetadata,
     )
+    google_mcp_server_floor_setting: "McpServerFloorSetting" = proto.Field(
+        proto.MESSAGE,
+        number=9,
+        optional=True,
+        message="McpServerFloorSetting",
+    )
+
+
+class McpServerFloorSetting(proto.Message):
+    r"""Message describing MCP Server Floor Setting.
+
+    This message has `oneof`_ fields (mutually exclusive fields).
+    For each oneof, at most one member field can be set at the same time.
+    Setting any member of the oneof automatically clears all other
+    members.
+
+    .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
+    Attributes:
+        inspect_only (bool):
+            Optional. If true, Model Armor filters will
+            be run in inspect only mode. No action will be
+            taken on the request.
+
+            This field is a member of `oneof`_ ``enforcement_type``.
+        inspect_and_block (bool):
+            Optional. If true, Model Armor filters will
+            be run in inspect and block mode. Requests that
+            trip Model Armor filters will be blocked.
+
+            This field is a member of `oneof`_ ``enforcement_type``.
+        enable_cloud_logging (bool):
+            Optional. If true, log Model Armor filter
+            results to Cloud Logging.
+    """
+
+    inspect_only: bool = proto.Field(
+        proto.BOOL,
+        number=1,
+        oneof="enforcement_type",
+    )
+    inspect_and_block: bool = proto.Field(
+        proto.BOOL,
+        number=2,
+        oneof="enforcement_type",
+    )
+    enable_cloud_logging: bool = proto.Field(
+        proto.BOOL,
+        number=3,
+    )
 
 
 class AiPlatformFloorSetting(proto.Message):
@@ -1251,6 +1426,66 @@ class SanitizeModelResponseResponse(proto.Message):
     )
 
 
+class FilterVersionConfig(proto.Message):
+    r"""Message describing a Filter Version Configuration.
+
+    .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
+
+    Attributes:
+        filter_version (str):
+            Output only. The identifier for this specific
+            version.
+        filter_version_alias (google.cloud.modelarmor_v1.types.FilterVersionAlias):
+            Output only. The alias associated with this
+            version, if any (e.g., "STABLE", "LATEST"). This
+            will be populated if this version is currently
+            mapped to an alias.
+
+            This field is a member of `oneof`_ ``_filter_version_alias``.
+        release_date (google.type.date_pb2.Date):
+            Output only. The date when this version was
+            released.
+
+            This field is a member of `oneof`_ ``_release_date``.
+        projected_deprecation_date (google.type.date_pb2.Date):
+            Output only. The estimated date when this
+            version is projected to be deprecated.
+
+            This field is a member of `oneof`_ ``_projected_deprecation_date``.
+        message_items (MutableSequence[google.cloud.modelarmor_v1.types.MessageItem]):
+            Output only. Extra information regarding this
+            filter version
+    """
+
+    filter_version: str = proto.Field(
+        proto.STRING,
+        number=1,
+    )
+    filter_version_alias: "FilterVersionAlias" = proto.Field(
+        proto.ENUM,
+        number=2,
+        optional=True,
+        enum="FilterVersionAlias",
+    )
+    release_date: date_pb2.Date = proto.Field(
+        proto.MESSAGE,
+        number=3,
+        optional=True,
+        message=date_pb2.Date,
+    )
+    projected_deprecation_date: date_pb2.Date = proto.Field(
+        proto.MESSAGE,
+        number=4,
+        optional=True,
+        message=date_pb2.Date,
+    )
+    message_items: MutableSequence["MessageItem"] = proto.RepeatedField(
+        proto.MESSAGE,
+        number=5,
+        message="MessageItem",
+    )
+
+
 class SanitizationResult(proto.Message):
     r"""Sanitization result after applying all the filters on input
     content.
@@ -1270,7 +1505,7 @@ class SanitizationResult(proto.Message):
         filter_results (MutableMapping[str, google.cloud.modelarmor_v1.types.FilterResult]):
             Output only. Results for all filters where the key is the
             filter name - either of "csam", "malicious_uris", "rai",
-            "pi_and_jailbreak" ,"sdp".
+            "pi_and_jailbreak", "sdp".
         invocation_result (google.cloud.modelarmor_v1.types.InvocationResult):
             Output only. A field indicating the outcome
             of the invocation, irrespective of match status.
@@ -1299,6 +1534,10 @@ class SanitizationResult(proto.Message):
             stream_chunk_processed (google.cloud.modelarmor_v1.types.DataItem):
                 Output only. The stream chunk processed by
                 the Sanitization service.
+            filter_version_config (google.cloud.modelarmor_v1.types.FilterVersionConfig):
+                Output only. Provides details about the
+                Filter Version configuration used to sanitize
+                this request.
         """
 
         error_code: int = proto.Field(
@@ -1318,6 +1557,11 @@ class SanitizationResult(proto.Message):
             number=4,
             message="DataItem",
         )
+        filter_version_config: "FilterVersionConfig" = proto.Field(
+            proto.MESSAGE,
+            number=6,
+            message="FilterVersionConfig",
+        )
 
     filter_match_state: "FilterMatchState" = proto.Field(
         proto.ENUM,
@@ -1347,11 +1591,20 @@ class MultiLanguageDetectionMetadata(proto.Message):
 
     Attributes:
         source_language (str):
-            Optional. Optional Source language of the
-            user prompt.
-            If multi-language detection is enabled but
-            language is not set in that case we would
-            automatically detect the source language.
+            Optional. Optional Source language of the user prompt.
+
+            If multi-language detection is enabled and this field is not
+            set, the source language will be automatically detected.
+            When a source language is provided, Model Armor uses it to
+            sanitize the input. In that case the system does not perform
+            auto-detection and relies solely on the specified language.
+
+            This string field accepts a language code from the ISO-639
+            standard. For a list of languages supported by Model Armor,
+            see [Model Armor supported languages]
+            (https://cloud.google.com/security-command-center/docs/model-armor-overview#languages-supported).
+            For a comprehensive list of language codes, see
+            `ISO-639 <https://cloud.google.com/translate/docs/languages#nmt>`__.
         enable_multi_language_detection (bool):
             Optional. Enable detection of multi-language
             prompts and responses.
@@ -1674,6 +1927,9 @@ class ByteDataItem(proto.Message):
             Required. The type of byte data
         byte_data (bytes):
             Required. Bytes Data
+        file_label (str):
+            Optional. Label of the file. This is used to
+            identify the file in the response.
     """
 
     class ByteItemType(proto.Enum):
@@ -1719,6 +1975,10 @@ class ByteDataItem(proto.Message):
         proto.BYTES,
         number=2,
     )
+    file_label: str = proto.Field(
+        proto.STRING,
+        number=3,
+    )
 
 
 class SdpDeidentifyResult(proto.Message):

{google_cloud_modelarmor-0.7.2/google/cloud/modelarmor_v1 → google_cloud_modelarmor-0.7.3/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.7.2"  # {x-release-please-version}
+__version__ = "0.7.3"  # {x-release-please-version}

{google_cloud_modelarmor-0.7.2 → google_cloud_modelarmor-0.7.3/google_cloud_modelarmor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-modelarmor
-Version: 0.7.2
+Version: 0.7.3
 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.7.2 → google_cloud_modelarmor-0.7.3}/tests/unit/gapic/modelarmor_v1/test_model_armor.py

@@ -6875,7 +6875,9 @@ def test_create_template_rest_call_success(request_type):
             "log_sanitize_operations": True,
             "enforcement_type": 1,
             "multi_language_detection": {"enable_multi_language_detection": True},
+            "filter_version_selector": {"version": "version_value", "alias": 1},
             "modalities": [1],
+            "data_residency_compliant": True,
         },
     }
     # The version of a generated dependency at test runtime may differ from the version used during generation.
@@ -7107,7 +7109,9 @@ def test_update_template_rest_call_success(request_type):
             "log_sanitize_operations": True,
             "enforcement_type": 1,
             "multi_language_detection": {"enable_multi_language_detection": True},
+            "filter_version_selector": {"version": "version_value", "alias": 1},
             "modalities": [1],
+            "data_residency_compliant": True,
         },
     }
     # The version of a generated dependency at test runtime may differ from the version used during generation.
@@ -7580,6 +7584,11 @@ def test_update_floor_setting_rest_call_success(request_type):
         "floor_setting_metadata": {
             "multi_language_detection": {"enable_multi_language_detection": True}
         },
+        "google_mcp_server_floor_setting": {
+            "inspect_only": True,
+            "inspect_and_block": True,
+            "enable_cloud_logging": True,
+        },
     }
     # The version of a generated dependency at test runtime may differ from the version used during generation.
     # Delete any fields which are not present in the current runtime dependency