Merge branch 'mnl/file-system-reader-mixin-standardize' of github.com…

…:EmanuelCampos/llama_index into mnl/add-get-methods-filesystemmixin
run-llama · Nov 26, 2024 · e513251 · e513251
2 parents 9e869d3 + b5e1c14
commit e513251
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/llama-index-core/llama_index/core/readers/file/base.py b/llama-index-core/llama_index/core/readers/file/base.py
@@ -489,10 +489,12 @@ async def aload_resource(
             **kwargs,
         )
 
-    def read_file_content(self, input_file: Path, **kwargs: Any) -> bytes:
+    def read_file_content(self, resource_id: str, **kwargs: Any) -> bytes:
         """Read file content."""
         fs: fsspec.AbstractFileSystem = kwargs.get("fs", self.fs)
-        with fs.open(input_file, errors=self.errors, encoding=self.encoding) as f:
+        with fs.open(
+            Path(resource_id), errors=self.errors, encoding=self.encoding
+        ) as f:
             return f.read()
 
     @staticmethod

diff --git a/...ers/llama-index-readers-microsoft-onedrive/llama_index/readers/microsoft_onedrive/base.py b/...ers/llama-index-readers-microsoft-onedrive/llama_index/readers/microsoft_onedrive/base.py
@@ -767,7 +767,7 @@ def list_resources(
                 recursive=recursive,
                 userprincipalname=userprincipalname,
             )
-            return [payload.resource_info["file_path"] for payload in payloads]
+            return [str(payload.resource_info["file_path"]) for payload in payloads]
         except Exception as e:
             logger.error(
                 f"An error occurred while listing resources: {e}", exc_info=True

diff --git a/...llama-index-readers-microsoft-sharepoint/llama_index/readers/microsoft_sharepoint/base.py b/...llama-index-readers-microsoft-sharepoint/llama_index/readers/microsoft_sharepoint/base.py
@@ -688,7 +688,7 @@ def list_resources(
         sharepoint_folder_id: Optional[str] = None,
         sharepoint_site_id: Optional[str] = None,
         recursive: bool = True,
-    ) -> List[Path]:
+    ) -> List[str]:
         """
         Lists the files in the specified folder in the SharePoint site.
 
@@ -738,11 +738,11 @@ def list_resources(
                     recursive,
                     os.path.join(sharepoint_site_name, sharepoint_folder_path),
                 )
-                file_paths.extend(folder_contents)
+                file_paths.extend([str(path) for path in folder_contents])
             else:
                 # Fetch drive contents
                 drive_contents = self._list_drive_contents()
-                file_paths.extend(drive_contents)
+                file_paths.extend([str(path) for path in drive_contents])
         except Exception as exp:
             logger.error("An error occurred while listing files in SharePoint: %s", exp)
             raise