Minor code updates

dataproc/api/urls.py

@@ -36,11 +36,18 @@ from api.views.user_view import *
 from api.views.relationships_view import *
 from api.views.input_view import *
 from api.views.proc_input_view import *
+from api.views.autoproc_input_view import *
 
 urlpatterns = [
 
-    path('storeInput', storeInput, name="store_input"),
-    path('storeProcInput', storeProcInput, name="store_proc_input"),
+    # path('storeInput', storeInput, name="store_input"),
+    # path('storeProcInput', storeProcInput, name="store_proc_input"),
+    # path('storeautoProcInput', storeautoProcInput, name="store_autoprocinput"),
+
+
+    path('storeInput', storeInput),
+    path('storeProcInput', storeProcInput),
+    path('storeautoProcInput', storeautoProcInput),
 
     # # autoPROC urlpatterns
     # path('indexautoPROC', indexautoPROC),

dataproc/api/views/draft.py

@@ -125,4 +125,47 @@
             # if input_prc['WatersPresent']==None:
             #     wp=None
             # else: 
-            #     wp=input_prc['WatersPresent']
+            #     wp=input_prc['WatersPresent']
\ No newline at end of file
+
+####################################
+####################################
+####################################
+
+# @csrf_exempt
+# def create_or_update_test(node_name, unique_properties_dict, all_properties_dict):
+#     logger.info("ACTIVATE FUNCTION")
+
+#     keyvaluepair=""
+
+#     for keys in unique_properties_dict:
+#         logger.info(keys)
+#         logger.info(unique_properties_dict[keys])
+
+#         keyvaluepair = keyvaluepair + keys + '=' + '\'' + unique_properties_dict[keys] + '\'' + ','
+
+#     keyvaluepair=keyvaluepair[:-1]
+#     logger.info(keyvaluepair)
+#     # exist=Report.nodes.get(jobid="6e83d158-fd27-494a-aa45-90f0fad00432")
+#     # logger.info("LOG REPOORT TYPE")
+#     # logger.info(type(exist))
+#     # test=exist.serialize
+#     # logger(test)
+#     key='jobid'
+#     # val='6e83d158-fd27-494a-aa45-90f0fad00432'
+#     all_nodes=Report.nodes
+#     logger.info("PRINT ALL NODE")
+#     logger.info(type(all_nodes))
+
+#     for node in all_nodes:
+#         logger.info("PRINT NODE")
+#         logger.info(node)
+#         # node = node.serialize
+#         logger.info("PRINT NODE")
+#         logger.info(type(node))
+#         logger.info(node.key)
+#         if (node[key] == val):
+#             exist = node
+#             break
+#     logger.info("PRINT VALUES")
+#     logger.info(keyvaluepair)
+#     logger.info(exist)
\ No newline at end of file

dataproc/api/views/proc_input_view.py

@@ -46,9 +46,10 @@ def storeProcInput(request):
         # json_data_mtz=json_data['dataprocessing']
 
         try:
-            create_or_update_test(node_name=Report, unique_properties_dict={"jobid" : "6e83d158-fd27-494a-aa45-90f0fad00432", 
-                "terminationstatus" : "COMPLETED"}, all_properties_dict=None)
-            # report=storeParseReport(json_data_report)
+            # create_or_update_test(node_name=Report, unique_properties_dict={"jobid" : "6e83d158-fd27-494a-aa45-90f0fad00432", 
+            #     "terminationstatus" : "COMPLETED"}, all_properties_dict=None)
+            
+            report=storeParseReport(json_data_report)
             # ligand=storeParseLigand(json_data_ligand, report)
             # storeParseRC(json_data_rc, report)
             # storeParsePRC(json_data_prc, ligand)
@@ -62,47 +63,6 @@ def storeProcInput(request):
         except :
             return JsonResponse({"STATUS":"ERROR OCCURRED"}, safe=False)
 
-# @csrf_exempt
-# def create_or_update_test(node_name, unique_properties_dict, all_properties_dict):
-#     logger.info("ACTIVATE FUNCTION")
-
-#     keyvaluepair=""
-
-#     for keys in unique_properties_dict:
-#         logger.info(keys)
-#         logger.info(unique_properties_dict[keys])
-
-#         keyvaluepair = keyvaluepair + keys + '=' + '\'' + unique_properties_dict[keys] + '\'' + ','
-
-#     keyvaluepair=keyvaluepair[:-1]
-#     logger.info(keyvaluepair)
-#     # exist=Report.nodes.get(jobid="6e83d158-fd27-494a-aa45-90f0fad00432")
-#     # logger.info("LOG REPOORT TYPE")
-#     # logger.info(type(exist))
-#     # test=exist.serialize
-#     # logger(test)
-#     key='jobid'
-#     # val='6e83d158-fd27-494a-aa45-90f0fad00432'
-#     all_nodes=Report.nodes
-#     logger.info("PRINT ALL NODE")
-#     logger.info(type(all_nodes))
-
-#     for node in all_nodes:
-#         logger.info("PRINT NODE")
-#         logger.info(node)
-#         # node = node.serialize
-#         logger.info("PRINT NODE")
-#         logger.info(type(node))
-#         logger.info(node.key)
-#         if (node[key] == val):
-#             exist = node
-#             break
-#     logger.info("PRINT VALUES")
-#     logger.info(keyvaluepair)
-#     logger.info(exist)
-
-
-
 @csrf_exempt
 def storeParseReport(data):
 

dataproc/dataproc/settings.py

@@ -22,7 +22,8 @@ SECRET_KEY = '!g%m-6&hdwfjxafjn61vvrhf1f8q3-d$5@0if_^#_a&en@^lsp'
 # DEBUG = True
 DEBUG = int(os.environ.get('DEBUG', default=1)) 
 
-ALLOWED_HOSTS = ['0.0.0.0']
+# ALLOWED_HOSTS = ['0.0.0.0']
+ALLOWED_HOSTS = []
 
 # Application definition
 INSTALLED_APPS = [
@@ -82,8 +83,8 @@ DATABASES = {
 }
 
 # Neo4j database settings 
-# NEOMODEL_NEO4J_BOLT_URL = os.environ.get('NEO4J_BOLT_URL','bolt://neo4j:neo4@localhost:7687')
-NEOMODEL_NEO4J_BOLT_URL = os.environ.get('NEO4J_BOLT_URL','bolt://neo4j:neo4@docker_neo4j_1:7687')
+NEOMODEL_NEO4J_BOLT_URL = os.environ.get('NEO4J_BOLT_URL','bolt://neo4j:neo4@localhost:7687')
+# NEOMODEL_NEO4J_BOLT_URL = os.environ.get('NEO4J_BOLT_URL','bolt://neo4j:neo4@docker_neo4j_1:7687')
 
 # Password validation. See https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
 AUTH_PASSWORD_VALIDATORS = [