fix:client mypy error

This commit is contained in:
aries_ckt
2024-03-20 16:22:38 +08:00
parent 7bc5c59a89
commit f43abf3155
19 changed files with 1814 additions and 80 deletions

View File

@@ -15,11 +15,17 @@ class SpaceServeRequest(BaseModel):
id: Optional[int] = Field(None, description="The space id")
name: str = Field(None, description="The space name")
"""vector_type: vector type"""
vector_type: str = Field(None, description="The vector type")
vector_type: str = Field("Chroma", description="The vector type")
"""desc: description"""
desc: str = Field(None, description="The description")
desc: Optional[str] = Field(None, description="The description")
"""owner: owner"""
owner: str = Field(None, description="The owner")
owner: Optional[str] = Field(None, description="The owner")
"""context: argument context"""
context: Optional[str] = Field(None, description="The context")
"""gmt_created: created time"""
gmt_created: Optional[str] = Field(None, description="The created time")
"""gmt_modified: modified time"""
gmt_modified: Optional[str] = Field(None, description="The modified time")
class DocumentServeRequest(BaseModel):

View File

@@ -38,7 +38,7 @@ class KnowledgeSpaceDao(BaseDao):
session.commit()
space_id = knowledge_space.id
session.close()
return space_id
return self.to_response(knowledge_space)
def get_knowledge_space(self, query: KnowledgeSpaceEntity):
"""Get knowledge space by query"""
@@ -81,11 +81,21 @@ class KnowledgeSpaceDao(BaseDao):
def update_knowledge_space(self, space: KnowledgeSpaceEntity):
"""Update knowledge space"""
session = self.get_raw_session()
session.merge(space)
request = SpaceServeRequest(id=space.id)
update_request = self.to_request(space)
query = self._create_query_object(session, request)
entry = query.first()
if entry is None:
raise Exception("Invalid request")
for key, value in update_request.dict().items(): # type: ignore
if value is not None:
setattr(entry, key, value)
session.merge(entry)
session.commit()
session.close()
return True
return self.to_response(space)
def delete_knowledge_space(self, space: KnowledgeSpaceEntity):
"""Delete knowledge space"""
@@ -127,6 +137,7 @@ class KnowledgeSpaceDao(BaseDao):
vector_type=entity.vector_type,
desc=entity.desc,
owner=entity.owner,
context=entity.context,
)
def to_response(self, entity: KnowledgeSpaceEntity) -> SpaceServeResponse:

View File

@@ -145,9 +145,7 @@ class Service(BaseService[KnowledgeSpaceEntity, SpaceServeRequest, SpaceServeRes
status_code=400,
detail=f"no space name named {request.name}",
)
space = spaces[0]
query_request = {"id": space.id}
update_obj = self._dao.update(query_request, update_request=request)
update_obj = self._dao.update_knowledge_space(self._dao.from_request(request))
return update_obj
async def create_document(