[Dashboard] Get or create ancestors in add_histograms_queue

dashboard/dashboard/add_point_queue.py

 # Copyright 2015 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.
 
 """URL endpoint to add new graph data to the datastore."""
 
 import datetime
 import json
 import logging
 
@@ skipping 160 matching lines @@
 
   Raises:
     RuntimeError: Something went wrong when trying to get the parent test.
   """
   master_name = row_dict.get('master')
   bot_name = row_dict.get('bot')
   test_name = row_dict.get('test').strip('/')
   units = row_dict.get('units')
   higher_is_better = row_dict.get('higher_is_better')
   improvement_direction = _ImprovementDirection(higher_is_better)
-  internal_only = _BotInternalOnly(bot_name, bot_whitelist)
+  internal_only = BotInternalOnly(bot_name, bot_whitelist)
   benchmark_description = row_dict.get('benchmark_description')
 
-  parent_test = _GetOrCreateAncestors(
-      master_name, bot_name, test_name, units=units,
-      improvement_direction=improvement_direction,
-      internal_only=internal_only,
-      benchmark_description=benchmark_description)
+  parent_test = GetOrCreateAncestors(
+      master_name, bot_name, test_name, internal_only=internal_only,
+      benchmark_description=benchmark_description, units=units,
+      improvement_direction=improvement_direction)
 
   return parent_test
 
 
 def _ImprovementDirection(higher_is_better):
   """Returns an improvement direction (constant from alerts_data) or None."""
   if higher_is_better is None:
     return None
   return anomaly.UP if higher_is_better else anomaly.DOWN
 
 
-def _BotInternalOnly(bot_name, bot_whitelist):
+def BotInternalOnly(bot_name, bot_whitelist):
   """Checks whether a given bot name is internal-only.
 
   If a bot name is internal only, then new data for that bot should be marked
   as internal-only.
   """
   if not bot_whitelist:
     logging.warning(
         'No bot whitelist available. All data will be internal-only. If this '
         'is not intended, please add a bot whitelist using /edit_site_config.')
     return True
   return bot_name not in bot_whitelist
 
 
-def _GetOrCreateAncestors(
-    master_name, bot_name, test_name, units=None,
-    improvement_direction=None, internal_only=True, benchmark_description=''):
+def GetOrCreateAncestors(
+    master_name, bot_name, test_name, internal_only=True,
+    benchmark_description='', units=None, improvement_direction=None):
   """Gets or creates all parent Master, Bot, TestMetadata entities for a Row."""
 
   master_entity = _GetOrCreateMaster(master_name)
   _GetOrCreateBot(bot_name, master_entity.key, internal_only)
 
   # Add all ancestor tests to the datastore in order.
   ancestor_test_parts = test_name.split('/')
 
   test_path = '%s/%s' % (master_name, bot_name)
   suite = None
   for index, ancestor_test_name in enumerate(ancestor_test_parts):
     # Certain properties should only be updated if the TestMetadata is for a
     # leaf test.
     is_leaf_test = (index == len(ancestor_test_parts) - 1)
     test_properties = {
         'units': units if is_leaf_test else None,
-        'improvement_direction': (improvement_direction
-                                  if is_leaf_test else None),
         'internal_only': internal_only,
     }
+    if is_leaf_test and improvement_direction is not None:
+      test_properties['improvement_direction'] = improvement_direction
     ancestor_test = _GetOrCreateTest(
         ancestor_test_name, test_path, test_properties)
     if index == 0:
       suite = ancestor_test
     test_path = ancestor_test.test_path
   if benchmark_description and suite.description != benchmark_description:
     suite.description = benchmark_description
   return ancestor_test
 
 
@@ skipping 43 matching lines @@
     An entity (which has already been put).
 
   Raises:
     datastore_errors.BadRequestError: Something went wrong getting the entity.
   """
   test_path = '%s/%s' % (parent_test_path, name)
   existing = graph_data.TestMetadata.get_by_id(test_path)
 
   if not existing:
     # Add improvement direction if this is a new test.
-    if 'units' in properties:
+    if 'units' in properties and 'improvement_direction' not in properties:
       units = properties['units']
       direction = units_to_direction.GetImprovementDirection(units)
       properties['improvement_direction'] = direction
+    elif 'units' not in properties or properties['units'] is None:
+      properties['improvement_direction'] = anomaly.UNKNOWN
+    else:
+      print properties
     new_entity = graph_data.TestMetadata(id=test_path, **properties)
     new_entity.put()
     # TODO(sullivan): Consider putting back Test entity in a scoped down
     # form so we can check if it exists here.
     return new_entity
 
   # Flag indicating whether we want to re-put the entity before returning.
   properties_changed = False
 
   if existing.deprecated:
@@ skipping 32 matching lines @@
 
   if properties_changed:
     existing.put()
   return existing
 
 
 def _IsRefBuild(test_key):
   """Checks whether a TestMetadata is for a reference build test run."""
   test_parts = test_key.id().split('/')
   return test_parts[-1] == 'ref' or test_parts[-1].endswith('_ref')