Update TL Function to always clean text
This commit is contained in:
parent
25f159926e
commit
397bdab7f7
14 changed files with 170 additions and 157 deletions
|
|
@ -520,7 +520,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -617,6 +617,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -630,13 +640,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -654,7 +657,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -665,7 +668,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -389,7 +389,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -403,6 +403,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -485,6 +486,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -498,13 +509,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -522,7 +526,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -533,7 +537,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -447,6 +447,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -529,6 +530,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -542,13 +553,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -566,7 +570,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -577,7 +581,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -448,7 +448,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -462,6 +462,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -544,6 +545,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -557,13 +568,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -581,7 +585,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -592,7 +596,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -444,7 +444,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -458,6 +458,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
|
|||
|
|
@ -372,7 +372,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -386,6 +386,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -468,6 +469,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -481,13 +492,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -505,7 +509,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -516,7 +520,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -2455,7 +2455,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -2469,6 +2469,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -2551,6 +2552,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -2564,13 +2575,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -2588,7 +2592,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -2599,7 +2603,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -2455,7 +2455,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -2469,6 +2469,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -2551,6 +2552,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -2564,13 +2575,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -2588,7 +2592,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -2599,7 +2603,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -584,7 +584,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -598,6 +598,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -680,6 +681,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -693,13 +704,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -717,7 +721,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -728,7 +732,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -375,6 +375,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -457,6 +458,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -470,13 +481,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -494,7 +498,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -505,7 +509,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -449,6 +449,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -531,6 +532,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -544,13 +555,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -568,7 +572,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -579,7 +583,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -2237,7 +2237,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -2251,6 +2251,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -2333,6 +2334,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -2346,13 +2357,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -2370,7 +2374,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -2381,7 +2385,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@ def translateText(system, user, history, penalty, format, model=MODEL):
|
|||
return response
|
||||
|
||||
|
||||
def cleanTranslatedText(translatedText, varResponse):
|
||||
def cleanTranslatedText(translatedText):
|
||||
placeholders = {
|
||||
f"{LANGUAGE} Translation: ": "",
|
||||
"Translation: ": "",
|
||||
|
|
@ -414,6 +414,7 @@ def cleanTranslatedText(translatedText, varResponse):
|
|||
"—": "―",
|
||||
"】": "]",
|
||||
"【": "[",
|
||||
"é": "e",
|
||||
"Placeholder Text": "",
|
||||
# Add more replacements as needed
|
||||
}
|
||||
|
|
@ -496,6 +497,16 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
tList = [text]
|
||||
|
||||
for index, tItem in enumerate(tList):
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, str(tItem)):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
for j in range(len(tItem)):
|
||||
tItem[j] = cleanTranslatedText(tItem[j])
|
||||
tList[index] = tItem
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Before sending to translation, if we have a list of items, add the formatting
|
||||
if isinstance(tItem, list):
|
||||
for j in range(len(tItem)):
|
||||
|
|
@ -509,13 +520,6 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
varResponse = [tItem, []]
|
||||
subbedT = varResponse[0]
|
||||
|
||||
# Things to Check before starting translation
|
||||
if not re.search(LANGREGEX, subbedT):
|
||||
if PBAR is not None:
|
||||
PBAR.update(len(tItem))
|
||||
history = tItem[-MAXHISTORY:]
|
||||
continue
|
||||
|
||||
# Create Message
|
||||
system, user = createContext(fullPromptFlag, subbedT, format)
|
||||
|
||||
|
|
@ -533,7 +537,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Check Translation
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
@ -544,7 +548,7 @@ def translateGPT(text, history, fullPromptFlag):
|
|||
totalTokens[1] += response.usage.completion_tokens
|
||||
|
||||
# Formatting
|
||||
translatedText = cleanTranslatedText(translatedText, varResponse)
|
||||
translatedText = cleanTranslatedText(translatedText)
|
||||
if isinstance(tItem, list):
|
||||
extractedTranslations = extractTranslation(translatedText, True)
|
||||
if extractedTranslations == None or len(tItem) != len(extractedTranslations):
|
||||
|
|
|
|||
37
vocab.txt
37
vocab.txt
|
|
@ -34,6 +34,7 @@ Here are some vocabulary and terms so that you know the proper spelling and tran
|
|||
姉さん (nee-san)
|
||||
お姉ちゃん (onee-chan)
|
||||
ねえさん (nee-san)
|
||||
おじさん (oji-san)
|
||||
|
||||
# System
|
||||
初めから (Start)
|
||||
|
|
@ -92,40 +93,4 @@ w ((lol))
|
|||
巫女 (Shrine Maiden)
|
||||
コイツ (this bastard)
|
||||
2万 (20,000)
|
||||
|
||||
#Items
|
||||
デバッグ用 (Debug Item)
|
||||
スマホ (Smartphone)
|
||||
チョコレート (Chocolate)
|
||||
疲労回復サプリ (Fatigue Recovery Supplement)
|
||||
エナジードリンク (Energy Drink)
|
||||
栄養ドリンク (Nutritional Drink)
|
||||
高級栄養ドリンク (Premium Nutritional Drink)
|
||||
コンドーム (Condom)
|
||||
お守り (Amulet)
|
||||
参考書 (Reference Book)
|
||||
ファッション雑誌 (Fashion Magazine)
|
||||
淑女のありかた (The Way of a Lady)
|
||||
1日1善 (One Good Deed a Day)
|
||||
配信機材セット (Streaming Equipment Set)
|
||||
いい釣竿 (Good Fishing Rod)
|
||||
真剣ゼミ (Serious Study Program)
|
||||
コスメセット (Cosmetic Set)
|
||||
ピル (Pill)
|
||||
アフターピル (Morning-After Pill)
|
||||
ローション (Lotion)
|
||||
ディルド (Dildo)
|
||||
アナルバイブ (Anal Vibrator)
|
||||
ペニバン (Strap-On)
|
||||
オトナの女の四十八手 (48 Techniques of an Adult Woman)
|
||||
正しいお尻の開発方法 (Proper Butt Development Method)
|
||||
虜にさせる口技集 (Oral Techniques to Enchant)
|
||||
ドキドキ露出プレイ (Exciting Exposure Play)
|
||||
夜のご奉仕大全 (Night Service Compendium)
|
||||
感じる乳房の作り方 (How to Create Sensitive Breasts)
|
||||
時計 (Watch)
|
||||
|
||||
# Locations:
|
||||
鴨ノ橋学園 (Kaminohashi Academy)
|
||||
喫茶店『宿り木』 (Cafe 'Yadorigi')
|
||||
```
|
||||
Loading…
Reference in a new issue