fixes

nazargesyk · nazargesyk · commit ed36ada8013d · 2025-01-08T12:03:21.000+02:00
diff --git a/uncoder-core/app/translator/core/mapping.py b/uncoder-core/app/translator/core/mapping.py
@@ -121,7 +121,7 @@ def update_default_source_mapping(self, default_mapping: SourceMapping, fields_m
 
     def prepare_alternative_mapping(self, platform_dir: str) -> dict[str, dict[str, SourceMapping]]:
         alternative_mappings = {}
-        for name, platform_dir in self._loader.get_platform_alternative_mappings(platform_dir).items():
+        for name, platform_dir in self._loader.get_platform_alternative_mappings_dirs(platform_dir).items():
             alternative_mappings[name] = self.prepare_mapping(platform_dir)
         return alternative_mappings
 
@@ -170,10 +170,18 @@ def prepare_log_source_signature(self, mapping: dict) -> LogSourceSignature:
 
     def get_source_mappings_by_fields_and_log_sources(
         self, field_names: list[str], log_sources: dict[str, list[Union[int, str]]]
+    ) -> list[SourceMapping]:
+        return self._get_source_mappings_by_fields_and_log_sources(field_names, log_sources, self._source_mappings)
+
+    def _get_source_mappings_by_fields_and_log_sources(
+        self,
+        field_names: list[str],
+        log_sources: dict[str, list[Union[int, str]]],
+        source_mapping: dict[str, SourceMapping],
     ) -> list[SourceMapping]:
         by_log_sources_and_fields = []
         by_fields = []
-        for source_mapping in self._source_mappings.values():
+        for source_mapping in source_mapping.values():
             if source_mapping.source_id == DEFAULT_MAPPING_NAME:
                 continue
 
@@ -184,28 +192,13 @@ def get_source_mappings_by_fields_and_log_sources(
                 if log_source_signature and log_source_signature.is_suitable(**log_sources):
                     by_log_sources_and_fields.append(source_mapping)
 
-        return by_log_sources_and_fields or by_fields or [self._source_mappings[DEFAULT_MAPPING_NAME]]
+        return by_log_sources_and_fields or by_fields or [source_mapping[DEFAULT_MAPPING_NAME]]
 
     def get_alt_source_mappings_by_fields_and_log_sources(
         self, field_names: list[str], log_sources: dict[str, list[Union[int, str]]], alt_mapping: str
     ) -> list[SourceMapping]:
-        by_log_sources_and_fields = []
-        by_fields = []
-        for source_mapping in self._alternative_mappings.get(alt_mapping, {}).values():
-            if source_mapping.source_id == DEFAULT_MAPPING_NAME:
-                continue
-
-            if source_mapping.fields_mapping.is_suitable(field_names):
-                by_fields.append(source_mapping)
-
-                log_source_signature: LogSourceSignature = source_mapping.log_source_signature
-                if log_source_signature and log_source_signature.is_suitable(**log_sources):
-                    by_log_sources_and_fields.append(source_mapping)
-
-        return (
-            by_log_sources_and_fields
-            or by_fields
-            or [self._alternative_mappings.get(alt_mapping)[DEFAULT_MAPPING_NAME]]
+        return self._get_source_mappings_by_fields_and_log_sources(
+            field_names, log_sources, self._alternative_mappings.get(alt_mapping, {})
         )
 
     def get_source_mapping(self, source_id: str) -> Optional[SourceMapping]:
diff --git a/uncoder-core/app/translator/mappings/utils/load_from_files.py b/uncoder-core/app/translator/mappings/utils/load_from_files.py
@@ -22,7 +22,7 @@ def load_mapping(mapping_file_path: str) -> dict:
                 print(err)
                 return {}
 
-    def get_platform_alternative_mappings(self, platform_dir: str) -> dict[str:str]:
+    def get_platform_alternative_mappings_dirs(self, platform_dir: str) -> dict[str:str]:
         platform_path = os.path.join(self.base_mapping_filepath, platform_dir, ALTERNATIVE_MAPPINGS_FOLDER_NAME)
         for _, dirs, _ in os.walk(platform_path):
             result = {}
diff --git a/uncoder-core/app/translator/platforms/microsoft/parsers/microsoft_sentinel.py b/uncoder-core/app/translator/platforms/microsoft/parsers/microsoft_sentinel.py
@@ -50,9 +50,9 @@ def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContain
             query_tokens, functions.functions
         )
         source_mappings = self.get_source_mappings(
-            field_tokens = query_field_tokens + function_field_tokens,
+            field_tokens=query_field_tokens + function_field_tokens,
             log_sources=log_sources,
-            alt_mapping=raw_query_container.meta_info.source_alt_mapping
+            alt_mapping=raw_query_container.meta_info.source_alt_mapping,
         )
         meta_info = raw_query_container.meta_info
         meta_info.query_fields = query_field_tokens

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ def parse(self, raw_query_container: RawQueryContainer) -> TokenizedQueryContain`
`50`	`50`	`query_tokens, functions.functions`
`51`	`51`	`)`
`52`	`52`	`source_mappings = self.get_source_mappings(`
`53`		`- field_tokens = query_field_tokens + function_field_tokens,`
	`53`	`+ field_tokens=query_field_tokens + function_field_tokens,`
`54`	`54`	`log_sources=log_sources,`
`55`		`- alt_mapping=raw_query_container.meta_info.source_alt_mapping`
	`55`	`+ alt_mapping=raw_query_container.meta_info.source_alt_mapping,`
`56`	`56`	`)`
`57`	`57`	`meta_info = raw_query_container.meta_info`
`58`	`58`	`meta_info.query_fields = query_field_tokens`