From 7c50553dc4b3d33e76d630a30677a443837309cc Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Tue, 23 Aug 2022 20:16:08 +0200
Subject: [PATCH] minor change
Former-commit-id: 468e77e9303ccaf216fd7c9ce91c22ad7b0e439a [formerly 9d0e80ee2af22516a3d674bd4faee8e53fcbff7b]
Former-commit-id: 6afadfa790ddf05ab755f246f13e7658c0b74731
---
drugstone/views.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drugstone/views.py b/drugstone/views.py
index a18fb48..c6521aa 100755
--- a/drugstone/views.py
+++ b/drugstone/views.py
@@ -224,7 +224,7 @@ def create_network(request) -> Response:
while True:
try:
Network.objects.create(id=id, nodes=request.data['network']['nodes'],
- edges=request.data['network']['edges'], config=request.data['config'],
+ edges=request.data['network']['edges'], config=request.data['config'],
groups=request.data['groups'])
break
except IntegrityError:
@@ -247,9 +247,9 @@ def load_network(request) -> Response:
network = NetworkSerializer().to_representation(Network.objects.get(id=request.query_params.get('id')))
result = {'network': {'nodes': json.loads(network['nodes'].replace("'", '"')),
'edges': json.loads(network['edges'].replace("'", '"'))},
- 'config': json.loads(
+ 'config': json.loads(
network['config'].replace("'", '"').replace('True', 'true').replace('False', 'false')),
- 'groups': json.loads(
+ 'groups': json.loads(
network['groups'].replace("'", '"').replace('True', 'true').replace('False', 'false'))}
return Response(result)
@@ -374,7 +374,9 @@ def result_view(request) -> Response:
detail['ensg'] = list(set(detail['ensg']))
edges = parameters['input_network']['edges']
+
edge_endpoint_ids = set()
+
# TODO check for custom edges when working again with ensemble gene ids
for edge in edges:
edge_endpoint_ids.add(edge['from'])
@@ -382,11 +384,10 @@ def result_view(request) -> Response:
nodes_mapped, id_key = query_proteins_by_identifier(edge_endpoint_ids, identifier)
-
if 'autofill_edges' in parameters['config'] and parameters['config']['autofill_edges']:
-
prots = list(filter(lambda n: n['drugstone_type'] == 'protein',
- filter(lambda n: 'drugstone_type' in n and node_name_attribute in n, parameters['input_network']['nodes'])))
+ filter(lambda n: 'drugstone_type' in n and node_name_attribute in n,
+ parameters['input_network']['nodes'])))
proteins = {node_name[1:] for node in prots for node_name in node[node_name_attribute]}
dataset = DEFAULTS['ppi'] if 'interaction_protein_protein' not in parameters['config'] else \
@@ -399,7 +400,6 @@ def result_view(request) -> Response:
interaction_objects))
edges.extend(auto_edges)
-
result['network']['edges'].extend(edges)
uniq_edges = dict()
for edge in result['network']['edges']:
--
GitLab