[RFC] Arches model QuerySets #11595

arches/app/datatypes/base.py

@@ -1,15 +1,20 @@
-import json, urllib
+import json
+import logging
+import urllib
+
 from django.urls import reverse
+from django.utils.translation import gettext as _
+
 from arches.app.models import models
-from arches.app.models.system_settings import settings
 from arches.app.search.elasticsearch_dsl_builder import Dsl, Bool, Terms, Exists, Nested
-from django.utils.translation import gettext as _
-import logging
 
 logger = logging.getLogger(__name__)
 
 
 class BaseDataType(object):
+    rest_framework_model_field = None
+    """Django model field if the datatype were to be a real table column."""
+
     def __init__(self, model=None):
         self.datatype_model = model
         self.datatype_name = model.datatype if model else None
@@ -336,7 +341,7 @@ def get_default_language_value_from_localized_node(self, tile, nodeid):
         """
         return tile.data[str(nodeid)]
 
-    def post_tile_save(self, tile, nodeid, request):
+    def post_tile_save(self, tile, nodeid, request=None):
         """
         Called after the tile is saved to the database
 
@@ -532,3 +537,13 @@ def validate_node(self, node):
         a GraphValidationError
         """
         pass
+
+    def get_base_orm_lookup(self, node):
+        """This expression gets the tile data for a specific node. It can be
+        overridden to extract something more specific, especially where the
+        node value is JSON and only certain k/v pairs are useful to query.
+        """
+        return f"data__{node.pk}"
+
+    def to_python(self, tile_val):
+        return tile_val

arches/app/datatypes/concept_types.py

@@ -2,11 +2,14 @@
 import uuid
 import csv
 import logging
+
+from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import fields
 from django.utils.translation import gettext as _
-from arches.app.models import models
-from arches.app.models import concept
 from django.core.cache import cache
+
+from arches.app.models import models
 from arches.app.models.system_settings import settings
 from arches.app.datatypes.base import BaseDataType
 from arches.app.datatypes.datatypes import DataTypeFactory, get_value_from_jsonld
@@ -32,7 +35,6 @@
 from rdflib.namespace import RDF, RDFS, XSD, DC, DCTERMS, SKOS
 from arches.app.models.concept import ConceptValue
 from arches.app.models.concept import Concept
-from io import StringIO
 
 archesproject = Namespace(settings.ARCHES_NAMESPACE_FOR_DATA_EXPORT)
 cidoc_nm = Namespace("http://www.cidoc-crm.org/cidoc-crm/")
@@ -41,6 +43,8 @@
 
 
 class BaseConceptDataType(BaseDataType):
+    rest_framework_model_field = fields.UUIDField(null=True)
+
     def __init__(self, model=None):
         super(BaseConceptDataType, self).__init__(model=model)
         self.value_lookup = {}
@@ -253,6 +257,8 @@ def validate(
         return errors
 
     def transform_value_for_tile(self, value, **kwargs):
+        if isinstance(value, uuid.UUID):
+            return str(value)
         try:
             stripped = value.strip()
             uuid.UUID(stripped)
@@ -409,6 +415,10 @@ def ignore_keys(self):
 
 
 class ConceptListDataType(BaseConceptDataType):
+    rest_framework_model_field = ArrayField(
+        base_field=BaseConceptDataType.rest_framework_model_field, null=True
+    )
+
     def validate(
         self,
         value,
@@ -425,13 +435,20 @@ def validate(
         if value is not None:
             validate_concept = DataTypeFactory().get_instance("concept")
             for v in value:
-                val = v.strip()
+                if isinstance(v, uuid.UUID):
+                    val = str(v)
+                else:
+                    val = v.strip()
                 errors += validate_concept.validate(val, row_number)
         return errors
 
     def transform_value_for_tile(self, value, **kwargs):
         ret = []
-        for val in csv.reader([value], delimiter=",", quotechar='"'):
+        if not isinstance(value, list):
+            value = [value]
+        if all(isinstance(inner, uuid.UUID) for inner in value):
+            return [str(inner) for inner in value]
+        for val in csv.reader(value, delimiter=",", quotechar='"'):
             lines = [line for line in val]
             for v in lines:
                 try:
@@ -473,7 +490,7 @@ def to_json(self, tile, node):
         new_values = []
         data = self.get_tile_data(tile)
         if data:
-            for val in data[str(node.nodeid)]:
+            for val in data[str(node.nodeid)] or []:
                 new_val = self.get_value(uuid.UUID(val))
                 new_values.append(new_val)
         return self.compile_json(tile, node, concept_details=new_values)

arches/app/datatypes/core/non_localized_string.py

@@ -1,10 +1,11 @@
+from django.conf import settings
+from django.db.models import fields
 from django.utils.translation import gettext as _
 from rdflib import URIRef, Literal, ConjunctiveGraph as Graph
 from rdflib.namespace import RDF
 
 from arches.app.datatypes.base import BaseDataType
 from arches.app.datatypes.core.util import get_value_from_jsonld
-from django.conf import settings
 from arches.app.search.elasticsearch_dsl_builder import (
     Bool,
     Exists,
@@ -18,6 +19,8 @@
 
 
 class NonLocalizedStringDataType(BaseDataType):
+    rest_framework_model_field = fields.CharField(null=True)
+
     def validate(
         self,
         value,