feat(Gen-AI): Updates for the for list_context_caches sample (GoogleCloudPlatform#12667)

* fix post-review comments for 'list_content_caches' sample

* rename the test file for context caching to follow the new structure

* refresh CI checks

* refresh CI checks

* refresh CI checks

* Update list_content_caches - use non-abstract values in example response when possible

Co-authored-by: Sampath Kumar <[email protected]>

* Update list_content_caches - use non-abstract values in example response when possible

Co-authored-by: Sampath Kumar <[email protected]>

* Update list_content_caches - use non-abstract values in example response when possible

Co-authored-by: Sampath Kumar <[email protected]>

* update region tag name to follow the standard schema

* update region tag name following an offline discussion

* refresh CI checks

* don't use deprecated 'typings'

---------

Co-authored-by: Sampath Kumar <[email protected]>

Author: Valeriy-Burlaka

generative_ai/context_caching/list_content_caches.py

@@ -11,19 +11,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import os
-
-from typing import List
+from __future__ import annotations
 
-from google.cloud.aiplatform_v1beta1.types.cached_content import CachedContent
+import os
 
 PROJECT_ID = os.getenv("GOOGLE_CLOUD_PROJECT")
 
 
-def list_content_caches() -> List[CachedContent]:
-    # [START generativeaionvertexai_gemini_get_list_of_context_caches]
-    import json
-
+def list_content_caches() -> list[str]:
+    # [START generativeaionvertexai_context_caching_list]
     import vertexai
 
     from vertexai.preview import caching
@@ -32,35 +28,19 @@ def list_content_caches() -> List[CachedContent]:
     # PROJECT_ID = "your-project-id"
     vertexai.init(project=PROJECT_ID, location="us-central1")
 
-    cached_content_list = caching.CachedContent.list()
+    cache_list = caching.CachedContent.list()
     # Access individual properties of a CachedContent object
-    for cc in cached_content_list:
-        print(
-            f"Cached content '{cc.display_name}' for model '{cc.model_name}' expires at {cc.expire_time}."
-        )
-        # Example response:
-        # Cached content 'scientific-articles' for model '.../gemini-1.5-pro-001' expires at 2024-09-23 18:01:47.242036+00:00.
-
-    # or convert the ContentCache object to a dictionary:
-    for cc in cached_content_list:
-        print(json.dumps(cc.to_dict(), indent=2))
+    for cached_content in cache_list:
+        print(f"Cache '{cached_content.name}' for model '{cached_content.model_name}'")
+        print(f"Last updated at: {cached_content.update_time}")
+        print(f"Expires at: {cached_content.expire_time}")
         # Example response:
-        #  {
-        #      "name": "projects/[PROJECT_NUMBER]/locations/us-central1/cachedContents/4101407070023057408",
-        #      "model": "projects/[PROJECT_ID]/locations/us-central1/publishers/google/models/gemini-1.5-pro-001",
-        #      "createTime": "2024-09-16T12:41:09.998635Z",
-        #      "updateTime": "2024-09-16T12:41:09.998635Z",
-        #      "expireTime": "2024-09-16T13:41:09.989729Z",
-        #      "displayName": "scientific-articles"
-        #      "usageMetadata": {
-        #          "totalTokenCount": 43130,
-        #          "textCount": 153,
-        #          "imageCount": 167
-        #      }
-        #  }
+        # Cached content 'example-cache' for model '.../gemini-1.5-pro-001'
+        # Last updated at: 2024-09-16T12:41:09.998635Z
+        # Expires at: 2024-09-16T13:41:09.989729Z
 
-    # [END generativeaionvertexai_gemini_get_list_of_context_caches]
-    return cached_content_list
+    # [END generativeaionvertexai_context_caching_list]
+    return [cached_content.name for cached_content in cache_list]
 
 
 if __name__ == "__main__":

generative_ai/context_caching/test_context_caching.py

@@ -51,8 +51,7 @@ def test_get_context_cache(cache_id: str) -> None:
 
 def test_get_list_of_context_caches(cache_id: str) -> None:
     response = list_content_caches.list_content_caches()
-    cache_id_is_in_response = any([cc for cc in response if cc.name == cache_id])
-    assert cache_id_is_in_response
+    assert cache_id in response
 
 
 def test_update_context_cache(cache_id: str) -> None: