Add ability to output ImageBaseGSUrl to render_picture and use in rebaseline server

gm/rebaseline_server/compare_rendered_pictures.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Compare results of two render_pictures runs.
 
@@ skipping 250 matching lines @@
           (dict_num, num_union_dict_paths, dict_path))
 
       dictA = self.get_default(setA_dicts, None, dict_path)
       self._validate_dict_version(dictA)
       dictA_results = self.get_default(dictA, {}, setA_section)
 
       dictB = self.get_default(setB_dicts, None, dict_path)
       self._validate_dict_version(dictB)
       dictB_results = self.get_default(dictB, {}, setB_section)
 
+      image_A_base_url = self.get_default(
+          setA_dicts, self._image_base_gs_url, dict_path,
+          gm_json.JSONKEY_IMAGE_BASE_GS_URL)
+      image_B_base_url = self.get_default(
+          setB_dicts, self._image_base_gs_url, dict_path,
+          gm_json.JSONKEY_IMAGE_BASE_GS_URL)
+
       # get the builders and render modes for each set
-      builder_A     = self.get_default(dictA, None, 
-                        gm_json.JSONKEY_DESCRIPTIONS, 
+      builder_A     = self.get_default(dictA, None,
+                        gm_json.JSONKEY_DESCRIPTIONS,
                         gm_json.JSONKEY_DESCRIPTIONS_BUILDER)
-      render_mode_A = self.get_default(dictA, None, 
-                        gm_json.JSONKEY_DESCRIPTIONS, 
+      render_mode_A = self.get_default(dictA, None,
+                        gm_json.JSONKEY_DESCRIPTIONS,
                         gm_json.JSONKEY_DESCRIPTIONS_RENDER_MODE)
-      builder_B     = self.get_default(dictB, None, 
-                        gm_json.JSONKEY_DESCRIPTIONS, 
+      builder_B     = self.get_default(dictB, None,
+                        gm_json.JSONKEY_DESCRIPTIONS,
                         gm_json.JSONKEY_DESCRIPTIONS_BUILDER)
-      render_mode_B = self.get_default(dictB, None, 
-                        gm_json.JSONKEY_DESCRIPTIONS, 
+      render_mode_B = self.get_default(dictB, None,
+                        gm_json.JSONKEY_DESCRIPTIONS,
                         gm_json.JSONKEY_DESCRIPTIONS_RENDER_MODE)
 
       skp_names = sorted(set(dictA_results.keys() + dictB_results.keys()))
       # Just for manual testing... truncate to an arbitrary subset.
       if self.truncate_results:
         skp_names = skp_names[1:3]
       for skp_name in skp_names:
         imagepairs_for_this_skp = []
 
         whole_image_A = self.get_default(
             dictA_results, None,
             skp_name, gm_json.JSONKEY_SOURCE_WHOLEIMAGE)
         whole_image_B = self.get_default(
             dictB_results, None,
             skp_name, gm_json.JSONKEY_SOURCE_WHOLEIMAGE)
+
         imagepairs_for_this_skp.append(self._create_image_pair(
             image_dict_A=whole_image_A, image_dict_B=whole_image_B,
+            image_A_base_url=image_A_base_url,
+            image_B_base_url=image_B_base_url,
             builder_A=builder_A, render_mode_A=render_mode_A,
             builder_B=builder_B, render_mode_B=render_mode_B,
             source_json_file=dict_path,
             source_skp_name=skp_name, tilenum=None))
 
         tiled_images_A = self.get_default(
             dictA_results, [],
             skp_name, gm_json.JSONKEY_SOURCE_TILEDIMAGES)
         tiled_images_B = self.get_default(
             dictB_results, [],
             skp_name, gm_json.JSONKEY_SOURCE_TILEDIMAGES)
         if tiled_images_A or tiled_images_B:
           num_tiles_A = len(tiled_images_A)
           num_tiles_B = len(tiled_images_B)
           num_tiles = max(num_tiles_A, num_tiles_B)
           for tile_num in range(num_tiles):
             imagepairs_for_this_skp.append(self._create_image_pair(
                 image_dict_A=(tiled_images_A[tile_num]
                               if tile_num < num_tiles_A else None),
                 image_dict_B=(tiled_images_B[tile_num]
                               if tile_num < num_tiles_B else None),
+                image_A_base_url=image_A_base_url,
+                image_B_base_url=image_B_base_url,
                 builder_A=builder_A, render_mode_A=render_mode_A,
                 builder_B=builder_B, render_mode_B=render_mode_B,
                 source_json_file=dict_path,
                 source_skp_name=skp_name, tilenum=tile_num))
 
         for one_imagepair in imagepairs_for_this_skp:
           if one_imagepair:
             all_image_pairs.add_image_pair(one_imagepair)
             result_type = one_imagepair.extra_columns_dict\
                 [COLUMN__RESULT_TYPE]
@@ skipping 30 matching lines @@
     header = result_dict[gm_json.JSONKEY_HEADER]
     header_type = header[gm_json.JSONKEY_HEADER_TYPE]
     if header_type != expected_header_type:
       raise Exception('expected header_type "%s", but got "%s"' % (
           expected_header_type, header_type))
     header_revision = header[gm_json.JSONKEY_HEADER_REVISION]
     if header_revision != expected_header_revision:
       raise Exception('expected header_revision %d, but got %d' % (
           expected_header_revision, header_revision))
 
-  def _create_image_pair(self, image_dict_A, image_dict_B, 
-                         builder_A, render_mode_A, 
+  def _create_image_pair(self, image_dict_A, image_dict_B,
+                         image_A_base_url, image_B_base_url,
+                         builder_A, render_mode_A,
                          builder_B, render_mode_B,
                          source_json_file,
                          source_skp_name, tilenum):
     """Creates an ImagePair object for this pair of images.
 
     Args:
       image_dict_A: dict with JSONKEY_IMAGE_* keys, or None if no image
       image_dict_B: dict with JSONKEY_IMAGE_* keys, or None if no image
+      image_A_base_url: base URL for image A
+      image_B_base_url: base URL for image B
       builder_A: builder that created image set A or None if unknow
-      render_mode_A: render mode used to generate image set A or None if 
+      render_mode_A: render mode used to generate image set A or None if
                      unknown.
       builder_B: builder that created image set A or None if unknow
-      render_mode_B: render mode used to generate image set A or None if 
+      render_mode_B: render mode used to generate image set A or None if
                      unknown.
       source_json_file: string; relative path of the JSON file where this
                         result came from, within setA and setB.
       source_skp_name: string; name of the source SKP file
       tilenum: which tile, or None if a wholeimage
 
     Returns:
       An ImagePair object, or None if both image_dict_A and image_dict_B are
       None.
     """
@@ skipping 33 matching lines @@
     if tilenum == None:
       extra_columns_dict[COLUMN__TILED_OR_WHOLE] = COLUMN__TILED_OR_WHOLE__WHOLE
       extra_columns_dict[COLUMN__TILENUM] = 'N/A'
     else:
       extra_columns_dict[COLUMN__TILED_OR_WHOLE] = COLUMN__TILED_OR_WHOLE__TILED
       extra_columns_dict[COLUMN__TILENUM] = str(tilenum)
 
     try:
       return imagepair.ImagePair(
           image_diff_db=self._image_diff_db,
-          base_url=self._image_base_gs_url,
+          imageA_base_url=image_A_base_url,
+          imageB_base_url=image_B_base_url,
           imageA_relative_url=imageA_relative_url,
           imageB_relative_url=imageB_relative_url,
           extra_columns=extra_columns_dict,
           source_json_file=source_json_file,
           download_all_images=self._download_all_images)
     except (KeyError, TypeError):
       logging.exception(
           'got exception while creating ImagePair for'
           ' urlPair=("%s","%s"), source_skp_name="%s", tilenum="%s"' % (
               imageA_relative_url, imageB_relative_url, source_skp_name,
@@ skipping 29 matching lines @@
       source_dir: path to source dir (GS URL, local filepath, or a special
           "repo:" URL type that points at a file within our Skia checkout;
           only the "repo:" URL type will have a commit hash.
     """
     if source_dir.lower().startswith(REPO_URL_PREFIX):
       repo_dir = os.path.join(REPO_BASEPATH, source_dir[len(REPO_URL_PREFIX):])
       return subprocess.check_output(
           args=[git_utils.GIT, 'rev-parse', 'HEAD'], cwd=repo_dir).strip()
     else:
       return None