From d15793a9f82baa689c71285cda5c5efe04a3ba39 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Wed, 10 Jan 2024 15:25:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8meta=E5=93=8D=E5=BA=94=E4=B8=BA=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/dataset/serializers/dataset_serializers.py | 10 +++++----- apps/dataset/sql/list_dataset.sql | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/dataset/serializers/dataset_serializers.py b/apps/dataset/serializers/dataset_serializers.py index 3baa7d5c7..1c0524099 100644 --- a/apps/dataset/serializers/dataset_serializers.py +++ b/apps/dataset/serializers/dataset_serializers.py @@ -64,7 +64,7 @@ from smartdoc.conf import PROJECT_DIR class DataSetSerializers(serializers.ModelSerializer): class Meta: model = DataSet - fields = ['id', 'name', 'desc', 'create_time', 'update_time'] + fields = ['id', 'name', 'desc', 'meta', 'create_time', 'update_time'] class Application(ApiMixin, serializers.Serializer): user_id = serializers.UUIDField(required=True) @@ -238,7 +238,7 @@ class DataSetSerializers(serializers.ModelSerializer): validators.MinLengthValidator(limit_value=1, message="知识库名称在1-256个字符之间") ]) - url = serializers.CharField(required=True) + source_url = serializers.CharField(required=True) selector = serializers.CharField(required=False, allow_null=True, allow_blank=True) @@ -286,7 +286,7 @@ class DataSetSerializers(serializers.ModelSerializer): properties={ 'name': openapi.Schema(type=openapi.TYPE_STRING, title="知识库名称", description="知识库名称"), 'desc': openapi.Schema(type=openapi.TYPE_STRING, title="知识库描述", description="知识库描述"), - 'url': openapi.Schema(type=openapi.TYPE_STRING, title="web站点url", description="web站点url"), + 'source_url': openapi.Schema(type=openapi.TYPE_STRING, title="web站点url", description="web站点url"), 'selector': openapi.Schema(type=openapi.TYPE_STRING, title="选择器", description="选择器") } ) @@ -369,10 +369,10 @@ class DataSetSerializers(serializers.ModelSerializer): dataset_id = uuid.uuid1() dataset = DataSet( **{'id': dataset_id, 'name': instance.get("name"), 'desc': instance.get('desc'), 'user_id': user_id, - 'type': Type.web, 'meta': {'source_url': instance.get('url'), 'selector': instance.get('selector')}}) + 'type': Type.web, 'meta': {'source_url': instance.get('source_url'), 'selector': instance.get('selector')}}) dataset.save() ListenerManagement.sync_web_dataset_signal.send( - SyncWebDatasetArgs(str(dataset_id), instance.get('url'), instance.get('selector'), + SyncWebDatasetArgs(str(dataset_id), instance.get('source_url'), instance.get('selector'), self.get_save_handler(dataset_id, instance.get('selector')))) return {**DataSetSerializers(dataset).data, 'document_list': []} diff --git a/apps/dataset/sql/list_dataset.sql b/apps/dataset/sql/list_dataset.sql index 317dacacf..8f62034d5 100644 --- a/apps/dataset/sql/list_dataset.sql +++ b/apps/dataset/sql/list_dataset.sql @@ -1,5 +1,6 @@ SELECT - * + *, + to_json(meta) as meta FROM ( SELECT