refac
This commit is contained in:
1 parent
3730a9eaac
commit
46c1d6591b
2 files changed
+63
-17
No files matched your search
@@ -31,6 +31,7 @@ from sqlalchemy import (
|
||||
update,
|
||||
)
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import defer
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@@ -416,6 +417,7 @@ class KnowledgeTable:
|
||||
if limit:
|
||||
stmt = stmt.limit(limit)
|
||||
|
||||
stmt = stmt.options(defer(File.data))
|
||||
result = await db.execute(stmt)
|
||||
rows = result.all()
|
||||
|
||||
@@ -423,7 +425,13 @@ class KnowledgeTable:
|
||||
for file, user, knowledge in rows:
|
||||
items.append(
|
||||
FileUserResponse(
|
||||
**FileModel.model_validate(file).model_dump(),
|
||||
id=file.id,
|
||||
user_id=file.user_id,
|
||||
hash=file.hash,
|
||||
filename=file.filename,
|
||||
meta=file.meta,
|
||||
created_at=file.created_at,
|
||||
updated_at=file.updated_at,
|
||||
user=(UserResponse(**UserModel.model_validate(user).model_dump()) if user else None),
|
||||
collection=(await self._to_knowledge_model(knowledge, db=db)).model_dump(),
|
||||
)
|
||||
@@ -603,17 +611,23 @@ class KnowledgeTable:
|
||||
if limit:
|
||||
stmt = stmt.limit(limit)
|
||||
|
||||
stmt = stmt.options(defer(File.data))
|
||||
result = await db.execute(stmt)
|
||||
items = result.all()
|
||||
|
||||
files = []
|
||||
for file, user in items:
|
||||
files.append(
|
||||
FileUserResponse(
|
||||
**FileModel.model_validate(file).model_dump(),
|
||||
user=(UserResponse(**UserModel.model_validate(user).model_dump()) if user else None),
|
||||
)
|
||||
files = [
|
||||
FileUserResponse(
|
||||
id=file.id,
|
||||
user_id=file.user_id,
|
||||
hash=file.hash,
|
||||
filename=file.filename,
|
||||
meta=file.meta,
|
||||
created_at=file.created_at,
|
||||
updated_at=file.updated_at,
|
||||
user=(UserResponse(**UserModel.model_validate(user).model_dump()) if user else None),
|
||||
)
|
||||
for file, user in items
|
||||
]
|
||||
|
||||
return KnowledgeFileListResponse(
|
||||
items=files,
|
||||
|
||||
Reference in new issue
Block a user