Skip to content

fix: thread-safe discovery API setup (Issues#327) #583

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 24, 2024
Merged

fix: thread-safe discovery API setup (Issues#327) #583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions google/generativeai/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import inspect
import dataclasses
import pathlib
import threading
from typing import Any, cast
from collections.abc import Sequence
import httplib2
Expand Down Expand Up @@ -64,6 +65,7 @@ def patch_colab_gce_credentials():
class FileServiceClient(glm.FileServiceClient):
def __init__(self, *args, **kwargs):
self._discovery_api = None
self._local = threading.local()
super().__init__(*args, **kwargs)

def _setup_discovery_api(self, metadata: dict | Sequence[tuple[str, str]] = ()):
Expand All @@ -83,7 +85,7 @@ def _setup_discovery_api(self, metadata: dict | Sequence[tuple[str, str]] = ()):
request.http.close()

discovery_doc = content.decode("utf-8")
self._discovery_api = googleapiclient.discovery.build_from_document(
self._local.discovery_api = googleapiclient.discovery.build_from_document(
discovery_doc, developerKey=api_key
)

Expand Down Expand Up @@ -115,7 +117,7 @@ def create_file(
filename=path, mimetype=mime_type, resumable=resumable
)

request = self._discovery_api.media().upload(body={"file": file}, media_body=media)
request = self._local.discovery_api.media().upload(body={"file": file}, media_body=media)
for key, value in metadata:
request.headers[key] = value
result = request.execute()
Expand Down
Loading