11211 - Allow use of graph slugs for ES reindex by type

arches/app/utils/index_database.py

@@ -327,30 +327,41 @@ def index_resources_by_type(
 
     for resource_type in resource_types:
         start = datetime.now()
+        try:
+            uuid.UUID(str(resource_type))
+            graph = models.GraphModel.objects.get(graphid=str(resource_type))
+        except ValueError:
+            try:
+                graph = models.GraphModel.objects.get(slug=str(resource_type))
+            except:
+                logger.warning(
+                    "Unable to resolve resource type %s. Please confirm it is a valid graph ID or slug."
+                    % resource_type
+                )
+                continue
 
-        graph_name = models.GraphModel.objects.get(graphid=str(resource_type)).name
-        logger.info("Indexing resource type '{0}'".format(graph_name))
+        logger.info("Indexing resource type '{0}'".format(graph.name))
 
         if clear_index:
             tq = Query(se=se)
             cards = models.CardModel.objects.filter(
-                graph_id=str(resource_type)
+                graph_id=str(graph.graphid)
             ).select_related("nodegroup")
             for nodegroup in [card.nodegroup for card in cards]:
                 term = Term(field="nodegroupid", term=str(nodegroup.nodegroupid))
                 tq.add_query(term)
             tq.delete(index=TERMS_INDEX, refresh=True)
 
             rq = Query(se=se)
-            term = Term(field="graph_id", term=str(resource_type))
+            term = Term(field="graph_id", term=str(graph.graphid))
             rq.add_query(term)
             rq.delete(index=RESOURCES_INDEX, refresh=True)
 
         if use_multiprocessing:
             resources = [
                 str(rid)
                 for rid in Resource.objects.filter(
-                    graph_id=str(resource_type)
+                    graph_id=str(graph.graphid)
                 ).values_list("resourceinstanceid", flat=True)
             ]
             index_resources_using_multiprocessing(
@@ -366,17 +377,17 @@ def index_resources_by_type(
                 SearchEngineInstance as _se,
             )
 
-            resources = Resource.objects.filter(graph_id=str(resource_type))
+            resources = Resource.objects.filter(graph_id=str(graph.graphid))
             index_resources_using_singleprocessing(
                 resources=resources,
                 batch_size=batch_size,
                 quiet=quiet,
-                title=graph_name,
+                title=graph.graphid,
                 recalculate_descriptors=recalculate_descriptors,
             )
 
         q = Query(se=se)
-        term = Term(field="graph_id", term=str(resource_type))
+        term = Term(field="graph_id", term=str(graph.graphid))
         q.add_query(term)
         result_summary = {
             "database": len(resources),
@@ -390,7 +401,7 @@ def index_resources_by_type(
         logger.info(
             "Status: {0}, Resource Type: {1}, In Database: {2}, Indexed: {3}, Took: {4} seconds".format(
                 status,
-                graph_name,
+                graph.graphid,
                 result_summary["database"],
                 result_summary["indexed"],
                 (datetime.now() - start).seconds,

arches/management/commands/es.py

@@ -97,7 +97,7 @@ def add_arguments(self, parser):
             action="store",
             dest="resource_types",
             default="",
-            help="UUID of resource_model to index resources of.",
+            help="Comma separated list of resource model UUIDs or slugs to index resources of.",
         )
 
         parser.add_argument(

releases/8.0.0.md

@@ -14,6 +14,7 @@ Arches 8.0.0 Release Notes
     For more, see (link to forthcoming blog post or documentation? Or arches-lingo?)
 
 ### Additional highlights
+- 11211 Allow use of graph slug in ES reindex resources management command
 
 ### Performance improvements
 

tests/fixtures/resource_graphs/Resource Test Model.json

@@ -533,7 +533,7 @@
                 "ontologyclass": null,
                 "sortorder": 0
             },
-            "slug": null,
+            "slug": "resource_test_model",
             "subtitle": "",
             "template_id": "50000000-0000-0000-0000-000000000001",
             "version": ""

tests/models/resource_test.py

@@ -70,6 +70,7 @@ def setUpClass(cls):
         resource_graph_importer(archesfile["graph"])
 
         cls.search_model_graphid = uuid.UUID("c9b37a14-17b3-11eb-a708-acde48001122")
+        cls.search_model_slug = "resource_test_model"
         cls.search_model_cultural_period_nodeid = "c9b3882e-17b3-11eb-a708-acde48001122"
         cls.search_model_creation_date_nodeid = "c9b38568-17b3-11eb-a708-acde48001122"
         cls.search_model_destruction_date_nodeid = (
@@ -288,6 +289,10 @@ def test_reindex_by_resource_type(self):
             [self.search_model_graphid], clear_index=True, batch_size=4000
         )
 
+        result = index_resources_by_type(
+            [self.search_model_slug], clear_index=True, batch_size=4000
+        )
+
         self.assertEqual(result, "Passed")
 
     def test_publication_restored_on_save(self):