Rename log_requests.py to request_factory.py, fix sonar warnings

app/commons/esclient.py

@@ -25,7 +25,7 @@
 from urllib3.exceptions import InsecureRequestWarning
 
 from app.amqp.amqp import AmqpClient
-from app.commons import logging, log_requests, log_merger
+from app.commons import logging, request_factory, log_merger
 from app.commons.model.launch_objects import ApplicationConfig, Response, Launch, TestItem, BulkResponse
 from app.commons.model.ml import TrainInfo, ModelType
 from app.utils import utils, text_processing

app/commons/log_requests.py → app/commons/request_factory.py

@@ -12,13 +12,16 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+"""This module contains functions for preparing requests to Vector DB such as Elasticsearch and OpenSearch."""
+
 from datetime import datetime
 from typing import Any
 
 from app.commons.model.launch_objects import Launch, TestItem, Log, TestItemInfo
 from app.commons.prepared_log import PreparedLogMessage, PreparedLogMessageClustering
 from app.utils import utils, text_processing
 from app.utils.log_preparation import clean_message
+from utils.utils import compute_if_absent
 
 
 def create_log_template() -> dict:
@@ -66,7 +69,7 @@ def transform_issue_type_into_lowercase(issue_type):
 
 def _fill_launch_test_item_fields(log_template: dict, launch: Launch, test_item: TestItem, project: str):
     log_template['_index'] = project
-    source = log_template['_source']
+    source = compute_if_absent(log_template, '_source', {})
     source["launch_id"] = launch.launchId
     source["launch_name"] = launch.launchName
     source["launch_number"] = getattr(launch, 'launchNumber', 0)
@@ -83,7 +86,7 @@ def _fill_launch_test_item_fields(log_template: dict, launch: Launch, test_item:
 
 def _fill_common_fields(log_template: dict, log: Log, prepared_log: PreparedLogMessage) -> None:
     log_template['_id'] = log.logId
-    source = log_template['_source']
+    source = compute_if_absent(log_template, '_source', {})
     source['cluster_id'] = str(log.clusterId)
     source['cluster_message'] = log.clusterMessage
     source['log_level'] = log.logLevel
@@ -101,7 +104,7 @@ def _fill_common_fields(log_template: dict, log: Log, prepared_log: PreparedLogM
 def _fill_log_fields(log_template: dict, log: Log, number_of_lines: int) -> dict[str, Any]:
     prepared_log = PreparedLogMessage(log.message, number_of_lines)
     _fill_common_fields(log_template, log, prepared_log)
-    source = log_template['_source']
+    source = compute_if_absent(log_template, '_source', {})
     source["detected_message"] = prepared_log.exception_message_no_numbers
     source["detected_message_with_numbers"] = prepared_log.exception_message
     source["log_time"] = datetime(*log.logTime[:6]).strftime("%Y-%m-%d %H:%M:%S")
@@ -145,7 +148,7 @@ def prepare_log(launch: Launch, test_item: TestItem, log: Log, project: str) ->
 
 def _fill_test_item_info_fields(log_template: dict, test_item_info: TestItemInfo, project: str) -> dict[str, Any]:
     log_template["_index"] = project
-    source = log_template['_source']
+    source = compute_if_absent(log_template, '_source', {})
     source["launch_id"] = test_item_info.launchId
     source["launch_name"] = test_item_info.launchName
     source["launch_number"] = getattr(test_item_info, 'launchNumber', 0)

app/service/auto_analyzer_service.py

@@ -19,7 +19,7 @@
 from time import time, sleep
 
 from app.amqp.amqp import AmqpClient
-from app.commons import logging, log_requests, object_saving, log_merger
+from app.commons import logging, request_factory, object_saving, log_merger
 from app.commons.esclient import EsClient
 from app.commons.model.launch_objects import AnalysisResult, BatchLogInfo, AnalysisCandidate, SuggestAnalysisResult, \
     SearchConfig, ApplicationConfig, Launch

app/service/cluster_service.py

@@ -23,7 +23,7 @@
 from sklearn.feature_extraction.text import CountVectorizer
 
 from app.amqp.amqp import AmqpClient
-from app.commons import clusterizer, logging, log_requests, log_merger
+from app.commons import clusterizer, logging, request_factory, log_merger
 from app.commons.esclient import EsClient
 from app.commons.model.launch_objects import (ClusterResult, ClusterInfo, SearchConfig, ApplicationConfig,
                                               LaunchInfoForClustering)

app/service/namespace_finder_service.py

@@ -14,7 +14,7 @@
 
 from time import time
 
-from app.commons import logging, namespace_finder, log_requests
+from app.commons import logging, namespace_finder, request_factory
 from app.commons.model.launch_objects import ApplicationConfig, Launch
 from app.utils import utils
 

app/service/search_service.py

@@ -17,7 +17,7 @@
 import elasticsearch
 import elasticsearch.helpers
 
-from app.commons import logging, similarity_calculator, object_saving, log_requests, log_merger
+from app.commons import logging, similarity_calculator, object_saving, request_factory, log_merger
 from app.commons.esclient import EsClient
 from app.commons.model.launch_objects import SearchLogInfo, Log, SearchConfig, ApplicationConfig
 from app.machine_learning.models.weighted_similarity_calculator import WeightedSimilarityCalculator

app/service/suggest_service.py

@@ -20,7 +20,7 @@
 import elasticsearch.helpers
 
 from app.amqp.amqp import AmqpClient
-from app.commons import logging, similarity_calculator, object_saving, log_requests, log_merger
+from app.commons import logging, similarity_calculator, object_saving, request_factory, log_merger
 from app.commons.esclient import EsClient
 from app.commons.model.launch_objects import SuggestAnalysisResult, SearchConfig, ApplicationConfig, TestItemInfo, \
     AnalyzerConf

app/utils/utils.py

@@ -350,3 +350,13 @@ def create_path(query: dict, path: tuple[str, ...], value: Any) -> Any:
     if last_element not in current_node:
         current_node[last_element] = value
     return current_node[last_element]
+
+
+def compute_if_absent(on: dict[str, Any], key: str, default_value: Any) -> Any:
+    """Compute value for key in dictionary if it is absent.
+
+    It is here just to mute SonarLint warning about possible KeyError.
+    """
+    if key not in on:
+        on[key] = default_value
+    return on[key]