adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(file): File uploads can be made without workspace.

Browse Source
This commit is contained in:
Timebomb2018
2026-02-26 17:09:50 +08:00
parent cbc9602495
commit be2f56ae6a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/app/models/file_metadata_model.py
View File

@@ -35,7 +35,7 @@ class FileMetadata(Base):
id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, index=True) id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, index=True)
tenant_id = Column(UUID(as_uuid=True), nullable=False, index=True, comment="Tenant ID") tenant_id = Column(UUID(as_uuid=True), nullable=False, index=True, comment="Tenant ID")
workspace_id = Column(UUID(as_uuid=True), nullable=False, index=True, comment="Workspace ID") workspace_id = Column(UUID(as_uuid=True), nullable=True, index=True, comment="Workspace ID")
file_key = Column(String(512), nullable=False, unique=True, index=True, comment="Storage file key") file_key = Column(String(512), nullable=False, unique=True, index=True, comment="Storage file key")
file_name = Column(String(255), nullable=False, comment="Original file name") file_name = Column(String(255), nullable=False, comment="Original file name")
file_ext = Column(String(32), nullable=False, comment="File extension") file_ext = Column(String(32), nullable=False, comment="File extension")

9
api/app/services/file_storage_service.py
View File

@@ -26,7 +26,7 @@ logger = get_business_logger()
def generate_file_key( def generate_file_key(
tenant_id: uuid.UUID, tenant_id: uuid.UUID,
workspace_id: uuid.UUID, workspace_id: uuid.UUID | None,
file_id: uuid.UUID, file_id: uuid.UUID,
file_ext: str, file_ext: str,
) -> str: ) -> str:
@@ -56,8 +56,9 @@ def generate_file_key(
# Ensure file_ext starts with a dot # Ensure file_ext starts with a dot
if file_ext and not file_ext.startswith('.'): if file_ext and not file_ext.startswith('.'):
file_ext = f'.{file_ext}' file_ext = f'.{file_ext}'
if workspace_id:
return f"{tenant_id}/{workspace_id}/{file_id}{file_ext}" return f"{tenant_id}/{workspace_id}/{file_id}{file_ext}"
return f"{tenant_id}/{file_id}{file_ext}"
class FileStorageService: class FileStorageService:
@@ -96,7 +97,7 @@ class FileStorageService:
async def upload_file( async def upload_file(
self, self,
tenant_id: uuid.UUID, tenant_id: uuid.UUID,
workspace_id: uuid.UUID, workspace_id: uuid.UUID | None,
file_id: uuid.UUID, file_id: uuid.UUID,
file_ext: str, file_ext: str,
content: bytes, content: bytes,