Skip to content

Commit 02d876c

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [google-cloud-modelarmor] Add MultiLingual Support for Sanitize APIs (#14052)
- [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE feat: Add MultiLingual Support for Sanitize APIs docs: Updated docs for Multi Language Detection Metadata feat: Support added for `TXT` and `CSV` files END_COMMIT_OVERRIDE PiperOrigin-RevId: 778377120 Source-Link: googleapis/googleapis@acb0511 Source-Link: googleapis/googleapis-gen@8f0b979 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1vZGVsYXJtb3IvLk93bEJvdC55YW1sIiwiaCI6IjhmMGI5NzlkMzFiNjJmOWRjNjI3MDQ2YzA4NzU2MTFjNTFmOTM0MjkifQ== BEGIN_NESTED_COMMIT PiperOrigin-RevId: 778375487 Source-Link: googleapis/googleapis@ed44195 Source-Link: googleapis/googleapis-gen@dd622e9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLW1vZGVsYXJtb3IvLk93bEJvdC55YW1sIiwiaCI6ImRkNjIyZTkzMmQ2OTY1NWU2MDNmZTYyNWRjZDc0YTIyMjdkOWQ1ZTMifQ== END_NESTED_COMMIT --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 62bb44c commit 02d876c

File tree

12 files changed

+144
-8
lines changed

12 files changed

+144
-8
lines changed

‎packages/google-cloud-modelarmor/google/cloud/modelarmor/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
MaliciousUriFilterResult,
4343
MaliciousUriFilterSettings,
4444
MessageItem,
45+
MultiLanguageDetectionMetadata,
4546
PiAndJailbreakFilterResult,
4647
PiAndJailbreakFilterSettings,
4748
RaiFilterResult,
@@ -86,6 +87,7 @@
8687
"MaliciousUriFilterResult",
8788
"MaliciousUriFilterSettings",
8889
"MessageItem",
90+
"MultiLanguageDetectionMetadata",
8991
"PiAndJailbreakFilterResult",
9092
"PiAndJailbreakFilterSettings",
9193
"RaiFilterResult",

‎packages/google-cloud-modelarmor/google/cloud/modelarmor/gapic_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.2.5" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

‎packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
MaliciousUriFilterResult,
4040
MaliciousUriFilterSettings,
4141
MessageItem,
42+
MultiLanguageDetectionMetadata,
4243
PiAndJailbreakFilterResult,
4344
PiAndJailbreakFilterSettings,
4445
RaiFilterResult,
@@ -87,6 +88,7 @@
8788
"MaliciousUriFilterSettings",
8889
"MessageItem",
8990
"ModelArmorClient",
91+
"MultiLanguageDetectionMetadata",
9092
"PiAndJailbreakFilterResult",
9193
"PiAndJailbreakFilterSettings",
9294
"RaiFilterResult",

‎packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/gapic_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.2.5" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

‎packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/types/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
MaliciousUriFilterResult,
3434
MaliciousUriFilterSettings,
3535
MessageItem,
36+
MultiLanguageDetectionMetadata,
3637
PiAndJailbreakFilterResult,
3738
PiAndJailbreakFilterSettings,
3839
RaiFilterResult,
@@ -75,6 +76,7 @@
7576
"MaliciousUriFilterResult",
7677
"MaliciousUriFilterSettings",
7778
"MessageItem",
79+
"MultiLanguageDetectionMetadata",
7880
"PiAndJailbreakFilterResult",
7981
"PiAndJailbreakFilterSettings",
8082
"RaiFilterResult",

‎packages/google-cloud-modelarmor/google/cloud/modelarmor_v1/types/service.py

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"SanitizeUserPromptResponse",
5353
"SanitizeModelResponseResponse",
5454
"SanitizationResult",
55+
"MultiLanguageDetectionMetadata",
5556
"FilterResult",
5657
"RaiFilterResult",
5758
"SdpFilterResult",
@@ -245,8 +246,25 @@ class TemplateMetadata(proto.Message):
245246
operations.
246247
log_sanitize_operations (bool):
247248
Optional. If true, log sanitize operations.
249+
multi_language_detection (google.cloud.modelarmor_v1.types.Template.TemplateMetadata.MultiLanguageDetection):
250+
Optional. Metadata for multi language
251+
detection.
248252
"""
249253

254+
class MultiLanguageDetection(proto.Message):
255+
r"""Metadata to enable multi language detection via template.
256+
257+
Attributes:
258+
enable_multi_language_detection (bool):
259+
Required. If true, multi language detection
260+
will be enabled.
261+
"""
262+
263+
enable_multi_language_detection: bool = proto.Field(
264+
proto.BOOL,
265+
number=1,
266+
)
267+
250268
ignore_partial_invocation_failures: bool = proto.Field(
251269
proto.BOOL,
252270
number=1,
@@ -275,6 +293,13 @@ class TemplateMetadata(proto.Message):
275293
proto.BOOL,
276294
number=7,
277295
)
296+
multi_language_detection: "Template.TemplateMetadata.MultiLanguageDetection" = (
297+
proto.Field(
298+
proto.MESSAGE,
299+
number=9,
300+
message="Template.TemplateMetadata.MultiLanguageDetection",
301+
)
302+
)
278303

279304
name: str = proto.Field(
280305
proto.STRING,
@@ -909,6 +934,9 @@ class SanitizeUserPromptRequest(proto.Message):
909934
name=projects/sample-project/locations/us-central1/templates/templ01
910935
user_prompt_data (google.cloud.modelarmor_v1.types.DataItem):
911936
Required. User prompt data to sanitize.
937+
multi_language_detection_metadata (google.cloud.modelarmor_v1.types.MultiLanguageDetectionMetadata):
938+
Optional. Metadata related to Multi Language
939+
Detection.
912940
"""
913941

914942
name: str = proto.Field(
@@ -920,6 +948,11 @@ class SanitizeUserPromptRequest(proto.Message):
920948
number=2,
921949
message="DataItem",
922950
)
951+
multi_language_detection_metadata: "MultiLanguageDetectionMetadata" = proto.Field(
952+
proto.MESSAGE,
953+
number=6,
954+
message="MultiLanguageDetectionMetadata",
955+
)
923956

924957

925958
class SanitizeModelResponseRequest(proto.Message):
@@ -935,6 +968,9 @@ class SanitizeModelResponseRequest(proto.Message):
935968
user_prompt (str):
936969
Optional. User Prompt associated with Model
937970
response.
971+
multi_language_detection_metadata (google.cloud.modelarmor_v1.types.MultiLanguageDetectionMetadata):
972+
Optional. Metadata related for multi language
973+
detection.
938974
"""
939975

940976
name: str = proto.Field(
@@ -950,6 +986,11 @@ class SanitizeModelResponseRequest(proto.Message):
950986
proto.STRING,
951987
number=4,
952988
)
989+
multi_language_detection_metadata: "MultiLanguageDetectionMetadata" = proto.Field(
990+
proto.MESSAGE,
991+
number=7,
992+
message="MultiLanguageDetectionMetadata",
993+
)
953994

954995

955996
class SanitizeUserPromptResponse(proto.Message):
@@ -1065,6 +1106,31 @@ class SanitizationMetadata(proto.Message):
10651106
)
10661107

10671108

1109+
class MultiLanguageDetectionMetadata(proto.Message):
1110+
r"""Message for Enabling Multi Language Detection.
1111+
1112+
Attributes:
1113+
source_language (str):
1114+
Optional. Optional Source language of the
1115+
user prompt.
1116+
If multi-language detection is enabled but
1117+
language is not set in that case we would
1118+
automatically detect the source language.
1119+
enable_multi_language_detection (bool):
1120+
Optional. Enable detection of multi-language
1121+
prompts and responses.
1122+
"""
1123+
1124+
source_language: str = proto.Field(
1125+
proto.STRING,
1126+
number=1,
1127+
)
1128+
enable_multi_language_detection: bool = proto.Field(
1129+
proto.BOOL,
1130+
number=2,
1131+
)
1132+
1133+
10681134
class FilterResult(proto.Message):
10691135
r"""Filter Result obtained after Sanitization operations.
10701136
@@ -1371,13 +1437,19 @@ class ByteItemType(proto.Enum):
13711437
XLSX, XLSM, XLTX, XLYM
13721438
POWERPOINT_DOCUMENT (5):
13731439
PPTX, PPTM, POTX, POTM, POT
1440+
TXT (6):
1441+
TXT
1442+
CSV (7):
1443+
CSV
13741444
"""
13751445
BYTE_ITEM_TYPE_UNSPECIFIED = 0
13761446
PLAINTEXT_UTF8 = 1
13771447
PDF = 2
13781448
WORD_DOCUMENT = 3
13791449
EXCEL_DOCUMENT = 4
13801450
POWERPOINT_DOCUMENT = 5
1451+
TXT = 6
1452+
CSV = 7
13811453

13821454
byte_data_type: ByteItemType = proto.Field(
13831455
proto.ENUM,

‎packages/google-cloud-modelarmor/google/cloud/modelarmor_v1beta/types/service.py

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,25 @@ class TemplateMetadata(proto.Message):
246246
operations.
247247
log_sanitize_operations (bool):
248248
Optional. If true, log sanitize operations.
249+
multi_language_detection (google.cloud.modelarmor_v1beta.types.Template.TemplateMetadata.MultiLanguageDetection):
250+
Optional. Metadata for multi language
251+
detection.
249252
"""
250253

254+
class MultiLanguageDetection(proto.Message):
255+
r"""Metadata to enable multi language detection via template.
256+
257+
Attributes:
258+
enable_multi_language_detection (bool):
259+
Required. If true, multi language detection
260+
will be enabled.
261+
"""
262+
263+
enable_multi_language_detection: bool = proto.Field(
264+
proto.BOOL,
265+
number=1,
266+
)
267+
251268
ignore_partial_invocation_failures: bool = proto.Field(
252269
proto.BOOL,
253270
number=1,
@@ -276,6 +293,13 @@ class TemplateMetadata(proto.Message):
276293
proto.BOOL,
277294
number=7,
278295
)
296+
multi_language_detection: "Template.TemplateMetadata.MultiLanguageDetection" = (
297+
proto.Field(
298+
proto.MESSAGE,
299+
number=9,
300+
message="Template.TemplateMetadata.MultiLanguageDetection",
301+
)
302+
)
279303

280304
name: str = proto.Field(
281305
proto.STRING,
@@ -910,6 +934,9 @@ class SanitizeUserPromptRequest(proto.Message):
910934
name=projects/sample-project/locations/us-central1/templates/templ01
911935
user_prompt_data (google.cloud.modelarmor_v1beta.types.DataItem):
912936
Required. User prompt data to sanitize.
937+
multi_language_detection_metadata (google.cloud.modelarmor_v1beta.types.MultiLanguageDetectionMetadata):
938+
Optional. Metadata related to Multi Language
939+
Detection.
913940
"""
914941

915942
name: str = proto.Field(
@@ -921,6 +948,11 @@ class SanitizeUserPromptRequest(proto.Message):
921948
number=2,
922949
message="DataItem",
923950
)
951+
multi_language_detection_metadata: "MultiLanguageDetectionMetadata" = proto.Field(
952+
proto.MESSAGE,
953+
number=6,
954+
message="MultiLanguageDetectionMetadata",
955+
)
924956

925957

926958
class SanitizeModelResponseRequest(proto.Message):
@@ -937,7 +969,8 @@ class SanitizeModelResponseRequest(proto.Message):
937969
Optional. User Prompt associated with Model
938970
response.
939971
multi_language_detection_metadata (google.cloud.modelarmor_v1beta.types.MultiLanguageDetectionMetadata):
940-
Optional. Metadata related for Translations.
972+
Optional. Metadata related for multi language
973+
detection.
941974
"""
942975

943976
name: str = proto.Field(
@@ -1074,7 +1107,28 @@ class SanitizationMetadata(proto.Message):
10741107

10751108

10761109
class MultiLanguageDetectionMetadata(proto.Message):
1077-
r"""Message for Translation Support."""
1110+
r"""Message for Enabling Multi Language Detection.
1111+
1112+
Attributes:
1113+
source_language (str):
1114+
Optional. Optional Source language of the
1115+
user prompt.
1116+
If multi-language detection is enabled but
1117+
language is not set in that case we would
1118+
automatically detect the source language.
1119+
enable_multi_language_detection (bool):
1120+
Optional. Enable detection of multi-language
1121+
prompts and responses.
1122+
"""
1123+
1124+
source_language: str = proto.Field(
1125+
proto.STRING,
1126+
number=1,
1127+
)
1128+
enable_multi_language_detection: bool = proto.Field(
1129+
proto.BOOL,
1130+
number=2,
1131+
)
10781132

10791133

10801134
class FilterResult(proto.Message):

‎packages/google-cloud-modelarmor/samples/generated_samples/snippet_metadata_google.cloud.modelarmor.v1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language": "PYTHON",
1010
"name": "google-cloud-modelarmor",
11-
"version": "0.2.5"
11+
"version": "0.1.0"
1212
},
1313
"snippets": [
1414
{

‎packages/google-cloud-modelarmor/scripts/fixup_modelarmor_v1_keywords.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ class modelarmorCallTransformer(cst.CSTTransformer):
4444
'get_floor_setting': ('name', ),
4545
'get_template': ('name', ),
4646
'list_templates': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
47-
'sanitize_model_response': ('name', 'model_response_data', 'user_prompt', ),
48-
'sanitize_user_prompt': ('name', 'user_prompt_data', ),
47+
'sanitize_model_response': ('name', 'model_response_data', 'user_prompt', 'multi_language_detection_metadata', ),
48+
'sanitize_user_prompt': ('name', 'user_prompt_data', 'multi_language_detection_metadata', ),
4949
'update_floor_setting': ('floor_setting', 'update_mask', ),
5050
'update_template': ('update_mask', 'template', 'request_id', ),
5151
}

‎packages/google-cloud-modelarmor/scripts/fixup_modelarmor_v1beta_keywords.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class modelarmorCallTransformer(cst.CSTTransformer):
4545
'get_template': ('name', ),
4646
'list_templates': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ),
4747
'sanitize_model_response': ('name', 'model_response_data', 'user_prompt', 'multi_language_detection_metadata', ),
48-
'sanitize_user_prompt': ('name', 'user_prompt_data', ),
48+
'sanitize_user_prompt': ('name', 'user_prompt_data', 'multi_language_detection_metadata', ),
4949
'update_floor_setting': ('floor_setting', 'update_mask', ),
5050
'update_template': ('update_mask', 'template', 'request_id', ),
5151
}

0 commit comments

Comments
 (0)