build fixes

demisto · Jul 9, 2024 · df9038b · df9038b
1 parent c7498f7
commit df9038b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Packs/Base/Scripts/DBotBuildPhishingClassifier/DBotBuildPhishingClassifier.yml b/Packs/Base/Scripts/DBotBuildPhishingClassifier/DBotBuildPhishingClassifier.yml
@@ -83,7 +83,7 @@ tags:
 - ml
 timeout: 12µs
 type: python
-dockerimage: demisto/python3:3.10.14.101217
+dockerimage: demisto/python3:3.11.9.101916
 tests:
 - Create Phishing Classifier V2 ML Test
 - DBotCreatePhishingClassifierV2FromFile-Test

diff --git a/Packs/Base/Scripts/DBotPredictPhishingWords/DBotPredictPhishingWords.py b/Packs/Base/Scripts/DBotPredictPhishingWords/DBotPredictPhishingWords.py
@@ -14,6 +14,7 @@
     "\nThe class this function is called from is 'DistilBertTokenizer'.\n"
 )
 
+
 class StderrRedirect:
     '''Context manager to redirect stderr.'''
     temp_stderr: Any
@@ -41,7 +42,7 @@ def OrderedSet(iterable):
     return list(dict.fromkeys(iterable))
 
 
-def get_model_data(model_name: str, store_type: str, is_return_error: bool) -> None | tuple[dict, str]:
+def get_model_data(model_name: str, store_type: str, is_return_error: bool) -> tuple[dict, str]:
 
     def load_from_models(model_name: str) -> None | tuple[dict, str]:
         res_model = demisto.executeCommand("getMLModel", {"modelName": model_name})
@@ -61,10 +62,10 @@ def load_from_list(model_name):
 
     if store_type == "mlModel":
         res = load_from_models(model_name) or load_from_list(model_name)
-    if store_type == "list":
+    elif store_type == "list":
         res = load_from_list(model_name) or load_from_models(model_name)
 
-    return res or handle_error(f"error reading model {model_name} from Demisto", is_return_error)
+    return res or handle_error(f"error reading model {model_name} from Demisto", is_return_error)  # type: ignore
 
 
 def handle_error(message, is_return_error):

diff --git a/...Words/dbot_predict_phishing_words_test.py → ...ingWords/DBotPredictPhishingWords_test.py b/...Words/dbot_predict_phishing_words_test.py → ...ingWords/DBotPredictPhishingWords_test.py
diff --git a/Packs/ML/Scripts/EvaluateMLModllAtProduction/EvaluateMLModllAtProduction.py b/Packs/ML/Scripts/EvaluateMLModllAtProduction/EvaluateMLModllAtProduction.py
@@ -107,8 +107,8 @@ def main(incident_types, incident_query, y_true_field, y_pred_field, y_pred_prob
     if is_error(incidents_query_res):
         return_error(get_error(incidents_query_res))
     incidents = json.loads(incidents_query_res[0]['Contents'])
-    demisto.results(f'Found {len(incidents)} incidents')
     if incidents:
+        demisto.results(f'Found {len(incidents)} incident(s)')
         y_true = []
         y_pred = []
         y_pred_prob = []
@@ -143,6 +143,8 @@ def main(incident_types, incident_query, y_true_field, y_pred_field, y_pred_prob
                                     context_field='EvaluateMLModllAtProductionNoThresh',
                                     human_readable_title=human_readable)
         return_file_result_with_predictions_on_test_set(incidents, y_true, y_pred, y_pred_prob, additional_fields)
+    else:
+        return_results('No incidents found.')
 
 
 model_target_accuracy = demisto.args().get('modelTargetAccuracy', 0)

diff --git a/Tests/conf.json b/Tests/conf.json
@@ -5933,7 +5933,6 @@
         "ThreatGrid_v2_Test": "No instance, developed by Qmasters",
         "Test-Detonate URL - ThreatGrid": "No instance, developed by Qmasters",
         "awake_security_test_pb": "No instance, CRTX-77572",
-        "Create Phishing Classifier V2 ML Test": "Updated docker image lacks data for the ml model. Once data issue is solved for ml module can un skip. ",
         "SumoLogic-Test": "401 unauthorized, CIAC-6334",
         "EWS_O365_test": "Issue CIAC-6753",
         "Microsoft Defender Advanced Threat Protection - Test dev": "Issue CIAC-7514",