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

Update gapic lib to use 0.6.5 and fix tests #390

Merged
merged 1 commit into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def get_version():
release_status = "Development Status :: 5 - Production/Stable"

dependencies = [
"google-ai-generativelanguage@https://storage.googleapis.com/generativeai-downloads/preview/ai-generativelanguage-v1beta-py.tar.gz",
"google-ai-generativelanguage==0.6.5",
"google-api-core",
"google-api-python-client",
"google-auth>=2.15.0", # 2.15 adds API key auth support
Expand Down
5 changes: 4 additions & 1 deletion tests/test_generative_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,10 @@ def test_count_tokens_smoke(self, kwargs):
self.responses["count_tokens"] = [protos.CountTokensResponse(total_tokens=7)]
model = generative_models.GenerativeModel("gemini-pro-vision", system_instruction=si)
response = model.count_tokens(**kwargs)
self.assertEqual(type(response).to_dict(response), {"total_tokens": 7})
self.assertEqual(
type(response).to_dict(response, including_default_value_fields=False),
{"total_tokens": 7},
)

@parameterized.named_parameters(
[
Expand Down
5 changes: 4 additions & 1 deletion tests/test_generative_models_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,10 @@ async def test_count_tokens_smoke(self, contents):
self.responses["count_tokens"] = [protos.CountTokensResponse(total_tokens=7)]
model = generative_models.GenerativeModel("gemini-pro-vision")
response = await model.count_tokens_async(contents)
self.assertEqual(type(response).to_dict(response), {"total_tokens": 7})
self.assertEqual(
type(response).to_dict(response, including_default_value_fields=False),
{"total_tokens": 7},
)

async def test_stream_generate_content_called_with_request_options(self):
self.client.stream_generate_content = unittest.mock.AsyncMock()
Expand Down
Loading