365 select visual display based on preferences (#378)

* visual display changed to use preferences with default to template's default display

Author: faridseifi

candidate_pudding/candidate_pudding.py

@@ -13,6 +13,10 @@
     "http://purl.bioontology.org/ontology/SNOMEDCT/has_precondition"
 )
 
+DEFAULT_DISPLAY = URIRef(
+    "https://schema.metadatacenter.org/properties/5b4f16a9-feb7-4724-8741-2739d8808760"
+)
+
 
 def create_candidate(measure: Resource, template: Resource) -> Optional[Resource]:
     g: Graph = measure.graph
@@ -126,6 +130,9 @@ def add_convenience_properties(candidate: Resource):
     )
 
     candidate[SLOWMO.RegardingComparator] = comparator or Literal(None)
+    candidate[SLOWMO.Display] = candidate.value(
+        SLOWMO.AncestorTemplate / DEFAULT_DISPLAY
+    )
     return candidate
 
 

esteemer/utils.py

@@ -1,4 +1,3 @@
-import random
 from typing import List
 
 from rdflib import DCTERMS, RDF, RDFS, BNode, Graph, URIRef
@@ -66,6 +65,7 @@ def render(performer_graph: Graph, candidate: BNode) -> dict:
         temp_name = SLOWMO.name  # URI of template name?
         Display = ["text only", "bar chart", "line graph"]
         o2wea = []
+        candidate_resource = performer_graph.resource(candidate)
 
         ## Format selected_candidate to return for pictoralist-ing
         for s21, p21, o21 in performer_graph.triples(
@@ -82,7 +82,10 @@ def render(performer_graph: Graph, candidate: BNode) -> dict:
             s_m["message_text"] = o2
         # for s212,p212,o212 in self.spek_tp.triples((s,p232,None)):
 
-        s_m["display"] = random.choice(Display)
+        s_m["display"] = candidate_resource.value(
+            SLOWMO.Display
+        ).value  # random.choice(Display)
+
         # for s9,p9,o9 in self.spek_tp.triples((s,p8,None)):
         #     s_m["Comparator Type"] = o9
         for s2we, p2we, o2we in performer_graph.triples(
@@ -92,7 +95,6 @@ def render(performer_graph: Graph, candidate: BNode) -> dict:
         # print(*o2wea)
         s_m["acceptable_by"] = o2wea
 
-        candidate_resource = performer_graph.resource(candidate)
         measure = candidate_resource.value(SLOWMO.RegardingMeasure)
         s_m["measure_name"] = str(measure.identifier)
         s_m["measure_title"] = measure.value(DCTERMS.title).value

main.py

@@ -163,6 +163,18 @@ async def createprecisionfeedback(info: Request):
     input_preferences: dict = (
         req_info.get("Preferences", {}).get("Utilities", {}).get("Message_Format", {})
     )
+
+    # TODO: consolidate all display handling in render
+    Display_Format_preference = None
+    for key, value in (
+        req_info.get("Preferences", {})
+        .get("Utilities", {})
+        .get("Display_Format", {})
+        .items()
+    ):
+        if value == 1 and key != "System-generated":
+            Display_Format_preference = key.lower()
+
     preferences = {
         "Social gain": "1.007650319",
         "Social stayed better": "0.4786461911",
@@ -251,6 +263,10 @@ async def createprecisionfeedback(info: Request):
         for candidate in candidates:
             esteemer.score(candidate, history, preferences)
     selected_candidate = esteemer.select_candidate(cool_new_super_graph)
+    if Display_Format_preference:
+        cool_new_super_graph.resource(selected_candidate)[SLOWMO.Display] = Literal(
+            Display_Format_preference
+        )
     toc = time.perf_counter()
     timing["esteemer"] = f"{(toc-tic)*1000.:.2f} ms"
 

tests/candidate_pudding/test_acceptable_by.py

@@ -34,6 +34,11 @@ def graph():
         URIRef("http://schema.org/name"),
         Literal("Performance Improving", datatype=XSD.string),
     )
+    template[
+        URIRef(
+            "https://schema.metadatacenter.org/properties/5b4f16a9-feb7-4724-8741-2739d8808760"
+        )
+    ] = Literal("Line chart")
 
     performance_content = graph.resource(BNode("performance_content"))
     performance_content.set(RDF.type, PSDO.performance_content)

tests/candidate_pudding/test_create.py

@@ -33,6 +33,11 @@ def graph():
         URIRef("http://schema.org/name"),
         Literal("Opportunity to Improve Top 10 Peer Benchmark", datatype=XSD.string),
     )
+    template[
+        URIRef(
+            "https://schema.metadatacenter.org/properties/5b4f16a9-feb7-4724-8741-2739d8808760"
+        )
+    ] = Literal("Line chart")
 
     comparator = graph.resource(PSDO.peer_90th_percentile_benchmark)
     comparator[RDF.type] = PSDO.comparator_content

utils/namespace/_SLOWMO.py

@@ -23,3 +23,4 @@ class SLOWMO(AliasingDefinedNamespace):
     MessageRecurrance: URIRef
     AcceptableBy: URIRef
     Selected: URIRef
+    Display: URIRef