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

security update

Former-commit-id: 35fbddb2
parent 6f890ae7
No related branches found
No related tags found
No related merge requests found
FROM andimajore/miniconda3:latest FROM andimajore/miniconda3_kinetic
WORKDIR /usr/src/drugstone/ WORKDIR /usr/src/drugstone/
......
...@@ -25,43 +25,31 @@ from drugstone.settings import DEFAULTS ...@@ -25,43 +25,31 @@ from drugstone.settings import DEFAULTS
def get_ppi_ds(source, licenced): def get_ppi_ds(source, licenced):
try:
ds = models.PPIDataset.objects.filter(name__iexact=source, licenced=licenced).last() ds = models.PPIDataset.objects.filter(name__iexact=source, licenced=licenced).last()
return ds if ds is None and licenced:
except:
if licenced:
return get_ppi_ds(source, False) return get_ppi_ds(source, False)
return None return ds
def get_pdi_ds(source, licenced): def get_pdi_ds(source, licenced):
try:
ds = models.PDIDataset.objects.filter(name__iexact=source, licenced=licenced).last() ds = models.PDIDataset.objects.filter(name__iexact=source, licenced=licenced).last()
return ds if ds is None and licenced:
except:
if licenced:
return get_pdi_ds(source, False) return get_pdi_ds(source, False)
return None return ds
def get_pdis_ds(source, licenced): def get_pdis_ds(source, licenced):
try:
ds = models.PDisDataset.objects.filter(name__iexact=source, licenced=licenced).last() ds = models.PDisDataset.objects.filter(name__iexact=source, licenced=licenced).last()
return ds if ds is None and licenced:
except:
if licenced:
return get_pdis_ds(source, False) return get_pdis_ds(source, False)
return None return ds
def get_drdis_ds(source, licenced): def get_drdis_ds(source, licenced):
try:
ds = models.DrDiDataset.objects.filter(name__iexact=source, licenced=licenced).last() ds = models.DrDiDataset.objects.filter(name__iexact=source, licenced=licenced).last()
return ds if ds is None and licenced:
except:
if licenced:
return get_drdis_ds(source, False) return get_drdis_ds(source, False)
return None return ds
class TaskView(APIView): class TaskView(APIView):
...@@ -143,6 +131,7 @@ def fetch_edges(request) -> Response: ...@@ -143,6 +131,7 @@ def fetch_edges(request) -> Response:
return Response(ProteinProteinInteractionSerializer(many=True).to_representation(interaction_objects)) return Response(ProteinProteinInteractionSerializer(many=True).to_representation(interaction_objects))
@api_view(['POST']) @api_view(['POST'])
def convert_compact_ids(request) -> Response: def convert_compact_ids(request) -> Response:
nodes = request.data.get('nodes', '[]') nodes = request.data.get('nodes', '[]')
...@@ -150,6 +139,7 @@ def convert_compact_ids(request) -> Response: ...@@ -150,6 +139,7 @@ def convert_compact_ids(request) -> Response:
cleaned = clean_proteins_from_compact_notation(nodes, identifier) cleaned = clean_proteins_from_compact_notation(nodes, identifier)
return Response(cleaned) return Response(cleaned)
@api_view(['POST']) @api_view(['POST'])
def map_nodes(request) -> Response: def map_nodes(request) -> Response:
"""Maps user given input nodes to Proteins in the django database. """Maps user given input nodes to Proteins in the django database.
...@@ -502,7 +492,6 @@ def graph_export(request) -> Response: ...@@ -502,7 +492,6 @@ def graph_export(request) -> Response:
node_name = node['drugstone_id'] node_name = node['drugstone_id']
G.add_node(node_name, **node) G.add_node(node_name, **node)
for e in edges: for e in edges:
# networkx does not support datatypes such as lists or dicts # networkx does not support datatypes such as lists or dicts
for prop in remove_edge_properties: for prop in remove_edge_properties:
......
asgiref==3.5.2 asgiref==3.5.2
celery==5.2.7 celery==5.2.7
certifi==2020.6.20 certifi==2022.12.7
chardet==3.0.4 chardet==3.0.4
click==8.1.3 click==8.1.3
cryptography==38.0.3 cryptography==38.0.3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment