Improve query bild

Author: saltar-ua

uncoder-core/app/translator/core/render.py

@@ -21,7 +21,6 @@
 from typing import Optional, Union
 
 from app.translator.const import DEFAULT_VALUE_TYPE
-from app.translator.core.context_vars import return_only_first_query_ctx_var
 from app.translator.core.custom_types.tokens import LogicalOperatorType, OperatorType
 from app.translator.core.custom_types.values import ValueType
 from app.translator.core.escape_manager import EscapeManager
@@ -192,8 +191,8 @@ class PlatformQueryRender(QueryRender):
 
     field_value_map = BaseQueryFieldValue(or_token=or_token)
 
-    query_pattern = "{table} {query} {functions}"
-    raw_log_field_pattern_map: dict = None
+    query_pattern = "{prefix}{query}{functions}"
+    raw_log_field_pattern: str = None
 
     def __init__(self):
         self.operator_map = {
@@ -202,6 +201,12 @@ def __init__(self):
             LogicalOperatorType.NOT: f" {self.not_token} ",
         }
 
+    def query_concatenation(self, prefix: str, search: str, functions: str) -> str:
+        prefix = prefix if prefix else ""
+        search = f" {search}" if search else ""
+        functions = f" {functions}" if functions else ""
+        return self.query_pattern.format(prefix=prefix, query=search, functions=functions).strip()
+
     def generate_prefix(self, log_source_signature: LogSourceSignature, functions_prefix: str = "") -> str:  # noqa: ARG002
         if str(log_source_signature):
             return f"{log_source_signature!s} {self.and_token}"
@@ -283,8 +288,7 @@ def finalize_query(
         *args,  # noqa: ARG002
         **kwargs,  # noqa: ARG002
     ) -> str:
-        query = self.query_pattern.format(prefix=prefix, query=query, functions=functions).strip()
-
+        query = self.query_concatenation(prefix=prefix, search=query, functions=functions)
         query = self.wrap_query_with_meta_info(meta_info=meta_info, query=query)
         if not_supported_functions:
             rendered_not_supported = self.render_not_supported_functions(not_supported_functions)
@@ -325,23 +329,7 @@ def _generate_from_raw_query_container(self, query_container: RawQueryContainer)
             prefix="", query=query_container.query, functions="", meta_info=query_container.meta_info
         )
 
-    def process_raw_log_field(self, field: str, field_type: str) -> Optional[str]:
-        if raw_log_field_pattern := self.raw_log_field_pattern_map.get(field_type):
-            return raw_log_field_pattern.pattern.format(field=field)
-
-    def process_raw_log_field_prefix(self, field: str, source_mapping: SourceMapping) -> Optional[list]:
-        if isinstance(field, list):
-            list_of_prefix = []
-            for f in field:
-                if prepared_prefix := self.process_raw_log_field_prefix(field=f, source_mapping=source_mapping):
-                    list_of_prefix.extend(prepared_prefix)
-            return list_of_prefix
-        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_raw_log_fields(self, fields: list[Field], source_mapping: SourceMapping) -> str:
-        if self.raw_log_field_pattern_map is None:
-            return ""
         defined_raw_log_fields = []
         for field in fields:
             mapped_field = source_mapping.fields_mapping.get_platform_field_name(generic_field_name=field.source_name)
@@ -352,8 +340,10 @@ def generate_raw_log_fields(self, fields: list[Field], source_mapping: SourceMap
                 )
             if not mapped_field and self.is_strict_mapping:
                 raise StrictPlatformException(field_name=field.source_name, platform_name=self.details.name)
-            if field_prefix := self.process_raw_log_field_prefix(field=mapped_field, source_mapping=source_mapping):
-                defined_raw_log_fields.extend(field_prefix)
+            if mapped_field not in source_mapping.raw_log_fields:
+                continue
+            field_prefix = self.raw_log_field_pattern.format(field=mapped_field)
+            defined_raw_log_fields.append(field_prefix)
         return "\n".join(set(defined_raw_log_fields))
 
     def _generate_from_tokenized_query_container(self, query_container: TokenizedQueryContainer) -> str:
@@ -384,8 +374,6 @@ def _generate_from_tokenized_query_container(self, query_container: TokenizedQue
                     meta_info=query_container.meta_info,
                     source_mapping=source_mapping,
                 )
-                if return_only_first_query_ctx_var.get() is True:
-                    return finalized_query
                 queries_map[source_mapping.source_id] = finalized_query
         if not queries_map and errors:
             raise errors[0]

uncoder-core/app/translator/platforms/athena/renders/athena.py

@@ -35,6 +35,6 @@ class AthenaQueryRender(SqlQueryRender):
     or_token = "OR"
 
     field_value_map = AthenaFieldValue(or_token=or_token)
-    query_pattern = "{prefix} WHERE {query} {functions}"
+    query_pattern = "{prefix} WHERE{query}{functions}"
     comment_symbol = "--"
     is_single_line_comment = True

uncoder-core/app/translator/platforms/base/aql/renders/aql.py

@@ -127,7 +127,7 @@ class AQLQueryRender(PlatformQueryRender):
     not_token = "NOT"
 
     field_value_map = AQLFieldValue(or_token=or_token)
-    query_pattern = "{prefix} AND {query} {functions}"
+    query_pattern = "{prefix} AND{query}{functions}"
 
     def generate_prefix(self, log_source_signature: AQLLogSourceSignature, functions_prefix: str = "") -> str:  # noqa: ARG002
         table = str(log_source_signature)

uncoder-core/app/translator/platforms/base/lucene/renders/lucene.py

@@ -106,7 +106,7 @@ class LuceneQueryRender(PlatformQueryRender):
     and_token = "AND"
     not_token = "NOT"
 
-    query_pattern = "{query} {functions}"
+    query_pattern = "{query}{functions}"
 
     comment_symbol = "//"
     is_single_line_comment = True