Add fallback and rebuild

Author: jinyan-li1

src/safety_report_generator.py

@@ -197,9 +197,16 @@ def run_safety_check_in_cb_context(self):
 
         :return: string, A JSON formatted string containing vulnerabilities found in the container
         """
-        from dlc.safety_check import SafetyCheck
-
-        return SafetyCheck().run_safety_check_on_container(self.docker_exec_cmd)
+        try:
+            from dlc.safety_check import SafetyCheck
+            result = SafetyCheck().run_safety_check_on_container(self.docker_exec_cmd)
+            if not result or not result.strip():
+                print("DEBUG: SafetyCheck returned empty result, using fallback")
+                return self.run_safety_check_in_non_cb_context()
+            return result
+        except Exception as e:
+            print(f"DEBUG: SafetyCheck failed: {e}, using fallback")
+            return self.run_safety_check_in_non_cb_context()
 
     def generate(self):
         """
@@ -209,15 +216,28 @@ def generate(self):
         :return: list[dict], the output follows the same format as mentioned in the description of the class
         """
         self.timestamp = datetime.now().strftime("%d-%m-%Y")
+        
+        safety_version_cmd = f"{self.docker_exec_cmd} safety --version"
+        try:
+            version_output = self.ctx.run(safety_version_cmd, hide=True, warn=True)
+            print(f"DEBUG: Safety version: {version_output.stdout.strip()}")
+        except:
+            print("DEBUG: Failed to get safety version")
+        
         if os.getenv("IS_CODEBUILD_IMAGE") is None:
             self.safety_check_output = self.run_safety_check_in_non_cb_context()
         elif os.getenv("IS_CODEBUILD_IMAGE").upper() == "TRUE":
             self.safety_check_output = self.run_safety_check_in_cb_context()
+        
+        print(f"DEBUG: safety_check_output is None: {self.safety_check_output is None}")
+        print(f"DEBUG: safety_check_output length: {len(self.safety_check_output) if self.safety_check_output else 0}")
+        print(f"DEBUG: safety_check_output content: {repr(self.safety_check_output)}")
+
         # In case of errors, json.loads command will fail. We want the failure to occur to ensure that
         # build process fails in case the safety report cannot be generated properly.
         scanned_vulnerabilities = json.loads(self.safety_check_output)
         self.insert_vulnerabilites_into_report(scanned_vulnerabilities)
         packages = self.get_package_set_from_container()
         self.insert_safe_packages_into_report(packages)
         self.process_report()
-        return self.vulnerability_list
+        return self.vulnerability_list