Boolean to indicate whether taxon is in the vision model

inaturalist · May 13, 2021 · c3d9352 · c3d9352
1 parent 11e0d8b
commit c3d9352
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/lib/controllers/v1/computervision_controller.js b/lib/controllers/v1/computervision_controller.js
@@ -620,7 +620,7 @@ const ComputervisionController = class ComputervisionController {
     } );
   }
 
-  static async modelContainsTaxonID( taxonID ) {
+  static modelContainsTaxonID( taxonID ) {
     return !!TFServingTaxonAncestries[taxonID];
   }
 };

diff --git a/lib/controllers/v1/taxa_controller.js b/lib/controllers/v1/taxa_controller.js
@@ -17,7 +17,11 @@ const TaxaController = { };
 TaxaController.show = async req => {
   const ids = _.filter( req.params.id.split( "," ), _.identity );
   const filters = [{ terms: { id: ids } }];
-  return TaxaController.searchQuery( req, { filters, details: true } );
+  return TaxaController.searchQuery( req, {
+    filters,
+    details: true,
+    assignVisionInclusion: true
+  } );
 };
 
 TaxaController.exact = async req => {
@@ -726,6 +730,9 @@ TaxaController.searchQuery = async ( req, options = { } ) => {
   await Taxon.assignConservationStatuses( taxa, options );
   await Taxon.assignListedTaxa( taxa, options );
   await Taxon.assignWikipediaSummary( taxa, wikiOpts );
+  if ( options.assignVisionInclusion ) {
+    await Taxon.assignVisionInclusion( taxa );
+  }
   return {
     total_results: data.hits.total.value,
     page: Number( searchHash.page ),

diff --git a/lib/models/taxon.js b/lib/models/taxon.js
@@ -2,7 +2,6 @@ const _ = require( "lodash" );
 const squel = require( "squel" ).useFlavour( "postgres" );
 const PromisePool = require( "es6-promise-pool" );
 const util = require( "../util" );
-const esClient = require( "../es_client" );
 const pgClient = require( "../pg_client" );
 const Model = require( "./model" );
 const ESModel = require( "./es_model" );
@@ -426,6 +425,15 @@ const Taxon = class Taxon extends Model {
     } );
   }
 
+  static async assignVisionInclusion( taxa ) {
+    // eslint-disable-next-line global-require
+    const ComputervisionController = require( "../controllers/v1/computervision_controller" );
+    await ComputervisionController.cacheAllTaxonAncestries( );
+    _.each( _.compact( taxa ), t => {
+      t.vision = ComputervisionController.modelContainsTaxonID( t.id );
+    } );
+  }
+
   static async preloadPhotosInto( taxa, options ) {
     options = options || { };
     const prepareTaxon = t => t.prepareForResponse( options.localeOpts );