Skip to content

Commit f9544c9

Browse files
feat: Add safety settings (#11148)
* feat: Add safety settings PiperOrigin-RevId: 529739461 Source-Link: googleapis/googleapis@989aeef Source-Link: googleapis/googleapis-gen@e71e1b7 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFpLWdlbmVyYXRpdmVsYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiZTcxZTFiNzM2N2I0NzYwODJiNjQzMmM2MjI2N2I3NzIwYTM5NTBmNiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent f13a68b commit f9544c9

14 files changed

Lines changed: 380 additions & 9 deletions

File tree

packages/google-ai-generativelanguage/google/ai/generativelanguage/__init__.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
ListModelsRequest,
5656
ListModelsResponse,
5757
)
58+
from google.ai.generativelanguage_v1beta2.types.safety import (
59+
ContentFilter,
60+
HarmCategory,
61+
SafetyFeedback,
62+
SafetyRating,
63+
SafetySetting,
64+
)
5865
from google.ai.generativelanguage_v1beta2.types.text_service import (
5966
Embedding,
6067
EmbedTextRequest,
@@ -85,6 +92,11 @@
8592
"GetModelRequest",
8693
"ListModelsRequest",
8794
"ListModelsResponse",
95+
"ContentFilter",
96+
"SafetyFeedback",
97+
"SafetyRating",
98+
"SafetySetting",
99+
"HarmCategory",
88100
"Embedding",
89101
"EmbedTextRequest",
90102
"EmbedTextResponse",

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/__init__.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@
3333
)
3434
from .types.model import Model
3535
from .types.model_service import GetModelRequest, ListModelsRequest, ListModelsResponse
36+
from .types.safety import (
37+
ContentFilter,
38+
HarmCategory,
39+
SafetyFeedback,
40+
SafetyRating,
41+
SafetySetting,
42+
)
3643
from .types.text_service import (
3744
Embedding,
3845
EmbedTextRequest,
@@ -49,6 +56,7 @@
4956
"TextServiceAsyncClient",
5057
"CitationMetadata",
5158
"CitationSource",
59+
"ContentFilter",
5260
"CountMessageTokensRequest",
5361
"CountMessageTokensResponse",
5462
"DiscussServiceClient",
@@ -61,12 +69,16 @@
6169
"GenerateTextRequest",
6270
"GenerateTextResponse",
6371
"GetModelRequest",
72+
"HarmCategory",
6473
"ListModelsRequest",
6574
"ListModelsResponse",
6675
"Message",
6776
"MessagePrompt",
6877
"Model",
6978
"ModelServiceClient",
79+
"SafetyFeedback",
80+
"SafetyRating",
81+
"SafetySetting",
7082
"TextCompletion",
7183
"TextPrompt",
7284
"TextServiceClient",

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/async_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
except AttributeError: # pragma: NO COVER
4343
OptionalRetry = Union[retries.Retry, object] # type: ignore
4444

45-
from google.ai.generativelanguage_v1beta2.types import discuss_service
45+
from google.ai.generativelanguage_v1beta2.types import discuss_service, safety
4646

4747
from .client import DiscussServiceClient
4848
from .transports.base import DEFAULT_CLIENT_INFO, DiscussServiceTransport

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/discuss_service/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
except AttributeError: # pragma: NO COVER
4747
OptionalRetry = Union[retries.Retry, object] # type: ignore
4848

49-
from google.ai.generativelanguage_v1beta2.types import discuss_service
49+
from google.ai.generativelanguage_v1beta2.types import discuss_service, safety
5050

5151
from .transports.base import DEFAULT_CLIENT_INFO, DiscussServiceTransport
5252
from .transports.grpc import DiscussServiceGrpcTransport

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/async_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
except AttributeError: # pragma: NO COVER
4343
OptionalRetry = Union[retries.Retry, object] # type: ignore
4444

45-
from google.ai.generativelanguage_v1beta2.types import text_service
45+
from google.ai.generativelanguage_v1beta2.types import safety, text_service
4646

4747
from .client import TextServiceClient
4848
from .transports.base import DEFAULT_CLIENT_INFO, TextServiceTransport

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/services/text_service/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
except AttributeError: # pragma: NO COVER
4747
OptionalRetry = Union[retries.Retry, object] # type: ignore
4848

49-
from google.ai.generativelanguage_v1beta2.types import text_service
49+
from google.ai.generativelanguage_v1beta2.types import safety, text_service
5050

5151
from .transports.base import DEFAULT_CLIENT_INFO, TextServiceTransport
5252
from .transports.grpc import TextServiceGrpcTransport

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/__init__.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@
2525
)
2626
from .model import Model
2727
from .model_service import GetModelRequest, ListModelsRequest, ListModelsResponse
28+
from .safety import (
29+
ContentFilter,
30+
HarmCategory,
31+
SafetyFeedback,
32+
SafetyRating,
33+
SafetySetting,
34+
)
2835
from .text_service import (
2936
Embedding,
3037
EmbedTextRequest,
@@ -49,6 +56,11 @@
4956
"GetModelRequest",
5057
"ListModelsRequest",
5158
"ListModelsResponse",
59+
"ContentFilter",
60+
"SafetyFeedback",
61+
"SafetyRating",
62+
"SafetySetting",
63+
"HarmCategory",
5264
"Embedding",
5365
"EmbedTextRequest",
5466
"EmbedTextResponse",

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/discuss_service.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import proto # type: ignore
2121

22-
from google.ai.generativelanguage_v1beta2.types import citation
22+
from google.ai.generativelanguage_v1beta2.types import citation, safety
2323

2424
__protobuf__ = proto.module(
2525
package="google.ai.generativelanguage.v1beta2",
@@ -132,6 +132,19 @@ class GenerateMessageResponse(proto.Message):
132132
Candidate response messages from the model.
133133
messages (MutableSequence[google.ai.generativelanguage_v1beta2.types.Message]):
134134
The conversation history used by the model.
135+
filters (MutableSequence[google.ai.generativelanguage_v1beta2.types.ContentFilter]):
136+
A set of content filtering metadata for the prompt and
137+
response text.
138+
139+
This indicates which ``SafetyCategory``\ (s) blocked a
140+
candidate from this response, the lowest ``HarmProbability``
141+
that triggered a block, and the HarmThreshold setting for
142+
that category. This indicates the smallest change to the
143+
``SafetySettings`` that would be necessary to unblock at
144+
least 1 response.
145+
146+
The blocking is configured by the ``SafetySettings`` in the
147+
request (or the default ``SafetySettings`` of the API).
135148
"""
136149

137150
candidates: MutableSequence["Message"] = proto.RepeatedField(
@@ -144,6 +157,11 @@ class GenerateMessageResponse(proto.Message):
144157
number=2,
145158
message="Message",
146159
)
160+
filters: MutableSequence[safety.ContentFilter] = proto.RepeatedField(
161+
proto.MESSAGE,
162+
number=3,
163+
message=safety.ContentFilter,
164+
)
147165

148166

149167
class Message(proto.Message):

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/types/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Model(proto.Message):
4343
4444
Examples:
4545
46-
- ``models/chat-pison-001``
46+
- ``models/chat-bison-001``
4747
base_model_id (str):
4848
Required. The name of the base model, pass this to the
4949
generation request.

0 commit comments

Comments
 (0)