Skip to content
Snippets Groups Projects
Commit 7c50553d authored by AndiMajore's avatar AndiMajore
Browse files

minor change

Former-commit-id: 468e77e9303ccaf216fd7c9ce91c22ad7b0e439a [formerly 9d0e80ee2af22516a3d674bd4faee8e53fcbff7b]
Former-commit-id: 6afadfa790ddf05ab755f246f13e7658c0b74731
parent b0996b5f
No related branches found
No related tags found
No related merge requests found
...@@ -224,7 +224,7 @@ def create_network(request) -> Response: ...@@ -224,7 +224,7 @@ def create_network(request) -> Response:
while True: while True:
try: try:
Network.objects.create(id=id, nodes=request.data['network']['nodes'], 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']) groups=request.data['groups'])
break break
except IntegrityError: except IntegrityError:
...@@ -247,9 +247,9 @@ def load_network(request) -> Response: ...@@ -247,9 +247,9 @@ def load_network(request) -> Response:
network = NetworkSerializer().to_representation(Network.objects.get(id=request.query_params.get('id'))) network = NetworkSerializer().to_representation(Network.objects.get(id=request.query_params.get('id')))
result = {'network': {'nodes': json.loads(network['nodes'].replace("'", '"')), result = {'network': {'nodes': json.loads(network['nodes'].replace("'", '"')),
'edges': json.loads(network['edges'].replace("'", '"'))}, 'edges': json.loads(network['edges'].replace("'", '"'))},
'config': json.loads( 'config': json.loads(
network['config'].replace("'", '"').replace('True', 'true').replace('False', 'false')), network['config'].replace("'", '"').replace('True', 'true').replace('False', 'false')),
'groups': json.loads( 'groups': json.loads(
network['groups'].replace("'", '"').replace('True', 'true').replace('False', 'false'))} network['groups'].replace("'", '"').replace('True', 'true').replace('False', 'false'))}
return Response(result) return Response(result)
...@@ -374,7 +374,9 @@ def result_view(request) -> Response: ...@@ -374,7 +374,9 @@ def result_view(request) -> Response:
detail['ensg'] = list(set(detail['ensg'])) detail['ensg'] = list(set(detail['ensg']))
edges = parameters['input_network']['edges'] edges = parameters['input_network']['edges']
edge_endpoint_ids = set() edge_endpoint_ids = set()
# TODO check for custom edges when working again with ensemble gene ids # TODO check for custom edges when working again with ensemble gene ids
for edge in edges: for edge in edges:
edge_endpoint_ids.add(edge['from']) edge_endpoint_ids.add(edge['from'])
...@@ -382,11 +384,10 @@ def result_view(request) -> Response: ...@@ -382,11 +384,10 @@ def result_view(request) -> Response:
nodes_mapped, id_key = query_proteins_by_identifier(edge_endpoint_ids, identifier) nodes_mapped, id_key = query_proteins_by_identifier(edge_endpoint_ids, identifier)
if 'autofill_edges' in parameters['config'] and parameters['config']['autofill_edges']: if 'autofill_edges' in parameters['config'] and parameters['config']['autofill_edges']:
prots = list(filter(lambda n: n['drugstone_type'] == 'protein', 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]} 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 \ dataset = DEFAULTS['ppi'] if 'interaction_protein_protein' not in parameters['config'] else \
...@@ -399,7 +400,6 @@ def result_view(request) -> Response: ...@@ -399,7 +400,6 @@ def result_view(request) -> Response:
interaction_objects)) interaction_objects))
edges.extend(auto_edges) edges.extend(auto_edges)
result['network']['edges'].extend(edges) result['network']['edges'].extend(edges)
uniq_edges = dict() uniq_edges = dict()
for edge in result['network']['edges']: for edge in result['network']['edges']:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment