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.

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

Update GoogleDriveLoader to allow bring your own credentials #605

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Update GoogleDriveLoader to allow bring your own credentials #605

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4885bc
Update GoogleDriveLoader to allow bring your own credentials
jeffbryner Nov 17, 2024
c87ca0e
Update drive.py, remove errant trailing spaces
jeffbryner Nov 23, 2024
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
7 changes: 7 additions & 0 deletions libs/community/langchain_google_community/drive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class GoogleDriveLoader(BaseLoader, BaseModel):
"""Path to the credentials file."""
token_path: Path = Path.home() / ".credentials" / "token.json"
"""Path to the token file."""
credentials: Any = None
"""Your own google credentials created via your own mechanism"""
folder_id: Optional[str] = None
"""The folder id to load from."""
document_ids: Optional[List[str]] = None
Expand Down Expand Up @@ -276,6 +278,11 @@ def _load_credentials(self) -> Any:
if self.token_path.exists():
creds = Credentials.from_authorized_user_file(str(self.token_path), SCOPES)

if self.credentials:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits: maybe we could move it a few lines up to avoid a not needed Credentials.from_authorized_user_file execution?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My thought was the other options wouldn't be called since they don't/wouldn't exist if you just pass in credentials? i.e. I'd set it on init to only use credentials and no other option:

drive_loader = GoogleDriveLoader(credentials=credentials, folder_id='someid', recursive=True)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, but what if smbd sends the token_path also?
it's not crucial, the important thing is that linter is failing, please take a look

P.S. https://github.com/langchain-ai/langchain-google?tab=readme-ov-file#local-development-dependencies describes how to run a linter locally if you wish.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, looks like trailing spaces. Fixed.

# use whatever was passed to us
creds = self.credentials
return creds

if not creds or not creds.valid:
if creds and creds.expired and creds.refresh_token:
creds.refresh(Request())
Expand Down
Loading