Merge pull request #1463 from hlohaus/upp

Fix merge issues
This commit is contained in:
H Lohaus 2024-01-13 15:57:00 +01:00 committed by GitHub
commit 693b15231d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View File

@ -3,17 +3,14 @@ from __future__ import annotations
import string import string
import random import random
import json import json
import io
import base64
import math import math
from PIL import Image
from ...typing import ImageType from ...typing import ImageType
from aiohttp import ClientSession from aiohttp import ClientSession
from ...image import to_image, process_image, to_base64 from ...image import to_image, process_image, to_base64
image_config = { image_config = {
"maxImagePixels": 360000, "maxImagePixels": 360000,
"imageComp.ssionRate": 0.7, "imageCompressionRate": 0.7,
"enableFaceBlurDebug": 0, "enableFaceBlurDebug": 0,
} }

View File

@ -110,7 +110,8 @@ class Backend_Api:
'provider': get_last_provider(True) 'provider': get_last_provider(True)
}) + "\n" }) + "\n"
if isinstance(chunk, Exception): if isinstance(chunk, Exception):
yield json.dumps({ logging.exception(chunk)
yield json.dumps({
'type' : 'message', 'type' : 'message',
'message': get_error_message(chunk), 'message': get_error_message(chunk),
}) + "\n" }) + "\n"