Formatting
This commit is contained in:
parent
56d67f9b78
commit
6546d56abe
12 changed files with 44 additions and 16 deletions
|
|
@ -622,4 +622,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -563,4 +563,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -622,7 +622,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
if format == "json":
|
return [finalList, totalTokens]
|
||||||
return [finalList, totalTokens]
|
|
||||||
else:
|
|
||||||
return [finalList[0], totalTokens]
|
|
||||||
|
|
|
||||||
|
|
@ -189,6 +189,24 @@ def translateRegex(data, translatedList):
|
||||||
lineRegexText = r"t\s'(.*)'$"
|
lineRegexText = r"t\s'(.*)'$"
|
||||||
lineRegexSpeaker = r"n\s'(.*)'$"
|
lineRegexSpeaker = r"n\s'(.*)'$"
|
||||||
choiceRegex = r"choice:\d+\s'(.*)'"
|
choiceRegex = r"choice:\d+\s'(.*)'"
|
||||||
|
titleRegex = r"title\s'(.*)'$"
|
||||||
|
|
||||||
|
# Title
|
||||||
|
match = re.search(titleRegex, data[i])
|
||||||
|
if match:
|
||||||
|
response = translateGPT(
|
||||||
|
[match.group(1)],
|
||||||
|
f"Reply with the {LANGUAGE} translation of the chapter title",
|
||||||
|
True,
|
||||||
|
)
|
||||||
|
tokens[0] += response[1][0]
|
||||||
|
tokens[1] += response[1][1]
|
||||||
|
title = response[0]
|
||||||
|
|
||||||
|
# Set
|
||||||
|
if translatedList:
|
||||||
|
title = re.sub(r"(?<!\\)'", r"\\'", title[0])
|
||||||
|
data[i] = data[i].replace(match.group(1), title)
|
||||||
|
|
||||||
# Speaker
|
# Speaker
|
||||||
match = re.search(lineRegexSpeaker, data[i])
|
match = re.search(lineRegexSpeaker, data[i])
|
||||||
|
|
@ -198,8 +216,10 @@ def translateRegex(data, translatedList):
|
||||||
speaker = response[0]
|
speaker = response[0]
|
||||||
tokens[0] += response[1][0]
|
tokens[0] += response[1][0]
|
||||||
tokens[1] += response[1][1]
|
tokens[1] += response[1][1]
|
||||||
|
|
||||||
if translatedList:
|
if translatedList:
|
||||||
|
# Escape Quotes
|
||||||
|
speaker = re.sub(r"(?<!\\)'", r"\\'", speaker)
|
||||||
data[i] = data[i].replace(match.group(1), speaker)
|
data[i] = data[i].replace(match.group(1), speaker)
|
||||||
else:
|
else:
|
||||||
speaker = None
|
speaker = None
|
||||||
|
|
@ -252,6 +272,12 @@ def translateRegex(data, translatedList):
|
||||||
# Escape Quotes
|
# Escape Quotes
|
||||||
translatedText = re.sub(r"(?<!\\)'", r"\\'", translatedText)
|
translatedText = re.sub(r"(?<!\\)'", r"\\'", translatedText)
|
||||||
|
|
||||||
|
# Remove Repeating Characters
|
||||||
|
pattern = re.compile(r"(.)\s*\1(?:\s*\1){" + str(10 - 1) + r",}")
|
||||||
|
translatedText = pattern.sub(
|
||||||
|
lambda match: match.group(0).replace(" ", "")[:10], translatedText
|
||||||
|
)
|
||||||
|
|
||||||
# Textwrap
|
# Textwrap
|
||||||
translatedText = textwrap.fill(translatedText, width=WIDTH)
|
translatedText = textwrap.fill(translatedText, width=WIDTH)
|
||||||
translatedTextList = translatedText.split("\n")
|
translatedTextList = translatedText.split("\n")
|
||||||
|
|
@ -442,6 +468,9 @@ def cleanTranslatedText(translatedText, varResponse):
|
||||||
for target, replacement in placeholders.items():
|
for target, replacement in placeholders.items():
|
||||||
translatedText = translatedText.replace(target, replacement)
|
translatedText = translatedText.replace(target, replacement)
|
||||||
|
|
||||||
|
# Remove Repeating Characters
|
||||||
|
translatedText = re.sub(r"^(.){10,}$", "\1\1\1\1\1\1\1\1\1\1", translatedText)
|
||||||
|
|
||||||
# Elongate Long Dashes (Since GPT Ignores them...)
|
# Elongate Long Dashes (Since GPT Ignores them...)
|
||||||
translatedText = elongateCharacters(translatedText)
|
translatedText = elongateCharacters(translatedText)
|
||||||
return translatedText
|
return translatedText
|
||||||
|
|
@ -559,7 +588,9 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
extractedTranslations = extractTranslation(translatedText, True)
|
extractedTranslations = extractTranslation(translatedText, True)
|
||||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||||
# Mismatch. Try Again
|
# Mismatch. Try Again
|
||||||
response = translateText(system, user, history, 0.05, format, "gpt-4")
|
response = translateText(
|
||||||
|
system, user, history, 0.05, format, "gpt-4-turbo-2024-04-09"
|
||||||
|
)
|
||||||
translatedText = response.choices[0].message.content
|
translatedText = response.choices[0].message.content
|
||||||
totalTokens[0] += response.usage.prompt_tokens
|
totalTokens[0] += response.usage.prompt_tokens
|
||||||
totalTokens[1] += response.usage.completion_tokens
|
totalTokens[1] += response.usage.completion_tokens
|
||||||
|
|
|
||||||
|
|
@ -546,4 +546,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -2678,4 +2678,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -2667,4 +2667,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -537,4 +537,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -537,4 +537,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -613,4 +613,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -2475,4 +2475,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
|
|
@ -580,4 +580,4 @@ def translateGPT(text, history, fullPromptFlag):
|
||||||
tList[index] = translatedText.replace("Placeholder Text", "")
|
tList[index] = translatedText.replace("Placeholder Text", "")
|
||||||
|
|
||||||
finalList = combineList(tList, text)
|
finalList = combineList(tList, text)
|
||||||
return [finalList, totalTokens]
|
return [finalList, totalTokens]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue