From f2c43713b16e821f4a1ae97804c60f18734d5f6a Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 13 十二月 2024 17:25:12 +0800
Subject: [PATCH] 问题优化
---
app/models/knowledge_model.py | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/app/models/knowledge_model.py b/app/models/knowledge_model.py
index bde8241..661423e 100644
--- a/app/models/knowledge_model.py
+++ b/app/models/knowledge_model.py
@@ -1,5 +1,8 @@
+import json
from datetime import datetime
+from typing import Optional
+from pydantic import BaseModel
from sqlalchemy import Column, Integer, String, Table, ForeignKey, DateTime, BigInteger, Text, Float, Boolean
from sqlalchemy.orm import relationship, backref
@@ -10,15 +13,17 @@
__mapper_args__ = {
# "order_by": 'SEQ'
}
- id = Column(String(32), primary_key=True) # id
+ id = Column(String(36), primary_key=True) # id
name = Column(String(128)) # 鍚嶇О
- create_date = Column(DateTime) # 鍒涘缓鏃堕棿
- update_date = Column(DateTime) # 鏇存柊鏃堕棿
- avatar = Column(Text) # 鍥炬爣
+ create_date = Column(DateTime, default=datetime.now()) # 鍒涘缓鏃堕棿
+ update_date = Column(DateTime, default=datetime.now(), onupdate=datetime.now()) # 鏇存柊鏃堕棿
+ # avatar = Column(Text) # 鍥炬爣
tenant_id = Column(String(32)) # 鍒涘缓浜篿d
description = Column(Text) # 璇存槑
status = Column(String(1)) # 鐘舵��
- kld_type = Column(String(1)) # 鐭ヨ瘑搴撳钩鍙�
+ documents = Column(Integer, default=0) # 鏂囨。
+ icon = Column(String(128)) # 鏂囨。
+ knowledge_type = Column(String(1)) # 鐭ヨ瘑搴撳钩鍙�
def get_id(self):
@@ -28,23 +33,22 @@
return {
'id': self.id,
'name': self.name,
- 'create_time': self.create_time,
- 'update_time': self.update_time,
- 'avatar': self.avatar,
- 'tenant_id': self.tenant_id,
- 'language': self.language,
+ 'create_time': self.create_date.strftime('%Y-%m-%d %H:%M:%S'),
+ 'update_time': self.update_date.strftime('%Y-%m-%d %H:%M:%S'),
+ # 'avatar': self.avatar,
+ 'user_id': self.tenant_id,
'description': self.description,
- 'embd_id': self.embd_id,
- 'permission': self.permission,
- 'created_by': self.created_by,
- 'doc_num': self.doc_num,
- 'token_num': self.token_num,
- 'chunk_num': self.chunk_num,
- 'similarity_threshold': self.similarity_threshold,
- 'vector_similarity_weight': self.vector_similarity_weight,
- 'parser_id': self.parser_id,
- 'parser_config': json.loads(self.parser_config),
- 'status': self.status
+ 'status': self.status,
+ 'documents': self.documents,
+ 'icon': self.icon
}
def __repr__(self):
- return '<Knowledge name:%r url:%r>\n' % (self.name, self.id)
\ No newline at end of file
+ return '<Knowledge name:%r url:%r>\n' % (self.name, self.id)
+
+
+class klgParameter(BaseModel):
+ id: str
+ name: str
+ description: Optional[str] = ""
+ icon: str
+ klgType: str
\ No newline at end of file
--
Gitblit v1.8.0