add dialog api (#33)

api/db/__init__.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -51,4 +51,11 @@ class LLMType(StrEnum):
     CHAT = 'chat'
     EMBEDDING = 'embedding'
     SPEECH2TEXT = 'speech2text'
-    IMAGE2TEXT = 'image2text'
+    IMAGE2TEXT = 'image2text'
+
+
+class ChatStyle(StrEnum):
+    CREATIVE = 'Creative'
+    PRECISE = 'Precise'
+    EVENLY = 'Evenly'
+    CUSTOM = 'Custom'

api/db/db_models.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -29,10 +29,10 @@ from peewee import (
 )
 from playhouse.pool import PooledMySQLDatabase
 
-from web_server.db import SerializedType
-from web_server.settings import DATABASE, stat_logger, SECRET_KEY
-from web_server.utils.log_utils import getLogger
-from web_server import utils
+from api.db import SerializedType
+from api.settings import DATABASE, stat_logger, SECRET_KEY
+from api.utils.log_utils import getLogger
+from api import utils
 
 LOGGER = getLogger()
 
@@ -467,6 +467,8 @@ class Knowledgebase(DataBaseModel):
     doc_num = IntegerField(default=0)
     token_num = IntegerField(default=0)
     chunk_num = IntegerField(default=0)
+    similarity_threshold = FloatField(default=0.4)
+    vector_similarity_weight = FloatField(default=0.3)
 
     parser_id = CharField(max_length=32, null=False, help_text="default parser ID")
     status = CharField(max_length=1, null=True, help_text="is it validate(0: wasted，1: validate)", default="1")
@@ -516,19 +518,20 @@ class Dialog(DataBaseModel):
     prompt_type = CharField(max_length=16, null=False, default="simple", help_text="simple|advanced")
     prompt_config = JSONField(null=False, default={"system": "", "prologue": "您好，我是您的助手小樱，长得可爱又善良，can I help you?",
                                                    "parameters": [], "empty_response": "Sorry! 知识库中未找到相关内容！"})
+    kb_ids = JSONField(null=False, default=[])
     status = CharField(max_length=1, null=True, help_text="is it validate(0: wasted，1: validate)", default="1")
 
     class Meta:
         db_table = "dialog"
 
 
-class DialogKb(DataBaseModel):
-    dialog_id = CharField(max_length=32, null=False, index=True)
-    kb_id = CharField(max_length=32, null=False)
-
-    class Meta:
-        db_table = "dialog_kb"
-        primary_key = CompositeKey('dialog_id', 'kb_id')
+# class DialogKb(DataBaseModel):
+#     dialog_id = CharField(max_length=32, null=False, index=True)
+#     kb_id = CharField(max_length=32, null=False)
+#
+#     class Meta:
+#         db_table = "dialog_kb"
+#         primary_key = CompositeKey('dialog_id', 'kb_id')
 
 
 class Conversation(DataBaseModel):

api/db/db_services.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2021 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2021 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@ import time
 from functools import wraps
 from shortuuid import ShortUUID
 
-from web_server.versions import get_rag_version
+from api.versions import get_rag_version
 
-from web_server.errors.error_services import *
-from web_server.settings import (
+from api.errors.error_services import *
+from api.settings import (
     GRPC_PORT, HOST, HTTP_PORT,
     RANDOM_INSTANCE_ID,  stat_logger,
 )

api/db/db_utils.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@ import operator
 from functools import reduce
 from typing import Dict, Type, Union
 
-from web_server.utils import current_timestamp, timestamp_to_date
+from api.utils import current_timestamp, timestamp_to_date
 
-from web_server.db.db_models import DB, DataBaseModel
-from web_server.db.runtime_config import RuntimeConfig
-from web_server.utils.log_utils import getLogger
+from api.db.db_models import DB, DataBaseModel
+from api.db.runtime_config import RuntimeConfig
+from api.utils.log_utils import getLogger
 from enum import Enum
 
 
@@ -123,9 +123,3 @@ def query_db(model: Type[DataBaseModel], limit: int = 0, offset: int = 0,
         data = data.offset(offset)
 
     return list(data), count
-
-
-class StatusEnum(Enum):
-    # 样本可用状态
-    VALID = "1"
-    IN_VALID = "0"

api/db/init_data.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 import time
 import uuid
 
-from web_server.db import LLMType
-from web_server.db.db_models import init_database_tables as init_web_db
-from web_server.db.services import UserService
-from web_server.db.services.llm_service import LLMFactoriesService, LLMService
+from api.db import LLMType
+from api.db.db_models import init_database_tables as init_web_db
+from api.db.services import UserService
+from api.db.services.llm_service import LLMFactoriesService, LLMService
 
 
 def init_superuser():

api/db/operatioins.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,5 +17,5 @@
 import operator
 import time
 import typing
-from web_server.utils.log_utils import sql_logger
+from api.utils.log_utils import sql_logger
 import peewee

api/db/reload_config_base.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

api/db/runtime_config.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-from web_server.versions import get_versions
+from api.versions import get_versions
 from .reload_config_base import ReloadConfigBase
 
 

api/db/services/__init__.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

api/db/services/common_service.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ from datetime import datetime
 
 import peewee
 
-from web_server.db.db_models import DB
-from web_server.utils import datetime_format
+from api.db.db_models import DB
+from api.utils import datetime_format
 
 
 class CommonService:

api/db/services/dialog_service.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,14 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import peewee
-from werkzeug.security import generate_password_hash, check_password_hash
-
-from web_server.db.db_models import DB, UserTenant
-from web_server.db.db_models import Dialog, Conversation, DialogKb
-from web_server.db.services.common_service import CommonService
-from web_server.utils import get_uuid, get_format_time
-from web_server.db.db_utils import StatusEnum
+from api.db.db_models import Dialog, Conversation
+from api.db.services.common_service import CommonService
 
 
 class DialogService(CommonService):
@@ -29,7 +23,3 @@ class DialogService(CommonService):
 
 class ConversationService(CommonService):
     model = Conversation
-
-
-class DialogKbService(CommonService):
-    model = DialogKb

api/db/services/document_service.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
 #
 from peewee import Expression
 
-from web_server.db import TenantPermission, FileType
-from web_server.db.db_models import DB, Knowledgebase, Tenant
-from web_server.db.db_models import Document
-from web_server.db.services.common_service import CommonService
-from web_server.db.services.kb_service import KnowledgebaseService
-from web_server.db.db_utils import StatusEnum
+from api.db import TenantPermission, FileType
+from api.db.db_models import DB, Knowledgebase, Tenant
+from api.db.db_models import Document
+from api.db.services.common_service import CommonService
+from api.db.services.kb_service import KnowledgebaseService
+from api.db import StatusEnum
 
 
 class DocumentService(CommonService):

api/db/services/kb_service.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,15 +13,12 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import peewee
-from werkzeug.security import generate_password_hash, check_password_hash
 
-from web_server.db import TenantPermission
-from web_server.db.db_models import DB, UserTenant, Tenant
-from web_server.db.db_models import Knowledgebase
-from web_server.db.services.common_service import CommonService
-from web_server.utils import get_uuid, get_format_time
-from web_server.db.db_utils import StatusEnum
+from api.db import TenantPermission
+from api.db.db_models import DB, Tenant
+from api.db.db_models import Knowledgebase
+from api.db.services.common_service import CommonService
+from api.db import StatusEnum
 
 
 class KnowledgebaseService(CommonService):

api/db/services/knowledgebase_service.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,14 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import peewee
-from werkzeug.security import generate_password_hash, check_password_hash
-
-from web_server.db.db_models import DB, UserTenant
-from web_server.db.db_models import Knowledgebase, Document
-from web_server.db.services.common_service import CommonService
-from web_server.utils import get_uuid, get_format_time
-from web_server.db.db_utils import StatusEnum
+from api.db.db_models import Knowledgebase, Document
+from api.db.services.common_service import CommonService
 
 
 class KnowledgebaseService(CommonService):

api/db/services/llm_service.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,15 +13,12 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import peewee
-from werkzeug.security import generate_password_hash, check_password_hash
-
 from rag.llm import EmbeddingModel, CvModel
-from web_server.db import LLMType
-from web_server.db.db_models import DB, UserTenant
-from web_server.db.db_models import LLMFactories, LLM, TenantLLM
-from web_server.db.services.common_service import CommonService
-from web_server.db.db_utils import StatusEnum
+from api.db import LLMType
+from api.db.db_models import DB, UserTenant
+from api.db.db_models import LLMFactories, LLM, TenantLLM
+from api.db.services.common_service import CommonService
+from api.db import StatusEnum
 
 
 class LLMFactoriesService(CommonService):

api/db/services/user_service.py

@@ -1,5 +1,5 @@
 #
-#  Copyright 2019 The RAG Flow Authors. All Rights Reserved.
+#  Copyright 2019 The InfiniFlow Authors. All Rights Reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 import peewee
 from werkzeug.security import generate_password_hash, check_password_hash
 
-from web_server.db import UserTenantRole
-from web_server.db.db_models import DB, UserTenant
-from web_server.db.db_models import User, Tenant
-from web_server.db.services.common_service import CommonService
-from web_server.utils import get_uuid, get_format_time
-from web_server.db.db_utils import StatusEnum
+from api.db import UserTenantRole
+from api.db.db_models import DB, UserTenant
+from api.db.db_models import User, Tenant
+from api.db.services.common_service import CommonService
+from api.utils import get_uuid, get_format_time
+from api.db import StatusEnum
 
 
 class UserService(CommonService):