diff --git a/cope2n-ai-fi/modules/sdsvkvu b/cope2n-ai-fi/modules/sdsvkvu index 910420b..3a19048 160000 --- a/cope2n-ai-fi/modules/sdsvkvu +++ b/cope2n-ai-fi/modules/sdsvkvu @@ -1 +1 @@ -Subproject commit 910420b53636b43af540e72237c06f49127163d3 +Subproject commit 3a1904810a334b95baec7265cdcee28535255c18 diff --git a/cope2n-api/fwd/settings.py b/cope2n-api/fwd/settings.py index 67d680e..34f9655 100755 --- a/cope2n-api/fwd/settings.py +++ b/cope2n-api/fwd/settings.py @@ -214,7 +214,7 @@ CELERY_TASK_TIME_LIMIT = None MAX_UPLOAD_SIZE_OF_A_FILE = 5 * 1024 * 1024 # 5 MB MAX_UPLOAD_FILE_SIZE_OF_A_REQUEST = 100 * 1024 * 1024 # 100 MB -MAX_UPLOAD_FILES_IN_A_REQUEST = 5 +MAX_UPLOAD_FILES_IN_A_REQUEST = 2 MAX_PIXEL_IN_A_FILE = 5000 TARGET_MAX_IMAGE_SIZE = (2048, 2048) SIZE_TO_COMPRESS = 2 * 1024 * 1024 diff --git a/cope2n-api/fwd_api/utils/accuracy.py b/cope2n-api/fwd_api/utils/accuracy.py index cc07a03..4a7f6ac 100755 --- a/cope2n-api/fwd_api/utils/accuracy.py +++ b/cope2n-api/fwd_api/utils/accuracy.py @@ -827,6 +827,8 @@ def calculate_a_request(report, request): images = SubscriptionRequestFile.objects.filter(request=request, file_category=FileCategory.Origin.value) report_files = [] for image in images: + if image.processing_time < 0: + continue status, att = calculate_subcription_file(image) att["acc"]["feedback"], fb_max_indexes = acc_maximize_list_values(att["acc"]["feedback"]) att["acc"]["reviewed"], rv_max_indexes = acc_maximize_list_values(att["acc"]["reviewed"]) diff --git a/cope2n-api/fwd_api/utils/process.py b/cope2n-api/fwd_api/utils/process.py index 9e02381..0e2f248 100644 --- a/cope2n-api/fwd_api/utils/process.py +++ b/cope2n-api/fwd_api/utils/process.py @@ -136,7 +136,7 @@ def sbt_validate_ocr_request_and_get(request, subscription): invoice_file = request.data.getlist('invoice_file') redemption_ID = request.data.get('redemption_ID', None) - FileUtils.validate_list_file(imei_files, file_field="imei_file") + FileUtils.validate_list_file(imei_files, max_file_num=settings.MAX_UPLOAD_FILES_IN_A_REQUEST, min_file_num=0, file_field="imei_file") FileUtils.validate_list_file(invoice_file, max_file_num=1, min_file_num=0, file_field="invoice_file") validated_data['imei_file'] = imei_files diff --git a/cope2n-api/fwd_api/utils/sdsvkvu b/cope2n-api/fwd_api/utils/sdsvkvu index b7baf49..3a19048 160000 --- a/cope2n-api/fwd_api/utils/sdsvkvu +++ b/cope2n-api/fwd_api/utils/sdsvkvu @@ -1 +1 @@ -Subproject commit b7baf4954e592068288c606376b035b41dd9e319 +Subproject commit 3a1904810a334b95baec7265cdcee28535255c18