From 9c1d1db500b34def69142504ff6b26b5d161bc71 Mon Sep 17 00:00:00 2001
From: Amir Mehr <amir.saiedmehr@gmail.com>
Date: Tue, 19 Mar 2024 10:00:42 -0600
Subject: [PATCH] Fix - Google Drive Issue of not loading same name files
(#12022)
---
.../readers/llama-index-readers-google/BUILD | 4 ----
.../llama_index/readers/google/drive/base.py | 5 +++--
.../readers/llama-index-readers-google/pyproject.toml | 2 +-
.../readers/llama-index-readers-google/requirements.txt | 5 -----
.../readers/llama-index-readers-google/tests/BUILD | 3 +++
.../readers/llama-index-readers-google/tests/__init__.py | 0
.../tests/test_readers_google_drive.py | 7 +++++++
7 files changed, 14 insertions(+), 12 deletions(-)
delete mode 100644 llama-index-integrations/readers/llama-index-readers-google/requirements.txt
create mode 100644 llama-index-integrations/readers/llama-index-readers-google/tests/BUILD
create mode 100644 llama-index-integrations/readers/llama-index-readers-google/tests/__init__.py
create mode 100644 llama-index-integrations/readers/llama-index-readers-google/tests/test_readers_google_drive.py
diff --git a/llama-index-integrations/readers/llama-index-readers-google/BUILD b/llama-index-integrations/readers/llama-index-readers-google/BUILD
index 1c1c97769..6e77d4b61 100644
--- a/llama-index-integrations/readers/llama-index-readers-google/BUILD
+++ b/llama-index-integrations/readers/llama-index-readers-google/BUILD
@@ -5,7 +5,3 @@ poetry_requirements(
"google-auth-oauthlib": ["google_auth_oauthlib"],
},
)
-
-python_requirements(
- name="reqs",
-)
diff --git a/llama-index-integrations/readers/llama-index-readers-google/llama_index/readers/google/drive/base.py b/llama-index-integrations/readers/llama-index-readers-google/llama_index/readers/google/drive/base.py
index 4a34da5be..a68272561 100644
--- a/llama-index-integrations/readers/llama-index-readers-google/llama_index/readers/google/drive/base.py
+++ b/llama-index-integrations/readers/llama-index-readers-google/llama_index/readers/google/drive/base.py
@@ -310,11 +310,12 @@ class GoogleDriveReader(BaseReader):
metadata = {}
for fileid_meta in fileids_meta:
- filename = fileid_meta[2]
- filepath = os.path.join(temp_dir, filename)
+ # Download files and name them with their fileid
fileid = fileid_meta[0]
+ filepath = os.path.join(temp_dir, fileid)
final_filepath = self._download_file(fileid, filepath)
+ # Add metadata of the file to metadata dictionary
metadata[final_filepath] = {
"file id": fileid_meta[0],
"author": fileid_meta[1],
diff --git a/llama-index-integrations/readers/llama-index-readers-google/pyproject.toml b/llama-index-integrations/readers/llama-index-readers-google/pyproject.toml
index 469924d5d..9a444a9ad 100644
--- a/llama-index-integrations/readers/llama-index-readers-google/pyproject.toml
+++ b/llama-index-integrations/readers/llama-index-readers-google/pyproject.toml
@@ -45,7 +45,7 @@ maintainers = [
]
name = "llama-index-readers-google"
readme = "README.md"
-version = "0.1.6"
+version = "0.1.7"
[tool.poetry.dependencies]
python = ">=3.10,<4.0"
diff --git a/llama-index-integrations/readers/llama-index-readers-google/requirements.txt b/llama-index-integrations/readers/llama-index-readers-google/requirements.txt
deleted file mode 100644
index 506584946..000000000
--- a/llama-index-integrations/readers/llama-index-readers-google/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-google-api-python-client
-google-auth-httplib2
-google-auth-oauthlib
-PyDrive
-gkeepapi
diff --git a/llama-index-integrations/readers/llama-index-readers-google/tests/BUILD b/llama-index-integrations/readers/llama-index-readers-google/tests/BUILD
new file mode 100644
index 000000000..a1431c235
--- /dev/null
+++ b/llama-index-integrations/readers/llama-index-readers-google/tests/BUILD
@@ -0,0 +1,3 @@
+python_tests(
+ interpreter_constraints=["==3.10.*"],
+)
diff --git a/llama-index-integrations/readers/llama-index-readers-google/tests/__init__.py b/llama-index-integrations/readers/llama-index-readers-google/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/llama-index-integrations/readers/llama-index-readers-google/tests/test_readers_google_drive.py b/llama-index-integrations/readers/llama-index-readers-google/tests/test_readers_google_drive.py
new file mode 100644
index 000000000..07825d266
--- /dev/null
+++ b/llama-index-integrations/readers/llama-index-readers-google/tests/test_readers_google_drive.py
@@ -0,0 +1,7 @@
+from llama_index.core.readers.base import BaseReader
+from llama_index.readers.google import GoogleDriveReader
+
+
+def test_class():
+ names_of_base_classes = [b.__name__ for b in GoogleDriveReader.__mro__]
+ assert BaseReader.__name__ in names_of_base_classes
--
GitLab