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

Fix - Google Drive Issue of not loading same name files #12022

Merged
merged 6 commits into from
Mar 19, 2024

Conversation

ammirsm
Copy link
Contributor

@ammirsm ammirsm commented Mar 17, 2024

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

The modification here aims to resolve an issue with the Google Drive loader. When there are multiple files with the same name in your folder, not all files are retrieved. This happens because the loader uses the filename for downloading, causing files to be overwritten.

In this Pull Request, we've shifted from using the filename to using the file ID, ensuring uniqueness and proper functionality.

Version Bump?

Did I bump the version in the pyproject.toml file of the package I am updating? (Except for the llama-index-core package)

  • Yes
  • No

Type of Change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

This update, which connects to Google, should be covered by existing tests. However, if you wish to test it yourself, I've added a 'folder_id' with 15 files. The previous code would return 10 files, but now it will return all 15. Additionally, I have included regular tests for all readers in the Google folder.

You can run the following code for testing:

from llama_index.readers.google import GoogleDriveReader

loader = GoogleDriveReader(credentials_path=GDRIVE_SERVICE_ACCOUNT)

def load_data(folder_id: str):
    docs = loader.load_data(folder_id=folder_id)
    for doc in docs:
        doc.id_ = doc.metadata["file name"]
    return docs

documents = load_data(folder_id="1NIGvjHBuUQHWnMqzboyg-zLI1q_bOuCH")

print(len(documents))

PS: if someone write a mock tests for this would be appreciated.

  • Added new unit/integration tests
  • Added new notebook (that tests end-to-end)
  • I stared at the code and made sure it makes sense

Suggested Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • [] I have made corresponding changes to the documentation
  • I have added Google Colab support for the newly added notebooks.
  • My changes generate no new warnings
  • [] I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I ran make format; make lint to appease the lint gods

Sorry, something went wrong.

Amir Mehr added 3 commits March 17, 2024 14:13
(cherry picked from commit dd9e302)
@dosubot dosubot bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Mar 17, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Mar 19, 2024
@logan-markewich logan-markewich enabled auto-merge (squash) March 19, 2024 15:46
@logan-markewich logan-markewich merged commit 9c1d1db into run-llama:main Mar 19, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm This PR has been approved by a maintainer size:S This PR changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants