outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update nltk version

Browse Source
This commit is contained in:
jyong 2024-08-23 16:43:47 +08:00
parent 0724640bbb
commit a63e15081f
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/controllers/console/datasets/external.py
View File

@ -35,11 +35,13 @@ def _validate_name(name):
raise ValueError('Name must be between 1 to 100 characters.') raise ValueError('Name must be between 1 to 100 characters.')
return name return name
def _validate_description_length(description): def _validate_description_length(description):
if len(description) > 400: if len(description) > 400:
raise ValueError('Description cannot exceed 400 characters.') raise ValueError('Description cannot exceed 400 characters.')
return description return description
class ExternalApiTemplateListApi(Resource): class ExternalApiTemplateListApi(Resource):
@setup_required @setup_required
@ -73,6 +75,9 @@ class ExternalApiTemplateListApi(Resource):
parser.add_argument('name', nullable=False, required=True, parser.add_argument('name', nullable=False, required=True,
help='type is required. Name must be between 1 to 100 characters.', help='type is required. Name must be between 1 to 100 characters.',
type=_validate_name) 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', parser.add_argument('settings', type=list, location='json',
nullable=False, nullable=False,
required=True, ) required=True, )
@ -118,6 +123,9 @@ class ExternalApiTemplateApi(Resource):
parser.add_argument('name', nullable=False, required=True, parser.add_argument('name', nullable=False, required=True,
help='type is required. Name must be between 1 to 100 characters.', help='type is required. Name must be between 1 to 100 characters.',
type=_validate_name) 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', parser.add_argument('settings', type=list, location='json',
nullable=False, nullable=False,
required=True, ) required=True, )
@ -170,10 +178,10 @@ class ExternalDatasetInitApi(Resource):
parser = reqparse.RequestParser() parser = reqparse.RequestParser()
parser.add_argument('api_template_id', type=str, required=True, nullable=True, location='json') parser.add_argument('api_template_id', type=str, required=True, nullable=True, location='json')
parser.add_argument('name', nullable=False, required=True, # parser.add_argument('name', nullable=False, required=True,
help='name is required. Name must be between 1 to 100 characters.', # help='name is required. Name must be between 1 to 100 characters.',
type=_validate_name) # type=_validate_name)
parser.add_argument('description', type=str, required=True, nullable=True, location='json') # 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('data_source', type=dict, required=True, nullable=True, location='json')
parser.add_argument('process_parameter', 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(ExternalApiTemplateListApi, '/datasets/external-api-template')
api.add_resource(ExternalApiTemplateApi, '/datasets/external-api-template/<uuid:api_template_id>') 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') api.add_resource(ExternalApiUseCheckApi, '/datasets/external-api-template/<uuid:api_template_id>/use-check')

10
api/services/external_knowledge_service.py
View File

@ -64,6 +64,7 @@ class ExternalDatasetService:
created_by=user_id, created_by=user_id,
updated_by=user_id, updated_by=user_id,
name=args.get('name'), name=args.get('name'),
description=args.get('description', ''),
settings=json.dumps(args.get('settings'), ensure_ascii=False), settings=json.dumps(args.get('settings'), ensure_ascii=False),
) )
@ -87,6 +88,7 @@ class ExternalDatasetService:
raise ValueError('api template not found') raise ValueError('api template not found')
api_template.name = args.get('name') 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.settings = json.dumps(args.get('settings'), ensure_ascii=False)
api_template.updated_by = user_id api_template.updated_by = user_id
api_template.updated_at = datetime.now(timezone.utc).replace(tzinfo=None) api_template.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
@ -125,10 +127,10 @@ class ExternalDatasetService:
raise ValueError('api template not found') raise ValueError('api template not found')
settings = json.loads(api_template.settings) settings = json.loads(api_template.settings)
for settings in settings: for settings in settings:
if settings.get('method') == 'create': custom_parameters = settings.get('document_process_setting')
parameters = settings.get('parameters') if custom_parameters:
for parameter in parameters: for parameter in custom_parameters:
if parameter.get('required') and not process_parameter.get(parameter.get('name')): if parameter.get('required', False) and not process_parameter.get(parameter.get('name')):
raise ValueError(f'{parameter.get("name")} is required') raise ValueError(f'{parameter.get("name")} is required')
@staticmethod @staticmethod