gis-8825 cleaning

Author: nazargesyk

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

@@ -24,7 +24,7 @@
 from app.translator.core.exceptions.parser import TokenizerGeneralException
 from app.translator.core.functions import PlatformFunctions
 from app.translator.core.mapping import BasePlatformMappings, SourceMapping
-from app.translator.core.models.functions.base import Function, ParsedFunctions
+from app.translator.core.models.functions.base import Function
 from app.translator.core.models.platform_details import PlatformDetails
 from app.translator.core.models.query_container import RawQueryContainer, TokenizedQueryContainer
 from app.translator.core.models.query_tokens.field import Field
@@ -51,9 +51,6 @@ def parse_raw_query(self, text: str, language: str) -> RawQueryContainer:
     def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContainer:
         raise NotImplementedError("Abstract method")
 
-    def _parse_query(self, query: str) -> tuple[str, dict[str, Union[list[str], list[int]]], Optional[ParsedFunctions]]:
-        raise NotImplementedError("Abstract method")
-
 
 class PlatformQueryParser(QueryParser, ABC):
     mappings: BasePlatformMappings = None
@@ -91,8 +88,3 @@ def get_source_mappings(
         )
         self.tokenizer.set_field_tokens_generic_names_map(field_tokens, source_mappings, self.mappings.default_mapping)
         return source_mappings
-
-    def get_source_mapping_ids_by_logsources(self, query: str) -> Optional[list[str]]:
-        _, parsed_logsources, _ = self._parse_query(query=query)
-        if parsed_logsources:
-            return self.mappings.get_source_mappings_by_log_sources(parsed_logsources)

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

@@ -17,7 +17,7 @@
 """
 
 import re
-from typing import Optional, Union
+from typing import Union
 
 from app.translator.core.exceptions.parser import TokenizerGeneralException
 from app.translator.core.models.functions.base import ParsedFunctions
@@ -105,7 +105,7 @@ def __parse_log_sources(self, query: str) -> tuple[dict[str, Union[list[str], li
 
         return log_sources, query
 
-    def _parse_query(self, query: str) -> tuple[str, dict[str, Union[list[str], list[int]]], Optional[ParsedFunctions]]:
+    def _parse_query(self, text: str) -> tuple[str, dict[str, Union[list[str], list[int]]], ParsedFunctions]:
         query = self.__clean_query(query)
         self.__check_table(query)
         query, functions = self.platform_functions.parse(query)

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

@@ -17,9 +17,7 @@
 """
 
 import re
-from typing import Optional, Union
 
-from app.translator.core.models.functions.base import ParsedFunctions
 from app.translator.core.models.query_container import RawQueryContainer, TokenizedQueryContainer
 from app.translator.core.parser import PlatformQueryParser
 from app.translator.platforms.base.lucene.tokenizer import LuceneTokenizer
@@ -33,7 +31,7 @@ class LuceneQueryParser(PlatformQueryParser):
 
     wrapped_with_comment_pattern = r"^\s*//.*(?:\n|$)"
 
-    def _parse_query(self, query: str) -> tuple[str, dict[str, Union[list[str], list[int]]], Optional[ParsedFunctions]]:
+    def _parse_query(self, query: str) -> tuple[str, dict[str, list[str]]]:
         log_sources = {}
         for source_type in self.log_source_key_types:
             pattern = self.log_source_pattern.replace("___source_type___", source_type)
@@ -45,10 +43,10 @@ def _parse_query(self, query: str) -> tuple[str, dict[str, Union[list[str], list
                 pos_end = search.end()
                 query = query[:pos_start] + query[pos_end:]
 
-        return query, log_sources, None
+        return query, log_sources
 
     def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContainer:
-        query, log_sources, _ = self._parse_query(raw_query_container.query)
+        query, log_sources = self._parse_query(raw_query_container.query)
         query_tokens = self.get_query_tokens(query)
         query_field_tokens, _, _ = self.get_field_tokens(query_tokens)
         source_mappings = self.get_source_mappings(query_field_tokens, log_sources)

uncoder-core/app/translator/platforms/base/sql/parsers/sql.py

@@ -17,7 +17,6 @@
 """
 
 import re
-from typing import Optional, Union
 
 from app.translator.core.models.functions.base import ParsedFunctions
 from app.translator.core.models.query_container import RawQueryContainer, TokenizedQueryContainer
@@ -32,18 +31,18 @@ class SqlQueryParser(PlatformQueryParser):
 
     wrapped_with_comment_pattern = r"^\s*--.*(?:\n|$)"
 
-    def _parse_query(self, query: str) -> tuple[str, dict[str, Union[list[str], list[int]]], Optional[ParsedFunctions]]:
+    def _parse_query(self, query: str) -> tuple[str, dict[str, list[str]]]:
         log_source = {"table": []}
         if re.search(self.query_delimiter_pattern, query, flags=re.IGNORECASE):
             table_search = re.search(self.table_pattern, query)
             table = table_search.group("table")
             log_source["table"] = [table]
             return re.split(self.query_delimiter_pattern, query, flags=re.IGNORECASE)[1], log_source, None
 
-        return query, log_source, None
+        return query, log_source
 
     def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContainer:
-        query, log_sources, _ = self._parse_query(raw_query_container.query)
+        query, log_sources = self._parse_query(raw_query_container.query)
         query_tokens = self.get_query_tokens(query)
         query_field_tokens, _, _ = self.get_field_tokens(query_tokens)
         source_mappings = self.get_source_mappings(query_field_tokens, log_sources)

uncoder-core/app/translator/platforms/microsoft/parsers/microsoft_sentinel.py

@@ -16,7 +16,6 @@
 -----------------------------------------------------------------
 """
 
-from typing import Optional, Union
 
 from app.translator.core.models.functions.base import ParsedFunctions
 from app.translator.core.models.platform_details import PlatformDetails
@@ -38,7 +37,7 @@ class MicrosoftSentinelQueryParser(PlatformQueryParser):
 
     wrapped_with_comment_pattern = r"^\s*//.*(?:\n|$)"
 
-    def _parse_query(self, query: str) -> tuple[str, dict[str, Union[list[str], list[int]]], Optional[ParsedFunctions]]:
+    def _parse_query(self, query: str) -> tuple[str, dict[str, list[str]], ParsedFunctions]:
         table, query, functions = self.platform_functions.parse(query)
         log_sources = {"table": [table]}
         return query, log_sources, functions