Skip to content

Commit 25b85f8

Browse files
committed
fix logic
1 parent bbc818c commit 25b85f8

File tree

2 files changed

+7
-20
lines changed

2 files changed

+7
-20
lines changed

core_backend/app/llm_call/llm_prompts.py

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from enum import Enum
88
from typing import ClassVar, Literal
99

10-
from pydantic import BaseModel, ConfigDict, Field, field_validator
10+
from pydantic import BaseModel, ConfigDict, Field
1111

1212
from .utils import format_prompt, remove_json_markdown
1313

@@ -428,22 +428,8 @@ def _missing_(cls, value: str) -> IdentifiedScript: # type: ignore[override]
428428
class LanguageIdentificationResponse(BaseModel):
429429
"""Pydantic model for the language identification response."""
430430

431-
language: str
432-
script: str
433-
434-
@field_validator("language")
435-
def validate_language(cls, value: str) -> str:
436-
"""Make sure language input is a valid IdentifiedLanguage"""
437-
if value not in IdentifiedLanguage._member_names_:
438-
raise ValueError(f"Invalid language: {value}")
439-
return value
440-
441-
@field_validator("script")
442-
def validate_script(cls, value: str) -> str:
443-
"""Make sure script input is a valid IdentifiedScript"""
444-
if value not in IdentifiedScript._member_names_:
445-
raise ValueError(f"Invalid script: {value}")
446-
return value
431+
language: IdentifiedLanguage
432+
script: IdentifiedScript
447433

448434
model_config = ConfigDict(strict=True)
449435

core_backend/app/llm_call/process_input.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,13 @@ def _process_identified_language_response(
167167

168168
supported_languages_list = IdentifiedLanguage.get_supported_languages()
169169
supported_scripts_list = IdentifiedScript.get_supported_scripts()
170-
supported_languages_str = ", ".join(supported_languages_list)
171-
suported_scripts_str = ", ".join(supported_scripts_list)
172170

173171
language_ok = identified_language in supported_languages_list
174172
script_ok = identified_script in supported_scripts_list
175173

174+
supported_languages_str = ", ".join(supported_languages_list)
175+
suported_scripts_str = ", ".join(supported_scripts_list)
176+
176177
if language_ok and script_ok:
177178
return response
178179
elif language_ok and not script_ok:
@@ -209,7 +210,7 @@ def _process_identified_language_response(
209210

210211
logger.info(
211212
f"LANGUAGE IDENTIFICATION FAILED due to {error_message} "
212-
f"language on query id: {str(response.query_id)}"
213+
f"on query id: {str(response.query_id)}"
213214
)
214215

215216
return error_response

0 commit comments

Comments
 (0)