Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@
ListModelsRequest,
ListModelsResponse,
)
from google.ai.generativelanguage_v1beta2.types.safety import (
ContentFilter,
HarmCategory,
SafetyFeedback,
SafetyRating,
SafetySetting,
)
from google.ai.generativelanguage_v1beta2.types.text_service import (
Embedding,
EmbedTextRequest,
Expand Down Expand Up @@ -85,6 +92,11 @@
"GetModelRequest",
"ListModelsRequest",
"ListModelsResponse",
"ContentFilter",
"SafetyFeedback",
"SafetyRating",
"SafetySetting",
"HarmCategory",
"Embedding",
"EmbedTextRequest",
"EmbedTextResponse",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
)
from .types.model import Model
from .types.model_service import GetModelRequest, ListModelsRequest, ListModelsResponse
from .types.safety import (
ContentFilter,
HarmCategory,
SafetyFeedback,
SafetyRating,
SafetySetting,
)
from .types.text_service import (
Embedding,
EmbedTextRequest,
Expand All @@ -49,6 +56,7 @@
"TextServiceAsyncClient",
"CitationMetadata",
"CitationSource",
"ContentFilter",
"CountMessageTokensRequest",
"CountMessageTokensResponse",
"DiscussServiceClient",
Expand All @@ -61,12 +69,16 @@
"GenerateTextRequest",
"GenerateTextResponse",
"GetModelRequest",
"HarmCategory",
"ListModelsRequest",
"ListModelsResponse",
"Message",
"MessagePrompt",
"Model",
"ModelServiceClient",
"SafetyFeedback",
"SafetyRating",
"SafetySetting",
"TextCompletion",
"TextPrompt",
"TextServiceClient",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
except AttributeError: # pragma: NO COVER
OptionalRetry = Union[retries.Retry, object] # type: ignore

from google.ai.generativelanguage_v1beta2.types import discuss_service
from google.ai.generativelanguage_v1beta2.types import discuss_service, safety

from .client import DiscussServiceClient
from .transports.base import DEFAULT_CLIENT_INFO, DiscussServiceTransport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
except AttributeError: # pragma: NO COVER
OptionalRetry = Union[retries.Retry, object] # type: ignore

from google.ai.generativelanguage_v1beta2.types import discuss_service
from google.ai.generativelanguage_v1beta2.types import discuss_service, safety

from .transports.base import DEFAULT_CLIENT_INFO, DiscussServiceTransport
from .transports.grpc import DiscussServiceGrpcTransport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
except AttributeError: # pragma: NO COVER
OptionalRetry = Union[retries.Retry, object] # type: ignore

from google.ai.generativelanguage_v1beta2.types import text_service
from google.ai.generativelanguage_v1beta2.types import safety, text_service

from .client import TextServiceClient
from .transports.base import DEFAULT_CLIENT_INFO, TextServiceTransport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
except AttributeError: # pragma: NO COVER
OptionalRetry = Union[retries.Retry, object] # type: ignore

from google.ai.generativelanguage_v1beta2.types import text_service
from google.ai.generativelanguage_v1beta2.types import safety, text_service

from .transports.base import DEFAULT_CLIENT_INFO, TextServiceTransport
from .transports.grpc import TextServiceGrpcTransport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
)
from .model import Model
from .model_service import GetModelRequest, ListModelsRequest, ListModelsResponse
from .safety import (
ContentFilter,
HarmCategory,
SafetyFeedback,
SafetyRating,
SafetySetting,
)
from .text_service import (
Embedding,
EmbedTextRequest,
Expand All @@ -49,6 +56,11 @@
"GetModelRequest",
"ListModelsRequest",
"ListModelsResponse",
"ContentFilter",
"SafetyFeedback",
"SafetyRating",
"SafetySetting",
"HarmCategory",
"Embedding",
"EmbedTextRequest",
"EmbedTextResponse",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import proto # type: ignore

from google.ai.generativelanguage_v1beta2.types import citation
from google.ai.generativelanguage_v1beta2.types import citation, safety

__protobuf__ = proto.module(
package="google.ai.generativelanguage.v1beta2",
Expand Down Expand Up @@ -132,6 +132,19 @@ class GenerateMessageResponse(proto.Message):
Candidate response messages from the model.
messages (MutableSequence[google.ai.generativelanguage_v1beta2.types.Message]):
The conversation history used by the model.
filters (MutableSequence[google.ai.generativelanguage_v1beta2.types.ContentFilter]):
A set of content filtering metadata for the prompt and
response text.

This indicates which ``SafetyCategory``\ (s) blocked a
candidate from this response, the lowest ``HarmProbability``
that triggered a block, and the HarmThreshold setting for
that category. This indicates the smallest change to the
``SafetySettings`` that would be necessary to unblock at
least 1 response.

The blocking is configured by the ``SafetySettings`` in the
request (or the default ``SafetySettings`` of the API).
"""

candidates: MutableSequence["Message"] = proto.RepeatedField(
Expand All @@ -144,6 +157,11 @@ class GenerateMessageResponse(proto.Message):
number=2,
message="Message",
)
filters: MutableSequence[safety.ContentFilter] = proto.RepeatedField(
proto.MESSAGE,
number=3,
message=safety.ContentFilter,
)


class Message(proto.Message):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class Model(proto.Message):

Examples:

- ``models/chat-pison-001``
- ``models/chat-bison-001``
base_model_id (str):
Required. The name of the base model, pass this to the
generation request.
Expand Down
Loading