parent
e7e377c326
commit
aac4b75a4d
4 changed files with 50 additions and 22 deletions
|
|
@ -22,7 +22,7 @@ from werkzeug.http import http_date
|
|||
from werkzeug.utils import secure_filename
|
||||
|
||||
from libretranslate import flood, remove_translated_files, scheduler, secret, security, storage
|
||||
from libretranslate.language import detect_languages, improve_translation_formatting
|
||||
from libretranslate.language import model2iso, iso2model, detect_languages, improve_translation_formatting
|
||||
from libretranslate.locales import (
|
||||
_,
|
||||
_lazy,
|
||||
|
|
@ -256,7 +256,7 @@ def create_app(args):
|
|||
return max(req_cost, int(math.ceil(getattr(request, 'duration', 0) / args.req_time_cost)))
|
||||
else:
|
||||
return req_cost
|
||||
|
||||
|
||||
def get_limits_key_func():
|
||||
if args.api_keys:
|
||||
def func():
|
||||
|
|
@ -264,7 +264,7 @@ def create_app(args):
|
|||
return ak if ak else get_remote_address()
|
||||
return func
|
||||
else:
|
||||
return get_remote_address
|
||||
return get_remote_address
|
||||
|
||||
limiter = Limiter(
|
||||
key_func=get_limits_key_func(),
|
||||
|
|
@ -499,7 +499,10 @@ def create_app(args):
|
|||
type: string
|
||||
description: Supported target language codes
|
||||
"""
|
||||
return jsonify([{"code": l.code, "name": _lazy(l.name), "targets": language_pairs.get(l.code, [])} for l in languages])
|
||||
return jsonify([{"code": model2iso(l.code),
|
||||
"name": _lazy(l.name),
|
||||
"targets": model2iso(language_pairs.get(l.code, []))
|
||||
} for l in languages])
|
||||
|
||||
# Add cors
|
||||
@bp.after_request
|
||||
|
|
@ -626,14 +629,14 @@ def create_app(args):
|
|||
if request.is_json:
|
||||
json = get_json_dict(request)
|
||||
q = json.get("q")
|
||||
source_lang = json.get("source")
|
||||
target_lang = json.get("target")
|
||||
source_lang = iso2model(json.get("source"))
|
||||
target_lang = iso2model(json.get("target"))
|
||||
text_format = json.get("format")
|
||||
num_alternatives = int(json.get("alternatives", 0))
|
||||
else:
|
||||
q = request.values.get("q")
|
||||
source_lang = request.values.get("source")
|
||||
target_lang = request.values.get("target")
|
||||
source_lang = iso2model(request.values.get("source"))
|
||||
target_lang = iso2model(request.values.get("target"))
|
||||
text_format = request.values.get("format")
|
||||
num_alternatives = request.values.get("alternatives", 0)
|
||||
|
||||
|
|
@ -736,7 +739,7 @@ def create_app(args):
|
|||
result = {"translatedText": batch_results}
|
||||
|
||||
if source_lang == "auto":
|
||||
result["detectedLanguage"] = [detected_src_lang] * len(q)
|
||||
result["detectedLanguage"] = [model2iso(detected_src_lang)] * len(q)
|
||||
if num_alternatives > 0:
|
||||
result["alternatives"] = batch_alternatives
|
||||
|
||||
|
|
@ -761,7 +764,7 @@ def create_app(args):
|
|||
result = {"translatedText": translated_text}
|
||||
|
||||
if source_lang == "auto":
|
||||
result["detectedLanguage"] = detected_src_lang
|
||||
result["detectedLanguage"] = model2iso(detected_src_lang)
|
||||
if num_alternatives > 0:
|
||||
result["alternatives"] = alternatives
|
||||
|
||||
|
|
@ -857,8 +860,8 @@ def create_app(args):
|
|||
if args.disable_files_translation:
|
||||
abort(403, description=_("Files translation are disabled on this server."))
|
||||
|
||||
source_lang = request.form.get("source")
|
||||
target_lang = request.form.get("target")
|
||||
source_lang = iso2model(request.form.get("source"))
|
||||
target_lang = iso2model(request.form.get("target"))
|
||||
file = request.files['file']
|
||||
char_limit = get_char_limit(args.char_limit, api_keys_db)
|
||||
|
||||
|
|
@ -1034,7 +1037,7 @@ def create_app(args):
|
|||
if not q:
|
||||
abort(400, description=_("Invalid request: missing %(name)s parameter", name='q'))
|
||||
|
||||
return jsonify(detect_languages(q))
|
||||
return jsonify(model2iso(detect_languages(q)))
|
||||
|
||||
@bp.route("/frontend/settings")
|
||||
@limiter.exempt
|
||||
|
|
@ -1180,13 +1183,13 @@ def create_app(args):
|
|||
json = get_json_dict(request)
|
||||
q = json.get("q")
|
||||
s = json.get("s")
|
||||
source_lang = json.get("source")
|
||||
target_lang = json.get("target")
|
||||
source_lang = iso2model(json.get("source"))
|
||||
target_lang = iso2model(json.get("target"))
|
||||
else:
|
||||
q = request.values.get("q")
|
||||
s = request.values.get("s")
|
||||
source_lang = request.values.get("source")
|
||||
target_lang = request.values.get("target")
|
||||
source_lang = iso2model(request.values.get("source"))
|
||||
target_lang = iso2model(request.values.get("target"))
|
||||
|
||||
if not q:
|
||||
abort(400, description=_("Invalid request: missing %(name)s parameter", name='q'))
|
||||
|
|
@ -1244,4 +1247,4 @@ def create_app(args):
|
|||
else:
|
||||
app.register_blueprint(swaggerui_blueprint)
|
||||
|
||||
return app
|
||||
return app
|
||||
|
|
@ -21,9 +21,11 @@ def check_lang(langcodes, lang):
|
|||
|
||||
def normalized_lang_code(lang):
|
||||
code = lang.lang
|
||||
# Handle zh-cn
|
||||
if code.startswith("zh"):
|
||||
# Handle Chinese
|
||||
if code == "zh-cn":
|
||||
code = "zh"
|
||||
elif code == "zh-tw":
|
||||
code = "zt"
|
||||
return code
|
||||
|
||||
class Detector:
|
||||
|
|
|
|||
|
|
@ -6,6 +6,30 @@ from argostranslate import translate
|
|||
from libretranslate.detect import Detector
|
||||
|
||||
__languages = None
|
||||
aliases = {
|
||||
'pb': 'pt-BR',
|
||||
'zh': 'zh-Hans',
|
||||
'zt': 'zh-Hant',
|
||||
}
|
||||
rev_aliases = {v.lower(): k for k, v in aliases.items()}
|
||||
|
||||
def iso2model(lang):
|
||||
if not isinstance(lang, str):
|
||||
return lang
|
||||
|
||||
lang = lang.lower()
|
||||
return rev_aliases.get(lang, lang)
|
||||
|
||||
def model2iso(lang):
|
||||
if isinstance(lang, dict) and 'language' in lang:
|
||||
d = dict(lang)
|
||||
d['language'] = model2iso(d['language'])
|
||||
return d
|
||||
elif isinstance(lang, list):
|
||||
return [model2iso(l) for l in lang]
|
||||
|
||||
lang = lang.lower()
|
||||
return aliases.get(lang, lang)
|
||||
|
||||
def load_languages():
|
||||
global __languages
|
||||
|
|
@ -132,4 +156,3 @@ def improve_translation_formatting(source, translation, improve_punctuation=True
|
|||
return translation[0].upper() + translation[1:]
|
||||
|
||||
return translation
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue