Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f48cedc

Browse files
mayureshagashe2105mayureshagashe2105
committed
Fix types
Change-Id: Ia4bf6b936fab4c1992798c65cff91c15e51a92c0
1 parent 645ceab commit f48cedc

File tree

3 files changed

+24
-39
lines changed

3 files changed

+24
-39
lines changed

‎google/generativeai/caching.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def _decode_cached_content(cls, cached_content: glm.CachedContent) -> CachedCont
8080
@staticmethod
8181
def _prepare_create_request(
8282
model: str,
83-
name: str = None,
83+
name: str | None = None,
8484
system_instruction: Optional[content_types.ContentType] = None,
8585
contents: Optional[content_types.ContentsType] = None,
8686
tools: Optional[content_types.FunctionLibraryType] = None,
@@ -129,7 +129,7 @@ def _prepare_create_request(
129129
def create(
130130
cls,
131131
model: str,
132-
name: str = None,
132+
name: str | None = None,
133133
system_instruction: Optional[content_types.ContentType] = None,
134134
contents: Optional[content_types.ContentsType] = None,
135135
tools: Optional[content_types.FunctionLibraryType] = None,

‎tests/test_caching.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def create_cached_content(
4949
) -> glm.CachedContent:
5050
self.observed_requests.append(request)
5151
return glm.CachedContent(
52-
name="cachedContent/test-cached-content",
52+
name="cachedContents/test-cached-content",
5353
model="models/gemini-1.0-pro-001",
5454
create_time="2000-01-01T01:01:01.123456Z",
5555
update_time="2000-01-01T01:01:01.123456Z",
@@ -63,7 +63,7 @@ def get_cached_content(
6363
) -> glm.CachedContent:
6464
self.observed_requests.append(request)
6565
return glm.CachedContent(
66-
name="cachedContent/test-cached-content",
66+
name="cachedContents/test-cached-content",
6767
model="models/gemini-1.0-pro-001",
6868
create_time="2000-01-01T01:01:01.123456Z",
6969
update_time="2000-01-01T01:01:01.123456Z",
@@ -78,14 +78,14 @@ def list_cached_contents(
7878
self.observed_requests.append(request)
7979
return [
8080
glm.CachedContent(
81-
name="cachedContent/test-cached-content-1",
81+
name="cachedContents/test-cached-content-1",
8282
model="models/gemini-1.0-pro-001",
8383
create_time="2000-01-01T01:01:01.123456Z",
8484
update_time="2000-01-01T01:01:01.123456Z",
8585
expire_time="2000-01-01T01:01:01.123456Z",
8686
),
8787
glm.CachedContent(
88-
name="cachedContent/test-cached-content-2",
88+
name="cachedContents/test-cached-content-2",
8989
model="models/gemini-1.0-pro-001",
9090
create_time="2000-01-01T01:01:01.123456Z",
9191
update_time="2000-01-01T01:01:01.123456Z",
@@ -100,7 +100,7 @@ def update_cached_content(
100100
) -> glm.CachedContent:
101101
self.observed_requests.append(request)
102102
return glm.CachedContent(
103-
name="cachedContent/test-cached-content",
103+
name="cachedContents/test-cached-content",
104104
model="models/gemini-1.0-pro-001",
105105
create_time="2000-01-01T01:01:01.123456Z",
106106
update_time="2000-01-01T01:01:01.123456Z",
@@ -130,7 +130,7 @@ def add(a: int, b: int) -> int:
130130
)
131131
self.assertIsInstance(self.observed_requests[-1], glm.CreateCachedContentRequest)
132132
self.assertIsInstance(cc, caching.CachedContent)
133-
self.assertEqual(cc.name, "cachedContent/test-cached-content")
133+
self.assertEqual(cc.name, "cachedContents/test-cached-content")
134134
self.assertEqual(cc.model, "models/gemini-1.0-pro-001")
135135

136136
@parameterized.named_parameters(
@@ -191,10 +191,10 @@ def test_create_cached_content_with_invalid_name_format(self, name):
191191
)
192192

193193
def test_get_cached_content(self):
194-
cc = caching.CachedContent.get(name="cachedContent/test-cached-content")
194+
cc = caching.CachedContent.get(name="cachedContents/test-cached-content")
195195
self.assertIsInstance(self.observed_requests[-1], glm.GetCachedContentRequest)
196196
self.assertIsInstance(cc, caching.CachedContent)
197-
self.assertEqual(cc.name, "cachedContent/test-cached-content")
197+
self.assertEqual(cc.name, "cachedContents/test-cached-content")
198198
self.assertEqual(cc.model, "models/gemini-1.0-pro-001")
199199

200200
def test_list_cached_contents(self):
@@ -212,7 +212,7 @@ def test_update_cached_content_invalid_update_paths(self):
212212
contents=["add this Content"],
213213
)
214214

215-
cc = caching.CachedContent.get(name="cachedContent/test-cached-content")
215+
cc = caching.CachedContent.get(name="cachedContents/test-cached-content")
216216
with self.assertRaises(ValueError):
217217
cc.update(updates=update_masks)
218218

@@ -221,17 +221,17 @@ def test_update_cached_content_valid_update_paths(self):
221221
ttl=datetime.timedelta(hours=2),
222222
)
223223

224-
cc = caching.CachedContent.get(name="cachedContent/test-cached-content")
224+
cc = caching.CachedContent.get(name="cachedContents/test-cached-content")
225225
cc = cc.update(updates=update_masks)
226226
self.assertIsInstance(self.observed_requests[-1], glm.UpdateCachedContentRequest)
227227
self.assertIsInstance(cc, caching.CachedContent)
228228

229229
def test_delete_cached_content(self):
230-
cc = caching.CachedContent.get(name="cachedContent/test-cached-content")
230+
cc = caching.CachedContent.get(name="cachedContents/test-cached-content")
231231
cc.delete()
232232
self.assertIsInstance(self.observed_requests[-1], glm.DeleteCachedContentRequest)
233233

234-
cc = caching.CachedContent.get(name="cachedContent/test-cached-content")
234+
cc = caching.CachedContent.get(name="cachedContents/test-cached-content")
235235
cc.delete()
236236
self.assertIsInstance(self.observed_requests[-1], glm.DeleteCachedContentRequest)
237237

‎tests/test_generative_models.py‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def get_cached_content(
8484
) -> glm.CachedContent:
8585
self.observed_requests.append(request)
8686
return glm.CachedContent(
87-
name="cachedContent/test-cached-content",
87+
name="cachedContents/test-cached-content",
8888
model="models/gemini-1.0-pro-001",
8989
create_time="2000-01-01T01:01:01.123456Z",
9090
update_time="2000-01-01T01:01:01.123456Z",
@@ -112,19 +112,6 @@ def setUp(self):
112112
client_lib._client_manager.clients["generative"] = self.client
113113
client_lib._client_manager.clients["cache"] = self.client
114114

115-
# @add_client_method
116-
# def get_cached_content(
117-
# request: glm.GetCachedContentRequest,
118-
# **kwargs,
119-
# ) -> glm.CachedContent:
120-
# self.observed_requests.append(request)
121-
# return glm.CachedContent(
122-
# name="cachedContent/test-cached-content",
123-
# model="models/gemini-1.0-pro-001",
124-
# create_time="2000-01-01T01:01:01.123456Z",
125-
# update_time="2000-01-01T01:01:01.123456Z",
126-
# expire_time="2000-01-01T01:01:01.123456Z",
127-
# )
128115

129116
def test_hello(self):
130117
# Generate text from text prompt
@@ -351,23 +338,19 @@ def test_stream_prompt_feedback_not_blocked(self):
351338
dict(testcase_name="test_cached_content_as_id", cached_content="test-cached-content"),
352339
dict(
353340
testcase_name="test_cached_content_as_CachedContent_object",
354-
cached_content=caching.CachedContent(
355-
name="cachedContent/test-cached-content",
356-
model="models/gemini-1.0-pro-001",
357-
create_time="2000-01-01T01:01:01.123456Z",
358-
update_time="2000-01-01T01:01:01.123456Z",
359-
expire_time="2000-01-01T01:01:01.123456Z",
360-
),
341+
cached_content=caching.CachedContent.get(name="cachedContents/test-cached-content"),
361342
),
362343
],
363344
)
364345
def test_model_with_cached_content_as_context(self, cached_content):
365346
model = generative_models.GenerativeModel.from_cached_content(cached_content=cached_content)
366-
cc_name = model.cached_content
347+
cc_name = model.cached_content # pytype: disable=attribute-error
367348
model_name = model.model_name
368-
self.assertEqual(cc_name, "cachedContent/test-cached-content")
349+
self.assertEqual(cc_name, "cachedContents/test-cached-content")
369350
self.assertEqual(model_name, "models/gemini-1.0-pro-001")
370-
self.assertEqual(model.cached_content, "cachedContent/test-cached-content")
351+
self.assertEqual(
352+
model.cached_content, "cachedContents/test-cached-content"
353+
) # pytype: disable=attribute-error
371354

372355
def test_content_generation_with_model_having_context(self):
373356
self.responses["generate_content"] = [simple_response("world!")]
@@ -377,7 +360,9 @@ def test_content_generation_with_model_having_context(self):
377360
response = model.generate_content("Hello")
378361

379362
self.assertEqual(response.text, "world!")
380-
self.assertEqual(model.cached_content, "cachedContent/test-cached-content")
363+
self.assertEqual(
364+
model.cached_content, "cachedContents/test-cached-content"
365+
) # pytype: disable=attribute-error
381366

382367
def test_fail_content_generation_with_model_having_context(self):
383368
model = generative_models.GenerativeModel.from_cached_content(

0 commit comments

Comments
 (0)