[Findit] Modify Findit API to return more information to Sheriff-O-Matic.

appengine/findit/handlers/build_failure.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from collections import defaultdict
 import copy
 from datetime import datetime
 
 from google.appengine.api import users
 
 from common import constants
 from common.base_handler import BaseHandler
 from common.base_handler import Permission
 from common.waterfall import failure_type
 from handlers import handlers_util
 from handlers import result_status
 from handlers.result_status import NO_TRY_JOB_REASON_MAP
-from model import analysis_approach_type
 from model import analysis_status
 from model import result_status as analysis_result_status
 from model import suspected_cl_status
 from model.result_status import RESULT_STATUS_TO_DESCRIPTION
 from model.suspected_cl_confidence import SuspectedCLConfidence
 from model.suspected_cl_status import CL_STATUS_TO_DESCRIPTION
 from model.wf_analysis import WfAnalysis
 from model.wf_suspected_cl import WfSuspectedCL
 from model.wf_try_job import WfTryJob
 from waterfall import build_failure_analysis_pipelines
 from waterfall import build_util
 from waterfall import buildbot
+from waterfall import suspected_cl_util
 from waterfall import waterfall_config
 
 
 NON_SWARMING = object()
 
 
 _ANALYSIS_CL_STATUS_MAP = {
     analysis_result_status.FOUND_CORRECT: suspected_cl_status.CORRECT,
     analysis_result_status.FOUND_INCORRECT: suspected_cl_status.INCORRECT
 }
 
 
 def _FormatDatetime(dt):
   if not dt:
     return None
   else:
     return dt.strftime('%Y-%m-%d %H:%M:%S UTC')
 
 
 def _GetCLDict(analysis, cl_info):
   if not cl_info:
     return {}
 
-  cl_keys = cl_info.split('/')
+  cl_keys = suspected_cl_util.GetCLInfo(cl_info)
   repo_name = cl_keys[0]
   revision = cl_keys[1]
   for cl in analysis.suspected_cls:
     if cl['repo_name'] == repo_name and cl['revision'] == revision:
       return cl
   return {}
 
 
 def _GetTriageHistory(analysis):
   if (not users.is_current_user_admin() or
@@ skipping 259 matching lines @@
     compile_failure = None
     for failure in analysis.result.get('failures', []):
       if failure['step_name'] == constants.COMPILE_STEP_NAME:
         compile_failure = failure
     if compile_failure:  # pragma: no branch.
       data['first_failure'] = compile_failure['first_failure']
       data['last_pass'] = compile_failure['last_pass']
       data['suspected_cls_by_heuristic'] = compile_failure['suspected_cls']
 
 
-def _PercentFormat(float_number):
-  if not float_number or not isinstance(float_number, float):
-    return None
-  return '%d%%' % (round(float_number * 100))
-
-
-def _GetConfidenceScore(confidence, cl_build):
-
-  if not confidence:
-    return None
-
-  if cl_build['failure_type'] == failure_type.COMPILE:
-    if cl_build['approaches'] == [
-        analysis_approach_type.HEURISTIC, analysis_approach_type.TRY_JOB]:
-      return _PercentFormat(confidence.compile_heuristic_try_job.confidence)
-    elif cl_build['approaches'] == [analysis_approach_type.TRY_JOB]:
-      return _PercentFormat(confidence.compile_try_job.confidence)
-    elif (cl_build['approaches'] == [analysis_approach_type.HEURISTIC] and
-          cl_build['top_score']):
-      for confidence_info in confidence.compile_heuristic:
-        if confidence_info.score == cl_build['top_score']:
-          return _PercentFormat(confidence_info.confidence)
-    return None
-  else:
-    if cl_build['approaches'] == [
-        analysis_approach_type.HEURISTIC, analysis_approach_type.TRY_JOB]:
-      return _PercentFormat(confidence.test_heuristic_try_job.confidence)
-    elif cl_build['approaches'] == [analysis_approach_type.TRY_JOB]:
-      return _PercentFormat(confidence.test_try_job.confidence)
-    elif (cl_build['approaches'] == [analysis_approach_type.HEURISTIC] and
-          cl_build['top_score']):
-      for confidence_info in confidence.test_heuristic:
-        if confidence_info.score == cl_build['top_score']:
-          return _PercentFormat(confidence_info.confidence)
-    return None
-
-
 def _GetAllSuspectedCLsAndCheckStatus(
     master_name, builder_name, build_number, analysis):
   build_key = build_util.CreateBuildId(
       master_name, builder_name, build_number)
   suspected_cls = copy.deepcopy(analysis.suspected_cls)
   if not suspected_cls:
     return []
 
-  cl_confidences = SuspectedCLConfidence.Get()
+  confidences = SuspectedCLConfidence.Get()
 
   for cl in suspected_cls:
     cl['status'] = _ANALYSIS_CL_STATUS_MAP.get(analysis.result_status, None)
     cl['confidence'] = None
 
     suspected_cl = WfSuspectedCL.Get(cl['repo_name'], cl['revision'])
     if not suspected_cl:
       continue
 
     build = suspected_cl.builds.get(build_key)
     if build:
       cl['status'] = build['status']
-      cl['confidence'] = _GetConfidenceScore(cl_confidences, build)
+      cl['confidence'] = '%d%%' % (
+          suspected_cl_util.GetSuspectedCLConfidenceScore(confidences, build))
 
   return suspected_cls
 
 
 class BuildFailure(BaseHandler):
   PERMISSION_LEVEL = Permission.ANYONE
 
   def _ShowTriageHelpButton(self):
     return users.is_current_user_admin()
 
@@ skipping 95 matching lines @@
     else:
       self._PrepareDataForTestFailures(
         analysis, build_info, data, self._ShowDebugInfo())
       return {
         'template': 'waterfall/test_failure.html',
         'data': data
       }
 
   def HandlePost(self):  # pragma: no cover
     return self.HandleGet()