Merge pull request #4008 from ProjectSidewalk/develop

v9.2.0

Author: misaugstad

app/actor/CheckImageExpiryActor.scala

@@ -52,8 +52,9 @@ class CheckImageExpiryActor @Inject() (gsvDataService: GsvDataService)(implicit
   def receive: Receive = { case CheckImageExpiryActor.Tick =>
     val currentTimeStart: String = dateFormatter.format(Instant.now())
     logger.info(s"Auto-scheduled checking image expiry started at: $currentTimeStart")
-    gsvDataService.checkForGsvImagery().onComplete {
-      case Success(_) =>
+    gsvDataService.checkForGsvImagery.onComplete {
+      case Success(results) =>
+        logger.info(results)
         val currentEndTime: String = dateFormatter.format(Instant.now())
         logger.info(s"Checking image expiry completed at: $currentEndTime")
       case Failure(e) => logger.error(s"Error checking for expired imagery: ${e.getMessage}")

app/controllers/AdminController.scala

@@ -39,6 +39,7 @@ class AdminController @Inject() (
     regionService: RegionService,
     labelService: LabelService,
     streetService: StreetService,
+    gsvDataService: GsvDataService,
     userService: service.UserService,
     actorSystem: ActorSystem,
     cpuEc: CpuIntensiveExecutionContext
@@ -566,6 +567,14 @@ class AdminController @Inject() (
     }
   }
 
+  /**
+   * Checks for Google Street View imagery that might be missing. Same as nightly process.
+   */
+  def checkGsvImagery() = cc.securityService.SecuredAction(WithAdmin()) { implicit request =>
+    logger.debug(request.toString) // Added bc scalafmt doesn't like "implicit _" & compiler needs us to use request.
+    gsvDataService.checkForGsvImagery.map { results => Ok(results) }
+  }
+
   /**
    * Returns information about the thread pools used by the application. Useful for debugging & monitoring thread usage.
    */

app/controllers/ApplicationController.scala

@@ -74,7 +74,7 @@ class ApplicationController @Inject() (
             auditedDist: Float           <- streetService.getAuditedStreetDistance(metric)
             streetDist: Float            <- streetService.getTotalStreetDistance(metric)
             labelCount: Int              <- labelService.countLabels
-            valCount: Int                <- validationService.countValidations
+            valCount: Int                <- validationService.countHumanValidations
           } yield {
             Ok(
               views.html.index("Project Sidewalk", commonData, user, openStatus, mapathonLink, streetDist, auditedDist,

app/controllers/ExploreController.scala

@@ -7,6 +7,7 @@ import formats.json.ExploreFormats._
 import formats.json.MissionFormats._
 import models.audit._
 import models.auth.DefaultEnv
+import models.label.LabelTypeEnum
 import models.street.StreetEdgeIssue
 import models.user._
 import play.api.libs.json._
@@ -18,6 +19,7 @@ import service.ExploreTaskPostReturnValue
 import java.time.OffsetDateTime
 import javax.inject.{Inject, Singleton}
 import scala.concurrent.{ExecutionContext, Future}
+import scala.util.{Failure, Success}
 
 @Singleton
 class ExploreController @Inject() (
@@ -26,7 +28,8 @@ class ExploreController @Inject() (
     val config: Configuration,
     configService: service.ConfigService,
     exploreService: service.ExploreService,
-    missionService: service.MissionService
+    missionService: service.MissionService,
+    aiService: service.AiService
 )(implicit ec: ExecutionContext, assets: AssetsFinder)
     extends CustomBaseController(cc) {
 
@@ -237,14 +240,23 @@ class ExploreController @Inject() (
               interaction.note, interaction.temporaryLabelId, interaction.timestamp)
           })
           .map { _ =>
+            // Send label info to Sidewalk AI API for AI validation async. AI API only available for some label types.
+            val labelsToSend = returnData.newLabels.filter(l => LabelTypeEnum.aiLabelTypes.contains(l._3))
+            aiService
+              .validateLabelsWithAi(labelsToSend.map(_._1))
+              .onComplete {
+                case Success(_) => logger.info("AI validation completed successfully.")
+                case Failure(e) => logger.error("Error recalculating street priority", e)
+              }
+
             // Send contributions to SciStarter async so that it can be recorded in their user dashboard there.
             val eligibleUser: Boolean = RoleTable.SCISTARTER_ROLES.contains(user.role)
             if (returnData.newLabels.nonEmpty && config.get[String]("environment-type") == "prod" && eligibleUser) {
               exploreService
                 .secondsSpentAuditing(
                   user.userId,
                   returnData.newLabels.map(_._1).min,
-                  returnData.newLabels.map(_._3).max
+                  returnData.newLabels.map(_._4).max
                 )
                 .flatMap { timeSpent: Float =>
                   configService.sendSciStarterContributions(user.email, returnData.newLabels.length, timeSpent)

app/controllers/GalleryController.scala

@@ -52,7 +52,7 @@ class GalleryController @Inject() (
             val jsonList: Seq[JsObject] = labels.map(l =>
               Json.obj(
                 "label"    -> LabelFormats.validationLabelMetadataToJson(l),
-                "imageUrl" -> gsvDataService.getImageUrl(l.gsvPanoramaId, l.heading, l.pitch, l.zoom)
+                "imageUrl" -> gsvDataService.getImageUrl(l.gsvPanoramaId, l.pov.heading, l.pov.pitch, l.pov.zoom)
               )
             )
             val labelList: JsObject = Json.obj("labelsOfType" -> jsonList)

app/controllers/UserProfileController.scala

@@ -113,7 +113,7 @@ class UserProfileController @Inject() (
           userService.getLabelLocations(userId, regionId).map { labels =>
             val features: Seq[JsObject] = labels.map { label =>
               Json.obj(
-                "type" -> "Feature",
+                "type"     -> "Feature",
                 "geometry" -> Json.obj(
                   "type"        -> "Point",
                   "coordinates" -> Json.arr(label.lng.toDouble, label.lat.toDouble)
@@ -150,7 +150,8 @@ class UserProfileController @Inject() (
           labelService.getRecentValidatedLabelsForUser(userId, labelTypes, n).map { validations =>
             val validationJson = Json.toJson(labelTypes.map { labelType =>
               labelType -> validations(labelType).map { l =>
-                val imageUrl: String = gsvDataService.getImageUrl(l.gsvPanoramaId, l.heading, l.pitch, l.zoom)
+                val imageUrl: String =
+                  gsvDataService.getImageUrl(l.gsvPanoramaId, l.pov.heading, l.pov.pitch, l.pov.zoom)
                 labelMetadataUserDashToJson(l, imageUrl)
               }
             }.toMap)

app/controllers/api/LabelApiController.scala

@@ -281,6 +281,6 @@ class LabelApiController @Inject() (
    * @return Asynchronous result containing an HTTP response with a JSON array of pano IDs and their associated labels.
    */
   def getAllPanoIdsWithLabels = Action.async {
-    gsvDataService.getAllPanosWithLabels.map { panos => Ok(Json.toJson(panos.map(p => Json.toJson(p)))) }
+    gsvDataService.getAllPanos.map { panos => Ok(Json.toJson(panos.map(p => Json.toJson(p)))) }
   }
 }

app/formats/json/AdminFormats.scala

@@ -68,7 +68,8 @@ object AdminFormats {
     (__ \ "count").write[Int] and
       (__ \ "time_interval").write[TimeInterval] and
       (__ \ "label_type").write[String] and
-      (__ \ "result").write[String]
+      (__ \ "result").write[String] and
+      (__ \ "validator").write[String]
   )(unlift(ValidationCount.unapply))
 
   implicit val genericCommentWrites: Writes[GenericComment] = (

app/formats/json/ApiFormats.scala

@@ -346,6 +346,7 @@ object ApiFormats {
 
   implicit val gsvDataSlimWrites: Writes[GsvDataSlim] = (
     (__ \ "gsv_panorama_id").write[String] and
+      (__ \ "has_labels").write[Boolean] and
       (__ \ "width").writeNullable[Int] and
       (__ \ "height").writeNullable[Int] and
       (__ \ "lat").writeNullable[Float] and

app/formats/json/LabelFormats.scala

@@ -59,6 +59,7 @@ object LabelFormats {
       (__ \ "temporary").write[Boolean] and
       (__ \ "description").write[Option[String]] and
       (__ \ "user_validation").write[Option[Int]] and
+      (__ \ "ai_validation").write[Option[Int]] and
       (__ \ "validations").write[Map[String, Int]] and
       (__ \ "tags").write[List[String]] and
       (__ \ "low_quality_incomplete_stale_flags").write[(Boolean, Boolean, Boolean)] and
@@ -79,9 +80,9 @@ object LabelFormats {
       "lng"                -> labelMetadata.lng,
       "camera_lat"         -> labelMetadata.cameraLat,
       "camera_lng"         -> labelMetadata.cameraLng,
-      "heading"            -> labelMetadata.heading,
-      "pitch"              -> labelMetadata.pitch,
-      "zoom"               -> labelMetadata.zoom,
+      "heading"            -> labelMetadata.pov.heading,
+      "pitch"              -> labelMetadata.pov.pitch,
+      "zoom"               -> labelMetadata.pov.zoom,
       "canvas_x"           -> labelMetadata.canvasXY.x,
       "canvas_y"           -> labelMetadata.canvasXY.y,
       "severity"           -> labelMetadata.severity,
@@ -94,7 +95,9 @@ object LabelFormats {
       "disagree_count"     -> labelMetadata.validationInfo.disagreeCount,
       "unsure_count"       -> labelMetadata.validationInfo.unsureCount,
       "user_validation"    -> labelMetadata.userValidation.map(LabelValidationTable.validationOptions.get),
+      "ai_validation"      -> labelMetadata.aiValidation.map(LabelValidationTable.validationOptions.get),
       "tags"               -> labelMetadata.tags,
+      "ai_tags"            -> labelMetadata.aiTags,
       "admin_data"         -> adminData.map(ad =>
         Json.obj(
           "username"             -> ad.username,
@@ -129,6 +132,7 @@ object LabelFormats {
       "temporary"          -> labelMetadata.temporary,
       "description"        -> labelMetadata.description,
       "user_validation"    -> labelMetadata.userValidation.map(LabelValidationTable.validationOptions.get),
+      "ai_validation"      -> labelMetadata.aiValidation.map(LabelValidationTable.validationOptions.get),
       "num_agree"          -> labelMetadata.validations("agree"),
       "num_disagree"       -> labelMetadata.validations("disagree"),
       "num_unsure"         -> labelMetadata.validations("unsure"),
@@ -163,9 +167,9 @@ object LabelFormats {
     Json.obj(
       "label_id"          -> label.labelId,
       "gsv_panorama_id"   -> label.gsvPanoramaId,
-      "heading"           -> label.heading,
-      "pitch"             -> label.pitch,
-      "zoom"              -> label.zoom,
+      "heading"           -> label.pov.heading,
+      "pitch"             -> label.pov.pitch,
+      "zoom"              -> label.pov.zoom,
       "canvas_x"          -> label.canvasX,
       "canvas_y"          -> label.canvasY,
       "label_type"        -> label.labelType,