This repository was archived by the owner on Dec 16, 2025. It is now read-only.
Explicit Caching patch#377
Merged
MarkDaoust merged 37 commits intogoogle-gemini:mainfrom Jun 13, 2024
Merged
Conversation
commit acb3806 Author: Mayuresh Agashe <magashe@google.com> Date: Wed Jun 5 00:51:30 2024 +0000 fix update method Change-Id: I433c25b2d80cdf6e483b59f61ff29bb8d2dc6595 commit fb9995c Merge: 4627fe1 7b9758f Author: Mark Daoust <markdaoust@google.com> Date: Tue Jun 4 09:55:38 2024 -0700 Merge branch 'main' into caching Change-Id: I2bade6b0099f12dd37a24fe26cfda1981c58fbc0 commit 4627fe1 Author: Mark Daoust <markdaoust@google.com> Date: Tue Jun 4 09:54:31 2024 -0700 use preview build Change-Id: Ic1cd4fc28f591794dc5fbff0647a00a77ea7f601 commit 8e86ef1 Author: Mayuresh Agashe <magashe@google.com> Date: Thu May 30 16:18:22 2024 +0000 Refactor for genai.protos module Change-Id: I2f02d2421d7303f0309ec86f05d33c07332c03c1 commit 82d3c5a Merge: bf6551a f08c789 Author: Mayuresh Agashe <magashe@google.com> Date: Thu May 30 15:57:27 2024 +0000 Merge branch 'main' of https://github.com/mayureshagashe2105/generative-ai-python into caching Change-Id: Id2b259fe4b2c91653bf5e4d5e883f556366d8676 commit bf6551a Author: Mayuresh Agashe <magashe@google.com> Date: Mon May 27 11:26:03 2024 +0000 Fix types Change-Id: Id3e7316562f4029e5b7409ae725bb66e2207f075 commit 67472d3 Author: Mayuresh Agashe <magashe@google.com> Date: Mon May 27 11:26:03 2024 +0000 Fix types Change-Id: Id3e7316562f4029e5b7409ae725bb66e2207f075 commit a1c8c72 Author: Mayuresh Agashe <magashe@google.com> Date: Mon May 27 11:15:15 2024 +0000 Fix docstrings Change-Id: I6020df4e862a4f1d58462a4cd70876a8448293cf commit f48cedc Author: Mayuresh Agashe <magashe@google.com> Date: Mon May 27 11:13:44 2024 +0000 Fix types Change-Id: Ia4bf6b936fab4c1992798c65cff91c15e51a92c0 commit 645ceab Author: Mayuresh Agashe <magashe@google.com> Date: Mon May 27 05:54:26 2024 +0000 blacken Change-Id: I4e073d821d29eea30801bdb7e2a8dc01bb7d6b9a commit 17372e3 Author: Mayuresh Agashe <magashe@google.com> Date: Mon May 27 05:54:06 2024 +0000 Add 'cached_content' to GenerativeModel's repr Change-Id: I06676fad23895e3e1a6393baa938fc1f2df57d80 commit d1fd749 Author: Mayuresh Agashe <magashe@google.com> Date: Mon May 27 05:04:43 2024 +0000 Add type-annotations to __new__ to fix pytype checks Change-Id: I6c69c036e54d56d18ea60368fa0a1dcda2d315fd commit f37df8c Author: Mayuresh Agashe <magashe@google.com> Date: Sun May 26 06:51:54 2024 +0000 mark name as OPTIONAL for CachedContent creation If not provided, the name will be randomly generated Change-Id: Ib95fbafd3dfe098b43164d7ee4d6c2a84b0aae2e commit 59663c8 Author: Mayuresh Agashe <magashe@google.com> Date: Fri May 24 10:22:08 2024 +0000 Add tests Change-Id: I249188fa585bd9b7193efa48b1cfca20b8a79821 commit e1d8c7a Author: Mayuresh Agashe <magashe@google.com> Date: Fri May 24 10:21:42 2024 +0000 Validate name checks for CachedContent creation Change-Id: Ie41602621d99ddff6404c6708c7278e0da790652 commit 2cde1a2 Author: Mayuresh Agashe <magashe@google.com> Date: Thu May 23 18:09:14 2024 +0000 fix tests Change-Id: I39f61012f850a82e09a7afb80b527a0f99ad0ec7 commit d862dae Author: Mayuresh Agashe <magashe@google.com> Date: Thu May 23 18:09:14 2024 +0000 fix tests Change-Id: I39f61012f850a82e09a7afb80b527a0f99ad0ec7 commit d35cc71 Author: Mayuresh Agashe <magashe@google.com> Date: Thu May 23 23:12:38 2024 +0530 Improve tests commit e65d16e Author: Mayuresh Agashe <magashe@google.com> Date: Thu May 23 23:12:05 2024 +0530 blacken commit cfc936e Author: Mayuresh Agashe <magashe@google.com> Date: Thu May 23 23:10:16 2024 +0530 Stroke out functional approach for CachedContent CURD ops commit afd066d Merge: 6fafe6b 0dca4ce Author: Mayuresh Agashe <magashe@google.com> Date: Wed May 22 23:10:20 2024 +0530 Merge branch 'main' into caching commit 6fafe6b Author: Mayuresh Agashe <magashe@google.com> Date: Wed May 22 10:49:35 2024 +0530 rename get_cached_content to get commit a4ac7a5 Merge: f13228d f987fde Author: Mayuresh Agashe <magashe@google.com> Date: Tue May 21 23:32:41 2024 +0530 Merge branch 'main' into caching commit f13228d Author: Mayuresh Agashe <magashe@google.com> Date: Fri Apr 26 16:54:09 2024 +0000 *Inital prototype for explicit caching *Add basic CURD support for caching *Remove INPUT_ONLY marked fields from CachedContent dataclass *Rename files 'cached_content*' -> 'caching*' *Update 'Create' method for explicit instantination of 'CachedContent' *Add a factory method to instatinate model with `CachedContent` as its context *blacken *Add tests Change-Id: I694545243efda467d6fd599beded0dc6679b727d Change-Id: I7b14d94f729953294780815f4c496888bb2ad46f
Change-Id: I4658e1c57f967faeb3945dffef0181a456d65370
Change-Id: I3c92c65e8e5b215e98c1ac0eea6db033166dec78
Remove __new__ construct Change-Id: Ie4f5527270be90730341b6c3b67de71b9b6e9c5c
883b500 to
f53a7c6
Compare
MarkDaoust
reviewed
Jun 5, 2024
Contributor
Author
|
Yeah, It simply overrides the name. |
'to_content' method assigns a default 'role=user' to all the contents passed as a string Change-Id: I748514a7839b7f1d36150b879c3d1464ca9e11ba
2bb9aa6 to
02cba55
Compare
MarkDaoust
suggested changes
Jun 5, 2024
Change-Id: If9c6f04fe8d419828e3efd2249f0698bca4d5bdc
Change-Id: I40fe7c8fafdb014fb9c7e74956452aca9a666641
MarkDaoust
suggested changes
Jun 6, 2024
Change-Id: I111a1218a7d9783d494b84f0a11cb3b76c7ad9da
Change-Id: Ibb1f75c409afaac124ef70232be71e3a882f6015
…agashe2105/generative-ai-python into magashe-caching-patch-1 Change-Id: I525dc7b1ec4e3f9eac59ed13a52d72b9fadda5a6
Let the API set the dafault Change-Id: Id8d125a085ed27229ddb78d5812ed5b5ad39227b
Change-Id: I17f05a90a1514f404dd3527c0db1ce6147d2c47a
Change-Id: Ic527c157bc2cd114948b73a8f1832c21dd61b52e
Change-Id: Id0a9be9d1bfdb94dc9d5c4fc7af9dee89e5365a4
Change-Id: I0acc57853ab7dde863bbbe4b30ae3957e6ec3d11
Change-Id: I0752741532a451f8720fa5e110e68f0b4e66cc4b
Change-Id: I14b4c54652fb51b867fb43d4b3e9091e6eaccd4e
Co-authored-by: Mayuresh Agashe <magashe@google.com>
Change-Id: Ic95dffb3e945e31adc0d98787942d27289512b8a
Change-Id: I928933edc82bcfb42f2ade6bfb49c5eae2a9ee3b
Accept kwargs instead of dict of updates and construct protos using kwargs Change-Id: I7858d585b1aa6b965134e2fb90adff737172af92
Change-Id: Id4ec78ebf9d6e96f22f6bf37fc4509268fa552f4
Contributor
Author
|
@MarkDaoust @markmcd We are good to go with context caching 🥳. Thanks for all the feedback and contributions. @markmcd can you please review my last commits. Thanks! |
markmcd
previously approved these changes
Jun 13, 2024
Member
markmcd
left a comment
There was a problem hiding this comment.
Looks good - just a few questions, hopefully nothing too stupid on my part :) LMK if you'd rather do any of it in a followup too.
Change-Id: I2a12b9689001bbc41c460db5a9f0e87c77d4caf6
markmcd
approved these changes
Jun 13, 2024
MarkDaoust
approved these changes
Jun 13, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
follow-on PR for #355
.update__new__constructs, and add public property to accesscached_contentonGenerativeModelclass.nameparamttlandexpire_timeseparatelyuserif the content is of type list[str] | str