AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-14 23:15:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve runtime error when self.folder is None (#8401)

Browse Source 
Co-authored-by: 陈长君 <chenchangjun@shuwen.com>
This commit is contained in:
swingchen01 2024-09-14 11:07:16 +08:00 committed by GitHub
parent b613b11422
commit f55e06d8bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
api/extensions/storage/aliyun_storage.py
View File

@ -31,54 +31,34 @@ class AliyunStorage(BaseStorage):
) )
def save(self, filename, data): def save(self, filename, data):
if not self.folder or self.folder.endswith("/"): self.client.put_object(self.__wrapper_folder_filename(filename), data)
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
self.client.put_object(filename, data)
def load_once(self, filename: str) -> bytes: def load_once(self, filename: str) -> bytes:
if not self.folder or self.folder.endswith("/"): with closing(self.client.get_object(self.__wrapper_folder_filename(filename))) as obj:
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
with closing(self.client.get_object(filename)) as obj:
data = obj.read() data = obj.read()
return data return data
def load_stream(self, filename: str) -> Generator: def load_stream(self, filename: str) -> Generator:
def generate(filename: str = filename) -> Generator: def generate(filename: str = filename) -> Generator:
if not self.folder or self.folder.endswith("/"): with closing(self.client.get_object(self.__wrapper_folder_filename(filename))) as obj:
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
with closing(self.client.get_object(filename)) as obj:
while chunk := obj.read(4096): while chunk := obj.read(4096):
yield chunk yield chunk
return generate() return generate()
def download(self, filename, target_filepath): def download(self, filename, target_filepath):
if not self.folder or self.folder.endswith("/"): self.client.get_object_to_file(self.__wrapper_folder_filename(filename), target_filepath)
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
self.client.get_object_to_file(filename, target_filepath)
def exists(self, filename): def exists(self, filename):
if not self.folder or self.folder.endswith("/"): return self.client.object_exists(self.__wrapper_folder_filename(filename))
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
return self.client.object_exists(filename)
def delete(self, filename): def delete(self, filename):
if not self.folder or self.folder.endswith("/"): self.client.delete_object(self.__wrapper_folder_filename(filename))
filename = self.folder + filename
else: def __wrapper_folder_filename(self, filename) -> str:
filename = self.folder + "/" + filename if self.folder:
self.client.delete_object(filename) if self.folder.endswith("/"):
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
return filename