second attempt to deconlict stashed code

RTXteam · Mar 9, 2024 · c7559fc · c7559fc
1 parent 4afc997
commit c7559fc
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/code/ARAX/ARAXQuery/ARAX_ranker.py b/code/ARAX/ARAXQuery/ARAX_ranker.py
@@ -598,9 +598,15 @@ def aggregate_scores_dmk(self, response):
                 edge_attributes = {x.original_attribute_name:x.value for x in edge.attributes}
                 for edge_attribute in edge.attributes:
                     if edge_attribute.attribute_type_id == "biolink:agent_type" and edge_attribute.value == "manual_agent":
+<<<<<<< Updated upstream
                         edge_attributes['confidence'] = edge_confidence_manual_agent
                         edge.confidence = edge_confidence_manual_agent
                         edge_ids_manual_agent.add(edge_key)
+=======
+                        response.info(f"encountered an edge with agent_type of manual_agent")
+                        edge.confidence = edge_confidence_manual_agent
+                        edge_attributes['confidence'] = edge.confidence
+>>>>>>> Stashed changes
                         break
             else:
                 edge_attributes = {}