From 2ea8ff2211b44d94bd8b1a9fb53a6e7e62922e4f Mon Sep 17 00:00:00 2001 From: jtyoung84 <104453205+jtyoung84@users.noreply.github.com> Date: Mon, 6 May 2024 16:48:30 -0700 Subject: [PATCH] feat: removes processor_full_name (#100) --- .../configs/job_configs.py | 5 ----- .../configs/job_upload_template.py | 4 ---- tests/resources/job_upload_template.xlsx | Bin 6565 -> 6523 bytes tests/resources/sample.csv | 8 ++++---- tests/resources/sample.xlsx | Bin 5611 -> 5604 bytes tests/resources/sample_alt_modality_case.csv | 8 ++++---- tests/resources/sample_empty_rows.csv | 8 ++++---- tests/resources/sample_empty_rows.xlsx | Bin 5607 -> 5605 bytes tests/resources/sample_invalid_ext.txt | 8 ++++---- tests/resources/sample_malformed.csv | 8 ++++---- tests/resources/sample_malformed.xlsx | Bin 5628 -> 5630 bytes tests/test_configs.py | 6 ------ tests/test_server.py | 6 ++---- 13 files changed, 22 insertions(+), 39 deletions(-) diff --git a/src/aind_data_transfer_service/configs/job_configs.py b/src/aind_data_transfer_service/configs/job_configs.py index 72c4ce9..c59ef37 100644 --- a/src/aind_data_transfer_service/configs/job_configs.py +++ b/src/aind_data_transfer_service/configs/job_configs.py @@ -131,11 +131,6 @@ class BasicUploadJobConfigs(BaseSettings): aws_param_store_name: Optional[str] = Field(None) - processor_full_name: str = Field( - ..., - description="Name of person uploading data", - title="Processor Full Name", - ) project_name: str = Field( ..., description="Name of project", title="Project Name" ) diff --git a/src/aind_data_transfer_service/configs/job_upload_template.py b/src/aind_data_transfer_service/configs/job_upload_template.py index bd8762f..2debb7a 100644 --- a/src/aind_data_transfer_service/configs/job_upload_template.py +++ b/src/aind_data_transfer_service/configs/job_upload_template.py @@ -19,7 +19,6 @@ class JobUploadTemplate: NUM_TEMPLATE_ROWS = 20 XLSX_DATETIME_FORMAT = "YYYY-MM-DDTHH:mm:ss" HEADERS = [ - "processor_full_name", "project_name", "process_capsule_id", "platform", @@ -33,7 +32,6 @@ class JobUploadTemplate: ] SAMPLE_JOBS = [ [ - "Anna Apple", "Behavior Platform", "1f999652-00a0-4c4b-99b5-64c2985ad070", Platform.BEHAVIOR.abbreviation, @@ -46,7 +44,6 @@ class JobUploadTemplate: "/allen/aind/stage/fake/dir", ], [ - "John Smith", "Ophys Platform - SLAP2", None, Platform.SMARTSPIM.abbreviation, @@ -57,7 +54,6 @@ class JobUploadTemplate: "/allen/aind/stage/fake/dir", ], [ - "Anna Apple", "Ephys Platform", None, Platform.ECEPHYS.abbreviation, diff --git a/tests/resources/job_upload_template.xlsx b/tests/resources/job_upload_template.xlsx index 9203d33d24c901742e0eb3353783216a81ee097d..39ec6f75592aeb41b12cbeafda72ff0cadda7115 100644 GIT binary patch delta 3215 zcmZ8jc{J307avTv?2Ii-W<<7-u_arQWo%(&i6W#j*0H^opS@&nLTHdIS(4odL$;KC zG)S`VLbform!5OpdY}8x_io>N?meG-&i&-d>|drgLQsI&K-ARKAnp3RGI~KWij%hj zPR8+D!5EMW0jBCM-=vu8cOc-k%MKRCuhoqEz%)i#n)Ep3vyVJbWl7o*2(IllM81AB z54TZA;!IZ$T}mfuZeF33^$KAS9?+nxr~!LRm>d4-dWZj+SWidTO)2v*dR5qZ`Y&t! z8H+6LhrVlvXbJEqKCP@IY+pDg%nP<#iq=xcXc&C~U?g`Yi?n1rFiHXAEr*{>kE!^& z@R4gR$kkra^$`JeDCnWj+L6Uu$n>6d!`tJRlI}PcXBj*GZQGfHE9%gj!nWCdO$J2@ zBcLM|L0YMk4vG@gUl64BLo%oJFDqiVPqgs;299;|8T=d zf-eC$mca2lucjtdnAPTBO&6RU&VvmjbVThPAFg#uv?YhhRnI1Zb>@a#JNfS-q*AeI z9(=~$%eehF@x|U>QV;gHBb>A%?62aTCd~3foPM}xwi$B7_A*9S*iz_d+GU1c&Etrb z7d;0U9KWb{TNjsqE(&I_^XnhJm=yC3wTJ?ouG>co!y^-eqn}*FK@3r;)Vc>-uP!<( zVSBQ8nc3wpGu~U5QSoJxitnkdiFGQzEF2nnoh-1{HcGs{fuuUy%Q15%&+@0p&6oFK z{s8X&Ui1rL+)T(rzpI}MzE<#5X(jpH80%$*d-tyBV8?0L zfKsEIWm75(ED1)&oQMuqYm;q7osUF{MhXq-(F}u;y_SKf-t!Tb-hxhU{kYcYcmpjB z<5rFvckCCrKhXmgpbsc*`$Kr z%pF6r{;{=VL9U-{dY?zz$LgmIKqWzo$Oz2H-HTjxqTYRO@RjnY;%k-IWIn5QfgZ3t z6DgQzi61SfNqVZK_)ag2elw7ppFX`krlZI};+ozF3YYb}vK(&4bMv=N(vt z+#EnCNx5tfG_5%Ie05Q0OEmxkfI2icJ))OT5%1ekuYN(}SnVksFRSySjv;?2LGN{Q z3rlg`gZqTB2ce2nVX;lf)~*{0$kx#t=%OcL=lYAF>~h(6G;e=msLtBA<|<2vX~|E5-1P;b__f}Q(y~xTW&h^((9E54REpc7`(b@iJ~*Upb=#s<^Y#UZhtV!&L`B4gh#<7`V+l-s`W zATi5vi2_4v%5i~?exO;Jmo-t9FUU;)q95)b6iO;}T++ah`c8wBG)u433gY#aV3_w& zZd$@`mV0L{YnOwO8@0KuW6d}RL=w8*lw5 z;m$Rg(W+e^i6f!*wtT#RTQ@(m%xJ~#j`)c~!m99KxujxPv~swxlKmw9P@<%6*sf^A zu4vSflOt0Uhg*Fb{q|Y(+q6fvw*v~7rrvj6s$RNOP5UmweZ7DXy6y@Czk(F|gqgI}iNwQZYsvH?e<>G@w!7TY%F~O}&)N(Hl*Q5q8OQwk1RYk@EI3=t`WD&Rq+9a1BjggoTbR zMoRPXWE#Md&7zoaP{S-A&z_u*K7eUG)*-I(a%MIc>sYb~90)^8873QLF0d2Y1J5%q zYT3kXc?xdSkdG!G+^1OJ`^6auRisQa#0U651xX!cG_uyQkAfLus^(K~SsU^Ze;t8zIL z9JVt#?n>bkx=a)17(rD@RN^6>4eBu~s@OZQt>w|`H`mpun+h2(`aa6l%b2~$>Ck_r zF+sQGd_D$jqvDlr?}gTgS}owW%r|^oUGTudq-xE={R4i}JkjmO_MGvO+Xn`a6-K$Q zC#^{gI)P2OsFz-Z9rRNL)@s=0vn)o){bp!Yt`R!*N8S;GRoXRTlni_(6tH{&?vyW! zrZrXq2mI2TA}OQqcH;+%AKZFal-Ipb&;NMyTc8pPoQk6c8e4K_;xT=!t8HXyAvlaC zPcfpoDIyemlWaM`w>PEi*sJ9WzL9=SRix^f@^HAV>)^4-c`tbdphOUzA+>8v`0`Yb zPn^$?Q(x)2RGqk3G@PvCzB=e@95Ix}kGe{JoODE7{TU^XbsO&;nJB%kJLHz?*VVPZ z>>-8wew^O6#eaJ0h48i2jZ`2|p}@aRy*cPFp+C`moh3cde$EaR)^xNKzscJ}Mp^Px z1(VGT1tN^C4a20^0(WjD;48?}aquP)(3F-h6=UQ^7U z50bTbSx8U{CDgNv&RaN6*Gg_q&GR*%$>q@}R9S|hX3N|q8`Di704IDdrxfL_`I;i|*O zyI$Lst2ef5-HPmj%V$QZZE4?xG*?jONXkn|4m|!C5LJHhiDQt|=4(H`Gxl;9)DMy; z?f`38TmB(Y&$CG@1?WO%bSOF8>?xG_wdPb4#58ZKmnXwAW*sBPiB5v>)b58_e1Y(q3{|Pr10b10?R$3j zTJ&j@uZ9Ch4!_QvqL)Q0ujhI~)TYT9{{>%#0jthG%sP#Y_!}(`NWni2J`TCxsNLew zWH>?3{14m16mr1%PhEd+1?OLT00L2B4mpG^PjlK8iTD{iFz(CZxO0Nt{jZpNB$ zmqONLy=niaK5Zf}7AAH*2Xy^IfZ)!X`y#3swK-Q5Y$K1&0?Xz|g;2l*%GJ-LqY1;W z+d28NRGj7O@LIA1n9n?L{-;3-&w4Twm?3#G({nljNtDA~PV z=cOxY=r0L|K62T)2&Sh<&+995rp}_+I0IAlaL%u43Vh%6YZMy8-NaDZsdzKzyCPFM z51yb%o&CDvfo*^hI3^a;&_?m4L$T6M>V1G+3ZlF#QRbP{nMwks$P_$omow>*P0POyu?JNNQ=Cz9 zNTf?ktKF}_4f*%9RU$8_Chl%l{Q$qYpf#h9`=r+4%@f48=~l#ZF;B%dm(dF!AKlI_ zJL)>X7;|HZu(O)GwHOjeDigqKEnwo?H*&Xh5Q}lE4VvB7N}pwMbWfg|+xC-mE_`$` ze&m7Tf((;EF%CjxD3s2-)yY^G&7=}6N|&x*G~l5b*7}b4(eNM=%u7YgV_x!taupF@ zyb`z#vn#cLp7oJDlH6UVei)8tL+Y@I41fBHvQlrF8OvG!zwNye$ENx6{T4pA}y1jk@-9Al* z^z!X_E=Ma5rlqxVQg}dI*8R#86YPaJfs2#Z^SUeU$4p~Yx zrZ3>$byMADN*QXxuikb5k8$x8&HO`CT%xvputn=jYj1J|Hd!`1yT?3DXjSi&eMJGm zK@3Q)c=&4>YT9-UhjGfOD9hq?PPA^;9HW^G{ic$~r@kTTo#g=cIg#0~9fAVRpejq; ze%a5d0@K-bY~30hn}RfHI0w#9al>ql^j^XddUoLvA@}^*WYrsMah&O$`n$@HSw1%y zY1n&;ybQFim&i}UT>x6nriF?hpzP}{?fUm(Y>(^S>q2Oy3Khp1If_+O!zYyul)9ym z@G2Rq`yKh7z`@}bZ1Sfmh_i7)Lx8PXqE?CZQvZlnYhH#?K^JycIR+dKcha1uRzT}O z`ot1#Lu}tED0Zdsje5WJ#ionj->PTQXcKJ8PSDEkfZi1kYKr{HeO_t-#l5SQXGM6b z{mZ^K*O`l%H^qJ|)+%r2PG2V^RgTgOVkXy&hYHK(+Gyx`sTW4R9FFj2T^-ik_$#6& zMxhMKCYNicQ7z|asDZo|Umk3f&cCkjF?+dWBQB&Aw<4%|C1#<&fGoR|RT@9XBmC^w3aX!_ z7UUSuwkQUCM_HZloCABy?>W{n_k9t_to_io+vv9a=ICm_B8rh@=y4P>)cRyM&1lG$ zShd-iZhL7jz+l)yWGt8!VX-u0AwhqSc_J{5#dbNr<+1Q;miDN6^#{S0ZUdczQK1lT zCV9xxE@bi$!?c{*!esNJ8y&8tWYs*R+*&c>K*g40R0gUo}xj;J7w># zlsavGb8#aOpO24ge>(8oKacit#2u?kKW7A~9U(arckn~4c{k@4Ng8znqDf)uKNo*# zDpz!DE!cN}h*CLd(Q~L*^J%@+;Y>|=RE`L%4-pIJUja1ZEsdwoX6+n2q^ZBF^Ikl3 zxDvHO1!D%72Id!Hn-X=>yn~mwjMjw_2!r7A<0TS7W&IB zQ3G}Lb-*cM6Z!&3pLCY8gv9|zFQLLM;1KnbgfD|alR}gQuedL9u#TSpFi`!TSGK73 zFgzB0%ty6rrw85Jw@k^XE4vFiD973cK2KeC+jCnDK-WvF-rPuQGr0;LyT{wHhmeq~ z?fO*`a*;ObE34tS=%pTL_&CL?tIhIg-eX#HX~WoH*^U!&BV3v8=3ZjPp^RTdq&ozy$Z*}N8MeRu9?P3pFF zhL@_P#3I6}_P`pPB44zx*m?O;7cFWCSj-Kz_s^7I-{qq4$_eSk0en}K57rUnJH9s@ zdWu&<f)5isd?W zhez?>+~@A8Bm}!U%fGUC^m46{6&aSF`fJ1U4zQME`>OY~#jL5fiYq0YzNHLc*&rHX zIu)CYD4KO&n_yhq3vqw6lEJq(aS#}^M~i(L#hsuzD7kWoZIi#E_WDwjJ=#q_=c;dx zJ;J0>QRsVL;m~opi+fPYxn&j9MIP?QZ)iV$D?S#3&11%^6MM9q$-3IcVp26#50o5a zZg`-F5f*7U5KQ?j<)^@67rjrxuQPYswhKoNMZQ0130Aqj7S43h<|AU}s`PScXA?Pa zTatCEf#UbmPY%83-%SGmqzL@q({B#=cOnSTa{*6{oibRK@^=Fh2!WzvjBE^^USSE| zHjA%Udy;Ss^hUia%i2+jEym~FX!)h2g2lF-?aC{@^SpX{zRNX*vmwHr#x~b(#Yf62 zX*`(~q*3sqYwKk3T2Foti|q|#&v#eIe+_(=G7P_|p~nsCu7L2%0)KD_lsaBAdOK*@ z!XZ}s94p#=r5d!vWx?!)vbJzkofEl8@w{H8UDnlz5&nktertZjmqhAJp;py9A7H9i zO$>p9bTqc14K-ZOC8Z&Ag6u@>PyI&Id5(-Bkyc^HkxJX^zwiY|fQHg+x!@v+sX!AJ z!<3A(FYr{kIlj>_rF?EdNy77X%RsG}4z%I>&?Y%ecG0J4tZ zD~dsH!zfvj^;`*^#o!}Av>n8jmq?Z-F9r4)3x6to3)Ly>S_`6&-2dWg-PG1GFTIsb zT3X|e>^gBMmfX~PM5b8ccYC%CZIQt{B@D}au+5&{X$~uCn%^u_Q33#edT)Xdv-aPf+m~hFR4Xl3{NI5MHn~&HF0*SeoM>nMKd*-gWtZXm9s1`T z;P{X1r!^GQ$1ZY8KV;{okjHRxoVWhX0Kq(`_fK}>0|WrTe=uxLx(_@hgM9ow9DRH| zBp!Hq8tPI|vH<@3PcZ-IF(7}ClQ9V#{HI&8nQr!FI9Z_jBs2bjQN{Fd@SS2NNPy7P old;v4%=`x?2E)J!J;f}b+XLKA=IE#Xe+&X+z$ttN%>JABFGFJlApigX diff --git a/tests/resources/sample.csv b/tests/resources/sample.csv index 2305c47..d62bab1 100644 --- a/tests/resources/sample.csv +++ b/tests/resources/sample.csv @@ -1,4 +1,4 @@ -processor_full_name, project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime -Anna Apple, Ephys Platform, , ECEPHYS, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 -John Smith, Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, BEHAVIOR_VIDEOS, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM -Anna Apple, Behavior Platform, , BEHAVIOR_VIDEOS, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime +Ephys Platform, , ECEPHYS, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 +Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, BEHAVIOR_VIDEOS, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +Behavior Platform, , BEHAVIOR_VIDEOS, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM diff --git a/tests/resources/sample.xlsx b/tests/resources/sample.xlsx index 94578d741b0711f91a810eb36137c13683546ced..e7ab7628c53863fa860ba77e83a646969ff87daa 100644 GIT binary patch delta 2376 zcmZ8j2{hE-7yk~1v5c{d-Q;J@zC}zWYqqgPVPs@a7)#bDV`;G$V{a0nMA0;4ERiK4 z*|YB>WTyq${_;EL_pk0b_uPB#``q{LJD+#%eTz~vQcyD#H4PkqKp=og%@ZP21Vnvk zNlGBDBL{CnC5F48=`|wHQnSfHv#Mx-4wTV0?|LFRt<55grT!+;)hFgCmBf&)xG<6K z-u2DW3=}MgB#};2d-{I&m~Z9bclR)qv?Q>}x4j-dllpCBptCiR?ORXTs|s4f5Kz9= zr)sKhyoR!MPsfgLCwCDuZH(0ENP6{q{m`Df#i5R>r|#oq0)eo3blY|s)SS;SCQ^-kfj}Xjn zQ#6;KdaMSQ7+-pGn|BlC23}N>`-n38JgtE1eo0!^DaYx6-y^+YCyp zaMqlbq2Kw;P;`(bHH*DW5CCw~0>B?^;`L~xaK?Vqsw{6-OMSM_a(`781RH(SfEc)> zJrgBal&d&=u;xH-7*c74?Ul{IJkjM3EM!yqLPEwuOq-X7(g)&0j!TP7d9K`jQ@iTG zxt{T|ar9ujX5XI@YA(nr+{Tl=!zH~Z7pLxeMb^$ambeif-dg!cGIfGBBHo-JI7C6Z z;$9~EBng5od?C)V^06PE#M4HF;nlb1-X-sDK2iAW0=CjhSsnlN?;to~(Jg3|jl&^2;FBUAPzpKN2r;zQv;ue>>9C9q2 z#fOx|cwle#oB?u8KeypHp)kulcaPbEUxHs{6MHXKD|t+G#LtGkNmWy?$e;dxA}&rc zEHZZPZ0|MmoS8}!VpGb3(@(p6BJ8a?&-OUq+>opmT!&$2uX)#$G?wU&eAIPYAVK#d{s_~TGco5FFDkn8e zf!d&8`_r^}3JQDKfEQ6PjYeBJm>EuUpSWU!KcQV}GYs0ovsyw6s@xuwO@h(fKbooY z%#-SZeUh}|GAFOVRo&^|rj zv}kXP&Y-Szb+jfQaY5(~wh6Wa#)w;3Y4dSUz zK-_#u%sWsH{1QG`5+H~e;AcU#lv6ua&xTun_R?MT`&jRM=ns~F6SywRLM%o`m744r z5Zp?{fy8B><^Cmzf5P|0Ova7oOf7$U%t_9KbmR?5akc<1T;${LyNOK^8jkKERbi`s zL!VQf+#=f{Rmo~rK2Akwcbju+e0QgeA*(x6&hqp3>`fagugQS}szcjzKeQ1ClT z)xtw)M)@LQym@`>%TIk-*E5N6%>1(YPE3uFM92WeRWYMqAUJN~SJUx!DJL4!0DuVd zUromv_)VYysT(ptbu?0n8I_M5JOwI(!S4M$HmvTua z=s82d)oS8iC?lV0K#cchwqMAK6@ELngrFw=kuT}-+pkH~k;-5$m)PvDw@+&)p1c4r zbEnClhwy$RJ-B7izza4lO3GoPTecR?rN>JQ^9s{9XJK=n43iifT8;DE-93v8ancey z`J$6un@+Y-xnN~@(47)~MEB4u`@DkDXGJRF+;OPI)Ft1i6vEF%^`nvHT+?}W7^Fw(Ej4Dd@)KGL_ER~XlEpKT1^W!++WND#z zP~cY{$maDilx|`5)pODa5WK5h)IB|a1bU1cfTr-=L41E zW8nO@zcQ4v?%D1f7UDw<0EeagCK-$X5bP-zd+3IJVr5XV19CH2a_E@M7CfPAPde_+D#8XN*gn5ljsJpFKO{ZQHez_jDTIE0Qc ZOOfvbt{(2u2mTwAkFVnpqcu57{2#XL4~GB% delta 2305 zcmZ8jc{CJi6dyB_eHhG$l%_HEoiGeq$(TrF$(Eg--6WHxv1OSOudz40N|v!NiR{ai zJQ6|;qHNj5Qg)4=ymLCe_x*G4?|1IG_xsN8ocsHxWEW&1CO8ln24H7r2aFa_Dj+Bp z(0;5s$#VE0AsYiFh~{>_BM4a7c-iR&O!&77txCIGyF543!Ge!6j85cMo?BJx^n}Ou zX8VZs`t`OHLMsLT_VcJL<=Wo7bpSASI5UzYoDaTNS*?EQ5OZT4A8>{v`1&7oYtSJb zP=D9gbN6SlkB-QBOolbPahrp(Xc>&wXmUA9H8IsBM262l@N;toexTONyjUUF{{;oj6uf4zNb znN8|cyb`Cm;RgDd$($Bxh@O8ndQ4$$G)h1d>8|uY zG9)OtY`KAnBp144MzNsG8->)$nd6hA_TIkgiS_ln7W4j_*F!e5Q}g^OBfB3lq_;Wf z$psP1@6&bu9<3SaRsPVpEewkb5o6?GSXw|?n}746e5GBQ2r|L3v8V9sz-m|kfKpZf z;6GZErNOequ7D9Vv|-t@oRGK$_3l!@Qmrb#cgs`Gs$qmOq0{+ z+u1*qbyW6{D)(|h;5+FrGLolLzQm*3HTlIXCV)f>(^q(uCuu# zPFHO;)g)cDPgB>P&JCht+(n!7%a5+6g>7@h;n1V0Cdg}n2}_}coz4D|;#ZvZQp6wO zNW_Aca*HR&#vHaA2Nu3&ghidMT6~jl-*`*ci2a#K=aL_#XH>Cu(D^C!$cjemg+5^n z(zydZP?K+P@`e_n3;XpvC->#f&A=7Ko3={9Yzg5H2ko}l&UIu0BXk}HuL7|LeK9t79>rqrx@(O3LC{udGkx# z0-@)5YYS&iEcO(Y+~2a~0(zF%lWH+OPp{62fK1XOADc<4?q&W3Xrc7~j|Y9BES z%l|Hn<+pvt1>YfZ_78^p!BWoJCCoH+$Yk-Gdw{(Jp*r16YEZc0jxQa)`+}v`!APj zr=BJ)n1(n>f&^G~H(Z8qO18V{x1iMpWt=Gu6=#ukfSiPFtl4@s0;_GiBD1*-Up*E< zyE39hym48iF_>G|AhG2k(JLbwH`uMh5FA{TW0yGdDR%Ok(wf)@vWf%)XTLz$6c;Mt z{|33$z9SlcpZdJ=z7&$$!swbsry_Q)g$MGFl)Su~-ZG}{p%aG#EkE=u0bt252}%Y==6 zF?5Yj4GaKC^89bPR5h^A01uobmrLy+A%BFRh?jjMm7urB%Mf9)z$bXH5?!#0%_y~i zURhI0`2aC|XVFJ&2KK*r!d1s+Xv8HrHZHA`NQmMSKxsLzm!R-GzA%;e$v= zb2;8(ui_2*IAEEs8XR!t5^?P=>+k{YWasEw64jv3*ptt>c$P=ziFW&^yxJ01y=PdW zYs8_)e?0{p-Pr?MKEfKGY%O^tTa47g%?ucl8s#t%6ep?2z*0C*1AvHEdu?bJ)@!bi z4u2=fVo5#MSD8q<>h$iUz3O~{+a91<;c!t;VHcrZhEodH6GgiM>`TJvBbG)WDQSJ} zlfm~ZdwIp)^NuQ6vjwdZ_!Dz#z(0t=P<~Ss1QYHko=h`aC2biIc1M;{jYg=0drVNll02P8%bep6Cb0hq?Ox>isS>{{x+q}Z0;ZtA|I3uXi~ZN< z>CnLgxhnXm{}Ofr>OTo`s(>D3KU)3r5%R2n+VP*v@8Syqem`1dZJ4C)&zirN@^(x2 zr_%TV0LbqpfNFLCfZ(Nwzj4dU6|X?>_AM^(oODtIve*6I0?4x(&AUN^>QQ#uLB0h2pADr9+hq9Ur{Os`$qoy1F diff --git a/tests/resources/sample_alt_modality_case.csv b/tests/resources/sample_alt_modality_case.csv index c58f227..35f31da 100644 --- a/tests/resources/sample_alt_modality_case.csv +++ b/tests/resources/sample_alt_modality_case.csv @@ -1,4 +1,4 @@ -processor_full_name, project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime -Anna Apple, Ephys Platform, , ecephys, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 -John Smith, Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, behavior-videos, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM -Anna Apple, Behavior Platform, , behavior-videos, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime +Ephys Platform, , ecephys, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 +Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, behavior-videos, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +Behavior Platform, , behavior-videos, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM diff --git a/tests/resources/sample_empty_rows.csv b/tests/resources/sample_empty_rows.csv index 9013962..48b3a14 100644 --- a/tests/resources/sample_empty_rows.csv +++ b/tests/resources/sample_empty_rows.csv @@ -1,7 +1,7 @@ -processor_full_name, project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime -Anna Apple, Ephys Platform, , ECEPHYS, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 -John Smith, Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, BEHAVIOR_VIDEOS, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM -Anna Apple, Behavior Platform, , BEHAVIOR_VIDEOS, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime +Ephys Platform, , ECEPHYS, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 +Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, BEHAVIOR_VIDEOS, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +Behavior Platform, , BEHAVIOR_VIDEOS, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM ,,,,,, ,,,,,, ,,,,,, diff --git a/tests/resources/sample_empty_rows.xlsx b/tests/resources/sample_empty_rows.xlsx index 62817e5fcc2b71cad3d66caa5f5dea7f4ec1c9d8..0274f9d485352ecee2912bd75d65a0030501b8cb 100644 GIT binary patch delta 2308 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 D>8lo9 diff --git a/tests/resources/sample_invalid_ext.txt b/tests/resources/sample_invalid_ext.txt index 2305c47..d62bab1 100644 --- a/tests/resources/sample_invalid_ext.txt +++ b/tests/resources/sample_invalid_ext.txt @@ -1,4 +1,4 @@ -processor_full_name, project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime -Anna Apple, Ephys Platform, , ECEPHYS, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 -John Smith, Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, BEHAVIOR_VIDEOS, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM -Anna Apple, Behavior Platform, , BEHAVIOR_VIDEOS, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime +Ephys Platform, , ECEPHYS, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 +Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, BEHAVIOR_VIDEOS, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +Behavior Platform, , BEHAVIOR_VIDEOS, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM diff --git a/tests/resources/sample_malformed.csv b/tests/resources/sample_malformed.csv index 690c713..f31058e 100644 --- a/tests/resources/sample_malformed.csv +++ b/tests/resources/sample_malformed.csv @@ -1,4 +1,4 @@ -processor_full_name, project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime -Anna Apple, Ephys Platform, , ECEPHYS, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 -John Smith, Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, WRONG_MODALITY_HERE, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM -Anna Apple, Behavior Platform, , BEHAVIOR_VIDEOS, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +project_name, process_capsule_id, modality0, modality0.source, modality1, modality1.source, s3-bucket, subject-id, platform, acq-datetime +Ephys Platform, , ECEPHYS, dir/data_set_1, ,, some_bucket, 123454, ecephys, 2020-10-10 14:10:10 +Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, WRONG_MODALITY_HERE, dir/data_set_2, MRI, dir/data_set_3, open, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM +Behavior Platform, , BEHAVIOR_VIDEOS, dir/data_set_2, BEHAVIOR_VIDEOS, dir/data_set_3, scratch, 123456, BEHAVIOR, 10/13/2020 1:10:10 PM diff --git a/tests/resources/sample_malformed.xlsx b/tests/resources/sample_malformed.xlsx index 66afb631d7422c41fbe2457159e43c5e7c833489..417d5cd01bce7309063f8ddcbf3b581e9cdc7872 100644 GIT binary patch delta 2397 zcmZuz2T&7O6Al<4fbA=QHfDbhhikSf8@O8~=#7MdWDa-j4CDN0wt zgmx4|mkuI=B3%(tiWD#6jHfsMo7vfY`*wHU&Ns8)9>^ZavY8=I0Kotd2n4VrlWN$+ z=}ypeoe~}2u|Y7Qm&U#j0Y|>7(k5$M?WV3i^BdzpC)CTCPY10M3_keuyGQqSns04* zR9Wn+%o~ycOEUrLOgfmo>CpucB;z@f-$YHKfGC}D^UARBjuVa*F~sbcIPGaW%p*eS z(<0(;eX>kJ+N)2%p?Y>YV!kf+Lx%%|niSu|Q7uIj49_i#1x$>}y^a{*FI18k4xEOq zD3MA=R*BKMk7Lgi+9k>$zb496^VUwhuMn9O8>(zr;qi91g#E(U z2xi25tMnjt_v54got{eJqM|>(T-_X~D!gPjt}4y~v66x^jJftEbKmWGHLig1AgaE^g~(3% z9HbwXT4+|Hw;n8gJ|7=5%pz66A-C2Nv(90LWCH!p;GJ7V2LPBc(&T4=2@XJ6Z10U1 zYT%cHHlXPV%;W&;qona$Z-6T$*(ES}4f`TFQE=I5FAeI%PCCZ62ybFN1zmVMPsv&` z8-KpOh18*(fTa7X>=c_Xhi6M@N}yDCu$m9fJMQLL;)!_wxTPc6%%i1Fr#dmdL4|JH zu(T*@W4^4_6^1{J{V$8Czm{;vR;T-!i!fN!u)0diBl<}=Mn7mC1A}N^mBQtOorO8O z3*6+_)aF)WD{5xs~iT}U$&C1LEkHF(U%Sl6+sF0^DPi%Qit7F!df}k#Vk8>4d9}0R9}b?6fM$nQP=N??6{7H?r=@$b(Eyqa&V1ky>`c| zt%<4Vb%Y7~Y3N`6#1*2~;g$r_?zHaNjV30?>)P4F1v!y@87ExI!rn#M`p>F~Waj0< zW5!~;2xSaUgIsF^TLQEPX3~?-+oo?;E3UOi25DCcU>^r+!(n4_X_Lc8({wfUP8uSa z+p6q%;-ULGWE=xQ3;redZsSy1nZqQNiB)6I$vI2U5M^HNuZm3Y4UE9Yj;>dm^PDfmSSJ9S2 zJQ~YjkUp<#7B+}BTnB+kU8AwZThohU*L-!{fe&4Kd1tcSGX<*ddyJfE!p}vX*GhWh zOCPQfw`{EO_p-(lOb^t-zxuP$YhhlHgsX_$|T1zBz2W0LH!9KmGJIgA(J5uAyZjS-fl`$LuH8IJle2Q5@eFr8 z6>IM_hks9*Mo9!^>ww4XGZUDNec@FY3U(7Zh8h{$fkE57)$HXc)GiS!j zi@HeVt?9L<_5dL!ofxdFyi#eLi^p3-d_$OgXebNlR5XoBq1UP9@z+ z&*#40h52(11%aoMOK)<1dE*6{y=|xOKJpm)6|-^j=@aV}f}mq4774$L(!M9k)DO<; z5>oV`3P<%LWfCbbBUsvBRXR`sjk%eYxfztBOud`fS|OY2=7!beLyZ@G97S@;&s-7i zZJj8Jj)Ps>pHEG*O{ROK6zZ>CRl*(86gLJ>iE_O7Qoi90sx_?vmt1IZx=M$8y@O|GDFhQg8@HQ z6WgEv%=Jt46*d6C6@AUjAMG1(_8QvX?f<2Zz#rAK(^`H)6V6}Kb2tD53tmCtZ!OG^ q1ER8MubVXC`6X(Rkjg819J7w=4)UT^8D;oyOfzAKSCY~5IPo7Xzcx(( delta 2364 zcmZ8j2{hFE7at6UEQ4Vf6I1pfRQTKC*%E4!-B>!=$v)XCevDoAi8M-<>=bVpl3fi_ z!c^A8P%7bB=P}B|JLmnY?>YB;@Asa2Ki~U3pL6c#`$K+Lp4;4v1q=g0AP`V-<-K}t zNhX&4outA9KXeEfW;q~V85a5BaosM)x3AaKuwo?l#9gA4=~GOke)CQ58axS1d zR^@Y%DwTbiYheo4ynv7y?f9B#l;mZr*o@3fjO**fRyC4=sp#JYlY zV462G3R(nzQR?OBp!bLqR;%XJaa$J$BewP!4>s7)YT8KMF@NbD_eUbJ+XCAB(_%Yp z?0q^}W&G_A02mV6H(Cf4Yt^STy}@R>Q?1m)-`(~!4mHqrZyNXC+>KtpEIXjNcRXwc z=jPkjo{v~NrWX_U!!>9o$ygi0FzW8to`0{;*O6yINW^aQvv$N-+`C=h!w<;_LcT7$ z)cItl%Min(hZHaC@;zSiw-1{02j9XLBZ{$!YagHXJh3vG@p>CQ=?Q;^m{rgJzJsT^ z!piqp=2AYmRez*jf7)AQFxY)^F)=0%D3AW8*6jA-+FJRh6WORB*X$eyJNr?0j?!`q z{e7Qob_k!&*ZTuZAkZf^5a<{33A$i;-~x`O4sBa`9Js9`9D5}jrmPy1`P#lL_a)}- zbexo{wcCI^N8bEsfZ31E+{ULGAEg@$oSSw`{?cZw$-7QxK};fa=sjIS^mAgk^XuQI z_EuYeT${aNQG}GB;7-vmCvS8pMCIRa4$qQ1_JRfPIQZSFl7@!3-OJ|cXHq)H1ITm0 zMJ$vB8Gi`jQNC*K3c}opRFr`V-7GYv&}IG;I-xB>z!g0pMuWh|qx29fLuZWlc9O?a9NQ6LE&RDlQnqGpq{yued6Tiutz znl|j<_vPlZ0wz`ll|%k!!pVYNOOg4pE}3o&;*$DRh_cC0jGPnm!#SWhUA&0)8@H`aYm`>`dWZQA6j#^owFLLPqAQJUN}OpjxlzD-SM0wP)p3GG!L z@i6R5ux>NP*Mxm5A^W)0QbskEOnU&=7! z)~tfMerZsA^Rh&@qRY5(YD3-*&bF|W> zZT@6uCzS4%umsQA`0aL8r7?2sZI@ekMeJ9?_md|cBcWytQTAseQA^Qw!Bd(j@)l20 z?f0?THr5+~fb#f+7HY3Ja-(a)cyG^z0d-*Hu(-T0+%FI!^NKhm`yW*x*YOA~8q$Xu zaUqhV_>ez*uf)E45O~b%ky?EHb7xK+u9|P-O-ru}UZqEe)i_zbV2zx6qVLP$oS#H0 z+lkd1Ztj5IX4??uzrmS&Hz>5HYvIMBwQHTe2YA{I=oNIVx}J;ZsqiEyw?cYmy|j;} zCGdSSQMX+#Ej-zl$lPk9_bj)ak19XD7DC~&{UlpcmL|S-=0ZK6wAQEcT@9&iHVnuA z9L?1qZg=J}SmCB9PDTG-^W8PoUR}#71hCY#U^p;9nfa2dO}&h^m>h1UzOmMuh1=b+ z30p_nBuD5a4~t@KL*4xlGgpX`L#vLpm6;1x7s6v#U#;%?z)z#DDbO>AAihw~(y}Mc`zv?Ys z2bWW+lqT%5ouDZ-)RjRO5>^jM4xks{t}olpJ+DXKXOVq%HLI|5J&OhZRs(K?FCdj_ z8K6ua8QU#g~byj&MWxeuN-dt&SEnR%K^$_kZAiGj}q)G}Frspi%E zq;DUD%MP^G%q-cd*p~GrQm#thf3qb%GrH+RP5T-={3wOVbPgvGCs)W8+>6L;pXzKq zzbyWzl&OJks-tdTkL(fu{%dE;h8#`kHgA(g`^m)sjrlN{#UNHuZ1vz+2g%4^{WU%bEI_-cGd48sMw^HxMSEb`T)c2^ewj?{@!52Z0%;iaLn=%(yV<=Y;_iFkl3) zxfv5P4D{azgAff9W$Go|gCP%rpYEUP2%|7D@dL1*d*u5W3-p-)6GS;3)4THQB+U#jN`S%Sw8yZDCh W4e{Pbf5ZBFPAg$VP@2u-u<#$RpC?`b diff --git a/tests/test_configs.py b/tests/test_configs.py index 0bbc4a2..7ce51eb 100644 --- a/tests/test_configs.py +++ b/tests/test_configs.py @@ -27,7 +27,6 @@ class TestJobConfigs(unittest.TestCase): expected_job_configs = [ BasicUploadJobConfigs( aws_param_store_name="/some/param/store", - processor_full_name="Anna Apple", project_name="Ephys Platform", process_capsule_id=None, s3_bucket="private", @@ -53,7 +52,6 @@ class TestJobConfigs(unittest.TestCase): ), BasicUploadJobConfigs( aws_param_store_name="/some/param/store", - processor_full_name="John Smith", project_name="Behavior Platform", process_capsule_id="1f999652-00a0-4c4b-99b5-64c2985ad070", s3_bucket="open", @@ -86,7 +84,6 @@ class TestJobConfigs(unittest.TestCase): ), BasicUploadJobConfigs( aws_param_store_name="/some/param/store", - processor_full_name="Anna Apple", project_name="Behavior Platform", process_capsule_id=None, s3_bucket="scratch", @@ -158,7 +155,6 @@ def test_parse_csv_file(self): # not formatted correctly with self.assertRaises(Exception) as e1: BasicUploadJobConfigs( - processor_full_name="Anna Apple", project_name="Behavior Platform", s3_bucket="", platform=Platform.BEHAVIOR, @@ -225,7 +221,6 @@ def test_malformed_platform(self): with self.assertRaises(AttributeError) as e: BasicUploadJobConfigs( aws_param_store_name="/some/param/store", - processor_full_name="Anna Apple", project_name="Behavior Platform", s3_bucket="some_bucket2", platform="MISSING", @@ -321,7 +316,6 @@ def test_from_job_and_server_configs(self): " python -m aind_data_transfer.jobs.basic_job" " --json-args ' " '{"aws_param_store_name":"/some/param/store",' - '"processor_full_name":"Anna Apple",' '"project_name":"Ephys Platform",' '"process_capsule_id":null,' '"s3_bucket":"private",' diff --git a/tests/test_server.py b/tests/test_server.py index 1b0f30d..a45e7f9 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -298,8 +298,7 @@ def test_submit_hpc_jobs( { "hpc_settings": '{"qos":"production", "name": "job1"}', "upload_job_settings": ( - '{"processor_full_name":"Anna Apple", ' - '"project_name":"Ephys Platform", ' + '{"project_name":"Ephys Platform", ' '"process_capsule_id":null, ' '"s3_bucket": "private", ' '"platform": {"name": "Behavior platform", ' @@ -367,8 +366,7 @@ def test_submit_hpc_jobs_open_data( { "hpc_settings": '{"qos":"production", "name": "job1"}', "upload_job_settings": ( - '{"processor_full_name":"Anna Apple", ' - '"project_name":"Ephys Platform", ' + '{"project_name":"Ephys Platform", ' '"process_capsule_id":null, ' '"s3_bucket": "open", ' '"platform": {"name": "Behavior platform", '