Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: A new field response_logprbs is added to message .google.cloud.aiplatform.v1.GenerationConfig #5664

Merged
merged 29 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
294070c
feat: add OFF to HarmBlockThreshold
gcf-owl-bot[bot] Sep 6, 2024
5f08b6b
feat: add OFF to HarmBlockThreshold
gcf-owl-bot[bot] Sep 7, 2024
6785cac
feat: add share_point_sources to SharePointSources
gcf-owl-bot[bot] Sep 9, 2024
50e1da8
feat: add Pinecone and Vector Search integration for Vertex RAG
gcf-owl-bot[bot] Sep 10, 2024
d4059c1
Merge branch 'main' into owl-bot-copy-packages-google-cloud-aiplatform
sofisl Sep 12, 2024
5c485e0
Merge branch 'main' into owl-bot-copy-packages-google-cloud-aiplatform
sofisl Sep 12, 2024
0abafaa
Merge branch 'main' into owl-bot-copy-packages-google-cloud-aiplatform
sofisl Sep 12, 2024
1a02231
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Sep 12, 2024
984c3e3
feat: add file_id to SharePointSource
gcf-owl-bot[bot] Sep 12, 2024
f871efa
Merge branch 'main' into owl-bot-copy-packages-google-cloud-aiplatform
sofisl Sep 13, 2024
bbb5f6f
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Sep 13, 2024
c689cea
feat: A new field `property_ordering` is added to message `.google.cl…
gcf-owl-bot[bot] Sep 15, 2024
bd80df3
feat: A new field `property_ordering` is added to message `.google.cl…
gcf-owl-bot[bot] Sep 16, 2024
43a5890
feat: A new field `generation_config` is added to message `.google.cl…
gcf-owl-bot[bot] Sep 16, 2024
d861bb1
Merge branch 'main' into owl-bot-copy-packages-google-cloud-aiplatform
sofisl Sep 17, 2024
c241805
fix: set canonical scopes for all LRO calls
gcf-owl-bot[bot] Sep 17, 2024
03e3903
feat: add psc_automation_configs to DeployIndex v1beta1
gcf-owl-bot[bot] Sep 18, 2024
c1acdaa
feat: A new field `generation_config` is added to message `.google.cl…
gcf-owl-bot[bot] Sep 18, 2024
0ad194a
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Sep 18, 2024
312c7bb
feat: Add CIVIC_INTEGRITY category to SafetySettings for prediction s…
gcf-owl-bot[bot] Sep 18, 2024
d5b0a3e
feat: Add CIVIC_INTEGRITY category to SafetySettings for prediction s…
gcf-owl-bot[bot] Sep 18, 2024
6fe49f8
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Sep 19, 2024
8b7aa5a
feat: A new field `any_of` is added to message `.google.cloud.aiplatf…
gcf-owl-bot[bot] Sep 19, 2024
e56b836
feat: A new field `any_of` is added to message `.google.cloud.aiplatf…
gcf-owl-bot[bot] Sep 19, 2024
c1d0cbd
feat: A new field `response_logprbs` is added to message `.google.clo…
gcf-owl-bot[bot] Sep 19, 2024
995fe60
feat: A new field `response_logprbs` is added to message `.google.clo…
gcf-owl-bot[bot] Sep 20, 2024
0f74b9b
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Sep 20, 2024
34b01cf
Merge branch 'main' into owl-bot-copy-packages-google-cloud-aiplatform
sofisl Sep 20, 2024
ef01036
Merge branch 'main' into owl-bot-copy-packages-google-cloud-aiplatform
sofisl Sep 20, 2024
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 @@ -46,6 +46,9 @@ enum HarmCategory {

// The harm category is sexually explicit content.
HARM_CATEGORY_SEXUALLY_EXPLICIT = 4;

// The harm category is civic integrity.
HARM_CATEGORY_CIVIC_INTEGRITY = 5;
}

// The base structured datatype containing multi-part content of a message.
Expand Down Expand Up @@ -197,6 +200,12 @@ message GenerationConfig {
// Optional. Stop sequences.
repeated string stop_sequences = 6 [(google.api.field_behavior) = OPTIONAL];

// Optional. If true, export the logprobs results in response.
optional bool response_logprobs = 18 [(google.api.field_behavior) = OPTIONAL];

// Optional. Logit probabilities.
optional int32 logprobs = 7 [(google.api.field_behavior) = OPTIONAL];

// Optional. Positive penalties.
optional float presence_penalty = 8 [(google.api.field_behavior) = OPTIONAL];

Expand Down Expand Up @@ -247,6 +256,9 @@ message SafetySetting {

// Block none.
BLOCK_NONE = 4;

// Turn off the safety filter.
OFF = 5;
}

// Probability vs severity.
Expand Down Expand Up @@ -412,6 +424,10 @@ message Candidate {
// Output only. Average log probability score of the candidate.
double avg_logprobs = 9 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. Log-likelihood scores for the response tokens and top tokens
LogprobsResult logprobs_result = 10
[(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The reason why the model stopped generating tokens.
// If empty, the model has not stopped generating the tokens.
FinishReason finish_reason = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
Expand All @@ -436,6 +452,34 @@ message Candidate {
[(google.api.field_behavior) = OUTPUT_ONLY];
}

// Logprobs Result
message LogprobsResult {
// Candidate for the logprobs token and score.
message Candidate {
// The candidate’s token string value.
optional string token = 1;

// The candidate’s token id value.
optional int32 token_id = 3;

// The candidate's log probability.
optional float log_probability = 2;
}

// Candidates with top log probabilities at each decoding step.
message TopCandidates {
// Sorted by log probability in descending order.
repeated Candidate candidates = 1;
}

// Length = total number of decoding steps.
repeated TopCandidates top_candidates = 1;

// Length = total number of decoding steps.
// The chosen candidates may or may not be in top_candidates.
repeated Candidate chosen_candidates = 2;
}

// Segment of the content.
message Segment {
// Output only. The index of a Part object within its parent Content object.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ enum Type {

// Schema is used to define the format of input/output data. Represents a select
// subset of an [OpenAPI 3.0 schema
// object](https://spec.openapis.org/oas/v3.0.3#schema). More fields may be
// added in the future as needed.
// object](https://spec.openapis.org/oas/v3.0.3#schema-object). More fields may
// be added in the future as needed.
message Schema {
// Optional. The type of the data.
Type type = 1 [(google.api.field_behavior) = OPTIONAL];
Expand Down Expand Up @@ -98,6 +98,12 @@ message Schema {
// Properties of Type.OBJECT.
map<string, Schema> properties = 3 [(google.api.field_behavior) = OPTIONAL];

// Optional. The order of the properties.
// Not a standard field in open api spec. Only used to support the order of
// the properties.
repeated string property_ordering = 25
[(google.api.field_behavior) = OPTIONAL];

// Optional. Required properties of Type.OBJECT.
repeated string required = 5 [(google.api.field_behavior) = OPTIONAL];

Expand Down Expand Up @@ -128,4 +134,8 @@ message Schema {
// Optional. Example of the object. Will only populated when the object is the
// root.
google.protobuf.Value example = 4 [(google.api.field_behavior) = OPTIONAL];

// Optional. The value should be validated against any (one or more) of the
// subschemas in the list.
repeated Schema any_of = 11 [(google.api.field_behavior) = OPTIONAL];
}
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,11 @@ message CountTokensRequest {
// external systems to perform an action, or set of actions, outside of
// knowledge and scope of the model.
repeated Tool tools = 6 [(google.api.field_behavior) = OPTIONAL];

// Optional. Generation config that the model will use to generate the
// response.
optional GenerationConfig generation_config = 7
[(google.api.field_behavior) = OPTIONAL];
}

// Response message for [PredictionService.CountTokens][].
Expand Down Expand Up @@ -702,6 +707,15 @@ message GenerateContentRequest {
// request.
ToolConfig tool_config = 7 [(google.api.field_behavior) = OPTIONAL];

// Optional. The labels with user-defined metadata for the request. It is used
// for billing and reporting only.
//
// Label keys and values can be no longer than 63 characters
// (Unicode codepoints) and can only contain lowercase letters, numeric
// characters, underscores, and dashes. International characters are allowed.
// Label values are optional. Label keys must start with a letter.
map<string, string> labels = 10 [(google.api.field_behavior) = OPTIONAL];

// Optional. Per request settings for blocking unsafe content.
// Enforced on GenerateContentResponse.candidates.
repeated SafetySetting safety_settings = 3
Expand Down Expand Up @@ -756,12 +770,16 @@ message GenerateContentResponse {
// Number of tokens in the response(s).
int32 candidates_token_count = 2;

// Total token count for prompt and response candidates.
int32 total_token_count = 3;
}

// Output only. Generated candidates.
repeated Candidate candidates = 2 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The model version used to generate the response.
string model_version = 11 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. Content filter results for a prompt sent in the request.
// Note: Sent only in the first stream chunk.
// Only happens when no candidates were generated due to content violations.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ enum HarmCategory {

// The harm category is sexually explicit content.
HARM_CATEGORY_SEXUALLY_EXPLICIT = 4;

// The harm category is civic integrity.
HARM_CATEGORY_CIVIC_INTEGRITY = 5;
}

// The base structured datatype containing multi-part content of a message.
Expand Down Expand Up @@ -197,6 +200,12 @@ message GenerationConfig {
// Optional. Stop sequences.
repeated string stop_sequences = 6 [(google.api.field_behavior) = OPTIONAL];

// Optional. If true, export the logprobs results in response.
optional bool response_logprobs = 18 [(google.api.field_behavior) = OPTIONAL];

// Optional. Logit probabilities.
optional int32 logprobs = 7 [(google.api.field_behavior) = OPTIONAL];

// Optional. Positive penalties.
optional float presence_penalty = 8 [(google.api.field_behavior) = OPTIONAL];

Expand Down Expand Up @@ -247,6 +256,9 @@ message SafetySetting {

// Block none.
BLOCK_NONE = 4;

// Turn off the safety filter.
OFF = 5;
}

// Probability vs severity.
Expand Down Expand Up @@ -409,6 +421,10 @@ message Candidate {
// Output only. Average log probability score of the candidate.
double avg_logprobs = 9 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. Log-likelihood scores for the response tokens and top tokens
LogprobsResult logprobs_result = 10
[(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The reason why the model stopped generating tokens.
// If empty, the model has not stopped generating the tokens.
FinishReason finish_reason = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
Expand All @@ -433,6 +449,34 @@ message Candidate {
[(google.api.field_behavior) = OUTPUT_ONLY];
}

// Logprobs Result
message LogprobsResult {
// Candidate for the logprobs token and score.
message Candidate {
// The candidate’s token string value.
optional string token = 1;

// The candidate’s token id value.
optional int32 token_id = 3;

// The candidate's log probability.
optional float log_probability = 2;
}

// Candidates with top log probabilities at each decoding step.
message TopCandidates {
// Sorted by log probability in descending order.
repeated Candidate candidates = 1;
}

// Length = total number of decoding steps.
repeated TopCandidates top_candidates = 1;

// Length = total number of decoding steps.
// The chosen candidates may or may not be in top_candidates.
repeated Candidate chosen_candidates = 2;
}

// Segment of the content.
message Segment {
// Output only. The index of a Part object within its parent Content object.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@ message DeployedIndex {
//
// Note: we only support up to 5 deployment groups(not including 'default').
string deployment_group = 11 [(google.api.field_behavior) = OPTIONAL];

// Optional. If set for PSC deployed index, PSC connection will be
// automatically created after deployment is done and the endpoint information
// is populated in private_endpoints.psc_automated_endpoints.
repeated PSCAutomationConfig psc_automation_configs = 19
[(google.api.field_behavior) = OPTIONAL];
}

// Used to set up the auth on the DeployedIndex's private endpoint.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,3 +203,48 @@ message JiraSource {
repeated JiraQueries jira_queries = 1
[(google.api.field_behavior) = REQUIRED];
}

// The SharePointSources to pass to ImportRagFiles.
message SharePointSources {
// An individual SharePointSource.
message SharePointSource {
// The SharePoint folder source. If not provided, uses "root".
oneof folder_source {
// The path of the SharePoint folder to download from.
string sharepoint_folder_path = 5;

// The ID of the SharePoint folder to download from.
string sharepoint_folder_id = 6;
}

// The SharePoint drive source.
oneof drive_source {
// The name of the drive to download from.
string drive_name = 7;

// The ID of the drive to download from.
string drive_id = 8;
}

// The Application ID for the app registered in Microsoft Azure Portal.
// The application must also be configured with MS Graph permissions
// "Files.ReadAll", "Sites.ReadAll" and BrowserSiteLists.Read.All.
string client_id = 1;

// The application secret for the app registered in Azure.
ApiAuth.ApiKeyConfig client_secret = 2;

// Unique identifier of the Azure Active Directory Instance.
string tenant_id = 3;

// The name of the SharePoint site to download from. This can be the site
// name or the site id.
string sharepoint_site_name = 4;

// Output only. The SharePoint file id. Output only.
string file_id = 9 [(google.api.field_behavior) = OUTPUT_ONLY];
}

// The SharePoint sources.
repeated SharePointSource share_point_sources = 1;
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ enum Type {

// Schema is used to define the format of input/output data. Represents a select
// subset of an [OpenAPI 3.0 schema
// object](https://spec.openapis.org/oas/v3.0.3#schema). More fields may be
// added in the future as needed.
// object](https://spec.openapis.org/oas/v3.0.3#schema-object). More fields may
// be added in the future as needed.
message Schema {
// Optional. The type of the data.
Type type = 1 [(google.api.field_behavior) = OPTIONAL];
Expand Down Expand Up @@ -98,6 +98,12 @@ message Schema {
// Properties of Type.OBJECT.
map<string, Schema> properties = 3 [(google.api.field_behavior) = OPTIONAL];

// Optional. The order of the properties.
// Not a standard field in open api spec. Only used to support the order of
// the properties.
repeated string property_ordering = 25
[(google.api.field_behavior) = OPTIONAL];

// Optional. Required properties of Type.OBJECT.
repeated string required = 5 [(google.api.field_behavior) = OPTIONAL];

Expand Down Expand Up @@ -128,4 +134,8 @@ message Schema {
// Optional. Example of the object. Will only populated when the object is the
// root.
google.protobuf.Value example = 4 [(google.api.field_behavior) = OPTIONAL];

// Optional. The value should be validated against any (one or more) of the
// subschemas in the list.
repeated Schema any_of = 11 [(google.api.field_behavior) = OPTIONAL];
}
Loading
Loading