gis-8971 fixes

nazargesyk · nazargesyk · commit 32814a1c770c · 2024-11-04T11:29:13.000+02:00
diff --git a/uncoder-core/app/translator/core/mixins/tokens.py b/uncoder-core/app/translator/core/mixins/tokens.py
@@ -1,14 +1,14 @@
 from typing import Union
 
+from app.translator.core.const import QUERY_TOKEN_TYPE
 from app.translator.core.custom_types.tokens import LogicalOperatorType, OperatorType
 from app.translator.core.mapping import SourceMapping
 from app.translator.core.models.query_tokens.field_value import FieldValue
 from app.translator.core.models.query_tokens.identifier import Identifier
-from app.translator.core.models.query_tokens.value import Value
 
 
 class ExtraConditionMixin:
-    def generate_extra_conditions(self, source_mapping: SourceMapping) -> list[Union[Value, Identifier]]:
+    def generate_extra_conditions(self, source_mapping: SourceMapping) -> list[QUERY_TOKEN_TYPE]:
         extra_tokens = []
         for field, value in source_mapping.conditions.items():
             extra_tokens.extend(
diff --git a/uncoder-core/app/translator/core/render.py b/uncoder-core/app/translator/core/render.py
@@ -41,7 +41,6 @@
 from app.translator.core.models.query_tokens.function_value import FunctionValue
 from app.translator.core.models.query_tokens.identifier import Identifier
 from app.translator.core.models.query_tokens.keyword import Keyword
-from app.translator.core.models.query_tokens.value import Value
 from app.translator.core.str_value_manager import StrValue, StrValueManager
 
 
@@ -404,7 +403,7 @@ def process_raw_log_field_prefix(self, field: str, source_mapping: SourceMapping
         if raw_log_field_type := source_mapping.raw_log_fields.get(field):
             return [self.process_raw_log_field(field=field, field_type=raw_log_field_type)]
 
-    def generate_extra_conditions(self, source_mapping: SourceMapping) -> list[Union[Value, Identifier]]:  # noqa: ARG002
+    def generate_extra_conditions(self, source_mapping: SourceMapping) -> list[QUERY_TOKEN_TYPE]:  # noqa: ARG002
         return []
 
     def generate_raw_log_fields(self, fields: list[Field], source_mapping: SourceMapping) -> str:
