Hua/nanobot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge PR #986: fix(feishu): replace file.get with message_resource.get to fix file download permission issue

Browse Source
This commit is contained in:
Re-bin
2026-02-22 18:16:45 +00:00
parent 4f0930f517 efe89c9091
commit 6913d541c8
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nanobot/channels/feishu.py
View File

@@ -503,18 +503,29 @@ class FeishuChannel(BaseChannel):
logger.error("Error downloading image {}: {}", image_key, e) logger.error("Error downloading image {}: {}", image_key, e)
return None, None return None, None
def _download_file_sync(self, file_key: str) -> tuple[bytes | None, str | None]: def _download_file_sync(
"""Download a file from Feishu by file_key.""" self, message_id: str, file_key: str, resource_type: str = "file"
) -> tuple[bytes | None, str | None]:
"""Download a file/audio/media from a Feishu message by message_id and file_key."""
try: try:
request = GetFileRequest.builder().file_key(file_key).build() request = (
response = self._client.im.v1.file.get(request) GetMessageResourceRequest.builder()
.message_id(message_id)
.file_key(file_key)
.type(resource_type)
.build()
)
response = self._client.im.v1.message_resource.get(request)
if response.success(): if response.success():
return response.file, response.file_name file_data = response.file
if hasattr(file_data, "read"):
file_data = file_data.read()
return file_data, response.file_name
else: else:
logger.error("Failed to download file: code={}, msg={}", response.code, response.msg) logger.error("Failed to download {}: code={}, msg={}", resource_type, response.code, response.msg)
return None, None return None, None
except Exception as e: except Exception:
logger.error("Error downloading file {}: {}", file_key, e) logger.exception("Error downloading {} {}", resource_type, file_key)
return None, None return None, None
async def _download_and_save_media( async def _download_and_save_media(
@@ -544,14 +555,14 @@ class FeishuChannel(BaseChannel):
if not filename: if not filename:
filename = f"{image_key[:16]}.jpg" filename = f"{image_key[:16]}.jpg"
elif msg_type in ("audio", "file"): elif msg_type in ("audio", "file", "media"):
file_key = content_json.get("file_key") file_key = content_json.get("file_key")
if file_key: if file_key and message_id:
data, filename = await loop.run_in_executor( data, filename = await loop.run_in_executor(
None, self._download_file_sync, file_key None, self._download_file_sync, message_id, file_key, msg_type
) )
if not filename: if not filename:
ext = ".opus" if msg_type == "audio" else "" ext = {"audio": ".opus", "media": ".mp4"}.get(msg_type, "")
filename = f"{file_key[:16]}{ext}" filename = f"{file_key[:16]}{ext}"
if data and filename: if data and filename:
@@ -684,7 +695,7 @@ class FeishuChannel(BaseChannel):
if text: if text:
content_parts.append(text) content_parts.append(text)
elif msg_type in ("image", "audio", "file"): elif msg_type in ("image", "audio", "file", "media"):
file_path, content_text = await self._download_and_save_media(msg_type, content_json, message_id) file_path, content_text = await self._download_and_save_media(msg_type, content_json, message_id)
if file_path: if file_path:
media_paths.append(file_path) media_paths.append(file_path)