Skip to content
Snippets Groups Projects
Commit 4ebba5f0 authored by AndiMajore's avatar AndiMajore
Browse files

fixed seed issue at quick drug search

parent 0fd0c1f7
No related branches found
No related tags found
No related merge requests found
Pipeline #63877 failed
...@@ -15,4 +15,4 @@ CELERY_BROKER_URL=redis://redis:6379/0 ...@@ -15,4 +15,4 @@ CELERY_BROKER_URL=redis://redis:6379/0
FLOWER_PORT=8888 FLOWER_PORT=8888
FLOWER_BASIC_AUTH=drugstone:test FLOWER_BASIC_AUTH=drugstone:test
GT_THREADS=2 GT_THREADS=2
DB_UPDATE_ON_START=1 DB_UPDATE_ON_START=0
\ No newline at end of file \ No newline at end of file
...@@ -291,7 +291,9 @@ def result_view(request) -> Response: ...@@ -291,7 +291,9 @@ def result_view(request) -> Response:
if not node_types: if not node_types:
node_types = {} node_types = {}
node_attributes['node_types'] = node_types node_attributes['node_types'] = node_types
is_seed = node_attributes.get('is_seed') is_seed = node_attributes.get('is_seed')
print(result)
if not is_seed: if not is_seed:
is_seed = {} is_seed = {}
node_attributes['is_seed'] = is_seed node_attributes['is_seed'] = is_seed
......
from tasks.task_hook import TaskHook from tasks.task_hook import TaskHook
def quick_task(task_hook: TaskHook): def quick_task(task_hook: TaskHook):
def run_closeness(parameters, network): def run_closeness(parameters, network, original_seeds=None):
from .closeness_centrality import closeness_centrality from .closeness_centrality import closeness_centrality
def closeness_progress(progress, status): def closeness_progress(progress, status):
...@@ -9,6 +10,8 @@ def quick_task(task_hook: TaskHook): ...@@ -9,6 +10,8 @@ def quick_task(task_hook: TaskHook):
def closeness_set_result(result): def closeness_set_result(result):
result["network"]["edges"].extend(network["edges"]) result["network"]["edges"].extend(network["edges"])
if original_seeds is not None:
result['node_attributes']['is_seed'] = original_seeds
task_hook.set_results(result) task_hook.set_results(result)
# Prepare intermediate hook # Prepare intermediate hook
...@@ -20,7 +23,6 @@ def quick_task(task_hook: TaskHook): ...@@ -20,7 +23,6 @@ def quick_task(task_hook: TaskHook):
# Run closeness centrality # Run closeness centrality
closeness_centrality(closeness_task_hook) closeness_centrality(closeness_task_hook)
def run_multi_steiner(parameters): def run_multi_steiner(parameters):
from .multi_steiner import multi_steiner from .multi_steiner import multi_steiner
...@@ -35,7 +37,7 @@ def quick_task(task_hook: TaskHook): ...@@ -35,7 +37,7 @@ def quick_task(task_hook: TaskHook):
if len(seeds) == 0: if len(seeds) == 0:
task_hook.set_results({"network": {"nodes": [], "edges": []}}) task_hook.set_results({"network": {"nodes": [], "edges": []}})
return return
og_seeds = parameters.get('seeds')
parameters.update({ parameters.update({
"seeds": seeds, "seeds": seeds,
"result_size": 10, "result_size": 10,
...@@ -43,7 +45,11 @@ def quick_task(task_hook: TaskHook): ...@@ -43,7 +45,11 @@ def quick_task(task_hook: TaskHook):
"target": "drug", "target": "drug",
"include_non_approved_drugs": True "include_non_approved_drugs": True
}) })
run_closeness(parameters, result["network"]) is_seed = result.get('node_attributes')
run_closeness(parameters, result["network"], result['node_attributes']['is_seed'])
# parameters.update({
# "seeds": og_seeds
# })
parameters["num_trees"] = 1 parameters["num_trees"] = 1
parameters["hub_penalty"] = 1 parameters["hub_penalty"] = 1
......
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