From 94eb16e8627c6aad8575787ecda008bff6743e0a Mon Sep 17 00:00:00 2001 From: Annie Luc Date: Sat, 9 Nov 2024 00:30:18 +0000 Subject: [PATCH 1/5] fix: Pass along model_version in GenerateContentResponse. --- docs/api/google/generativeai/_api_cache.json | 45 +++- docs/api/google/generativeai/api_report.pb | Bin 54075 -> 55867 bytes .../caching/get_default_cache_client.md | 2 +- docs/api/google/generativeai/configure.md | 2 +- .../google/generativeai/get_tuned_model.md | 2 +- .../protos/AttributionSourceId.md | 2 +- .../AttributionSourceId/GroundingPassageId.md | 2 +- .../SemanticRetrieverChunk.md | 2 +- .../protos/BatchEmbedContentsRequest.md | 2 +- .../protos/BatchEmbedContentsResponse.md | 2 +- .../google/generativeai/protos/Candidate.md | 2 +- .../protos/Candidate/FinishReason.md | 2 +- .../generativeai/protos/ContentEmbedding.md | 2 +- .../generativeai/protos/CountTokensRequest.md | 2 +- .../protos/CountTokensResponse.md | 2 +- .../protos/EmbedContentRequest.md | 2 +- .../protos/EmbedContentResponse.md | 2 +- .../protos/GenerateAnswerRequest.md | 2 +- .../GenerateAnswerRequest/AnswerStyle.md | 2 +- .../protos/GenerateAnswerResponse.md | 2 +- .../GenerateAnswerResponse/InputFeedback.md | 2 +- .../InputFeedback/BlockReason.md | 2 +- .../protos/GenerateContentResponse.md | 15 +- .../GenerateContentResponse/PromptFeedback.md | 2 +- .../PromptFeedback/BlockReason.md | 2 +- .../GenerateContentResponse/UsageMetadata.md | 2 +- .../protos/GroundingAttribution.md | 2 +- .../generativeai/protos/GroundingChunk.md | 2 +- .../generativeai/protos/GroundingChunk/Web.md | 2 +- .../generativeai/protos/GroundingMetadata.md | 2 +- .../generativeai/protos/GroundingSupport.md | 2 +- .../generativeai/protos/LogprobsResult.md | 2 +- .../protos/LogprobsResult/Candidate.md | 2 +- .../protos/LogprobsResult/TopCandidates.md | 2 +- .../generativeai/protos/RetrievalMetadata.md | 2 +- .../generativeai/protos/SearchEntryPoint.md | 2 +- .../api/google/generativeai/protos/Segment.md | 2 +- docs/api/google/generativeai/types.md | 14 +- .../types/AsyncGenerateContentResponse.md | 21 +- .../api/google/generativeai/types/BlobDict.md | 4 +- .../google/generativeai/types/ContentDict.md | 4 +- .../google/generativeai/types/FileDataDict.md | 4 +- .../types/GenerateContentResponse.md | 23 +- .../generativeai/types/GenerationConfig.md | 73 +----- .../types/GenerationConfigDict.md | 6 +- .../api/google/generativeai/types/PartDict.md | 4 +- docs/api/google/generativeai/types/Status.md | 247 +++++++++++++++++- .../api/google/generativeai/types/ToolDict.md | 4 +- .../types/get_default_file_client.md | 2 +- google/generativeai/types/generation_types.py | 10 + tests/test_generation.py | 3 + 51 files changed, 399 insertions(+), 148 deletions(-) diff --git a/docs/api/google/generativeai/_api_cache.json b/docs/api/google/generativeai/_api_cache.json index 518937a44..9532b3d72 100644 --- a/docs/api/google/generativeai/_api_cache.json +++ b/docs/api/google/generativeai/_api_cache.json @@ -2404,6 +2404,7 @@ "google.generativeai.types.GenerateContentResponse.__ne__": "google.generativeai.caching.CachedContent.__ne__", "google.generativeai.types.GenerateContentResponse.__new__": "google.generativeai.caching.CachedContent.__new__", "google.generativeai.types.GenerateContentResponse.candidates": "google.generativeai.types.AsyncGenerateContentResponse.candidates", + "google.generativeai.types.GenerateContentResponse.model_version": "google.generativeai.types.AsyncGenerateContentResponse.model_version", "google.generativeai.types.GenerateContentResponse.parts": "google.generativeai.types.AsyncGenerateContentResponse.parts", "google.generativeai.types.GenerateContentResponse.prompt_feedback": "google.generativeai.types.AsyncGenerateContentResponse.prompt_feedback", "google.generativeai.types.GenerateContentResponse.text": "google.generativeai.types.AsyncGenerateContentResponse.text", @@ -2723,6 +2724,11 @@ "google.generativeai.types.SafetySettingDict.setdefault": "google.generativeai.types.BlobDict.setdefault", "google.generativeai.types.SafetySettingDict.update": "google.generativeai.types.BlobDict.update", "google.generativeai.types.SafetySettingDict.values": "google.generativeai.types.BlobDict.values", + "google.generativeai.types.Status.__ge__": "google.generativeai.caching.CachedContent.__ge__", + "google.generativeai.types.Status.__gt__": "google.generativeai.caching.CachedContent.__gt__", + "google.generativeai.types.Status.__le__": "google.generativeai.caching.CachedContent.__le__", + "google.generativeai.types.Status.__lt__": "google.generativeai.caching.CachedContent.__lt__", + "google.generativeai.types.Status.__new__": "google.generativeai.caching.CachedContent.__new__", "google.generativeai.types.StopCandidateException.__eq__": "google.generativeai.caching.CachedContent.__eq__", "google.generativeai.types.StopCandidateException.__ge__": "google.generativeai.caching.CachedContent.__ge__", "google.generativeai.types.StopCandidateException.__gt__": "google.generativeai.caching.CachedContent.__gt__", @@ -2852,13 +2858,10 @@ "google.generativeai.GenerationConfig.__new__": true, "google.generativeai.GenerationConfig.candidate_count": true, "google.generativeai.GenerationConfig.frequency_penalty": true, - "google.generativeai.GenerationConfig.logprobs": true, "google.generativeai.GenerationConfig.max_output_tokens": true, "google.generativeai.GenerationConfig.presence_penalty": true, - "google.generativeai.GenerationConfig.response_logprobs": true, "google.generativeai.GenerationConfig.response_mime_type": true, "google.generativeai.GenerationConfig.response_schema": true, - "google.generativeai.GenerationConfig.seed": true, "google.generativeai.GenerationConfig.stop_sequences": true, "google.generativeai.GenerationConfig.temperature": true, "google.generativeai.GenerationConfig.top_k": true, @@ -5325,6 +5328,7 @@ "google.generativeai.protos.GenerateContentResponse.copy_from": true, "google.generativeai.protos.GenerateContentResponse.deserialize": true, "google.generativeai.protos.GenerateContentResponse.from_json": true, + "google.generativeai.protos.GenerateContentResponse.model_version": true, "google.generativeai.protos.GenerateContentResponse.mro": true, "google.generativeai.protos.GenerateContentResponse.pb": true, "google.generativeai.protos.GenerateContentResponse.prompt_feedback": true, @@ -7796,6 +7800,7 @@ "google.generativeai.types.AsyncGenerateContentResponse.candidates": true, "google.generativeai.types.AsyncGenerateContentResponse.from_aiterator": true, "google.generativeai.types.AsyncGenerateContentResponse.from_response": true, + "google.generativeai.types.AsyncGenerateContentResponse.model_version": true, "google.generativeai.types.AsyncGenerateContentResponse.parts": true, "google.generativeai.types.AsyncGenerateContentResponse.prompt_feedback": true, "google.generativeai.types.AsyncGenerateContentResponse.resolve": true, @@ -8125,6 +8130,7 @@ "google.generativeai.types.GenerateContentResponse.candidates": true, "google.generativeai.types.GenerateContentResponse.from_iterator": true, "google.generativeai.types.GenerateContentResponse.from_response": true, + "google.generativeai.types.GenerateContentResponse.model_version": true, "google.generativeai.types.GenerateContentResponse.parts": true, "google.generativeai.types.GenerateContentResponse.prompt_feedback": true, "google.generativeai.types.GenerateContentResponse.resolve": true, @@ -8142,13 +8148,10 @@ "google.generativeai.types.GenerationConfig.__new__": true, "google.generativeai.types.GenerationConfig.candidate_count": true, "google.generativeai.types.GenerationConfig.frequency_penalty": true, - "google.generativeai.types.GenerationConfig.logprobs": true, "google.generativeai.types.GenerationConfig.max_output_tokens": true, "google.generativeai.types.GenerationConfig.presence_penalty": true, - "google.generativeai.types.GenerationConfig.response_logprobs": true, "google.generativeai.types.GenerationConfig.response_mime_type": true, "google.generativeai.types.GenerationConfig.response_schema": true, - "google.generativeai.types.GenerationConfig.seed": true, "google.generativeai.types.GenerationConfig.stop_sequences": true, "google.generativeai.types.GenerationConfig.temperature": true, "google.generativeai.types.GenerationConfig.top_k": true, @@ -8543,28 +8546,30 @@ "google.generativeai.types.SafetySettingDict.values": true, "google.generativeai.types.Status": false, "google.generativeai.types.Status.ByteSize": true, + "google.generativeai.types.Status.CODE_FIELD_NUMBER": true, "google.generativeai.types.Status.Clear": true, "google.generativeai.types.Status.ClearExtension": true, "google.generativeai.types.Status.ClearField": true, "google.generativeai.types.Status.CopyFrom": true, "google.generativeai.types.Status.DESCRIPTOR": true, + "google.generativeai.types.Status.DETAILS_FIELD_NUMBER": true, "google.generativeai.types.Status.DiscardUnknownFields": true, - "google.generativeai.types.Status.Extensions": true, "google.generativeai.types.Status.FindInitializationErrors": true, "google.generativeai.types.Status.FromString": true, "google.generativeai.types.Status.HasExtension": true, "google.generativeai.types.Status.HasField": true, "google.generativeai.types.Status.IsInitialized": true, "google.generativeai.types.Status.ListFields": true, + "google.generativeai.types.Status.MESSAGE_FIELD_NUMBER": true, "google.generativeai.types.Status.MergeFrom": true, "google.generativeai.types.Status.MergeFromString": true, "google.generativeai.types.Status.ParseFromString": true, - "google.generativeai.types.Status.RegisterExtension": true, "google.generativeai.types.Status.SerializePartialToString": true, "google.generativeai.types.Status.SerializeToString": true, "google.generativeai.types.Status.SetInParent": true, "google.generativeai.types.Status.UnknownFields": true, "google.generativeai.types.Status.WhichOneof": true, + "google.generativeai.types.Status.__contains__": true, "google.generativeai.types.Status.__eq__": true, "google.generativeai.types.Status.__ge__": true, "google.generativeai.types.Status.__gt__": true, @@ -10359,7 +10364,29 @@ "google.generativeai.types.SafetyRatingDict": "google.generativeai.types.safety_types.SafetyRatingDict", "google.generativeai.types.SafetySettingDict": "google.generativeai.types.safety_types.SafetySettingDict", "google.generativeai.types.Status": "google.rpc.status_pb2.Status", - "google.generativeai.types.Status.RegisterExtension": "google.protobuf.message.Message.RegisterExtension", + "google.generativeai.types.Status.ByteSize": "google.protobuf.internal.python_message._AddByteSizeMethod..ByteSize", + "google.generativeai.types.Status.Clear": "google.protobuf.internal.python_message._Clear", + "google.generativeai.types.Status.ClearExtension": "google.protobuf.message.Message.ClearExtension", + "google.generativeai.types.Status.ClearField": "google.protobuf.internal.python_message._AddClearFieldMethod..ClearField", + "google.generativeai.types.Status.CopyFrom": "google.protobuf.message.Message.CopyFrom", + "google.generativeai.types.Status.DiscardUnknownFields": "google.protobuf.internal.python_message._DiscardUnknownFields", + "google.generativeai.types.Status.FindInitializationErrors": "google.protobuf.internal.python_message._AddIsInitializedMethod..FindInitializationErrors", + "google.generativeai.types.Status.FromString": "google.protobuf.internal.python_message._AddStaticMethods..FromString", + "google.generativeai.types.Status.HasExtension": "google.protobuf.message.Message.HasExtension", + "google.generativeai.types.Status.HasField": "google.protobuf.internal.python_message._AddHasFieldMethod..HasField", + "google.generativeai.types.Status.IsInitialized": "google.protobuf.internal.python_message._AddIsInitializedMethod..IsInitialized", + "google.generativeai.types.Status.ListFields": "google.protobuf.internal.python_message._AddListFieldsMethod..ListFields", + "google.generativeai.types.Status.MergeFrom": "google.protobuf.internal.python_message._AddMergeFromMethod..MergeFrom", + "google.generativeai.types.Status.MergeFromString": "google.protobuf.internal.python_message._AddMergeFromStringMethod..MergeFromString", + "google.generativeai.types.Status.ParseFromString": "google.protobuf.message.Message.ParseFromString", + "google.generativeai.types.Status.SerializePartialToString": "google.protobuf.internal.python_message._AddSerializePartialToStringMethod..SerializePartialToString", + "google.generativeai.types.Status.SerializeToString": "google.protobuf.internal.python_message._AddSerializeToStringMethod..SerializeToString", + "google.generativeai.types.Status.SetInParent": "google.protobuf.internal.python_message._AddPrivateHelperMethods..Modified", + "google.generativeai.types.Status.UnknownFields": "google.protobuf.message.Message.UnknownFields", + "google.generativeai.types.Status.WhichOneof": "google.protobuf.internal.python_message._AddWhichOneofMethod..WhichOneof", + "google.generativeai.types.Status.__contains__": "google.protobuf.internal.python_message._AddContainsMethod..__contains__", + "google.generativeai.types.Status.__eq__": "google.protobuf.internal.python_message._AddEqualsMethod..__eq__", + "google.generativeai.types.Status.__ne__": "google.protobuf.message.Message.__ne__", "google.generativeai.types.StopCandidateException": "google.generativeai.types.generation_types.StopCandidateException", "google.generativeai.types.Tool": "google.generativeai.types.content_types.Tool", "google.generativeai.types.Tool.__call__": "google.generativeai.types.content_types.Tool.__call__", diff --git a/docs/api/google/generativeai/api_report.pb b/docs/api/google/generativeai/api_report.pb index bd0f3970f40d4a0bc343cb3857d7592d9ef6848a..cdb18b214df530b0e52e562fe0efebfcf4bc7135 100644 GIT binary patch delta 851 zcmdnJjCuDKW_>Omjt@6??PL>ZXq>Q}SxDN*z{o_`&`{UFGQ_~Z%E;2n*i6sT$iULj zC`ziFOMdc1CXtDIxHtN3ik|#Fi)S-W%v?t{2M1LKh69_|&z;T0=HVpEz|b%`Q9*yQ z!xELvix=EuM~Jyiez1&v^OY5TDC**i#3z4P#5VcY8sW|Ds~MSL=Jl;>W8zV81e(Xd z0JK2CakAhFtI7BJA*%mw5SZM)Q3zqU{^aw^WhW}PC_?|PelOG)6n!LA$ zee?c(zqpwi>?b!?i7;-M?5HF$`4^)&W8q}Ovoid_C5a`a#d=PaC8@!gRjHF1*SSxA zy-Jn`D(;+sQIW`3S)QBi(Tu>hkKt0*WO zCU2N4F?qv5zR3a{5{$)@Cn|`6f)3^ox1#*q;F6-uymX*L+);hykys3KqCVJpOW7qr zdPSgCdlthjPEDEo?y$tkJ97?N4O{7=am2^ TY}w5+r?VN6(%9xbXX@DiRpmQW delta 265 zcmdnJg?aZfW_>Omj(MjK>|hg^@Z$4UMj>e<10xe%Ljzqyvk)T#D-#ndLlZq?3qunN zqbR9zF8Rq5nM5Y;;oj)CDSEO(GW%xsm_?3k3=XOc3=1}|pF5jr@>>q!$s49wPX4fn zck|)}_t-%KlX5I4KUl`T`N|4Eh=K!LN|WP@#DR*~CjVL^yt#cfBQwmDzIAO(JOPff z3_t)hHo$SR;0mkB_xd5K|85YN+`dr=Yz@ei^UGx?Cu|Yg{C8tK4_I))ah1vYE=x~- qaD;2}-WvAJ`}h6go*bSdHd(yVV6wv!+08PSvKe72H}AV#%LV|ow`mRl diff --git a/docs/api/google/generativeai/caching/get_default_cache_client.md b/docs/api/google/generativeai/caching/get_default_cache_client.md index 8457f5c14..74bcd7569 100644 --- a/docs/api/google/generativeai/caching/get_default_cache_client.md +++ b/docs/api/google/generativeai/caching/get_default_cache_client.md @@ -5,7 +5,7 @@