From a63e15081f967d74f652e0e4b0fbd676b9fa0c8d Mon Sep 17 00:00:00 2001
From: jyong <718720800@qq.com>
Date: Fri, 23 Aug 2024 16:43:47 +0800
Subject: [PATCH] update nltk version

---
 api/controllers/console/datasets/external.py | 17 ++++++++++++-----
 api/services/external_knowledge_service.py   | 10 ++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/api/controllers/console/datasets/external.py b/api/controllers/console/datasets/external.py
index 58665e2f55..3d9d99ce98 100644
--- a/api/controllers/console/datasets/external.py
+++ b/api/controllers/console/datasets/external.py
@@ -35,11 +35,13 @@ def _validate_name(name):
         raise ValueError('Name must be between 1 to 100 characters.')
     return name
 
+
 def _validate_description_length(description):
     if len(description) > 400:
         raise ValueError('Description cannot exceed 400 characters.')
     return description
 
+
 class ExternalApiTemplateListApi(Resource):
 
     @setup_required
@@ -73,6 +75,9 @@ class ExternalApiTemplateListApi(Resource):
         parser.add_argument('name', nullable=False, required=True,
                             help='type is required. Name must be between 1 to 100 characters.',
                             type=_validate_name)
+        parser.add_argument('description', nullable=False, required=True,
+                            help='description is required. Description must be between 1 to 400 characters.',
+                            type=_validate_description_length)
         parser.add_argument('settings', type=list, location='json',
                             nullable=False,
                             required=True, )
@@ -118,6 +123,9 @@ class ExternalApiTemplateApi(Resource):
         parser.add_argument('name', nullable=False, required=True,
                             help='type is required. Name must be between 1 to 100 characters.',
                             type=_validate_name)
+        parser.add_argument('description', nullable=False, required=True,
+                            help='description is required. Description must be between 1 to 400 characters.',
+                            type=_validate_description_length)
         parser.add_argument('settings', type=list, location='json',
                             nullable=False,
                             required=True, )
@@ -170,10 +178,10 @@ class ExternalDatasetInitApi(Resource):
 
         parser = reqparse.RequestParser()
         parser.add_argument('api_template_id', type=str, required=True, nullable=True, location='json')
-        parser.add_argument('name', nullable=False, required=True,
-                            help='name is required. Name must be between 1 to 100 characters.',
-                            type=_validate_name)
-        parser.add_argument('description', type=str, required=True, nullable=True, location='json')
+        # parser.add_argument('name', nullable=False, required=True,
+        #                     help='name is required. Name must be between 1 to 100 characters.',
+        #                     type=_validate_name)
+        # parser.add_argument('description', type=str, required=True, nullable=True, location='json')
         parser.add_argument('data_source', type=dict, required=True, nullable=True, location='json')
         parser.add_argument('process_parameter', type=dict, required=True, nullable=True, location='json')
 
@@ -210,4 +218,3 @@ class ExternalDatasetInitApi(Resource):
 api.add_resource(ExternalApiTemplateListApi, '/datasets/external-api-template')
 api.add_resource(ExternalApiTemplateApi, '/datasets/external-api-template/<uuid:api_template_id>')
 api.add_resource(ExternalApiUseCheckApi, '/datasets/external-api-template/<uuid:api_template_id>/use-check')
-
diff --git a/api/services/external_knowledge_service.py b/api/services/external_knowledge_service.py
index ecfb883ca1..fa95d9fded 100644
--- a/api/services/external_knowledge_service.py
+++ b/api/services/external_knowledge_service.py
@@ -64,6 +64,7 @@ class ExternalDatasetService:
             created_by=user_id,
             updated_by=user_id,
             name=args.get('name'),
+            description=args.get('description', ''),
             settings=json.dumps(args.get('settings'), ensure_ascii=False),
         )
 
@@ -87,6 +88,7 @@ class ExternalDatasetService:
             raise ValueError('api template not found')
 
         api_template.name = args.get('name')
+        api_template.description = args.get('description', '')
         api_template.settings = json.dumps(args.get('settings'), ensure_ascii=False)
         api_template.updated_by = user_id
         api_template.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
@@ -125,10 +127,10 @@ class ExternalDatasetService:
             raise ValueError('api template not found')
         settings = json.loads(api_template.settings)
         for settings in settings:
-            if settings.get('method') == 'create':
-                parameters = settings.get('parameters')
-                for parameter in parameters:
-                    if parameter.get('required') and not process_parameter.get(parameter.get('name')):
+            custom_parameters = settings.get('document_process_setting')
+            if custom_parameters:
+                for parameter in custom_parameters:
+                    if parameter.get('required', False) and not process_parameter.get(parameter.get('name')):
                         raise ValueError(f'{parameter.get("name")} is required')
 
     @staticmethod