From e38cb84c45b13a5b05991393cbf75eeca5a4fd10 Mon Sep 17 00:00:00 2001
From: root <Yorgo EL MOUBAYED>
Date: Tue, 24 Aug 2021 10:39:55 +0200
Subject: [PATCH] Minor code updates

---
 dataproc/api/__pycache__/urls.cpython-38.pyc  | Bin 2768 -> 2797 bytes
 dataproc/api/urls.py                          |  11 +++-
 .../proc_input_view.cpython-38.pyc            | Bin 14330 -> 13596 bytes
 dataproc/api/views/draft.py                   |  45 +++++++++++++++-
 dataproc/api/views/proc_input_view.py         |  48 ++----------------
 .../__pycache__/settings.cpython-38.pyc       | Bin 2970 -> 2970 bytes
 dataproc/dataproc/settings.py                 |   7 +--
 7 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/dataproc/api/__pycache__/urls.cpython-38.pyc b/dataproc/api/__pycache__/urls.cpython-38.pyc
index 901554db35a3c392a06b0c8ff822cb751643cfbd..e013097f3d3a297e1f95cf313e2b77c9fc485d5e 100644
GIT binary patch
delta 515
zcmYk(IZpyn6b0ZJc1CeQaYvCI1_oDLa6w#gi;3D05<=v}kQgB>QWAr$6^WfKz2T48
z*w9*8_#d1(l{dNh-nn@<uXvx1Ux$2avq^$lukYUck6#eJweY`WH6+!pW<O-J*er+z
z!-M-qfT3W7r=?Rh!As5XQ49RkiU5@mq<sj{euSwFG95sK4kAj2pwMB&s2vM*1dFYv
z_TVU%IB;N@j$wt4W0g)IPA9QOr?5_^u|a3BNu5a0S!~fcY*QC@=sb3*8%gTHUX}+h
zQq+fi>c;^M;E)D!L_;{HVVqDIX&S*PjpD4OyANf~3(B<+inU*K4OefVS}Rp>RVm%2
zAItSx&(55$*Gimq6@5o1UUa{ValJp|%$JMGQxT1-qTMK~Te+gPmeYn6qxx|bQ`csV
WisD;4A*C#$#j3VwX+KMsV&@Me7lrcx

delta 498
zcmYk(IZpyn6a`?0VI4qm!Cg`IVMi3)#a%QpCSpT_#5pk(0s)LA1(w=KXJKh&WB3<V
z)^x_&|KM=6@Fp+cxhF4q#rt-AI6~((o1{^veD`$m>D6eyddvR_s!K*a_1s&?C^Vr{
z^l&K##rPnq*#x&@{>u_PEv?#F;H6ghs11JFhXCz|OzjBL0fguv!gL4`I*cfFAVx<J
zZ#8=lj3U8e4D)mxNjiZAI*CO(g%q7en$BQ}I<ZV=u|nstN?ll^Zmd%eHmDby)Q3!t
z!H+E(z&4e!Lxb3*A?(pG_GttMG>StSL$;;83gnNJ_?bpdwC}aI$-JfBsMJs>m8&-m
zS?KD@#cOo?Sf17@m)TyQxBp(MszssHaf>fn;kfgzPl;`(+0Y4^WkGsWKTD^#3RbaQ
Rl+p&lq*HVISvnD3e*nPQeyjih

diff --git a/dataproc/api/urls.py b/dataproc/api/urls.py
index 791a951..e4ddb68 100644
--- a/dataproc/api/urls.py
+++ b/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),
diff --git a/dataproc/api/views/__pycache__/proc_input_view.cpython-38.pyc b/dataproc/api/views/__pycache__/proc_input_view.cpython-38.pyc
index e7c5a9230487bd57d5ff909e480b15aee814ba8d..f0310ac9abb23610193ea243dd5360c4f07793a9 100644
GIT binary patch
delta 2624
zcmZ{mYitx%6vy|@PG`4Iz&>b~zPsIJx^0(sODI?fP^x0I)-6V;;=0`#%GT}9=I*Qs
zwWI<nD1y|h2n_)mNeHMYETG6kP=okPPy`u#phnSzm}ugc`o(i*`dGH5O@6)i+&kxg
z&OPVObXeKdo%K*=W||3pzT0K@cP$^tDkOu4T|0>&k#>_<AHPg82<z}<F89KoK2x_z
zB2RF%RV8~ln3;#jTGB_>a=m#f-^XnrYt3qk#7X8L*+3pPwVR0ktK0Y>ky0dK3n!RX
zz{+xyWB~;$Yd0@tc7EZUR#DJ|9$8(jNE+WARl-_INbyTijqg;XHQLmus!+MjPouI|
zjwn>697H7YY#;B)&;+X64wz^$`-)$kHx*N|q>&7cPvv-PY8EFDS{mPI8RA`9O1IJ(
zlr%w!sganfS)P<>GzfarRGIb!!+sSeQPr=;qVeX8-RACc@I@;Sc0?t@0nl=~BCA7@
zU__Rv?C<dz{^(3x7ZFtm7or+bgQ!Kg5wj3=h<bzvz^+fpEosErT*N%YorosHe8hry
z|5R!bvSHloWEUM}EI&U-)P#`I)g@Dn4~ADM8n3R2$XaStra^xw*ek=)@{(Wm(=yhU
zKi5W!&{OdkN^oQYEN1ciE5yb&7n~@04viZTn-I?<UO;R{WV3+n0kI#3B1fNrKUg3d
z3#c(Fukr_=R?$QOcFk5o-edpSD#%v$w=0KvX0%Oz79X=>To|rM=u3v@!5Kx;i!f{z
z%@hksQHE{+h`g>vx4>94_o%%cJfJ>N30E@5d*%LR9aq2<%>tMNj${!lCz#W)9R}Dr
zdrsV4SWn1$)>-7~e;Kw=hIj?>DnPT)fDfai+tKtIVh3U;Vi2I^8Lj6FE0XMsPzCm?
zK{;x4$Q|%_(t^gvVnK=O1<dp|mwH?7UfRB_#oN-ggc@1%G!?y%WvxvKDB-XiP>sg-
zHj637F<==xtidpJv5y8cjs`l+G%(>fGRBX?+x(}AJyl#whOi3pGsX9Esjs8hJ^(vh
zRN$ruary@0O~hM>Lx{H#?;s8%b|D;WMOk6`ZXAwvq?7G0%UwAhefBNU-xuuiho#X%
zVg}H=x~;=v{GAYg!qqpPPGJS*bIEb2UoZQzeE-Tx3P;ytOp_E%Or?`-*Q}A-6`EbF
zC@?aN>uIuoD;5hzc5J>qU%=+4$JirwTk)+oDzOdQplFQQYsks?Is1czI9ax%$#WVX
zJ%jiFaTak7;Y56h_z3YaLRUY+);k=6ao+5Z<FWMdV=iQ8#T@2xrjJI{<g9K?il|_`
z6O5B=S3)uUb=N}RlGs7VWZ~e7up#>lLfC10KD*>RMNYASnS=c2u*zB;Ht{0H^EKid
z#3jVHh|37PZ==yt(OGUpi^lVaPXMh@{|uaroa0Hcay07SMR$5a)U33sg!tLQs@dck
zv}_;yr)p6?zI+c5I_CH;ngf>JS@1f{WskcmELsX)x+vS^nq92F>yDvVf?J#(1*~J+
z>T=0Z@ceGx_h|e9fvr5^vu4C+F8iZ8L--L_e`3ScmF}Nm2wD7smR}LN&R!fP>Ffd9
zHeF|rp278+rFlniU$T~GL@S;7Y70lT*3}lZOwiKP`E(Mk3t-!WrNq<4Qf84X&PL#E
zcR|<ox$nvQ4WCQW9<EK$PGdLRnWOr{?&68L>iQb`Ny_yq*beErUIo1>wsF?hiX<s|
z1NO9v7MhOFkDO>@op>9S_a{*~0k+e+$_Y@J$FA4yn3kl{yI?G#1NF`&h77vG4}t!#
zgJuo+JLOOaKHd|~*Z97`mn<<qcCew4_sXlj(3NkFC@*H`J#7=z8xz!X*`p0(trKp@
zb4)5nw<RSCawX97(4W@7U`h1Q>G2y4F0TJ++*pdhPd43(7(fgmjw4PYK0{nXV5d`T
yLyG-Du}BopklsX~_k=w4ik5&)vo`f8QY<7d;9wS&09IlpZ2O!_VrOUP%=;g_E~0b*

delta 3388
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

diff --git a/dataproc/api/views/draft.py b/dataproc/api/views/draft.py
index 609c476..b030244 100644
--- a/dataproc/api/views/draft.py
+++ b/dataproc/api/views/draft.py
@@ -125,4 +125,47 @@
             # if input_prc['WatersPresent']==None:
             #     wp=None
             # else: 
-            #     wp=input_prc['WatersPresent']
\ No newline at end of file
+            #     wp=input_prc['WatersPresent']
+
+####################################
+####################################
+####################################
+
+# @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
diff --git a/dataproc/api/views/proc_input_view.py b/dataproc/api/views/proc_input_view.py
index 5bd7b3b..b902695 100644
--- a/dataproc/api/views/proc_input_view.py
+++ b/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):
 
diff --git a/dataproc/dataproc/__pycache__/settings.cpython-38.pyc b/dataproc/dataproc/__pycache__/settings.cpython-38.pyc
index 3db7b2d06d8c9319ee3453aed558abfdcce0cdb8..c0255b7f42cd1d207682340f1eccc6785bccf513 100644
GIT binary patch
delta 114
zcmbOwK1-Z0l$V!_0SHQC<q|aoH}bi%GDb}fVZ8<<wb>Rka&11(Ce8@tJZDc}<elun
zp~c1rR9(b7xq_nwDEya0fe$1Q#h#O&o}OA%9JN`SGm(+a7^KK}@+7WIM&`+XxO^Ge
JCVO!Q001ij98LfL

delta 114
zcmbOwK1-Z0l$V!_0SE%lFeWY&*vRL~%6MyX2<tT<sm->Sk!SOHHgQHE=Q(=<qrhYj
z4lOo8pz0!l$rT(eK;gd}3Va}eTkJXc>FKFO#kV$Vb0#vfS%MT<PM*Y-$;dSM50@_^
J>trwP001MTAP)cl

diff --git a/dataproc/dataproc/settings.py b/dataproc/dataproc/settings.py
index c44118b..7fe27a6 100644
--- a/dataproc/dataproc/settings.py
+++ b/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 = [
-- 
GitLab