From 80ea546894cff1e3b88822a696b303eb2c56ef83 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Tue, 18 May 2021 12:23:57 +0300 Subject: [PATCH 01/43] Added project template for Java --- .../project_templates/java/build.gradle | 19 ++ .../java/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + .../qodana/project_templates/java/gradlew | 185 ++++++++++++++++++ .../qodana/project_templates/java/gradlew.bat | 89 +++++++++ .../project_templates/java/settings.gradle | 2 + 6 files changed, 300 insertions(+) create mode 100644 src/python/evaluation/qodana/project_templates/java/build.gradle create mode 100644 src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.jar create mode 100644 src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.properties create mode 100755 src/python/evaluation/qodana/project_templates/java/gradlew create mode 100644 src/python/evaluation/qodana/project_templates/java/gradlew.bat create mode 100644 src/python/evaluation/qodana/project_templates/java/settings.gradle diff --git a/src/python/evaluation/qodana/project_templates/java/build.gradle b/src/python/evaluation/qodana/project_templates/java/build.gradle new file mode 100644 index 00000000..95687b5b --- /dev/null +++ b/src/python/evaluation/qodana/project_templates/java/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'java' +} + +group 'org.example' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.jar b/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ zw`1S}(D?mUXu_C{wupRS-jiX~w=Uqqhf|Vb3Cm9L=T+w91Cu^ z*&Ty%sN?x*h~mJc4g~k{xD4ZmF%FXZNC;oVDwLZ_WvrnzY|{v8hc1nmx4^}Z;yriXsAf+Lp+OFLbR!&Ox?xABwl zu8w&|5pCxmu#$?Cv2_-Vghl2LZ6m7}VLEfR5o2Ou$x02uA-%QB2$c(c1rH3R9hesc zfpn#oqpbKuVsdfV#cv@5pV4^f_!WS+F>SV6N0JQ9E!T90EX((_{bSSFv9ld%I0&}9 zH&Jd4MEX1e0iqDtq~h?DBrxQX1iI0lIs<|kB$Yrh&cpeK0-^K%=FBsCBT46@h#yi!AyDq1V(#V}^;{{V*@T4WJ&U-NTq43w=|K>z8%pr_nC>%C(Wa_l78Ufib$r8Od)IIN=u>417 z`Hl{9A$mI5A(;+-Q&$F&h-@;NR>Z<2U;Y21>>Z;s@0V@SbkMQQj%_;~+qTuQ?c|AV zcWm3XZQHhP&R%QWarS%mJ!9R^&!_)*s(v+VR@I#QrAT}`17Y+l<`b-nvmDNW`De%y zrwTZ9EJrj1AFA>B`1jYDow}~*dfPs}IZMO3=a{Fy#IOILc8F0;JS4x(k-NSpbN@qM z`@aE_e}5{!$v3+qVs7u?sOV(y@1Os*Fgu`fCW9=G@F_#VQ%xf$hj0~wnnP0$hFI+@ zkQj~v#V>xn)u??YutKsX>pxKCl^p!C-o?+9;!Nug^ z{rP!|+KsP5%uF;ZCa5F;O^9TGac=M|=V z_H(PfkV1rz4jl?gJ(ArXMyWT4y(86d3`$iI4^l9`vLdZkzpznSd5Ikfrs8qcSy&>z zTIZgWZGXw0n9ibQxYWE@gI0(3#KA-dAdPcsL_|hg2@~C!VZDM}5;v_Nykfq!*@*Zf zE_wVgx82GMDryKO{U{D>vSzSc%B~|cjDQrt5BN=Ugpsf8H8f1lR4SGo#hCuXPL;QQ z#~b?C4MoepT3X`qdW2dNn& zo8)K}%Lpu>0tQei+{>*VGErz|qjbK#9 zvtd8rcHplw%YyQCKR{kyo6fgg!)6tHUYT(L>B7er5)41iG`j$qe*kSh$fY!PehLcD zWeKZHn<492B34*JUQh=CY1R~jT9Jt=k=jCU2=SL&&y5QI2uAG2?L8qd2U(^AW#{(x zThSy=C#>k+QMo^7caQcpU?Qn}j-`s?1vXuzG#j8(A+RUAY})F@=r&F(8nI&HspAy4 z4>(M>hI9c7?DCW8rw6|23?qQMSq?*Vx?v30U%luBo)B-k2mkL)Ljk5xUha3pK>EEj z@(;tH|M@xkuN?gsz;*bygizwYR!6=(Xgcg^>WlGtRYCozY<rFX2E>kaZo)O<^J7a`MX8Pf`gBd4vrtD|qKn&B)C&wp0O-x*@-|m*0egT=-t@%dD zgP2D+#WPptnc;_ugD6%zN}Z+X4=c61XNLb7L1gWd8;NHrBXwJ7s0ce#lWnnFUMTR& z1_R9Fin4!d17d4jpKcfh?MKRxxQk$@)*hradH2$3)nyXep5Z;B z?yX+-Bd=TqO2!11?MDtG0n(*T^!CIiF@ZQymqq1wPM_X$Iu9-P=^}v7npvvPBu!d$ z7K?@CsA8H38+zjA@{;{kG)#AHME>Ix<711_iQ@WWMObXyVO)a&^qE1GqpP47Q|_AG zP`(AD&r!V^MXQ^e+*n5~Lp9!B+#y3#f8J^5!iC@3Y@P`;FoUH{G*pj*q7MVV)29+j z>BC`a|1@U_v%%o9VH_HsSnM`jZ-&CDvbiqDg)tQEnV>b%Ptm)T|1?TrpIl)Y$LnG_ zzKi5j2Fx^K^PG1=*?GhK;$(UCF-tM~^=Z*+Wp{FSuy7iHt9#4n(sUuHK??@v+6*|10Csdnyg9hAsC5_OrSL;jVkLlf zHXIPukLqbhs~-*oa^gqgvtpgTk_7GypwH><53riYYL*M=Q@F-yEPLqQ&1Sc zZB%w}T~RO|#jFjMWcKMZccxm-SL)s_ig?OC?y_~gLFj{n8D$J_Kw%{r0oB8?@dWzn zB528d-wUBQzrrSSLq?fR!K%59Zv9J4yCQhhDGwhptpA5O5U?Hjqt>8nOD zi{)0CI|&Gu%zunGI*XFZh(ix)q${jT8wnnzbBMPYVJc4HX*9d^mz|21$=R$J$(y7V zo0dxdbX3N#=F$zjstTf*t8vL)2*{XH!+<2IJ1VVFa67|{?LP&P41h$2i2;?N~RA30LV`BsUcj zfO9#Pg1$t}7zpv#&)8`mis3~o+P(DxOMgz-V*(?wWaxi?R=NhtW}<#^Z?(BhSwyar zG|A#Q7wh4OfK<|DAcl9THc-W4*>J4nTevsD%dkj`U~wSUCh15?_N@uMdF^Kw+{agk zJ`im^wDqj`Ev)W3k3stasP`88-M0ZBs7;B6{-tSm3>I@_e-QfT?7|n0D~0RRqDb^G zyHb=is;IwuQ&ITzL4KsP@Z`b$d%B0Wuhioo1CWttW8yhsER1ZUZzA{F*K=wmi-sb#Ju+j z-l@In^IKnb{bQG}Ps>+Vu_W#grNKNGto+yjA)?>0?~X`4I3T@5G1)RqGUZuP^NJCq&^HykuYtMDD8qq+l8RcZNJsvN(10{ zQ1$XcGt}QH-U^WU!-wRR1d--{B$%vY{JLWIV%P4-KQuxxDeJaF#{eu&&r!3Qu{w}0f--8^H|KwE>)ORrcR+2Qf zb})DRcH>k0zWK8@{RX}NYvTF;E~phK{+F;MkIP$)T$93Ba2R2TvKc>`D??#mv9wg$ zd~|-`Qx5LwwsZ2hb*Rt4S9dsF%Cny5<1fscy~)d;0m2r$f=83<->c~!GNyb!U)PA; zq^!`@@)UaG)Ew(9V?5ZBq#c%dCWZrplmuM`o~TyHjAIMh0*#1{B>K4po-dx$Tk-Cq z=WZDkP5x2W&Os`N8KiYHRH#UY*n|nvd(U>yO=MFI-2BEp?x@=N<~CbLJBf6P)}vLS?xJXYJ2^<3KJUdrwKnJnTp{ zjIi|R=L7rn9b*D#Xxr4*R<3T5AuOS+#U8hNlfo&^9JO{VbH!v9^JbK=TCGR-5EWR@ zN8T-_I|&@A}(hKeL4_*eb!1G8p~&_Im8|wc>Cdir+gg90n1dw?QaXcx6Op_W1r=axRw>4;rM*UOpT#Eb9xU1IiWo@h?|5uP zka>-XW0Ikp@dIe;MN8B01a7+5V@h3WN{J=HJ*pe0uwQ3S&MyWFni47X32Q7SyCTNQ z+sR!_9IZa5!>f&V$`q!%H8ci!a|RMx5}5MA_kr+bhtQy{-^)(hCVa@I!^TV4RBi zAFa!Nsi3y37I5EK;0cqu|9MRj<^r&h1lF}u0KpKQD^5Y+LvFEwM zLU@@v4_Na#Axy6tn3P%sD^5P#<7F;sd$f4a7LBMk zGU^RZHBcxSA%kCx*eH&wgA?Qwazm8>9SCSz_!;MqY-QX<1@p$*T8lc?@`ikEqJ>#w zcG``^CoFMAhdEXT9qt47g0IZkaU)4R7wkGs^Ax}usqJ5HfDYAV$!=6?>J6+Ha1I<5 z|6=9soU4>E))tW$<#>F ziZ$6>KJf0bPfbx_)7-}tMINlc=}|H+$uX)mhC6-Hz+XZxsKd^b?RFB6et}O#+>Wmw9Ec9) z{q}XFWp{3@qmyK*Jvzpyqv57LIR;hPXKsrh{G?&dRjF%Zt5&m20Ll?OyfUYC3WRn{cgQ?^V~UAv+5 z&_m#&nIwffgX1*Z2#5^Kl4DbE#NrD&Hi4|7SPqZ}(>_+JMz=s|k77aEL}<=0Zfb)a z%F(*L3zCA<=xO)2U3B|pcTqDbBoFp>QyAEU(jMu8(jLA61-H!ucI804+B!$E^cQQa z)_ERrW3g!B9iLb3nn3dlkvD7KsY?sRvls3QC0qPi>o<)GHx%4Xb$5a3GBTJ(k@`e@ z$RUa^%S15^1oLEmA=sayrP5;9qtf!Z1*?e$ORVPsXpL{jL<6E)0sj&swP3}NPmR%FM?O>SQgN5XfHE< zo(4#Cv11(%Nnw_{_Ro}r6=gKd{k?NebJ~<~Kv0r(r0qe4n3LFx$5%x(BKvrz$m?LG zjLIc;hbj0FMdb9aH9Lpsof#yG$(0sG2%RL;d(n>;#jb!R_+dad+K;Ccw!|RY?uS(a zj~?=&M!4C(5LnlH6k%aYvz@7?xRa^2gml%vn&eKl$R_lJ+e|xsNfXzr#xuh(>`}9g zLHSyiFwK^-p!;p$yt7$F|3*IfO3Mlu9e>Dpx8O`37?fA`cj`C0B-m9uRhJjs^mRp# zWB;Aj6|G^1V6`jg7#7V9UFvnB4((nIwG?k%c7h`?0tS8J3Bn0t#pb#SA}N-|45$-j z$R>%7cc2ebAClXc(&0UtHX<>pd)akR3Kx_cK+n<}FhzmTx!8e9^u2e4%x{>T6pQ`6 zO182bh$-W5A3^wos0SV_TgPmF4WUP-+D25KjbC{y_6W_9I2_vNKwU(^qSdn&>^=*t z&uvp*@c8#2*paD!ZMCi3;K{Na;I4Q35zw$YrW5U@Kk~)&rw;G?d7Q&c9|x<Hg|CNMsxovmfth*|E*GHezPTWa^Hd^F4!B3sF;)? z(NaPyAhocu1jUe(!5Cy|dh|W2=!@fNmuNOzxi^tE_jAtzNJ0JR-avc_H|ve#KO}#S z#a(8secu|^Tx553d4r@3#6^MHbH)vmiBpn0X^29xEv!Vuh1n(Sr5I0V&`jA2;WS|Y zbf0e}X|)wA-Pf5gBZ>r4YX3Mav1kKY(ulAJ0Q*jB)YhviHK)w!TJsi3^dMa$L@^{` z_De`fF4;M87vM3Ph9SzCoCi$#Fsd38u!^0#*sPful^p5oI(xGU?yeYjn;Hq1!wzFk zG&2w}W3`AX4bxoVm03y>ts{KaDf!}b&7$(P4KAMP=vK5?1In^-YYNtx1f#}+2QK@h zeSeAI@E6Z8a?)>sZ`fbq9_snl6LCu6g>o)rO;ijp3|$vig+4t} zylEo7$SEW<_U+qgVcaVhk+4k+C9THI5V10qV*dOV6pPtAI$)QN{!JRBKh-D zk2^{j@bZ}yqW?<#VVuI_27*cI-V~sJiqQv&m07+10XF+#ZnIJdr8t`9s_EE;T2V;B z4UnQUH9EdX%zwh-5&wflY#ve!IWt0UE-My3?L#^Bh%kcgP1q{&26eXLn zTkjJ*w+(|_>Pq0v8{%nX$QZbf)tbJaLY$03;MO=Ic-uqYUmUCuXD>J>o6BCRF=xa% z3R4SK9#t1!K4I_d>tZgE>&+kZ?Q}1qo4&h%U$GfY058s%*=!kac{0Z+4Hwm!)pFLR zJ+5*OpgWUrm0FPI2ib4NPJ+Sk07j(`diti^i#kh&f}i>P4~|d?RFb#!JN)~D@)beox}bw?4VCf^y*`2{4`-@%SFTry2h z>9VBc9#JxEs1+0i2^LR@B1J`B9Ac=#FW=(?2;5;#U$0E0UNag_!jY$&2diQk_n)bT zl5Me_SUvqUjwCqmVcyb`igygB_4YUB*m$h5oeKv3uIF0sk}~es!{D>4r%PC*F~FN3owq5e0|YeUTSG#Vq%&Gk7uwW z0lDo#_wvflqHeRm*}l?}o;EILszBt|EW*zNPmq#?4A+&i0xx^?9obLyY4xx=Y9&^G;xYXYPxG)DOpPg!i_Ccl#3L}6xAAZzNhPK1XaC_~ z!A|mlo?Be*8Nn=a+FhgpOj@G7yYs(Qk(8&|h@_>w8Y^r&5nCqe0V60rRz?b5%J;GYeBqSAjo|K692GxD4` zRZyM2FdI+-jK2}WAZTZ()w_)V{n5tEb@>+JYluDozCb$fA4H)$bzg(Ux{*hXurjO^ zwAxc+UXu=&JV*E59}h3kzQPG4M)X8E*}#_&}w*KEgtX)cU{vm9b$atHa;s>| z+L6&cn8xUL*OSjx4YGjf6{Eq+Q3{!ZyhrL&^6Vz@jGbI%cAM9GkmFlamTbcQGvOlL zmJ?(FI)c86=JEs|*;?h~o)88>12nXlpMR4@yh%qdwFNpct;vMlc=;{FSo*apJ;p}! zAX~t;3tb~VuP|ZW;z$=IHf->F@Ml)&-&Bnb{iQyE#;GZ@C$PzEf6~q}4D>9jic@mTO5x76ulDz@+XAcm35!VSu zT*Gs>;f0b2TNpjU_BjHZ&S6Sqk6V1370+!eppV2H+FY!q*n=GHQ!9Rn6MjY!Jc77A zG7Y!lFp8?TIHN!LXO?gCnsYM-gQxsm=Ek**VmZu7vnuufD7K~GIxfxbsQ@qv2T zPa`tvHB$fFCyZl>3oYg?_wW)C>^_iDOc^B7klnTOoytQH18WkOk)L2BSD0r%xgRSW zQS9elF^?O=_@|58zKLK;(f77l-Zzu}4{fXed2saq!5k#UZAoDBqYQS{sn@j@Vtp|$ zG%gnZ$U|9@u#w1@11Sjl8ze^Co=)7yS(}=;68a3~g;NDe_X^}yJj;~s8xq9ahQ5_r zxAlTMnep*)w1e(TG%tWsjo3RR;yVGPEO4V{Zp?=a_0R#=V^ioQu4YL=BO4r0$$XTX zZfnw#_$V}sDAIDrezGQ+h?q24St0QNug_?{s-pI(^jg`#JRxM1YBV;a@@JQvH8*>> zIJvku74E0NlXkYe_624>znU0J@L<-c=G#F3k4A_)*;ky!C(^uZfj%WB3-*{*B$?9+ zDm$WFp=0(xnt6`vDQV3Jl5f&R(Mp};;q8d3I%Kn>Kx=^;uSVCw0L=gw53%Bp==8Sw zxtx=cs!^-_+i{2OK`Q;913+AXc_&Z5$@z3<)So0CU3;JAv=H?@Zpi~riQ{z-zLtVL z!oF<}@IgJp)Iyz1zVJ42!SPHSkjYNS4%ulVVIXdRuiZ@5Mx8LJS}J#qD^Zi_xQ@>DKDr-_e#>5h3dtje*NcwH_h;i{Sx7}dkdpuW z(yUCjckQsagv*QGMSi9u1`Z|V^}Wjf7B@q%j2DQXyd0nOyqg%m{CK_lAoKlJ7#8M} z%IvR?Vh$6aDWK2W!=i?*<77q&B8O&3?zP(Cs@kapc)&p7En?J;t-TX9abGT#H?TW? ztO5(lPKRuC7fs}zwcUKbRh=7E8wzTsa#Z{a`WR}?UZ%!HohN}d&xJ=JQhpO1PI#>X zHkb>pW04pU%Bj_mf~U}1F1=wxdBZu1790>3Dm44bQ#F=T4V3&HlOLsGH)+AK$cHk6 zia$=$kog?)07HCL*PI6}DRhpM^*%I*kHM<#1Se+AQ!!xyhcy6j7`iDX7Z-2i73_n# zas*?7LkxS-XSqv;YBa zW_n*32D(HTYQ0$feV_Fru1ZxW0g&iwqixPX3=9t4o)o|kOo79V$?$uh?#8Q8e>4e)V6;_(x&ViUVxma+i25qea;d-oK7ouuDsB^ab{ zu1qjQ%`n56VtxBE#0qAzb7lph`Eb-}TYpXB!H-}3Ykqyp`otprp7{VEuW*^IR2n$Fb99*nAtqT&oOFIf z@w*6>YvOGw@Ja?Pp1=whZqydzx@9X4n^2!n83C5{C?G@|E?&$?p*g68)kNvUTJ)I6 z1Q|(#UuP6pj78GUxq11m-GSszc+)X{C2eo-?8ud9sB=3(D47v?`JAa{V(IF zPZQ_0AY*9M97>Jf<o%#O_%Wq}8>YM=q0|tGY+hlXcpE=Z4Od z`NT7Hu2hnvRoqOw@g1f=bv`+nba{GwA$Ak0INlqI1k<9!x_!sL()h?hEWoWrdU3w` zZ%%)VR+Bc@_v!C#koM1p-3v_^L6)_Ktj4HE>aUh%2XZE@JFMOn)J~c`_7VWNb9c-N z2b|SZMR4Z@E7j&q&9(6H3yjEu6HV7{2!1t0lgizD;mZ9$r(r7W5G$ky@w(T_dFnOD z*p#+z$@pKE+>o@%eT(2-p_C}wbQ5s(%Sn_{$HDN@MB+Ev?t@3dPy`%TZ!z}AThZSu zN<1i$siJhXFdjV zP*y|V<`V8t=h#XTRUR~5`c`Z9^-`*BZf?WAehGdg)E2Je)hqFa!k{V(u+(hTf^Yq& zoruUh2(^3pe)2{bvt4&4Y9CY3js)PUHtd4rVG57}uFJL)D(JfSIo^{P=7liFXG zq5yqgof0V8paQcP!gy+;^pp-DA5pj=gbMN0eW=-eY+N8~y+G>t+x}oa!5r>tW$xhI zPQSv=pi;~653Gvf6~*JcQ%t1xOrH2l3Zy@8AoJ+wz@daW@m7?%LXkr!bw9GY@ns3e zSfuWF_gkWnesv?s3I`@}NgE2xwgs&rj?kH-FEy82=O8`+szN ziHch`vvS`zNfap14!&#i9H@wF7}yIPm=UB%(o(}F{wsZ(wA0nJ2aD^@B41>>o-_U6 zUqD~vdo48S8~FTb^+%#zcbQiiYoDKYcj&$#^;Smmb+Ljp(L=1Kt_J!;0s%1|JK}Wi z;={~oL!foo5n8=}rs6MmUW~R&;SIJO3TL4Ky?kh+b2rT9B1Jl4>#Uh-Bec z`Hsp<==#UEW6pGPhNk8H!!DUQR~#F9jEMI6T*OWfN^Ze&X(4nV$wa8QUJ>oTkruH# zm~O<`J7Wxseo@FqaZMl#Y(mrFW9AHM9Kb|XBMqaZ2a)DvJgYipkDD_VUF_PKd~dT7 z#02}bBfPn9a!X!O#83=lbJSK#E}K&yx-HI#T6ua)6o0{|={*HFusCkHzs|Fn&|C3H zBck1cmfcWVUN&i>X$YU^Sn6k2H;r3zuXbJFz)r5~3$d$tUj(l1?o={MM){kjgqXRO zc5R*#{;V7AQh|G|)jLM@wGAK&rm2~@{Pewv#06pHbKn#wL0P6F1!^qw9g&cW3Z=9} zj)POhOlwsh@eF=>z?#sIs*C-Nl(yU!#DaiaxhEs#iJqQ8w%(?+6lU02MYSeDkr!B- zPjMv+on6OLXgGnAtl(ao>|X2Y8*Hb}GRW5}-IzXnoo-d0!m4Vy$GS!XOLy>3_+UGs z2D|YcQx@M#M|}TDOetGi{9lGo9m-=0-^+nKE^*?$^uHkxZh}I{#UTQd;X!L+W@jm( zDg@N4+lUqI92o_rNk{3P>1gxAL=&O;x)ZT=q1mk0kLlE$WeWuY_$0`0jY-Kkt zP*|m3AF}Ubd=`<>(Xg0har*_@x2YH}bn0Wk*OZz3*e5;Zc;2uBdnl8?&XjupbkOeNZsNh6pvsq_ydmJI+*z**{I{0K)-;p1~k8cpJXL$^t!-`E}=*4G^-E8>H!LjTPxSx zcF+cS`ommfKMhNSbas^@YbTpH1*RFrBuATUR zt{oFWSk^$xU&kbFQ;MCX22RAN5F6eq9UfR$ut`Jw--p2YX)A*J69m^!oYfj2y7NYcH6&r+0~_sH^c^nzeN1AU4Ga7=FlR{S|Mm~MpzY0$Z+p2W(a={b-pR9EO1Rs zB%KY|@wLcAA@)KXi!d2_BxrkhDn`DT1=Dec}V!okd{$+wK z4E{n8R*xKyci1(CnNdhf$Dp2(Jpof0-0%-38X=Dd9PQgT+w%Lshx9+loPS~MOm%ZT zt%2B2iL_KU_ita%N>xjB!#71_3=3c}o zgeW~^U_ZTJQ2!PqXulQd=3b=XOQhwATK$y(9$#1jOQ4}4?~l#&nek)H(04f(Sr=s| zWv7Lu1=%WGk4FSw^;;!8&YPM)pQDCY9DhU`hMty1@sq1=Tj7bFsOOBZOFlpR`W>-J$-(kezWJj;`?x-v>ev{*8V z8p|KXJPV$HyQr1A(9LVrM47u-XpcrIyO`yWvx1pVYc&?154aneRpLqgx)EMvRaa#|9?Wwqs2+W8n5~79G z(}iCiLk;?enn}ew`HzhG+tu+Ru@T+K5juvZN)wY;x6HjvqD!&!)$$;1VAh~7fg0K| zEha#aN=Yv|3^~YFH}cc38ovVb%L|g@9W6fo(JtT6$fa?zf@Ct88e}m?i)b*Jgc{fl zExfdvw-BYDmH6>(4QMt#p0;FUIQqkhD}aH?a7)_%JtA~soqj{ppP_82yi9kaxuK>~ ze_)Zt>1?q=ZH*kF{1iq9sr*tVuy=u>Zev}!gEZx@O6-fjyu9X00gpIl-fS_pzjpqJ z1yqBmf9NF!jaF<+YxgH6oXBdK)sH(>VZ)1siyA$P<#KDt;8NT*l_0{xit~5j1P)FN zI8hhYKhQ)i z37^aP13B~u65?sg+_@2Kr^iWHN=U;EDSZ@2W2!5ALhGNWXnFBY%7W?1 z=HI9JzQ-pLKZDYTv<0-lt|6c-RwhxZ)mU2Os{bsX_i^@*fKUj8*aDO5pks=qn3Dv6 zwggpKLuyRCTVPwmw1r}B#AS}?X7b837UlXwp~E2|PJw2SGVueL7){Y&z!jL!XN=0i zU^Eig`S2`{+gU$68aRdWx?BZ{sU_f=8sn~>s~M?GU~`fH5kCc; z8ICp+INM3(3{#k32RZdv6b9MQYdZXNuk7ed8;G?S2nT+NZBG=Tar^KFl2SvhW$bGW#kdWL-I)s_IqVnCDDM9fm8g;P;8 z7t4yZn3^*NQfx7SwmkzP$=fwdC}bafQSEF@pd&P8@H#`swGy_rz;Z?Ty5mkS%>m#% zp_!m9e<()sfKiY(nF<1zBz&&`ZlJf6QLvLhl`_``%RW&{+O>Xhp;lwSsyRqGf=RWd zpftiR`={2(siiPAS|p}@q=NhVc0ELprt%=fMXO3B)4ryC2LT(o=sLM7hJC!}T1@)E zA3^J$3&1*M6Xq>03FX`R&w*NkrZE?FwU+Muut;>qNhj@bX17ZJxnOlPSZ=Zeiz~T_ zOu#yc3t6ONHB;?|r4w+pI)~KGN;HOGC)txxiUN8#mexj+W(cz%9a4sx|IRG=}ia zuEBuba3AHsV2feqw-3MvuL`I+2|`Ud4~7ZkN=JZ;L20|Oxna5vx1qbIh#k2O4$RQF zo`tL()zxaqibg^GbB+BS5#U{@K;WWQj~GcB1zb}zJkPwH|5hZ9iH2308!>_;%msji zJHSL~s)YHBR=Koa1mLEOHos*`gp=s8KA-C zu0aE+W!#iJ*0xqKm3A`fUGy#O+X+5W36myS>Uh2!R*s$aCU^`K&KKLCCDkejX2p=5 z%o7-fl03x`gaSNyr?3_JLv?2RLS3F*8ub>Jd@^Cc17)v8vYEK4aqo?OS@W9mt%ITJ z9=S2%R8M){CugT@k~~0x`}Vl!svYqX=E)c_oU6o}#Hb^%G1l3BudxA{F*tbjG;W_>=xV73pKY53v%>I)@D36I_@&p$h|Aw zonQS`07z_F#@T-%@-Tb|)7;;anoD_WH>9ewFy(ZcEOM$#Y)8>qi7rCnsH9GO-_7zF zu*C87{Df1P4TEOsnzZ@H%&lvV(3V@;Q!%+OYRp`g05PjY^gL$^$-t0Y>H*CDDs?FZly*oZ&dxvsxaUWF!{em4{A>n@vpXg$dwvt@_rgmHF z-MER`ABa8R-t_H*kv>}CzOpz;!>p^^9ztHMsHL|SRnS<-y5Z*r(_}c4=fXF`l^-i}>e7v!qs_jv zqvWhX^F=2sDNWA9c@P0?lUlr6ecrTKM%pNQ^?*Lq?p-0~?_j50xV%^(+H>sMul#Tw zeciF*1=?a7cI(}352%>LO96pD+?9!fNyl^9v3^v&Y4L)mNGK0FN43&Xf8jUlxW1Bw zyiu2;qW-aGNhs=zbuoxnxiwZ3{PFZM#Kw)9H@(hgX23h(`Wm~m4&TvoZoYp{plb^> z_#?vXcxd>r7K+1HKJvhed>gtK`TAbJUazUWQY6T~t2af%#<+Veyr%7-#*A#@&*;@g58{i|E%6yC_InGXCOd{L0;$)z#?n7M`re zh!kO{6=>7I?*}czyF7_frt#)s1CFJ_XE&VrDA?Dp3XbvF{qsEJgb&OLSNz_5g?HpK z9)8rsr4JN!Af3G9!#Qn(6zaUDqLN(g2g8*M)Djap?WMK9NKlkC)E2|-g|#-rp%!Gz zAHd%`iq|81efi93m3yTBw3g0j#;Yb2X{mhRAI?&KDmbGqou(2xiRNb^sV}%%Wu0?< z?($L>(#BO*)^)rSgyNRni$i`R4v;GhlCZ8$@e^ROX(p=2_v6Y!%^As zu022)fHdv_-~Yu_H6WVPLpHQx!W%^6j)cBhS`O3QBW#x(eX54d&I22op(N59b*&$v zFiSRY6rOc^(dgSV1>a7-5C;(5S5MvKcM2Jm-LD9TGqDpP097%52V+0>Xqq!! zq4e3vj53SE6i8J`XcQB|MZPP8j;PAOnpGnllH6#Ku~vS42xP*Nz@~y%db7Xi8s09P z1)e%8ys6&M8D=Dt6&t`iKG_4X=!kgRQoh%Z`dc&mlOUqXk-k`jKv9@(a^2-Upw>?< zt5*^DV~6Zedbec4NVl($2T{&b)zA@b#dUyd>`2JC0=xa_fIm8{5um zr-!ApXZhC8@=vC2WyxO|!@0Km)h8ep*`^he92$@YwP>VcdoS5OC^s38e#7RPsg4j+ zbVGG}WRSET&ZfrcR(x~k8n1rTP%CnfUNKUonD$P?FtNFF#cn!wEIab-;jU=B1dHK@ z(;(yAQJ`O$sMn>h;pf^8{JISW%d+@v6@CnXh9n5TXGC}?FI9i-D0OMaIg&mAg=0Kn zNJ7oz5*ReJukD55fUsMuaP+H4tDN&V9zfqF@ zr=#ecUk9wu{0;!+gl;3Bw=Vn^)z$ahVhhw)io!na&9}LmWurLb0zubxK=UEnU*{5P z+SP}&*(iBKSO4{alBHaY^)5Q=mZ+2OwIooJ7*Q5XJ+2|q`9#f?6myq!&oz?klihLq z4C)$XP!BNS0G_Z1&TM>?Jk{S~{F3n83ioli=IO6f%wkvCl(RFFw~j0tb{GvXTx>*sB0McY0s&SNvj4+^h`9nJ_wM>F!Uc>X}9PifQekn0sKI2SAJP!a4h z5cyGTuCj3ZBM^&{dRelIlT^9zcfaAuL5Y~bl!ppSf`wZbK$z#6U~rdclk``e+!qhe z6Qspo*%<)eu6?C;Bp<^VuW6JI|Ncvyn+LlSl;Mp22Bl7ARQ0Xc24%29(ZrdsIPw&-=yHQ7_Vle|5h>AST0 zUGX2Zk34vp?U~IHT|;$U86T+UUHl_NE4m|}>E~6q``7hccCaT^#y+?wD##Q%HwPd8 zV3x4L4|qqu`B$4(LXqDJngNy-{&@aFBvVsywt@X^}iH7P%>bR?ciC$I^U-4Foa`YKI^qDyGK7k%E%c_P=yzAi`YnxGA%DeNd++j3*h^ z=rn>oBd0|~lZ<6YvmkKY*ZJlJ;Im0tqgWu&E92eqt;+NYdxx`eS(4Hw_Jb5|yVvBg z*tbdY^!AN;luEyN4VRhS@-_DC{({ziH{&Z}iGElSV~qvT>L-8G%+yEL zX#MFOhj{InyKG=mvW-<1B@c-}x$vA(nU?>S>0*eN#!SLzQ)Ex7fvQ)S4D<8|I#N$3 zT5Ei`Z?cxBODHX8(Xp73v`IsAYC@9b;t}z0wxVuQSY1J^GRwDPN@qbM-ZF48T$GZ< z8WU+;Pqo?{ghI-KZ-i*ydXu`Ep0Xw^McH_KE9J0S7G;x8Fe`DVG?j3Pv=0YzJ}yZR z%2=oqHiUjvuk0~Ca>Kol4CFi0_xQT~;_F?=u+!kIDl-9g`#ZNZ9HCy17Ga1v^Jv9# z{T4Kb1-AzUxq*MutfOWWZgD*HnFfyYg0&e9f(5tZ>krPF6{VikNeHoc{linPPt#Si z&*g>(c54V8rT_AX!J&bNm-!umPvOR}vDai#`CX___J#=zeB*{4<&2WpaDncZsOkp* zsg<%@@rbrMkR_ux9?LsQxzoBa1s%$BBn6vk#{&&zUwcfzeCBJUwFYSF$08qDsB;gWQN*g!p8pxjofWbqNSZOEKOaTx@+* zwdt5*Q47@EOZ~EZL9s?1o?A%9TJT=Ob_13yyugvPg*e&ZU(r6^k4=2+D-@n=Hv5vu zSXG|hM(>h9^zn=eQ=$6`JO&70&2|%V5Lsx>)(%#;pcOfu>*nk_3HB_BNaH$`jM<^S zcSftDU1?nL;jy)+sfonQN}(}gUW?d_ikr*3=^{G)=tjBtEPe>TO|0ddVB zTklrSHiW+!#26frPXQQ(YN8DG$PZo?(po(QUCCf_OJC`pw*uey00%gmH!`WJkrKXj2!#6?`T25mTu9OJp2L8z3! z=arrL$ZqxuE{%yV)14Kd>k}j7pxZ6#$Dz8$@WV5p8kTqN<-7W)Q7Gt2{KoOPK_tZ| zf2WG~O5@{qPI+W<4f_;reuFVdO^5`ADC1!JQE|N`s3cq@(0WB!n0uh@*c{=LAd;~} zyGK@hbF-Oo+!nN)@i*O(`@FA#u?o=~e{`4O#5}z&=UkU*50fOrzi11D^&FOqe>wii z?*k+2|EcUs;Gx{!@KBT~>PAwLrIDT7Th=Utu?~?np@t^gFs?zgX=D${RwOY^WGh-+ z+#4$066ISh8eYW#FXWp~S`<*%O^ZuItL1Tyqt8#tZ zY120E;^VG`!lZn&3sPd$RkdHpU#|w+bYV)pJC|SH9g%|5IkxVTQcBA4CL0}$&}ef@ zW^Vtj%M;;_1xxP9x#ex17&4N*{ksO*_4O}xYu(p*JkL#yr}@7b)t5X?%CY<+s5_MJ zuiqt+N_;A(_)%lumoyRFixWa-M7qK_9s6<1X?JDa9fP!+_6u~~M$5L=ipB=7(j#f< zZ34J%=bs549%~_mA(|={uZNs_0?o7;-LBP(ZRnkd{-^|2|=4vUTmtByHL8 zEph`(LSEzQj68a+`d$V<45J7cyv^#|^|%fD#si1Nx!4NW*`l*{->HEWNh6-|g>-=r zXmQ|-i}Ku$ndUeHQ^&ieT!Lf}vf6GaqW9$DJ2NWrqwPY%%4nip$@vK$nRp*_C-v<| zuKz~ZyN&<%!NS26&x?jhy+@awJipMQ-8(X4#Ae5??U<1QMt1l9R=w9fAnEF}NYu$2 z>6}Vkc zIb*A?G*z8^IvibmBKn_u^5&T_1oey0gZS2~obf(#xk=erZGTEdQnt3DMGM+0oPwss zj5zXD;(oWhB_T@~Ig#9@v)AKtXu3>Inmgf@A|-lD-1U>cNyl3h?ADD9)GG4}zUGPk zZzaXe!~Kf?<~@$G?Uql3t8jy9{2!doq4=J}j9ktTxss{p6!9UdjyDERlA*xZ!=Q)KDs5O)phz>Vq3BNGoM(H|=1*Q4$^2fTZw z(%nq1P|5Rt81}SYJpEEzMPl5VJsV5&4e)ZWKDyoZ>1EwpkHx-AQVQc8%JMz;{H~p{=FXV>jIxvm4X*qv52e?Y-f%DJ zxEA165GikEASQ^fH6K#d!Tpu2HP{sFs%E=e$gYd$aj$+xue6N+Wc(rAz~wUsk2`(b z8Kvmyz%bKQxpP}~baG-rwYcYCvkHOi zlkR<=>ZBTU*8RF_d#Bl@zZsRIhx<%~Z@Z=ik z>adw3!DK(8R|q$vy{FTxw%#xliD~6qXmY^7_9kthVPTF~Xy1CfBqbU~?1QmxmU=+k z(ggxvEuA;0e&+ci-zQR{-f7aO{O(Pz_OsEjLh_K>MbvoZ4nxtk5u{g@nPv)cgW_R} z9}EA4K4@z0?7ue}Z(o~R(X&FjejUI2g~08PH1E4w>9o{)S(?1>Z0XMvTb|;&EuyOE zGvWNpYX)Nv<8|a^;1>bh#&znEcl-r!T#pn= z4$?Yudha6F%4b>*8@=BdtXXY4N+`U4Dmx$}>HeVJk-QdTG@t!tVT#0(LeV0gvqyyw z2sEp^9eY0N`u10Tm4n8No&A=)IeEC|gnmEXoNSzu!1<4R<%-9kY_8~5Ej?zRegMn78wuMs#;i&eUA0Zk_RXQ3b&TT} z;SCI=7-FUB@*&;8|n>(_g^HGf3@QODE3LpmX~ELnymQm{Sx9xrKS zK29p~?v@R$0=v6Dr5aW>-!{+h@?Q58|Kz8{{W`%J+lDAdb&M5VHrX_mDY;1-JLnf)ezmPau$)1;=`-FU=-r-83tX=C`S#}GZufju zQ>sXNT0Ny=k@nc%cFnvA_i4SC)?_ORXHq8B4D%el1uPX`c~uG#S1M7C+*MMqLw78E zhY2dI8@+N^qrMI1+;TUda(vGqGSRyU{Fnm`aqrr7bz42c5xsOO-~oZpkzorD1g}Y<6rk&3>PsSGy}W?MtqFky@A(X# zIuNZK0cK?^=;PUAu>j0#HtjbHCV*6?jzA&OoE$*Jlga*}LF`SF?WLhv1O|zqC<>*> zYB;#lsYKx0&kH@BFpW8n*yDcc6?;_zaJs<-jPSkCsSX-!aV=P5kUgF@Nu<{a%#K*F z134Q{9|YX7X(v$62_cY3^G%t~rD>Q0z@)1|zs)vjJ6Jq9;7#Ki`w+eS**En?7;n&7 zu==V3T&eFboN3ZiMx3D8qYc;VjFUk_H-WWCau(VFXSQf~viH0L$gwD$UfFHqNcgN`x}M+YQ6RnN<+@t>JUp#)9YOkqst-Ga?{FsDpEeX0(5v{0J~SEbWiL zXC2}M4?UH@u&|;%0y`eb33ldo4~z-x8zY!oVmV=c+f$m?RfDC35mdQ2E>Pze7KWP- z>!Bh<&57I+O_^s}9Tg^k)h7{xx@0a0IA~GAOt2yy!X%Q$1rt~LbTB6@Du!_0%HV>N zlf)QI1&gvERKwso23mJ!Ou6ZS#zCS5W`gxE5T>C#E|{i<1D35C222I33?Njaz`On7 zi<+VWFP6D{e-{yiN#M|Jgk<44u1TiMI78S5W`Sdb5f+{zu34s{CfWN7a3Cf^@L%!& zN$?|!!9j2c)j$~+R6n#891w-z8(!oBpL2K=+%a$r2|~8-(vQj5_XT`<0Ksf;oP+tz z9CObS!0m)Tgg`K#xBM8B(|Z)Wb&DYL{WTYv`;A=q6~Nnx2+!lTIXtj8J7dZE!P_{z z#f8w6F}^!?^KE#+ZDv+xd5O&3EmomZzsv?>E-~ygGum45fk!SBN&|eo1rKw^?aZJ4 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.properties b/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..be52383e --- /dev/null +++ b/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/python/evaluation/qodana/project_templates/java/gradlew b/src/python/evaluation/qodana/project_templates/java/gradlew new file mode 100755 index 00000000..4f906e0c --- /dev/null +++ b/src/python/evaluation/qodana/project_templates/java/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/src/python/evaluation/qodana/project_templates/java/gradlew.bat b/src/python/evaluation/qodana/project_templates/java/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/src/python/evaluation/qodana/project_templates/java/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/python/evaluation/qodana/project_templates/java/settings.gradle b/src/python/evaluation/qodana/project_templates/java/settings.gradle new file mode 100644 index 00000000..670936d0 --- /dev/null +++ b/src/python/evaluation/qodana/project_templates/java/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'gradle_qqodana_example' + From db30732122031c342372c01804e767af0ca9d8d2 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Tue, 18 May 2021 12:24:56 +0300 Subject: [PATCH 02/43] Added DatasetMarker --- src/python/evaluation/qodana/__init__.py | 0 .../evaluation/qodana/dataset_marking.py | 258 ++++++++++++++++++ 2 files changed, 258 insertions(+) create mode 100644 src/python/evaluation/qodana/__init__.py create mode 100644 src/python/evaluation/qodana/dataset_marking.py diff --git a/src/python/evaluation/qodana/__init__.py b/src/python/evaluation/qodana/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py new file mode 100644 index 00000000..6317cd4c --- /dev/null +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -0,0 +1,258 @@ +import json +import logging +import os +import re +import shutil +import sys +import traceback +from argparse import ArgumentParser, Namespace +from collections import defaultdict +from dataclasses import dataclass +from math import ceil +from pathlib import Path +from typing import Any, Dict, Optional + +import numpy as np +import pandas as pd +from pandas import DataFrame +from python_on_whales import docker +from src.python.review.application_config import LanguageVersion +from src.python.review.common.file_system import new_temp_dir +from src.python.review.run_tool import positive_int + +logger = logging.getLogger(__name__) +logging.basicConfig(level=logging.INFO) + + +def configure_arguments(parser: ArgumentParser) -> None: + parser.add_argument("dataset_path", type=lambda value: Path(value).absolute(), help="Path to dataset") # TODO + + parser.add_argument( + "inspections_output", + type=lambda value: Path(value).absolute(), + help="The path where the id of the inspections will be saved", + ) + + parser.add_argument("-c", "--config", type=lambda value: Path(value).absolute(), help="Path to qodana.yaml") # TODO + + parser.add_argument("-l", "--limit", type=positive_int, help="dataset head limit. ONLY FOR DEBUG") # TODO + + parser.add_argument("-s", "--chunk-size", type=positive_int, help="The size of the chunk") # TODO + + parser.add_argument( + "-o", + "--dataset-output", + type=lambda value: Path(value).absolute(), + help="The path where the tagged dataset will be saved. " + "If not specified, the original dataset will be overwritten", + ) # TODO + + +@dataclass(init=False) +class InspectionData: + package: str + + def __init__(self, package: str, **kwargs: Any): + self.package = package + + def __str__(self): + return self.package + + +IGNORE = [LanguageVersion.KOTLIN.value, LanguageVersion.PYTHON_3.value] + + +class DatasetMarker: + dataset_path: Path + config: Optional[Path] + limit: Optional[int] + chunk_size: Optional[int] + inspection_to_id: Dict[str, int] + dataset_output: Path + inspections_output: Path + + def __init__(self, args: Namespace): + self.dataset_path = args.dataset_path + self.config = args.config + self.limit = args.limit + self.chunk_size = args.chunk_size + + self.dataset_output = self.dataset_path + if args.dataset_output is not None: + self.dataset_output = args.dataset_output + + self.inspections_output = args.inspections_output + + self.inspection_to_id = {} + + def mark(self): + df = pd.read_csv(self.dataset_path, index_col="id", nrows=self.limit) + + grouped_df = df.groupby("lang") + unique_languages = df["lang"].unique() + + logger.info(f"Unique languages: {unique_languages}") + + groups = [] + for language in unique_languages: + lang_df = grouped_df.get_group(language) + + if language in LanguageVersion.values() and language not in IGNORE: + logger.info(f"Processing the language: {language}") + groups.append(self._mark_language(lang_df, LanguageVersion(language))) + else: + logger.warning(f"Unknown language: {language}") + groups.append(lang_df) + + logger.info("Dataset processing finished") + + result = pd.concat(groups) + + logger.info("Writing the dataset to a file.") + result.to_csv(self.dataset_output) + + id_to_inspection = {value: index for index, value in self.inspection_to_id.items()} + id_to_inspection_df = pd.DataFrame.from_dict(id_to_inspection, "index") + id_to_inspection_df.index.name = "id" + id_to_inspection_df.columns = ["inspection"] + id_to_inspection_df.to_csv(self.inspections_output) + print(self.inspection_to_id) + print(id_to_inspection) + + def _mark_language(self, df: DataFrame, language: LanguageVersion): + number_of_chunks = 1 + if self.chunk_size is not None: + number_of_chunks = ceil(df.shape[0] / self.chunk_size) + + chunks = np.array_split(df, number_of_chunks) + for index, chunk in enumerate(chunks): + logger.info(f"Processing chunk: {index + 1} / {number_of_chunks}") + self._mark_chunk(chunk, language) + + logger.info(f"{language} processing finished.") + result = pd.concat(chunks) + return result + + def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): + with new_temp_dir() as temp_dir: + logger.info("Copying the template") + self._copy_template(temp_dir, language) + + if self.config: + logger.info("Copying the config") + self._copy_config(temp_dir) + + logger.info("Creating main files") + self._create_main_files(temp_dir, chunk, language) + + logger.info("Running qodana") + self._run_qodana(temp_dir) + + logger.info("Getting unique inspections") + inspections = self._get_inspections(temp_dir) + existing_inspections = set(self.inspection_to_id.keys()) + new_inspections = inspections.difference(existing_inspections) + + for inspection in new_inspections: + self.inspection_to_id[inspection] = len(self.inspection_to_id) + + logger.info("Parsing the output of qodana") + student_id_to_inspection_ids = self._parse(temp_dir, inspections) + chunk["inspection_ids"] = "" + for student_id, inspection_ids in student_id_to_inspection_ids.items(): + chunk.loc[student_id, "inspection_ids"] = ",".join(map(str, inspection_ids)) + + @staticmethod + def _copy_template(temp_dir: Path, language: LanguageVersion): + if ( + language == LanguageVersion.JAVA_11 + or language == LanguageVersion.JAVA_9 + or language == LanguageVersion.JAVA_8 + or language == LanguageVersion.JAVA_7 + ): + shutil.copytree(Path("./project_templates/java"), temp_dir, dirs_exist_ok=True) + else: + logger.warning(f"{language} is not supported yet") + + def _copy_config(self, temp_dir: Path): + shutil.copy(self.config, temp_dir) + + @staticmethod + def _create_main_files(temp_dir: Path, chunk: DataFrame, language: LanguageVersion): + if ( + language == LanguageVersion.JAVA_11 + or language == LanguageVersion.JAVA_9 + or language == LanguageVersion.JAVA_8 + or language == LanguageVersion.JAVA_7 + ): + (temp_dir / "results").mkdir() + dist_path = temp_dir / "src" / "main" / "java" + for index, row in chunk.iterrows(): + directory = dist_path / f"student{index}" + directory.mkdir(parents=True) + file_path = directory / "Main.java" + with open(file_path, "w") as file: + file.write(f"package student{index};\n\n") + file.write(row["code"]) + else: + logger.warning(f"{language} is not supported yet") + + @staticmethod + def _run_qodana(temp_dir: Path): + docker.run( + "jetbrains/qodana", + remove=True, + volumes=[(temp_dir, "/data/project/"), ((temp_dir / "results/"), "/data/results/")], + user=os.getuid(), + ) + + @staticmethod + def _get_inspections(temp_dir: Path) -> set[str]: + results_dir = temp_dir / "results" + files = os.listdir(results_dir) + + file_name_regex = re.compile(r"(\w*).json") + inspection_files = filter(lambda file: file_name_regex.match(file), files) + + return {file_name_regex.match(file).group(1) for file in inspection_files} + + def _parse(self, temp_dir: Path, inspections: set[str]): + results_dir = temp_dir / "results" + package_regex = re.compile(r"student(\d*)") + + student_id_to_inspections_ids = defaultdict(list) + for inspection in inspections: + inspection_id = self.inspection_to_id[inspection] + file_path = results_dir / f"{inspection}.json" + + with open(file_path) as file: + inspection_json = json.load(file) + + problems = inspection_json["problems"] + for problem_data in problems: + data = InspectionData(**problem_data) + student_match = package_regex.match(data.package) + if student_match: + student_id = int(student_match.group(1)) + student_id_to_inspections_ids[student_id].append(inspection_id) + + return student_id_to_inspections_ids + + +def main(): + parser = ArgumentParser() + configure_arguments(parser) + + try: + args = parser.parse_args() + dm = DatasetMarker(args) + dm.mark() + + except Exception: + traceback.print_exc() + logger.exception("An unexpected error") + return 2 + + +if __name__ == "__main__": + sys.exit(main()) From 8c85e3690d2907ac3bf25140a8f88da3590d823a Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Tue, 18 May 2021 20:46:28 +0300 Subject: [PATCH 03/43] Code refactoring --- .../evaluation/qodana/dataset_marking.py | 136 ++++++++++-------- 1 file changed, 75 insertions(+), 61 deletions(-) diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 6317cd4c..513eb7b5 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -25,27 +25,41 @@ def configure_arguments(parser: ArgumentParser) -> None: - parser.add_argument("dataset_path", type=lambda value: Path(value).absolute(), help="Path to dataset") # TODO + parser.add_argument( + "dataset_path", + type=lambda value: Path(value).absolute(), + help=f"Dataset path. The dataset must contain at least three columns: 'id', 'code' and 'lang', where 'id' " + f"is a unique solution number, 'lang' is the language in which the code is written in the 'code' column. " + f"The 'lang' must belong to one of the following values: {LanguageVersion.values()}. " + f"If 'lang' is not equal to any of the values, the row will be skipped.", + ) parser.add_argument( - "inspections_output", + "inspections_output_path", type=lambda value: Path(value).absolute(), - help="The path where the id of the inspections will be saved", + help="Path where id of all found inspections will be saved.", ) - parser.add_argument("-c", "--config", type=lambda value: Path(value).absolute(), help="Path to qodana.yaml") # TODO + parser.add_argument("-c", "--config", type=lambda value: Path(value).absolute(), help="Path to qodana.yaml") - parser.add_argument("-l", "--limit", type=positive_int, help="dataset head limit. ONLY FOR DEBUG") # TODO + parser.add_argument( + "-l", + "--limit", + type=positive_int, + help="Allows you to read only the specified number of first rows from the dataset.", + ) - parser.add_argument("-s", "--chunk-size", type=positive_int, help="The size of the chunk") # TODO + parser.add_argument( + "-s", "--chunk-size", type=positive_int, help="The number of files that qodana will process at a time.", + ) parser.add_argument( "-o", - "--dataset-output", + "--dataset-output-path", type=lambda value: Path(value).absolute(), - help="The path where the tagged dataset will be saved. " - "If not specified, the original dataset will be overwritten", - ) # TODO + help="The path where the marked dataset will be saved. " + "If not specified, the original dataset will be overwritten.", + ) @dataclass(init=False) @@ -59,17 +73,14 @@ def __str__(self): return self.package -IGNORE = [LanguageVersion.KOTLIN.value, LanguageVersion.PYTHON_3.value] - - class DatasetMarker: dataset_path: Path config: Optional[Path] limit: Optional[int] chunk_size: Optional[int] inspection_to_id: Dict[str, int] - dataset_output: Path - inspections_output: Path + dataset_output_path: Path + inspections_output_path: Path def __init__(self, args: Namespace): self.dataset_path = args.dataset_path @@ -77,49 +88,51 @@ def __init__(self, args: Namespace): self.limit = args.limit self.chunk_size = args.chunk_size - self.dataset_output = self.dataset_path - if args.dataset_output is not None: - self.dataset_output = args.dataset_output + self.dataset_output_path = self.dataset_path + if args.dataset_output_path is not None: + self.dataset_output_path = args.dataset_output_path - self.inspections_output = args.inspections_output + self.inspections_output_path = args.inspections_output_path self.inspection_to_id = {} def mark(self): df = pd.read_csv(self.dataset_path, index_col="id", nrows=self.limit) - grouped_df = df.groupby("lang") + group_by_lang = df.groupby("lang") unique_languages = df["lang"].unique() logger.info(f"Unique languages: {unique_languages}") groups = [] for language in unique_languages: - lang_df = grouped_df.get_group(language) - - if language in LanguageVersion.values() and language not in IGNORE: - logger.info(f"Processing the language: {language}") - groups.append(self._mark_language(lang_df, LanguageVersion(language))) + lang_group = group_by_lang.get_group(language) + + if language in LanguageVersion.values(): + try: + logger.info(f"Processing the language: {language}") + groups.append(self._mark_language(lang_group, LanguageVersion(language))) + except NotImplementedError: + logger.warning(f"{language} needs implementation") + groups.append(lang_group) else: logger.warning(f"Unknown language: {language}") - groups.append(lang_df) + groups.append(lang_group) logger.info("Dataset processing finished") - result = pd.concat(groups) + df = pd.concat(groups) logger.info("Writing the dataset to a file.") - result.to_csv(self.dataset_output) + df.to_csv(self.dataset_output_path) id_to_inspection = {value: index for index, value in self.inspection_to_id.items()} - id_to_inspection_df = pd.DataFrame.from_dict(id_to_inspection, "index") + + id_to_inspection_df = pd.DataFrame.from_dict(id_to_inspection, orient="index", columns=["inspection"]) id_to_inspection_df.index.name = "id" - id_to_inspection_df.columns = ["inspection"] - id_to_inspection_df.to_csv(self.inspections_output) - print(self.inspection_to_id) - print(id_to_inspection) + id_to_inspection_df.to_csv(self.inspections_output_path) - def _mark_language(self, df: DataFrame, language: LanguageVersion): + def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: number_of_chunks = 1 if self.chunk_size is not None: number_of_chunks = ceil(df.shape[0] / self.chunk_size) @@ -157,10 +170,10 @@ def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): self.inspection_to_id[inspection] = len(self.inspection_to_id) logger.info("Parsing the output of qodana") - student_id_to_inspection_ids = self._parse(temp_dir, inspections) + solution_id_to_inspection_ids = self._parse(temp_dir, inspections) chunk["inspection_ids"] = "" - for student_id, inspection_ids in student_id_to_inspection_ids.items(): - chunk.loc[student_id, "inspection_ids"] = ",".join(map(str, inspection_ids)) + for solution_id, inspection_ids in solution_id_to_inspection_ids.items(): + chunk.loc[solution_id, "inspection_ids"] = ",".join(map(str, inspection_ids)) @staticmethod def _copy_template(temp_dir: Path, language: LanguageVersion): @@ -170,12 +183,12 @@ def _copy_template(temp_dir: Path, language: LanguageVersion): or language == LanguageVersion.JAVA_8 or language == LanguageVersion.JAVA_7 ): - shutil.copytree(Path("./project_templates/java"), temp_dir, dirs_exist_ok=True) + shutil.copytree(Path("./project_templates/java"), (temp_dir / "project"), dirs_exist_ok=True) else: - logger.warning(f"{language} is not supported yet") + raise NotImplementedError def _copy_config(self, temp_dir: Path): - shutil.copy(self.config, temp_dir) + shutil.copy(self.config, (temp_dir / "project")) @staticmethod def _create_main_files(temp_dir: Path, chunk: DataFrame, language: LanguageVersion): @@ -185,24 +198,25 @@ def _create_main_files(temp_dir: Path, chunk: DataFrame, language: LanguageVersi or language == LanguageVersion.JAVA_8 or language == LanguageVersion.JAVA_7 ): - (temp_dir / "results").mkdir() - dist_path = temp_dir / "src" / "main" / "java" + working_path = temp_dir / "project" / "src" / "main" / "java" for index, row in chunk.iterrows(): - directory = dist_path / f"student{index}" - directory.mkdir(parents=True) - file_path = directory / "Main.java" + src_directory = working_path / f"solution{index}" + src_directory.mkdir(parents=True) + file_path = src_directory / "Main.java" with open(file_path, "w") as file: - file.write(f"package student{index};\n\n") + file.write(f"package solution{index};\n\n") file.write(row["code"]) else: - logger.warning(f"{language} is not supported yet") + raise NotImplementedError @staticmethod def _run_qodana(temp_dir: Path): + (temp_dir / "results").mkdir() + docker.run( "jetbrains/qodana", remove=True, - volumes=[(temp_dir, "/data/project/"), ((temp_dir / "results/"), "/data/results/")], + volumes=[((temp_dir / "project"), "/data/project/"), ((temp_dir / "results/"), "/data/results/")], user=os.getuid(), ) @@ -218,25 +232,25 @@ def _get_inspections(temp_dir: Path) -> set[str]: def _parse(self, temp_dir: Path, inspections: set[str]): results_dir = temp_dir / "results" - package_regex = re.compile(r"student(\d*)") + package_regex = re.compile(r"solution(\d*)") - student_id_to_inspections_ids = defaultdict(list) + solution_id_to_inspections_ids = defaultdict(list) for inspection in inspections: inspection_id = self.inspection_to_id[inspection] - file_path = results_dir / f"{inspection}.json" + inspection_file_path = results_dir / f"{inspection}.json" - with open(file_path) as file: + with open(inspection_file_path) as file: inspection_json = json.load(file) problems = inspection_json["problems"] - for problem_data in problems: - data = InspectionData(**problem_data) - student_match = package_regex.match(data.package) - if student_match: - student_id = int(student_match.group(1)) - student_id_to_inspections_ids[student_id].append(inspection_id) + for problem in problems: + data = InspectionData(**problem) + package_match = package_regex.match(data.package) + if package_match: + solution_id = int(package_match.group(1)) + solution_id_to_inspections_ids[solution_id].append(inspection_id) - return student_id_to_inspections_ids + return solution_id_to_inspections_ids def main(): @@ -245,8 +259,8 @@ def main(): try: args = parser.parse_args() - dm = DatasetMarker(args) - dm.mark() + marker = DatasetMarker(args) + marker.mark() except Exception: traceback.print_exc() From b1fa21b26ffb27739b86726cb4c875d0b34a43f3 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Tue, 18 May 2021 20:46:48 +0300 Subject: [PATCH 04/43] Added some words --- whitelist.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/whitelist.txt b/whitelist.txt index 7095e567..0337ed42 100644 --- a/whitelist.txt +++ b/whitelist.txt @@ -93,4 +93,15 @@ nom wmc util tmp -Namespace \ No newline at end of file +Namespace +dataset +qodana +listdir +numpy +concat +loc +copytree +iterrows +nrows +groupby +getuid From 5929f46950faa602b7cf526ab6edb3838715643f Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Wed, 19 May 2021 21:55:43 +0300 Subject: [PATCH 05/43] Small code refactoring --- .../evaluation/qodana/dataset_marking.py | 73 +++++++++++-------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 513eb7b5..715ac507 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -10,12 +10,15 @@ from dataclasses import dataclass from math import ceil from pathlib import Path -from typing import Any, Dict, Optional +from typing import Any, Dict, Optional, Set + +sys.path.append("../../../..") import numpy as np import pandas as pd from pandas import DataFrame from python_on_whales import docker +from src.python.evaluation.common.util import ColumnName from src.python.review.application_config import LanguageVersion from src.python.review.common.file_system import new_temp_dir from src.python.review.run_tool import positive_int @@ -28,10 +31,12 @@ def configure_arguments(parser: ArgumentParser) -> None: parser.add_argument( "dataset_path", type=lambda value: Path(value).absolute(), - help=f"Dataset path. The dataset must contain at least three columns: 'id', 'code' and 'lang', where 'id' " - f"is a unique solution number, 'lang' is the language in which the code is written in the 'code' column. " - f"The 'lang' must belong to one of the following values: {LanguageVersion.values()}. " - f"If 'lang' is not equal to any of the values, the row will be skipped.", + help=f"Dataset path. The dataset must contain at least three columns: '{ColumnName.ID.value}', " + f"'{ColumnName.CODE.value}' and '{ColumnName.LANG.value}', where '{ColumnName.ID.value}' is a unique " + f"solution number, '{ColumnName.LANG.value}' is the language in which the code is written in the " + f"'{ColumnName.CODE.value}' column. The '{ColumnName.LANG.value}' must belong to one of the following " + f"values: {', '.join(LanguageVersion.values())}. " + f"If '{ColumnName.LANG.value}' is not equal to any of the values, the row will be skipped.", ) parser.add_argument( @@ -50,7 +55,10 @@ def configure_arguments(parser: ArgumentParser) -> None: ) parser.add_argument( - "-s", "--chunk-size", type=positive_int, help="The number of files that qodana will process at a time.", + "-s", + "--chunk-size", + type=positive_int, + help="The number of files that qodana will process at a time.", ) parser.add_argument( @@ -97,10 +105,10 @@ def __init__(self, args: Namespace): self.inspection_to_id = {} def mark(self): - df = pd.read_csv(self.dataset_path, index_col="id", nrows=self.limit) + df = pd.read_csv(self.dataset_path, index_col=ColumnName.ID.value, nrows=self.limit) - group_by_lang = df.groupby("lang") - unique_languages = df["lang"].unique() + group_by_lang = df.groupby(ColumnName.LANG.value) + unique_languages = df[ColumnName.LANG.value].unique() logger.info(f"Unique languages: {unique_languages}") @@ -148,21 +156,24 @@ def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): with new_temp_dir() as temp_dir: + project_dir = temp_dir / "project" + results_dir = temp_dir / "results" + logger.info("Copying the template") - self._copy_template(temp_dir, language) + self._copy_template(project_dir, language) if self.config: logger.info("Copying the config") - self._copy_config(temp_dir) + self._copy_config(project_dir) logger.info("Creating main files") - self._create_main_files(temp_dir, chunk, language) + self._create_main_files(project_dir, chunk, language) logger.info("Running qodana") - self._run_qodana(temp_dir) + self._run_qodana(project_dir, results_dir) logger.info("Getting unique inspections") - inspections = self._get_inspections(temp_dir) + inspections = self._get_inspections(results_dir) existing_inspections = set(self.inspection_to_id.keys()) new_inspections = inspections.difference(existing_inspections) @@ -170,59 +181,58 @@ def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): self.inspection_to_id[inspection] = len(self.inspection_to_id) logger.info("Parsing the output of qodana") - solution_id_to_inspection_ids = self._parse(temp_dir, inspections) + solution_id_to_inspection_ids = self._parse(results_dir, inspections) chunk["inspection_ids"] = "" for solution_id, inspection_ids in solution_id_to_inspection_ids.items(): chunk.loc[solution_id, "inspection_ids"] = ",".join(map(str, inspection_ids)) @staticmethod - def _copy_template(temp_dir: Path, language: LanguageVersion): + def _copy_template(project_dir: Path, language: LanguageVersion): if ( language == LanguageVersion.JAVA_11 or language == LanguageVersion.JAVA_9 or language == LanguageVersion.JAVA_8 or language == LanguageVersion.JAVA_7 ): - shutil.copytree(Path("./project_templates/java"), (temp_dir / "project"), dirs_exist_ok=True) + shutil.copytree(Path("./project_templates/java"), project_dir, dirs_exist_ok=True) else: raise NotImplementedError - def _copy_config(self, temp_dir: Path): - shutil.copy(self.config, (temp_dir / "project")) + def _copy_config(self, project_dir: Path): + shutil.copy(self.config, project_dir) @staticmethod - def _create_main_files(temp_dir: Path, chunk: DataFrame, language: LanguageVersion): + def _create_main_files(project_dir: Path, chunk: DataFrame, language: LanguageVersion): if ( language == LanguageVersion.JAVA_11 or language == LanguageVersion.JAVA_9 or language == LanguageVersion.JAVA_8 or language == LanguageVersion.JAVA_7 ): - working_path = temp_dir / "project" / "src" / "main" / "java" + working_dir = project_dir / "src" / "main" / "java" for index, row in chunk.iterrows(): - src_directory = working_path / f"solution{index}" - src_directory.mkdir(parents=True) - file_path = src_directory / "Main.java" + solution_dir = working_dir / f"solution{index}" + solution_dir.mkdir(parents=True) + file_path = solution_dir / "Main.java" with open(file_path, "w") as file: file.write(f"package solution{index};\n\n") - file.write(row["code"]) + file.write(row[ColumnName.CODE.value]) else: raise NotImplementedError @staticmethod - def _run_qodana(temp_dir: Path): - (temp_dir / "results").mkdir() + def _run_qodana(project_dir: Path, results_dir: Path): + results_dir.mkdir() docker.run( "jetbrains/qodana", remove=True, - volumes=[((temp_dir / "project"), "/data/project/"), ((temp_dir / "results/"), "/data/results/")], + volumes=[(project_dir, "/data/project/"), (results_dir, "/data/results/")], user=os.getuid(), ) @staticmethod - def _get_inspections(temp_dir: Path) -> set[str]: - results_dir = temp_dir / "results" + def _get_inspections(results_dir: Path) -> Set[str]: files = os.listdir(results_dir) file_name_regex = re.compile(r"(\w*).json") @@ -230,8 +240,7 @@ def _get_inspections(temp_dir: Path) -> set[str]: return {file_name_regex.match(file).group(1) for file in inspection_files} - def _parse(self, temp_dir: Path, inspections: set[str]): - results_dir = temp_dir / "results" + def _parse(self, results_dir: Path, inspections: Set[str]): package_regex = re.compile(r"solution(\d*)") solution_id_to_inspections_ids = defaultdict(list) From 1a34b5007eae02219358bf422ef87501f2fc3391 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Wed, 19 May 2021 21:56:02 +0300 Subject: [PATCH 06/43] Added new requirements --- requirements-evaluation.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements-evaluation.txt b/requirements-evaluation.txt index 11910373..e498430c 100644 --- a/requirements-evaluation.txt +++ b/requirements-evaluation.txt @@ -1,2 +1,5 @@ openpyxl==3.0.7 -pandas==1.2.3 \ No newline at end of file +pandas==1.2.3 + +numpy~=1.20.2 +python_on_whales~=0.17.1 From ecbcdf490cc992cb9b51dd58363fc4056a05885e Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Wed, 19 May 2021 21:56:13 +0300 Subject: [PATCH 07/43] Added ID to ColumnName --- src/python/evaluation/common/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python/evaluation/common/util.py b/src/python/evaluation/common/util.py index c306d3b7..c03f2075 100644 --- a/src/python/evaluation/common/util.py +++ b/src/python/evaluation/common/util.py @@ -6,6 +6,7 @@ @unique class ColumnName(Enum): + ID = "id" CODE = "code" LANG = "lang" LANGUAGE = "language" From 92f9a8a9352330e545db6204305e0e624cbdfc82 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Thu, 20 May 2021 10:53:53 +0300 Subject: [PATCH 08/43] Added README.md --- src/python/evaluation/qodana/README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/python/evaluation/qodana/README.md diff --git a/src/python/evaluation/qodana/README.md b/src/python/evaluation/qodana/README.md new file mode 100644 index 00000000..46cdf590 --- /dev/null +++ b/src/python/evaluation/qodana/README.md @@ -0,0 +1,23 @@ +# Dataset marker +This script allows you to mark up a dataset using the found qodana inspections. + +The dataset must contain at least three columns: `id`, `code` and `lang`, where `id` is a unique solution number, `lang` is the language in which the code is written in the `code` column. The `lang` must belong to one of the following values: `java7`, `java8`, `java9`, `java11`, `python3`, `kotlin`. If `lang` is not equal to any of the values, the row will be skipped. + +The dataset must have the format `csv`. The marked dataset is also in `csv` format, with a new column `inpection_ids` added, which contains a list of id's of all found inspections. The table with found inspections, consists of two columns: `id` and `inspection`, and is also in `csv` format. + +# Usage +Run the [dataset_marking.py](dataset_marking.py) with the arguments from command line. + +### Required arguments + +`dataset_path` — path to dataset. + +`inspections_output_path` — path where id of all found inspections will be saved. + +### Optional arguments +| Argument | Description | +|-----------------------------------|--------------------------------------------------------------------------------------------------------------| +| **-c**, **--config** | Path to qodana.yaml. Default is `None`. | +| **-l**, **--limit** | Allows you to read only the specified number of first rows from the dataset. Default is `None`. | +| **-s**, **--chunk-size** | The number of files that qodana will process at a time. Default is `5000`. | +| **-o**, **--dataset-output-path** | The path where the marked dataset will be saved. If not specified, the original dataset will be overwritten. | From 3ef6a4262d0666b088fb7c0fda0093c10b8155ca Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Thu, 20 May 2021 10:55:49 +0300 Subject: [PATCH 09/43] Added default value for --chunk-size --- src/python/evaluation/qodana/dataset_marking.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 715ac507..9abd5e44 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -59,6 +59,7 @@ def configure_arguments(parser: ArgumentParser) -> None: "--chunk-size", type=positive_int, help="The number of files that qodana will process at a time.", + default=5000, ) parser.add_argument( From 7cd79e0473b7653ac35c033180faabf3fba5c4b4 Mon Sep 17 00:00:00 2001 From: "Anastasiia.Birillo" Date: Thu, 20 May 2021 20:29:19 +0300 Subject: [PATCH 10/43] parse qodana output --- requirements-evaluation.txt | 1 + .../evaluation/qodana/dataset_marking.py | 30 +++++++++++++++---- src/python/evaluation/qodana/util/__init__.py | 0 .../evaluation/qodana/util/qoadana_issue.py | 11 +++++++ 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 src/python/evaluation/qodana/util/__init__.py create mode 100644 src/python/evaluation/qodana/util/qoadana_issue.py diff --git a/requirements-evaluation.txt b/requirements-evaluation.txt index e498430c..a325d3c0 100644 --- a/requirements-evaluation.txt +++ b/requirements-evaluation.txt @@ -3,3 +3,4 @@ pandas==1.2.3 numpy~=1.20.2 python_on_whales~=0.17.1 +docker diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 9abd5e44..cc6878b6 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -10,7 +10,9 @@ from dataclasses import dataclass from math import ceil from pathlib import Path -from typing import Any, Dict, Optional, Set +from typing import Any, Dict, Optional, Set, List + +from src.python.evaluation.qodana.util.qoadana_issue import QodanaIssue sys.path.append("../../../..") @@ -155,6 +157,21 @@ def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: result = pd.concat(chunks) return result + @classmethod + def _get_fragment_id_from_fragment_file_path(cls, fragment_file_path: str) -> int: + pass + + @classmethod + def _parse_inspections_files(cls, inspections_files: List[Path]): + for file in inspections_files: + issues = json.loads(str(file))['problems'] + for issue in issues: + qodana_issue = QodanaIssue(line=issue['line'], offset=issue['offset'], length=issue['length'], + highlighted_element=issue['highlighted_element'], + description=issue['description']) + pass + pass + def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): with new_temp_dir() as temp_dir: project_dir = temp_dir / "project" @@ -174,7 +191,10 @@ def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): self._run_qodana(project_dir, results_dir) logger.info("Getting unique inspections") - inspections = self._get_inspections(results_dir) + inspections = self._get_inspections_files(results_dir) + + # Todo: open all jsons and parse inspections + existing_inspections = set(self.inspection_to_id.keys()) new_inspections = inspections.difference(existing_inspections) @@ -233,13 +253,11 @@ def _run_qodana(project_dir: Path, results_dir: Path): ) @staticmethod - def _get_inspections(results_dir: Path) -> Set[str]: + def _get_inspections_files(results_dir: Path) -> Set[Path]: files = os.listdir(results_dir) file_name_regex = re.compile(r"(\w*).json") - inspection_files = filter(lambda file: file_name_regex.match(file), files) - - return {file_name_regex.match(file).group(1) for file in inspection_files} + return set(map(lambda f: results_dir / f, filter(lambda file: file_name_regex.match(file), files))) def _parse(self, results_dir: Path, inspections: Set[str]): package_regex = re.compile(r"solution(\d*)") diff --git a/src/python/evaluation/qodana/util/__init__.py b/src/python/evaluation/qodana/util/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/python/evaluation/qodana/util/qoadana_issue.py b/src/python/evaluation/qodana/util/qoadana_issue.py new file mode 100644 index 00000000..ff4db5d7 --- /dev/null +++ b/src/python/evaluation/qodana/util/qoadana_issue.py @@ -0,0 +1,11 @@ +from dataclasses import dataclass + + +@dataclass(frozen=True) +class QodanaIssue: + fragment_id: int + line: int + offset: int + length: int + highlighted_element: str + description: str From a8b80c0a2b30d8c8c4a72c2acb68fedc9d9723dd Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Thu, 20 May 2021 20:30:39 +0300 Subject: [PATCH 11/43] Update README.md --- src/python/evaluation/qodana/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/python/evaluation/qodana/README.md b/src/python/evaluation/qodana/README.md index 46cdf590..35ccb782 100644 --- a/src/python/evaluation/qodana/README.md +++ b/src/python/evaluation/qodana/README.md @@ -1,5 +1,5 @@ -# Dataset marker -This script allows you to mark up a dataset using the found qodana inspections. +# Dataset label +This script allows you to mark up a dataset using the found [Qodana](https://github.com/JetBrains/Qodana) inspections. The dataset must contain at least three columns: `id`, `code` and `lang`, where `id` is a unique solution number, `lang` is the language in which the code is written in the `code` column. The `lang` must belong to one of the following values: `java7`, `java8`, `java9`, `java11`, `python3`, `kotlin`. If `lang` is not equal to any of the values, the row will be skipped. @@ -15,9 +15,9 @@ Run the [dataset_marking.py](dataset_marking.py) with the arguments from command `inspections_output_path` — path where id of all found inspections will be saved. ### Optional arguments -| Argument | Description | -|-----------------------------------|--------------------------------------------------------------------------------------------------------------| -| **-c**, **--config** | Path to qodana.yaml. Default is `None`. | -| **-l**, **--limit** | Allows you to read only the specified number of first rows from the dataset. Default is `None`. | -| **-s**, **--chunk-size** | The number of files that qodana will process at a time. Default is `5000`. | -| **-o**, **--dataset-output-path** | The path where the marked dataset will be saved. If not specified, the original dataset will be overwritten. | +| Argument | Description | +|-|-| +| **‑c**, **‑‑config** | Path to qodana.yaml. If the path is not specified, Qodana will start without a configuration file| +| **‑l**, **‑‑limit** | Allows you to read only the specified number of first rows from the dataset. If no limit is specified, the whole dataset will be processed. | +| **‑s**, **‑‑chunk‑size** | The number of files that Qodana will process at a time. Default is `5000`. | +| **‑o**, **‑‑dataset‑output‑path** | The path where the marked dataset will be saved. If not specified, the original dataset will be overwritten. | From 75cac7b4e64570c74c950c9a060492511e7ffd14 Mon Sep 17 00:00:00 2001 From: "Anastasiia.Birillo" Date: Thu, 20 May 2021 21:12:42 +0300 Subject: [PATCH 12/43] Change qodana scipt output --- .../evaluation/qodana/dataset_marking.py | 93 ++++++++++--------- .../util/{qoadana_issue.py => models.py} | 7 ++ src/python/review/common/file_system.py | 4 +- 3 files changed, 59 insertions(+), 45 deletions(-) rename src/python/evaluation/qodana/util/{qoadana_issue.py => models.py} (61%) diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index cc6878b6..7697fc23 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -10,9 +10,7 @@ from dataclasses import dataclass from math import ceil from pathlib import Path -from typing import Any, Dict, Optional, Set, List - -from src.python.evaluation.qodana.util.qoadana_issue import QodanaIssue +from typing import Any, Dict, List, Optional, Set sys.path.append("../../../..") @@ -21,8 +19,11 @@ from pandas import DataFrame from python_on_whales import docker from src.python.evaluation.common.util import ColumnName +from src.python.evaluation.qodana.util.models import QodanaColumnName, QodanaIssue from src.python.review.application_config import LanguageVersion -from src.python.review.common.file_system import new_temp_dir +from src.python.review.common.file_system import ( + get_content_from_file, get_name_from_path, get_parent_folder, new_temp_dir, +) from src.python.review.run_tool import positive_int logger = logging.getLogger(__name__) @@ -105,10 +106,8 @@ def __init__(self, args: Namespace): self.inspections_output_path = args.inspections_output_path - self.inspection_to_id = {} - def mark(self): - df = pd.read_csv(self.dataset_path, index_col=ColumnName.ID.value, nrows=self.limit) + df = pd.read_csv(self.dataset_path, nrows=self.limit) group_by_lang = df.groupby(ColumnName.LANG.value) unique_languages = df[ColumnName.LANG.value].unique() @@ -136,12 +135,12 @@ def mark(self): logger.info("Writing the dataset to a file.") df.to_csv(self.dataset_output_path) - - id_to_inspection = {value: index for index, value in self.inspection_to_id.items()} - - id_to_inspection_df = pd.DataFrame.from_dict(id_to_inspection, orient="index", columns=["inspection"]) - id_to_inspection_df.index.name = "id" - id_to_inspection_df.to_csv(self.inspections_output_path) + # + # id_to_inspection = {value: index for index, value in self.inspection_to_id.items()} + # + # id_to_inspection_df = pd.DataFrame.from_dict(id_to_inspection, orient="index", columns=["inspection"]) + # id_to_inspection_df.index.name = "id" + # id_to_inspection_df.to_csv(self.inspections_output_path) def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: number_of_chunks = 1 @@ -149,30 +148,43 @@ def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: number_of_chunks = ceil(df.shape[0] / self.chunk_size) chunks = np.array_split(df, number_of_chunks) + labeled_chunks = [] for index, chunk in enumerate(chunks): logger.info(f"Processing chunk: {index + 1} / {number_of_chunks}") - self._mark_chunk(chunk, language) + chunk = self._mark_chunk(chunk, language) + labeled_chunks.append(chunk) logger.info(f"{language} processing finished.") - result = pd.concat(chunks) + result = pd.concat(labeled_chunks) return result + @classmethod + def _extract_fragment_id(cls, folder_name: str) -> int: + numbers = re.findall(r'\d+', folder_name) + if len(numbers) != 1: + raise ValueError(f'Can npt extract fragment id from {folder_name}') + return numbers[0] + @classmethod def _get_fragment_id_from_fragment_file_path(cls, fragment_file_path: str) -> int: - pass + folder_name = get_name_from_path(get_parent_folder(fragment_file_path), with_extension=False) + return cls._extract_fragment_id(folder_name) @classmethod - def _parse_inspections_files(cls, inspections_files: List[Path]): + def _parse_inspections_files(cls, inspections_files: Set[Path]) -> Dict[int, List[QodanaIssue]]: + id_to_issues: Dict[int, List[QodanaIssue]] = defaultdict(list) for file in inspections_files: - issues = json.loads(str(file))['problems'] + issues = json.loads(get_content_from_file(file))['problems'] for issue in issues: + fragment_id = cls._get_fragment_id_from_fragment_file_path(issue['file']) qodana_issue = QodanaIssue(line=issue['line'], offset=issue['offset'], length=issue['length'], highlighted_element=issue['highlighted_element'], - description=issue['description']) - pass - pass + description=issue['description'], fragment_id=fragment_id, + problem_id=issue['problem_class']['id']) + id_to_issues[fragment_id].append(qodana_issue) + return id_to_issues - def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): + def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion) -> pd.DataFrame: with new_temp_dir() as temp_dir: project_dir = temp_dir / "project" results_dir = temp_dir / "results" @@ -190,22 +202,15 @@ def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): logger.info("Running qodana") self._run_qodana(project_dir, results_dir) - logger.info("Getting unique inspections") - inspections = self._get_inspections_files(results_dir) - - # Todo: open all jsons and parse inspections + logger.info("Getting inspections") + inspections_files = self._get_inspections_files(results_dir) + inspections = self._parse_inspections_files(inspections_files) - existing_inspections = set(self.inspection_to_id.keys()) - new_inspections = inspections.difference(existing_inspections) + logger.info("Write inspections") + chunk[QodanaColumnName.INSPECTIONS.value] = chunk.apply( + lambda row: inspections.get(row[ColumnName.ID.value], []), axis=1) - for inspection in new_inspections: - self.inspection_to_id[inspection] = len(self.inspection_to_id) - - logger.info("Parsing the output of qodana") - solution_id_to_inspection_ids = self._parse(results_dir, inspections) - chunk["inspection_ids"] = "" - for solution_id, inspection_ids in solution_id_to_inspection_ids.items(): - chunk.loc[solution_id, "inspection_ids"] = ",".join(map(str, inspection_ids)) + return chunk @staticmethod def _copy_template(project_dir: Path, language: LanguageVersion): @@ -244,13 +249,15 @@ def _create_main_files(project_dir: Path, chunk: DataFrame, language: LanguageVe @staticmethod def _run_qodana(project_dir: Path, results_dir: Path): results_dir.mkdir() - - docker.run( - "jetbrains/qodana", - remove=True, - volumes=[(project_dir, "/data/project/"), (results_dir, "/data/results/")], - user=os.getuid(), - ) + try: + docker.run( + "jetbrains/qodana", + remove=True, + volumes=[(project_dir, "/data/project/"), (results_dir, "/data/results/")], + user=os.getuid(), + ) + except Exception as e: + logger.exception(f'Error during qodana running: {e}') @staticmethod def _get_inspections_files(results_dir: Path) -> Set[Path]: diff --git a/src/python/evaluation/qodana/util/qoadana_issue.py b/src/python/evaluation/qodana/util/models.py similarity index 61% rename from src/python/evaluation/qodana/util/qoadana_issue.py rename to src/python/evaluation/qodana/util/models.py index ff4db5d7..0cc7de2f 100644 --- a/src/python/evaluation/qodana/util/qoadana_issue.py +++ b/src/python/evaluation/qodana/util/models.py @@ -1,4 +1,5 @@ from dataclasses import dataclass +from enum import Enum, unique @dataclass(frozen=True) @@ -9,3 +10,9 @@ class QodanaIssue: length: int highlighted_element: str description: str + problem_id: str + + +@unique +class QodanaColumnName(Enum): + INSPECTIONS = 'inspections' diff --git a/src/python/review/common/file_system.py b/src/python/review/common/file_system.py index eb5bc768..a06daed7 100644 --- a/src/python/review/common/file_system.py +++ b/src/python/review/common/file_system.py @@ -85,7 +85,7 @@ def deserialize_data_from_file(path: Path) -> Any: # For getting name of the last folder or file # For example, returns 'folder' for both 'path/data/folder' and 'path/data/folder/' -def get_name_from_path(path: str, with_extension: bool = True) -> str: +def get_name_from_path(path: Union[Path, str], with_extension: bool = True) -> str: head, tail = os.path.split(path) # Tail can be empty if '/' is at the end of the path file_name = tail or os.path.basename(head) @@ -173,7 +173,7 @@ def add_slash(path: str) -> str: return path -def get_parent_folder(path: Path, to_add_slash: bool = False) -> Path: +def get_parent_folder(path: Union[Path, str], to_add_slash: bool = False) -> Path: path = remove_slash(str(path)) parent_folder = '/'.join(path.split('/')[:-1]) if to_add_slash: From c428b7859d2e4323f7dfef4734053b291638d9a7 Mon Sep 17 00:00:00 2001 From: "Anastasiia.Birillo" Date: Fri, 21 May 2021 12:26:12 +0300 Subject: [PATCH 13/43] Fix a bug with qodana --- .../evaluation/qodana/dataset_marking.py | 83 +++++++++---------- src/python/evaluation/qodana/util/models.py | 39 +++++++++ src/python/review/common/file_system.py | 6 ++ src/python/review/common/subprocess_runner.py | 5 ++ whitelist.txt | 1 + 5 files changed, 92 insertions(+), 42 deletions(-) diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 7697fc23..574e7d07 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -17,13 +17,14 @@ import numpy as np import pandas as pd from pandas import DataFrame -from python_on_whales import docker +from src.python.evaluation.common.csv_util import write_dataframe_to_csv from src.python.evaluation.common.util import ColumnName -from src.python.evaluation.qodana.util.models import QodanaColumnName, QodanaIssue +from src.python.evaluation.qodana.util.models import QodanaColumnName, QodanaIssue, QodanaJsonField from src.python.review.application_config import LanguageVersion from src.python.review.common.file_system import ( - get_content_from_file, get_name_from_path, get_parent_folder, new_temp_dir, + create_directory, get_content_from_file, get_name_from_path, get_parent_folder, remove_directory, ) +from src.python.review.common.subprocess_runner import run_and_wait from src.python.review.run_tool import positive_int logger = logging.getLogger(__name__) @@ -134,13 +135,7 @@ def mark(self): df = pd.concat(groups) logger.info("Writing the dataset to a file.") - df.to_csv(self.dataset_output_path) - # - # id_to_inspection = {value: index for index, value in self.inspection_to_id.items()} - # - # id_to_inspection_df = pd.DataFrame.from_dict(id_to_inspection, orient="index", columns=["inspection"]) - # id_to_inspection_df.index.name = "id" - # id_to_inspection_df.to_csv(self.inspections_output_path) + write_dataframe_to_csv(self.dataset_output_path, df) def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: number_of_chunks = 1 @@ -149,10 +144,10 @@ def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: chunks = np.array_split(df, number_of_chunks) labeled_chunks = [] + # Todo: run this in parallel for index, chunk in enumerate(chunks): logger.info(f"Processing chunk: {index + 1} / {number_of_chunks}") - chunk = self._mark_chunk(chunk, language) - labeled_chunks.append(chunk) + labeled_chunks.append(self._mark_chunk(chunk, language, index)) logger.info(f"{language} processing finished.") result = pd.concat(labeled_chunks) @@ -176,7 +171,7 @@ def _parse_inspections_files(cls, inspections_files: Set[Path]) -> Dict[int, Lis for file in inspections_files: issues = json.loads(get_content_from_file(file))['problems'] for issue in issues: - fragment_id = cls._get_fragment_id_from_fragment_file_path(issue['file']) + fragment_id = int(cls._get_fragment_id_from_fragment_file_path(issue['file'])) qodana_issue = QodanaIssue(line=issue['line'], offset=issue['offset'], length=issue['length'], highlighted_element=issue['highlighted_element'], description=issue['description'], fragment_id=fragment_id, @@ -184,33 +179,43 @@ def _parse_inspections_files(cls, inspections_files: Set[Path]) -> Dict[int, Lis id_to_issues[fragment_id].append(qodana_issue) return id_to_issues - def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion) -> pd.DataFrame: - with new_temp_dir() as temp_dir: - project_dir = temp_dir / "project" - results_dir = temp_dir / "results" + @classmethod + def _to_json(cls, issues: List[QodanaIssue]) -> str: + issues_json = { + QodanaJsonField.ISSUES.value: list(map(lambda i: i.to_json(), issues)), + } + return json.dumps(issues_json) + + def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion, chunk_id: int) -> pd.DataFrame: + tmp_file_path = self.dataset_path.parent.absolute() / f'qodana_project_{chunk_id}' + create_directory(tmp_file_path) + + project_dir = tmp_file_path / "project" + results_dir = tmp_file_path / "results" - logger.info("Copying the template") - self._copy_template(project_dir, language) + logger.info("Copying the template") + self._copy_template(project_dir, language) - if self.config: - logger.info("Copying the config") - self._copy_config(project_dir) + if self.config: + logger.info("Copying the config") + self._copy_config(project_dir) - logger.info("Creating main files") - self._create_main_files(project_dir, chunk, language) + logger.info("Creating main files") + self._create_main_files(project_dir, chunk, language) - logger.info("Running qodana") - self._run_qodana(project_dir, results_dir) + logger.info("Running qodana") + self._run_qodana(project_dir, results_dir) - logger.info("Getting inspections") - inspections_files = self._get_inspections_files(results_dir) - inspections = self._parse_inspections_files(inspections_files) + logger.info("Getting inspections") + inspections_files = self._get_inspections_files(results_dir) + inspections = self._parse_inspections_files(inspections_files) - logger.info("Write inspections") - chunk[QodanaColumnName.INSPECTIONS.value] = chunk.apply( - lambda row: inspections.get(row[ColumnName.ID.value], []), axis=1) + logger.info("Write inspections") + chunk[QodanaColumnName.INSPECTIONS.value] = chunk.apply( + lambda row: self._to_json(inspections.get(row[ColumnName.ID.value], [])), axis=1) - return chunk + remove_directory(tmp_file_path) + return chunk @staticmethod def _copy_template(project_dir: Path, language: LanguageVersion): @@ -249,15 +254,9 @@ def _create_main_files(project_dir: Path, chunk: DataFrame, language: LanguageVe @staticmethod def _run_qodana(project_dir: Path, results_dir: Path): results_dir.mkdir() - try: - docker.run( - "jetbrains/qodana", - remove=True, - volumes=[(project_dir, "/data/project/"), (results_dir, "/data/results/")], - user=os.getuid(), - ) - except Exception as e: - logger.exception(f'Error during qodana running: {e}') + command = ['docker', 'run', '--rm', '-v', f'{project_dir}/:/data/project/', '-v', + f'{results_dir}/:/data/results/', 'jetbrains/qodana'] + run_and_wait(command) @staticmethod def _get_inspections_files(results_dir: Path) -> Set[Path]: diff --git a/src/python/evaluation/qodana/util/models.py b/src/python/evaluation/qodana/util/models.py index 0cc7de2f..f5b3a589 100644 --- a/src/python/evaluation/qodana/util/models.py +++ b/src/python/evaluation/qodana/util/models.py @@ -1,3 +1,4 @@ +import json from dataclasses import dataclass from enum import Enum, unique @@ -12,7 +13,45 @@ class QodanaIssue: description: str problem_id: str + def to_json(self) -> str: + issue = { + QodanaJsonField.FRAGMENT_ID.value: self.fragment_id, + QodanaJsonField.LINE.value: self.line, + QodanaJsonField.OFFSET.value: self.offset, + QodanaJsonField.LENGTH.value: self.length, + QodanaJsonField.HIGHLIGHTED_ELEMENT.value: self.highlighted_element, + QodanaJsonField.DESCRIPTION.value: self.description, + QodanaJsonField.PROBLEM_ID.value: self.problem_id, + } + return json.dumps(issue) + + @classmethod + def from_json(cls, str_json: str) -> 'QodanaIssue': + issue = json.loads(str_json) + return QodanaIssue( + fragment_id=issue[QodanaJsonField.FRAGMENT_ID.value], + line=issue[QodanaJsonField.LINE.value], + offset=issue[QodanaJsonField.OFFSET.value], + length=issue[QodanaJsonField.LENGTH.value], + highlighted_element=issue[QodanaJsonField.HIGHLIGHTED_ELEMENT.value], + description=issue[QodanaJsonField.DESCRIPTION.value], + problem_id=issue[QodanaJsonField.PROBLEM_ID.value], + ) + @unique class QodanaColumnName(Enum): INSPECTIONS = 'inspections' + + +@unique +class QodanaJsonField(Enum): + FRAGMENT_ID = 'fragment_id' + LINE = 'line' + OFFSET = 'offset' + LENGTH = 'length' + HIGHLIGHTED_ELEMENT = 'highlighted_element' + DESCRIPTION = 'description' + PROBLEM_ID = 'problem_id' + + ISSUES = 'issues' diff --git a/src/python/review/common/file_system.py b/src/python/review/common/file_system.py index a06daed7..3e2e8bce 100644 --- a/src/python/review/common/file_system.py +++ b/src/python/review/common/file_system.py @@ -2,6 +2,7 @@ import os import pickle import re +import shutil import tempfile from contextlib import contextmanager from enum import Enum, unique @@ -167,6 +168,11 @@ def remove_slash(path: str) -> str: return path.rstrip('/') +def remove_directory(directory: Union[str, Path]) -> None: + if os.path.isdir(directory): + shutil.rmtree(directory, ignore_errors=True) + + def add_slash(path: str) -> str: if not path.endswith('/'): path += '/' diff --git a/src/python/review/common/subprocess_runner.py b/src/python/review/common/subprocess_runner.py index a25cbdcd..2a89ad42 100644 --- a/src/python/review/common/subprocess_runner.py +++ b/src/python/review/common/subprocess_runner.py @@ -21,3 +21,8 @@ def run_in_subprocess(command: List[str]) -> str: logger.debug('%s\'s stderr:\n%s' % (command[0], stderr)) return stdout + + +def run_and_wait(command: List[str]) -> None: + process = subprocess.Popen(command) + process.wait() diff --git a/whitelist.txt b/whitelist.txt index bbf66332..3e331750 100644 --- a/whitelist.txt +++ b/whitelist.txt @@ -113,3 +113,4 @@ iterrows nrows groupby getuid +Popen From 8489c9d0564f0a780521345f18c2f016bfcb8791 Mon Sep 17 00:00:00 2001 From: "Anastasiia.Birillo" Date: Fri, 21 May 2021 13:46:55 +0300 Subject: [PATCH 14/43] Fix a bug with path to the gradle project --- src/python/evaluation/qodana/dataset_marking.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 574e7d07..00f17667 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -22,7 +22,7 @@ from src.python.evaluation.qodana.util.models import QodanaColumnName, QodanaIssue, QodanaJsonField from src.python.review.application_config import LanguageVersion from src.python.review.common.file_system import ( - create_directory, get_content_from_file, get_name_from_path, get_parent_folder, remove_directory, + create_directory, get_content_from_file, get_name_from_path, get_parent_folder, remove_directory, remove_slash, ) from src.python.review.common.subprocess_runner import run_and_wait from src.python.review.run_tool import positive_int @@ -225,7 +225,8 @@ def _copy_template(project_dir: Path, language: LanguageVersion): or language == LanguageVersion.JAVA_8 or language == LanguageVersion.JAVA_7 ): - shutil.copytree(Path("./project_templates/java"), project_dir, dirs_exist_ok=True) + shutil.copytree(Path(f"{remove_slash(os.path.dirname(os.path.abspath(__file__)))}/project_templates/java"), + project_dir, dirs_exist_ok=True) else: raise NotImplementedError From 371f985f8d6315b8568f48d66727a18f6447d3f8 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sat, 22 May 2021 11:31:37 +0300 Subject: [PATCH 15/43] Fixed PR issues --- .../evaluation/qodana/dataset_marking.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 00f17667..40f679bd 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -157,7 +157,7 @@ def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: def _extract_fragment_id(cls, folder_name: str) -> int: numbers = re.findall(r'\d+', folder_name) if len(numbers) != 1: - raise ValueError(f'Can npt extract fragment id from {folder_name}') + raise ValueError(f'Can not extract fragment id from {folder_name}') return numbers[0] @classmethod @@ -187,11 +187,11 @@ def _to_json(cls, issues: List[QodanaIssue]) -> str: return json.dumps(issues_json) def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion, chunk_id: int) -> pd.DataFrame: - tmp_file_path = self.dataset_path.parent.absolute() / f'qodana_project_{chunk_id}' - create_directory(tmp_file_path) + tmp_dir_path = self.dataset_path.parent.absolute() / f'qodana_project_{chunk_id}' + create_directory(tmp_dir_path) - project_dir = tmp_file_path / "project" - results_dir = tmp_file_path / "results" + project_dir = tmp_dir_path / "project" + results_dir = tmp_dir_path / "results" logger.info("Copying the template") self._copy_template(project_dir, language) @@ -214,7 +214,7 @@ def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion, chunk_id: int chunk[QodanaColumnName.INSPECTIONS.value] = chunk.apply( lambda row: self._to_json(inspections.get(row[ColumnName.ID.value], [])), axis=1) - remove_directory(tmp_file_path) + remove_directory(tmp_dir_path) return chunk @staticmethod @@ -242,12 +242,12 @@ def _create_main_files(project_dir: Path, chunk: DataFrame, language: LanguageVe or language == LanguageVersion.JAVA_7 ): working_dir = project_dir / "src" / "main" / "java" - for index, row in chunk.iterrows(): - solution_dir = working_dir / f"solution{index}" + for _, row in chunk.iterrows(): + solution_dir = working_dir / f"solution{row[ColumnName.ID.value]}" solution_dir.mkdir(parents=True) file_path = solution_dir / "Main.java" with open(file_path, "w") as file: - file.write(f"package solution{index};\n\n") + file.write(f"package solution{row[ColumnName.ID.value]};\n\n") file.write(row[ColumnName.CODE.value]) else: raise NotImplementedError @@ -255,7 +255,7 @@ def _create_main_files(project_dir: Path, chunk: DataFrame, language: LanguageVe @staticmethod def _run_qodana(project_dir: Path, results_dir: Path): results_dir.mkdir() - command = ['docker', 'run', '--rm', '-v', f'{project_dir}/:/data/project/', '-v', + command = ['docker', 'run', '-u', str(os.getuid()), '--rm', '-v', f'{project_dir}/:/data/project/', '-v', f'{results_dir}/:/data/results/', 'jetbrains/qodana'] run_and_wait(command) From 0dab1b7ca77b9a5c47d53dc49ddebbc940655b51 Mon Sep 17 00:00:00 2001 From: Nastya Birillo Date: Sat, 22 May 2021 11:45:29 +0300 Subject: [PATCH 16/43] Fix/qodana output (#33) * Update version to 1.2.0 * parse qodana output * Change qodana scipt output * Fix a bug with qodana * Fix a bug with path to the gradle project * Fixed PR issues Co-authored-by: Ilya Vlasov --- requirements-evaluation.txt | 1 + .../evaluation/qodana/dataset_marking.py | 147 ++++++++++-------- src/python/evaluation/qodana/util/__init__.py | 0 src/python/evaluation/qodana/util/models.py | 57 +++++++ src/python/review/common/file_system.py | 10 +- src/python/review/common/subprocess_runner.py | 5 + whitelist.txt | 1 + 7 files changed, 158 insertions(+), 63 deletions(-) create mode 100644 src/python/evaluation/qodana/util/__init__.py create mode 100644 src/python/evaluation/qodana/util/models.py diff --git a/requirements-evaluation.txt b/requirements-evaluation.txt index 4fcd70e8..cff892f6 100644 --- a/requirements-evaluation.txt +++ b/requirements-evaluation.txt @@ -4,3 +4,4 @@ pandarallel numpy~=1.20.2 python_on_whales~=0.17.1 +docker diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 9abd5e44..40f679bd 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -10,17 +10,21 @@ from dataclasses import dataclass from math import ceil from pathlib import Path -from typing import Any, Dict, Optional, Set +from typing import Any, Dict, List, Optional, Set sys.path.append("../../../..") import numpy as np import pandas as pd from pandas import DataFrame -from python_on_whales import docker +from src.python.evaluation.common.csv_util import write_dataframe_to_csv from src.python.evaluation.common.util import ColumnName +from src.python.evaluation.qodana.util.models import QodanaColumnName, QodanaIssue, QodanaJsonField from src.python.review.application_config import LanguageVersion -from src.python.review.common.file_system import new_temp_dir +from src.python.review.common.file_system import ( + create_directory, get_content_from_file, get_name_from_path, get_parent_folder, remove_directory, remove_slash, +) +from src.python.review.common.subprocess_runner import run_and_wait from src.python.review.run_tool import positive_int logger = logging.getLogger(__name__) @@ -103,10 +107,8 @@ def __init__(self, args: Namespace): self.inspections_output_path = args.inspections_output_path - self.inspection_to_id = {} - def mark(self): - df = pd.read_csv(self.dataset_path, index_col=ColumnName.ID.value, nrows=self.limit) + df = pd.read_csv(self.dataset_path, nrows=self.limit) group_by_lang = df.groupby(ColumnName.LANG.value) unique_languages = df[ColumnName.LANG.value].unique() @@ -133,13 +135,7 @@ def mark(self): df = pd.concat(groups) logger.info("Writing the dataset to a file.") - df.to_csv(self.dataset_output_path) - - id_to_inspection = {value: index for index, value in self.inspection_to_id.items()} - - id_to_inspection_df = pd.DataFrame.from_dict(id_to_inspection, orient="index", columns=["inspection"]) - id_to_inspection_df.index.name = "id" - id_to_inspection_df.to_csv(self.inspections_output_path) + write_dataframe_to_csv(self.dataset_output_path, df) def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: number_of_chunks = 1 @@ -147,45 +143,79 @@ def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: number_of_chunks = ceil(df.shape[0] / self.chunk_size) chunks = np.array_split(df, number_of_chunks) + labeled_chunks = [] + # Todo: run this in parallel for index, chunk in enumerate(chunks): logger.info(f"Processing chunk: {index + 1} / {number_of_chunks}") - self._mark_chunk(chunk, language) + labeled_chunks.append(self._mark_chunk(chunk, language, index)) logger.info(f"{language} processing finished.") - result = pd.concat(chunks) + result = pd.concat(labeled_chunks) return result - def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion): - with new_temp_dir() as temp_dir: - project_dir = temp_dir / "project" - results_dir = temp_dir / "results" - - logger.info("Copying the template") - self._copy_template(project_dir, language) - - if self.config: - logger.info("Copying the config") - self._copy_config(project_dir) - - logger.info("Creating main files") - self._create_main_files(project_dir, chunk, language) - - logger.info("Running qodana") - self._run_qodana(project_dir, results_dir) - - logger.info("Getting unique inspections") - inspections = self._get_inspections(results_dir) - existing_inspections = set(self.inspection_to_id.keys()) - new_inspections = inspections.difference(existing_inspections) - - for inspection in new_inspections: - self.inspection_to_id[inspection] = len(self.inspection_to_id) - - logger.info("Parsing the output of qodana") - solution_id_to_inspection_ids = self._parse(results_dir, inspections) - chunk["inspection_ids"] = "" - for solution_id, inspection_ids in solution_id_to_inspection_ids.items(): - chunk.loc[solution_id, "inspection_ids"] = ",".join(map(str, inspection_ids)) + @classmethod + def _extract_fragment_id(cls, folder_name: str) -> int: + numbers = re.findall(r'\d+', folder_name) + if len(numbers) != 1: + raise ValueError(f'Can not extract fragment id from {folder_name}') + return numbers[0] + + @classmethod + def _get_fragment_id_from_fragment_file_path(cls, fragment_file_path: str) -> int: + folder_name = get_name_from_path(get_parent_folder(fragment_file_path), with_extension=False) + return cls._extract_fragment_id(folder_name) + + @classmethod + def _parse_inspections_files(cls, inspections_files: Set[Path]) -> Dict[int, List[QodanaIssue]]: + id_to_issues: Dict[int, List[QodanaIssue]] = defaultdict(list) + for file in inspections_files: + issues = json.loads(get_content_from_file(file))['problems'] + for issue in issues: + fragment_id = int(cls._get_fragment_id_from_fragment_file_path(issue['file'])) + qodana_issue = QodanaIssue(line=issue['line'], offset=issue['offset'], length=issue['length'], + highlighted_element=issue['highlighted_element'], + description=issue['description'], fragment_id=fragment_id, + problem_id=issue['problem_class']['id']) + id_to_issues[fragment_id].append(qodana_issue) + return id_to_issues + + @classmethod + def _to_json(cls, issues: List[QodanaIssue]) -> str: + issues_json = { + QodanaJsonField.ISSUES.value: list(map(lambda i: i.to_json(), issues)), + } + return json.dumps(issues_json) + + def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion, chunk_id: int) -> pd.DataFrame: + tmp_dir_path = self.dataset_path.parent.absolute() / f'qodana_project_{chunk_id}' + create_directory(tmp_dir_path) + + project_dir = tmp_dir_path / "project" + results_dir = tmp_dir_path / "results" + + logger.info("Copying the template") + self._copy_template(project_dir, language) + + if self.config: + logger.info("Copying the config") + self._copy_config(project_dir) + + logger.info("Creating main files") + self._create_main_files(project_dir, chunk, language) + + logger.info("Running qodana") + self._run_qodana(project_dir, results_dir) + + logger.info("Getting inspections") + inspections_files = self._get_inspections_files(results_dir) + inspections = self._parse_inspections_files(inspections_files) + + logger.info("Write inspections") + chunk[QodanaColumnName.INSPECTIONS.value] = chunk.apply( + lambda row: self._to_json(inspections.get(row[ColumnName.ID.value], [])), axis=1) + + remove_directory(tmp_dir_path) + return chunk @staticmethod def _copy_template(project_dir: Path, language: LanguageVersion): @@ -195,7 +225,8 @@ def _copy_template(project_dir: Path, language: LanguageVersion): or language == LanguageVersion.JAVA_8 or language == LanguageVersion.JAVA_7 ): - shutil.copytree(Path("./project_templates/java"), project_dir, dirs_exist_ok=True) + shutil.copytree(Path(f"{remove_slash(os.path.dirname(os.path.abspath(__file__)))}/project_templates/java"), + project_dir, dirs_exist_ok=True) else: raise NotImplementedError @@ -211,12 +242,12 @@ def _create_main_files(project_dir: Path, chunk: DataFrame, language: LanguageVe or language == LanguageVersion.JAVA_7 ): working_dir = project_dir / "src" / "main" / "java" - for index, row in chunk.iterrows(): - solution_dir = working_dir / f"solution{index}" + for _, row in chunk.iterrows(): + solution_dir = working_dir / f"solution{row[ColumnName.ID.value]}" solution_dir.mkdir(parents=True) file_path = solution_dir / "Main.java" with open(file_path, "w") as file: - file.write(f"package solution{index};\n\n") + file.write(f"package solution{row[ColumnName.ID.value]};\n\n") file.write(row[ColumnName.CODE.value]) else: raise NotImplementedError @@ -224,22 +255,16 @@ def _create_main_files(project_dir: Path, chunk: DataFrame, language: LanguageVe @staticmethod def _run_qodana(project_dir: Path, results_dir: Path): results_dir.mkdir() - - docker.run( - "jetbrains/qodana", - remove=True, - volumes=[(project_dir, "/data/project/"), (results_dir, "/data/results/")], - user=os.getuid(), - ) + command = ['docker', 'run', '-u', str(os.getuid()), '--rm', '-v', f'{project_dir}/:/data/project/', '-v', + f'{results_dir}/:/data/results/', 'jetbrains/qodana'] + run_and_wait(command) @staticmethod - def _get_inspections(results_dir: Path) -> Set[str]: + def _get_inspections_files(results_dir: Path) -> Set[Path]: files = os.listdir(results_dir) file_name_regex = re.compile(r"(\w*).json") - inspection_files = filter(lambda file: file_name_regex.match(file), files) - - return {file_name_regex.match(file).group(1) for file in inspection_files} + return set(map(lambda f: results_dir / f, filter(lambda file: file_name_regex.match(file), files))) def _parse(self, results_dir: Path, inspections: Set[str]): package_regex = re.compile(r"solution(\d*)") diff --git a/src/python/evaluation/qodana/util/__init__.py b/src/python/evaluation/qodana/util/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/python/evaluation/qodana/util/models.py b/src/python/evaluation/qodana/util/models.py new file mode 100644 index 00000000..f5b3a589 --- /dev/null +++ b/src/python/evaluation/qodana/util/models.py @@ -0,0 +1,57 @@ +import json +from dataclasses import dataclass +from enum import Enum, unique + + +@dataclass(frozen=True) +class QodanaIssue: + fragment_id: int + line: int + offset: int + length: int + highlighted_element: str + description: str + problem_id: str + + def to_json(self) -> str: + issue = { + QodanaJsonField.FRAGMENT_ID.value: self.fragment_id, + QodanaJsonField.LINE.value: self.line, + QodanaJsonField.OFFSET.value: self.offset, + QodanaJsonField.LENGTH.value: self.length, + QodanaJsonField.HIGHLIGHTED_ELEMENT.value: self.highlighted_element, + QodanaJsonField.DESCRIPTION.value: self.description, + QodanaJsonField.PROBLEM_ID.value: self.problem_id, + } + return json.dumps(issue) + + @classmethod + def from_json(cls, str_json: str) -> 'QodanaIssue': + issue = json.loads(str_json) + return QodanaIssue( + fragment_id=issue[QodanaJsonField.FRAGMENT_ID.value], + line=issue[QodanaJsonField.LINE.value], + offset=issue[QodanaJsonField.OFFSET.value], + length=issue[QodanaJsonField.LENGTH.value], + highlighted_element=issue[QodanaJsonField.HIGHLIGHTED_ELEMENT.value], + description=issue[QodanaJsonField.DESCRIPTION.value], + problem_id=issue[QodanaJsonField.PROBLEM_ID.value], + ) + + +@unique +class QodanaColumnName(Enum): + INSPECTIONS = 'inspections' + + +@unique +class QodanaJsonField(Enum): + FRAGMENT_ID = 'fragment_id' + LINE = 'line' + OFFSET = 'offset' + LENGTH = 'length' + HIGHLIGHTED_ELEMENT = 'highlighted_element' + DESCRIPTION = 'description' + PROBLEM_ID = 'problem_id' + + ISSUES = 'issues' diff --git a/src/python/review/common/file_system.py b/src/python/review/common/file_system.py index eb5bc768..3e2e8bce 100644 --- a/src/python/review/common/file_system.py +++ b/src/python/review/common/file_system.py @@ -2,6 +2,7 @@ import os import pickle import re +import shutil import tempfile from contextlib import contextmanager from enum import Enum, unique @@ -85,7 +86,7 @@ def deserialize_data_from_file(path: Path) -> Any: # For getting name of the last folder or file # For example, returns 'folder' for both 'path/data/folder' and 'path/data/folder/' -def get_name_from_path(path: str, with_extension: bool = True) -> str: +def get_name_from_path(path: Union[Path, str], with_extension: bool = True) -> str: head, tail = os.path.split(path) # Tail can be empty if '/' is at the end of the path file_name = tail or os.path.basename(head) @@ -167,13 +168,18 @@ def remove_slash(path: str) -> str: return path.rstrip('/') +def remove_directory(directory: Union[str, Path]) -> None: + if os.path.isdir(directory): + shutil.rmtree(directory, ignore_errors=True) + + def add_slash(path: str) -> str: if not path.endswith('/'): path += '/' return path -def get_parent_folder(path: Path, to_add_slash: bool = False) -> Path: +def get_parent_folder(path: Union[Path, str], to_add_slash: bool = False) -> Path: path = remove_slash(str(path)) parent_folder = '/'.join(path.split('/')[:-1]) if to_add_slash: diff --git a/src/python/review/common/subprocess_runner.py b/src/python/review/common/subprocess_runner.py index a25cbdcd..2a89ad42 100644 --- a/src/python/review/common/subprocess_runner.py +++ b/src/python/review/common/subprocess_runner.py @@ -21,3 +21,8 @@ def run_in_subprocess(command: List[str]) -> str: logger.debug('%s\'s stderr:\n%s' % (command[0], stderr)) return stdout + + +def run_and_wait(command: List[str]) -> None: + process = subprocess.Popen(command) + process.wait() diff --git a/whitelist.txt b/whitelist.txt index bbf66332..3e331750 100644 --- a/whitelist.txt +++ b/whitelist.txt @@ -113,3 +113,4 @@ iterrows nrows groupby getuid +Popen From f9b418deb6541de63b48d28d19450c657c129c87 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 10:22:32 +0300 Subject: [PATCH 17/43] Added is_java function --- src/python/review/application_config.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/python/review/application_config.py b/src/python/review/application_config.py index f41d439d..995b0bc0 100644 --- a/src/python/review/application_config.py +++ b/src/python/review/application_config.py @@ -42,3 +42,11 @@ def language_to_extension_dict(cls) -> Dict['LanguageVersion', Extension]: def extension_by_language(self) -> Extension: return self.language_to_extension_dict()[self] + + def is_java(self) -> bool: + return ( + self == LanguageVersion.JAVA_7 + or self == LanguageVersion.JAVA_8 + or self == LanguageVersion.JAVA_9 + or self == LanguageVersion.JAVA_11 + ) From 96c05188f5b00ed7de2d1eb09b1418d4c24d494b Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 10:24:08 +0300 Subject: [PATCH 18/43] 1) Added copy_directory and copy_file functions; 2) Added new extension: .json --- src/python/review/common/file_system.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/python/review/common/file_system.py b/src/python/review/common/file_system.py index 3e2e8bce..00ff2a41 100644 --- a/src/python/review/common/file_system.py +++ b/src/python/review/common/file_system.py @@ -35,6 +35,7 @@ class Extension(Enum): XLSX = '.xlsx' CSV = '.csv' PICKLE = '.pickle' + JSON = '.json' # Not empty extensions are returned with a dot, for example, '.txt' # If file has no extensions, an empty one ('') is returned @@ -185,3 +186,11 @@ def get_parent_folder(path: Union[Path, str], to_add_slash: bool = False) -> Pat if to_add_slash: parent_folder = add_slash(parent_folder) return Path(parent_folder) + + +def copy_directory(source: Union[str, Path], destination: Union[str, Path], dirs_exist_ok: bool = True): + shutil.copytree(source, destination, dirs_exist_ok=dirs_exist_ok) + + +def copy_file(source: Union[str, Path], destination: Union[str, Path]): + shutil.copy(source, destination) From 38a936a20b2ab66268b04c394bfd065ee43ffe08 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 10:24:30 +0300 Subject: [PATCH 19/43] Removed python_on_whales dependency --- requirements-evaluation.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements-evaluation.txt b/requirements-evaluation.txt index cff892f6..5fe5b7eb 100644 --- a/requirements-evaluation.txt +++ b/requirements-evaluation.txt @@ -1,7 +1,5 @@ openpyxl==3.0.7 pandas==1.2.3 pandarallel - numpy~=1.20.2 -python_on_whales~=0.17.1 docker From 235e60fec7bab1b6eff3cce432cd4bc457bdff39 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 10:36:01 +0300 Subject: [PATCH 20/43] Fixed some PR issues --- .../evaluation/qodana/dataset_marking.py | 213 ++++++++---------- 1 file changed, 95 insertions(+), 118 deletions(-) diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py index 40f679bd..b99d26b4 100644 --- a/src/python/evaluation/qodana/dataset_marking.py +++ b/src/python/evaluation/qodana/dataset_marking.py @@ -2,27 +2,32 @@ import logging import os import re -import shutil import sys import traceback from argparse import ArgumentParser, Namespace from collections import defaultdict -from dataclasses import dataclass from math import ceil from pathlib import Path -from typing import Any, Dict, List, Optional, Set +from typing import Dict, List, Optional, Set -sys.path.append("../../../..") +sys.path.append('../../../..') import numpy as np import pandas as pd -from pandas import DataFrame from src.python.evaluation.common.csv_util import write_dataframe_to_csv from src.python.evaluation.common.util import ColumnName from src.python.evaluation.qodana.util.models import QodanaColumnName, QodanaIssue, QodanaJsonField from src.python.review.application_config import LanguageVersion from src.python.review.common.file_system import ( - create_directory, get_content_from_file, get_name_from_path, get_parent_folder, remove_directory, remove_slash, + copy_directory, + copy_file, + create_directory, + Extension, + get_content_from_file, + get_name_from_path, + get_parent_folder, + remove_directory, + remove_slash, ) from src.python.review.common.subprocess_runner import run_and_wait from src.python.review.run_tool import positive_int @@ -33,7 +38,7 @@ def configure_arguments(parser: ArgumentParser) -> None: parser.add_argument( - "dataset_path", + 'dataset_path', type=lambda value: Path(value).absolute(), help=f"Dataset path. The dataset must contain at least three columns: '{ColumnName.ID.value}', " f"'{ColumnName.CODE.value}' and '{ColumnName.LANG.value}', where '{ColumnName.ID.value}' is a unique " @@ -44,49 +49,38 @@ def configure_arguments(parser: ArgumentParser) -> None: ) parser.add_argument( - "inspections_output_path", + 'inspections_output_path', type=lambda value: Path(value).absolute(), - help="Path where id of all found inspections will be saved.", + help='Path where id of all found inspections will be saved.', ) - parser.add_argument("-c", "--config", type=lambda value: Path(value).absolute(), help="Path to qodana.yaml") + parser.add_argument('-c', '--config', type=lambda value: Path(value).absolute(), help='Path to qodana.yaml') parser.add_argument( - "-l", - "--limit", + '-l', + '--limit', type=positive_int, - help="Allows you to read only the specified number of first rows from the dataset.", + help='Allows you to read only the specified number of first rows from the dataset.', ) parser.add_argument( - "-s", - "--chunk-size", + '-s', + '--chunk-size', type=positive_int, - help="The number of files that qodana will process at a time.", + help='The number of files that qodana will process at a time.', default=5000, ) parser.add_argument( - "-o", - "--dataset-output-path", + '-o', + '--output-path', type=lambda value: Path(value).absolute(), - help="The path where the marked dataset will be saved. " - "If not specified, the original dataset will be overwritten.", + help='The path where the labeled dataset will be saved. ' + 'If not specified, the labeled dataset will be saved next to the original one.', ) -@dataclass(init=False) -class InspectionData: - package: str - - def __init__(self, package: str, **kwargs: Any): - self.package = package - - def __str__(self): - return self.package - - -class DatasetMarker: +class DatasetLabel: dataset_path: Path config: Optional[Path] limit: Optional[int] @@ -101,19 +95,21 @@ def __init__(self, args: Namespace): self.limit = args.limit self.chunk_size = args.chunk_size - self.dataset_output_path = self.dataset_path - if args.dataset_output_path is not None: - self.dataset_output_path = args.dataset_output_path + self.output_path = args.output_path + if self.output_path is None: + output_dir = get_parent_folder(self.dataset_path) + dataset_name = get_name_from_path(self.dataset_path) + self.output_path = output_dir / f'labeled_{dataset_name}' self.inspections_output_path = args.inspections_output_path - def mark(self): - df = pd.read_csv(self.dataset_path, nrows=self.limit) + def label(self) -> None: + dataset = pd.read_csv(self.dataset_path, nrows=self.limit) - group_by_lang = df.groupby(ColumnName.LANG.value) - unique_languages = df[ColumnName.LANG.value].unique() + group_by_lang = dataset.groupby(ColumnName.LANG.value) + unique_languages = dataset[ColumnName.LANG.value].unique() - logger.info(f"Unique languages: {unique_languages}") + logger.info(f'Unique languages: {unique_languages}') groups = [] for language in unique_languages: @@ -121,23 +117,23 @@ def mark(self): if language in LanguageVersion.values(): try: - logger.info(f"Processing the language: {language}") - groups.append(self._mark_language(lang_group, LanguageVersion(language))) + logger.info(f'Processing the language: {language}') + groups.append(self._label_language(lang_group, LanguageVersion(language))) except NotImplementedError: - logger.warning(f"{language} needs implementation") + logger.warning(f'{language} needs implementation') groups.append(lang_group) else: - logger.warning(f"Unknown language: {language}") + logger.warning(f'Unknown language: {language}') groups.append(lang_group) - logger.info("Dataset processing finished") + logger.info('Dataset processing finished') - df = pd.concat(groups) + dataset = pd.concat(groups) - logger.info("Writing the dataset to a file.") - write_dataframe_to_csv(self.dataset_output_path, df) + logger.info('Writing the dataset to a file.') + write_dataframe_to_csv(self.dataset_output_path, dataset) - def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: + def _label_language(self, df: pd.DataFrame, language: LanguageVersion) -> pd.DataFrame: number_of_chunks = 1 if self.chunk_size is not None: number_of_chunks = ceil(df.shape[0] / self.chunk_size) @@ -146,10 +142,10 @@ def _mark_language(self, df: DataFrame, language: LanguageVersion) -> DataFrame: labeled_chunks = [] # Todo: run this in parallel for index, chunk in enumerate(chunks): - logger.info(f"Processing chunk: {index + 1} / {number_of_chunks}") - labeled_chunks.append(self._mark_chunk(chunk, language, index)) + logger.info(f'Processing chunk: {index + 1} / {number_of_chunks}') + labeled_chunks.append(self._label_chunk(chunk, language, index)) - logger.info(f"{language} processing finished.") + logger.info(f'{language} processing finished.') result = pd.concat(labeled_chunks) return result @@ -172,10 +168,15 @@ def _parse_inspections_files(cls, inspections_files: Set[Path]) -> Dict[int, Lis issues = json.loads(get_content_from_file(file))['problems'] for issue in issues: fragment_id = int(cls._get_fragment_id_from_fragment_file_path(issue['file'])) - qodana_issue = QodanaIssue(line=issue['line'], offset=issue['offset'], length=issue['length'], - highlighted_element=issue['highlighted_element'], - description=issue['description'], fragment_id=fragment_id, - problem_id=issue['problem_class']['id']) + qodana_issue = QodanaIssue( + line=issue['line'], + offset=issue['offset'], + length=issue['length'], + highlighted_element=issue['highlighted_element'], + description=issue['description'], + fragment_id=fragment_id, + problem_id=issue['problem_class']['id'], + ) id_to_issues[fragment_id].append(qodana_issue) return id_to_issues @@ -186,77 +187,74 @@ def _to_json(cls, issues: List[QodanaIssue]) -> str: } return json.dumps(issues_json) - def _mark_chunk(self, chunk: DataFrame, language: LanguageVersion, chunk_id: int) -> pd.DataFrame: + def _label_chunk(self, chunk: pd.DataFrame, language: LanguageVersion, chunk_id: int) -> pd.DataFrame: tmp_dir_path = self.dataset_path.parent.absolute() / f'qodana_project_{chunk_id}' create_directory(tmp_dir_path) - project_dir = tmp_dir_path / "project" - results_dir = tmp_dir_path / "results" + project_dir = tmp_dir_path / 'project' + results_dir = tmp_dir_path / 'results' - logger.info("Copying the template") + logger.info('Copying the template') self._copy_template(project_dir, language) if self.config: - logger.info("Copying the config") + logger.info('Copying the config') self._copy_config(project_dir) - logger.info("Creating main files") + logger.info('Creating main files') self._create_main_files(project_dir, chunk, language) - logger.info("Running qodana") + logger.info('Running qodana') self._run_qodana(project_dir, results_dir) - logger.info("Getting inspections") + logger.info('Getting inspections') inspections_files = self._get_inspections_files(results_dir) inspections = self._parse_inspections_files(inspections_files) - logger.info("Write inspections") + logger.info('Write inspections') chunk[QodanaColumnName.INSPECTIONS.value] = chunk.apply( - lambda row: self._to_json(inspections.get(row[ColumnName.ID.value], [])), axis=1) + lambda row: self._to_json(inspections.get(row[ColumnName.ID.value], [])), axis=1, + ) remove_directory(tmp_dir_path) return chunk @staticmethod - def _copy_template(project_dir: Path, language: LanguageVersion): - if ( - language == LanguageVersion.JAVA_11 - or language == LanguageVersion.JAVA_9 - or language == LanguageVersion.JAVA_8 - or language == LanguageVersion.JAVA_7 - ): - shutil.copytree(Path(f"{remove_slash(os.path.dirname(os.path.abspath(__file__)))}/project_templates/java"), - project_dir, dirs_exist_ok=True) + def _copy_template(project_dir: Path, language: LanguageVersion) -> None: + if language.is_java(): + source = f'{remove_slash(os.path.dirname(os.path.abspath(__file__)))}/project_templates/java' + copy_directory(source, project_dir) else: raise NotImplementedError - def _copy_config(self, project_dir: Path): - shutil.copy(self.config, project_dir) + def _copy_config(self, project_dir: Path) -> None: + copy_file(self.config, project_dir) @staticmethod - def _create_main_files(project_dir: Path, chunk: DataFrame, language: LanguageVersion): - if ( - language == LanguageVersion.JAVA_11 - or language == LanguageVersion.JAVA_9 - or language == LanguageVersion.JAVA_8 - or language == LanguageVersion.JAVA_7 - ): - working_dir = project_dir / "src" / "main" / "java" + def _create_main_files(project_dir: Path, chunk: pd.DataFrame, language: LanguageVersion) -> None: + if language.is_java(): + working_dir = project_dir / 'src' / 'main' / 'java' for _, row in chunk.iterrows(): - solution_dir = working_dir / f"solution{row[ColumnName.ID.value]}" - solution_dir.mkdir(parents=True) - file_path = solution_dir / "Main.java" - with open(file_path, "w") as file: - file.write(f"package solution{row[ColumnName.ID.value]};\n\n") + solution_dir = working_dir / f'solution{row[ColumnName.ID.value]}' + create_directory(solution_dir) + file_path = solution_dir / f'Main{Extension.JAVA.value}' + with open(file_path, 'w') as file: + file.write(f'package solution{row[ColumnName.ID.value]};\n\n') file.write(row[ColumnName.CODE.value]) else: raise NotImplementedError @staticmethod - def _run_qodana(project_dir: Path, results_dir: Path): + def _run_qodana(project_dir: Path, results_dir: Path) -> None: results_dir.mkdir() - command = ['docker', 'run', '-u', str(os.getuid()), '--rm', '-v', f'{project_dir}/:/data/project/', '-v', - f'{results_dir}/:/data/results/', 'jetbrains/qodana'] + command = [ + 'docker', 'run', + '-u', str(os.getuid()), + '--rm', + '-v', f'{project_dir}/:/data/project/', + '-v', f'{results_dir}/:/data/results/', + 'jetbrains/qodana', + ] run_and_wait(command) @staticmethod @@ -266,27 +264,6 @@ def _get_inspections_files(results_dir: Path) -> Set[Path]: file_name_regex = re.compile(r"(\w*).json") return set(map(lambda f: results_dir / f, filter(lambda file: file_name_regex.match(file), files))) - def _parse(self, results_dir: Path, inspections: Set[str]): - package_regex = re.compile(r"solution(\d*)") - - solution_id_to_inspections_ids = defaultdict(list) - for inspection in inspections: - inspection_id = self.inspection_to_id[inspection] - inspection_file_path = results_dir / f"{inspection}.json" - - with open(inspection_file_path) as file: - inspection_json = json.load(file) - - problems = inspection_json["problems"] - for problem in problems: - data = InspectionData(**problem) - package_match = package_regex.match(data.package) - if package_match: - solution_id = int(package_match.group(1)) - solution_id_to_inspections_ids[solution_id].append(inspection_id) - - return solution_id_to_inspections_ids - def main(): parser = ArgumentParser() @@ -294,14 +271,14 @@ def main(): try: args = parser.parse_args() - marker = DatasetMarker(args) - marker.mark() + dataset_label = DatasetLabel(args) + dataset_label.label() except Exception: traceback.print_exc() - logger.exception("An unexpected error") + logger.exception('An unexpected error') return 2 -if __name__ == "__main__": +if __name__ == '__main__': sys.exit(main()) From 6c73c4458391b15188e3e2494e5ef3996d8dbfa5 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 21:43:38 +0300 Subject: [PATCH 21/43] Fixed tests --- test/python/evaluation/test_data_path.py | 1 + test/python/evaluation/test_output_results.py | 1 + test/python/evaluation/test_tool_path.py | 1 + test/python/evaluation/test_xlsx_file_structure.py | 1 + test/python/evaluation/testing_config.py | 5 ++++- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/python/evaluation/test_data_path.py b/test/python/evaluation/test_data_path.py index bae12c11..effacc92 100644 --- a/test/python/evaluation/test_data_path.py +++ b/test/python/evaluation/test_data_path.py @@ -10,6 +10,7 @@ def test_incorrect_data_path(): with pytest.raises(FileNotFoundError): testing_arguments_dict = get_testing_arguments(to_add_traceback=True, to_add_tool_path=True) testing_arguments_dict.solutions_file_path = XLSX_DATA_FOLDER / 'do_not_exist.xlsx' + testing_arguments_dict.with_history = False config = EvaluationConfig(testing_arguments_dict) lang_code_dataframe = get_solutions_df(config.extension, config.solutions_file_path) assert inspect_solutions_df(config, lang_code_dataframe) diff --git a/test/python/evaluation/test_output_results.py b/test/python/evaluation/test_output_results.py index 44508688..ad767181 100644 --- a/test/python/evaluation/test_output_results.py +++ b/test/python/evaluation/test_output_results.py @@ -21,6 +21,7 @@ def test_correct_output(test_file: str, target_file: str, output_type: bool): testing_arguments_dict = get_testing_arguments(to_add_tool_path=True) testing_arguments_dict.solutions_file_path = XLSX_DATA_FOLDER / test_file testing_arguments_dict.traceback = output_type + testing_arguments_dict.with_history = False config = EvaluationConfig(testing_arguments_dict) lang_code_dataframe = get_solutions_df(config.extension, config.solutions_file_path) diff --git a/test/python/evaluation/test_tool_path.py b/test/python/evaluation/test_tool_path.py index 8ee4cd07..e42c1c45 100644 --- a/test/python/evaluation/test_tool_path.py +++ b/test/python/evaluation/test_tool_path.py @@ -11,6 +11,7 @@ def test_correct_tool_path(): try: testing_arguments_dict = get_testing_arguments(to_add_traceback=True, to_add_tool_path=True) testing_arguments_dict.solutions_file_path = XLSX_DATA_FOLDER / 'test_unsorted_order.xlsx' + testing_arguments_dict.with_history = False config = EvaluationConfig(testing_arguments_dict) lang_code_dataframe = get_solutions_df(config.extension, config.solutions_file_path) inspect_solutions_df(config, lang_code_dataframe) diff --git a/test/python/evaluation/test_xlsx_file_structure.py b/test/python/evaluation/test_xlsx_file_structure.py index f043772d..e1b7c8fe 100644 --- a/test/python/evaluation/test_xlsx_file_structure.py +++ b/test/python/evaluation/test_xlsx_file_structure.py @@ -18,6 +18,7 @@ def test_wrong_column(file_name: str): with pytest.raises(KeyError): testing_arguments_dict = get_testing_arguments(to_add_traceback=True, to_add_tool_path=True) testing_arguments_dict.solutions_file_path = XLSX_DATA_FOLDER / file_name + testing_arguments_dict.with_history = False config = EvaluationConfig(testing_arguments_dict) lang_code_dataframe = get_solutions_df(config.extension, config.solutions_file_path) assert inspect_solutions_df(config, lang_code_dataframe) diff --git a/test/python/evaluation/testing_config.py b/test/python/evaluation/testing_config.py index 8d144534..b27f1a95 100644 --- a/test/python/evaluation/testing_config.py +++ b/test/python/evaluation/testing_config.py @@ -5,7 +5,7 @@ from src.python.review.reviewers.perform_review import OutputFormat -def get_testing_arguments(to_add_traceback=None, to_add_tool_path=None) -> Namespace: +def get_testing_arguments(to_add_traceback=None, to_add_tool_path=None, to_add_with_history=None) -> Namespace: testing_arguments = Namespace(format=OutputFormat.JSON.value, output_file_name=EvaluationArgument.RESULT_FILE_NAME_XLSX.value, output_folder_path=None) @@ -15,6 +15,9 @@ def get_testing_arguments(to_add_traceback=None, to_add_tool_path=None) -> Names if to_add_tool_path: testing_arguments.tool_path = MAIN_FOLDER.parent / 'review/run_tool.py' + if to_add_with_history: + testing_arguments.with_history = True + testing_arguments.solutions_file_path = None return testing_arguments From b73b9b9079fb75a6bb404b61d745295baf9065fa Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 21:43:50 +0300 Subject: [PATCH 22/43] Added script --- .../evaluation/inspectors/add_history.py | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 src/python/evaluation/inspectors/add_history.py diff --git a/src/python/evaluation/inspectors/add_history.py b/src/python/evaluation/inspectors/add_history.py new file mode 100644 index 00000000..3f6c301b --- /dev/null +++ b/src/python/evaluation/inspectors/add_history.py @@ -0,0 +1,110 @@ +import argparse +import json +from collections import Counter +from pathlib import Path + +import pandas as pd +from pandarallel import pandarallel +from src.python.common.tool_arguments import RunToolArgument +from src.python.evaluation.common.pandas_util import ( + get_issues_from_json, + get_solutions_df_by_file_path, + write_df_to_file, +) +from src.python.evaluation.common.util import ColumnName, EvaluationArgument +from src.python.review.common.file_system import Extension, get_name_from_path, get_parent_folder + +TRACEBACK = EvaluationArgument.TRACEBACK.value +GRADE = ColumnName.GRADE.value +HISTORY = ColumnName.HISTORY.value +USER = ColumnName.USER.value +TIME = ColumnName.TIME.value +EXTRACTED_ISSUES = 'extracted_issues' + + +def configure_arguments(parser: argparse.ArgumentParser) -> None: + parser.add_argument( + RunToolArgument.SOLUTIONS_FILE_PATH.value.long_name, + type=lambda value: Path(value).absolute(), + help=f'Path to csv file. Your dataset must include column-names: "{USER}", "{TIME}, "{TRACEBACK}".', + ) + + parser.add_argument( + '-o', '--output-path', + type=lambda value: Path(value).absolute(), + help='The path where the dataset with history will be saved. ' + 'If not specified, the dataset will be saved next to the original one.', + ) + + parser.add_argument( + '--dont-drop-traceback', + help=f'The "{TRACEBACK}" column will not be removed from the final dataset.', + action='store_true', + ) + + parser.add_argument( + '--dont-drop-grade', + help=f'The "{GRADE}" column will not be removed from the final dataset.', + action='store_true', + ) + + +def update_counter(history: str, counter: Counter) -> None: + issue_classes = [] + if history: + issue_classes = history.split(',') + counter.update(issue_classes) + + +def add_history(row, solutions_df: pd.DataFrame) -> str: + counter = Counter() + + filtered_df = solutions_df[(solutions_df[USER] == row[USER]) & (solutions_df[TIME] < row[TIME])] + filtered_df.apply(lambda row: update_counter(row[EXTRACTED_ISSUES], counter), axis=1) + + history = {'python': [{'origin_class': key, 'number': value} for key, value in counter.items()]} + + return json.dumps(history) + + +def extract_issues(traceback: str) -> str: + issue_classes = [] + issues = get_issues_from_json(traceback) + for issue in issues: + issue_classes.append(issue.origin_class) + return ','.join(issue_classes) + + +def main(): + parser = argparse.ArgumentParser() + configure_arguments(parser) + args = parser.parse_args() + + pandarallel.initialize() + + solutions_file_path = args.solutions_file_path + solutions_df = get_solutions_df_by_file_path(solutions_file_path) + solutions_df[EXTRACTED_ISSUES] = solutions_df.parallel_apply(lambda row: extract_issues(row[TRACEBACK]), axis=1) + solutions_df[HISTORY] = solutions_df.parallel_apply(add_history, axis=1, args=(solutions_df,)) + + columns_to_drop = [EXTRACTED_ISSUES] + + if not args.dont_drop_grade: + columns_to_drop.append(GRADE) + + if not args.dont_drop_traceback: + columns_to_drop.append(TRACEBACK) + + solutions_df.drop(columns=columns_to_drop, inplace=True) + + output_path = args.output_path + if output_path is None: + output_dir = get_parent_folder(solutions_file_path) + dataset_name = get_name_from_path(solutions_file_path, with_extension=False) + output_path = output_dir / f'{dataset_name}_with_history{Extension.CSV.value}' + + write_df_to_file(solutions_df, output_path, Extension.CSV) + + +if __name__ == '__main__': + main() From f753b2b2225101510642944e584706ae1b1a3102 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 21:44:24 +0300 Subject: [PATCH 23/43] Added new column names and updated script_structure_rule --- src/python/evaluation/common/util.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/python/evaluation/common/util.py b/src/python/evaluation/common/util.py index 271956f1..e50d1085 100644 --- a/src/python/evaluation/common/util.py +++ b/src/python/evaluation/common/util.py @@ -16,6 +16,9 @@ class ColumnName(Enum): OLD = 'old' NEW = 'new' IS_PUBLIC = 'is_public' + HISTORY = 'history' + USER = 'user' + TIME = 'time' @unique @@ -38,4 +41,5 @@ class EvaluationArgument(Enum): 'acceptable language-names: \n' f'Acceptable language-names are: {LanguageVersion.PYTHON_3.value}, ' f'{LanguageVersion.JAVA_8.value} ,' - f'{LanguageVersion.JAVA_11.value} and {LanguageVersion.KOTLIN.value}.') + f'{LanguageVersion.JAVA_11.value} and {LanguageVersion.KOTLIN.value}.' + f'4. If you have the --with-history flag, check for the "{ColumnName.HISTORY.value}" column.') From cbbf8b8ffd1cc5cbaffb82530eed14da1af61402 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 21:44:33 +0300 Subject: [PATCH 24/43] Added 'inplace' --- whitelist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/whitelist.txt b/whitelist.txt index 3e331750..50ed0220 100644 --- a/whitelist.txt +++ b/whitelist.txt @@ -114,3 +114,4 @@ nrows groupby getuid Popen +inplace From dee07dd489f746543ffe4ab14e8c30a6e2fe907c Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 21:45:02 +0300 Subject: [PATCH 25/43] Added support for --with-history flag --- src/python/evaluation/evaluation_config.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/python/evaluation/evaluation_config.py b/src/python/evaluation/evaluation_config.py index a987fa8b..4e08c015 100644 --- a/src/python/evaluation/evaluation_config.py +++ b/src/python/evaluation/evaluation_config.py @@ -22,6 +22,7 @@ def __init__(self, args: Namespace): self.output_format: str = args.format self.solutions_file_path: Union[str, Path] = args.solutions_file_path self.traceback: bool = args.traceback + self.with_history: bool = args.with_history self.output_folder_path: Union[str, Path] = args.output_folder_path self.extension: Extension = get_restricted_extension(self.solutions_file_path, [Extension.XLSX, Extension.CSV]) self.__init_output_file_name(args.output_file_name) @@ -32,12 +33,15 @@ def __init_output_file_name(self, output_file_name: Optional[str]): else: self.output_file_name = output_file_name - def build_command(self, inspected_file_path: Union[str, Path], lang: str) -> List[str]: + def build_command(self, inspected_file_path: Union[str, Path], lang: str, history: str) -> List[str]: command = [LanguageVersion.PYTHON_3.value, self.tool_path, inspected_file_path, RunToolArgument.FORMAT.value.short_name, self.output_format] + if self.with_history is not None: + command.extend([RunToolArgument.HISTORY.value.long_name, history]) + if lang == LanguageVersion.JAVA_8.value or lang == LanguageVersion.JAVA_11.value: command.extend([RunToolArgument.LANG_VERSION.value.long_name, lang]) return command From bd954712328f3b4e71eca14ac0d38f6703ef46d2 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sun, 23 May 2021 21:45:33 +0300 Subject: [PATCH 26/43] Added support for --with-history flag --- src/python/evaluation/evaluation_run_tool.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/python/evaluation/evaluation_run_tool.py b/src/python/evaluation/evaluation_run_tool.py index 4a8d5029..487aa1ab 100644 --- a/src/python/evaluation/evaluation_run_tool.py +++ b/src/python/evaluation/evaluation_run_tool.py @@ -63,6 +63,12 @@ def configure_arguments(parser: argparse.ArgumentParser) -> None: f'Use this argument when {EvaluationArgument.TRACEBACK.value} argument' 'is enabled argument will not be used otherwise.') + parser.add_argument('--with-history', + help=f'If True, then history will be taken into account when calculating the grade. ' + f'In that case, for each fragment, the "{ColumnName.HISTORY.value}" column ' + 'must contain the history of previous errors.', + action='store_true') + def get_language(lang_key: str) -> LanguageVersion: try: @@ -73,14 +79,14 @@ def get_language(lang_key: str) -> LanguageVersion: raise KeyError(e) -def __inspect_row(lang: str, code: str, fragment_id: int, config: EvaluationConfig) -> str: +def __inspect_row(lang: str, code: str, fragment_id: int, history: str, config: EvaluationConfig) -> str: print(f'current id: {fragment_id}') # Tool does not work correctly with tmp files from module on macOS # thus we create a real file in the file system extension = get_language(lang).extension_by_language().value tmp_file_path = config.solutions_file_path.parent.absolute() / f'inspected_code_{fragment_id}{extension}' temp_file = next(create_file(tmp_file_path, code)) - command = config.build_command(temp_file, lang) + command = config.build_command(temp_file, lang, history) results = run_in_subprocess(command) os.remove(temp_file) return results @@ -103,7 +109,9 @@ def inspect_solutions_df(config: EvaluationConfig, lang_code_dataframe: pd.DataF lang_code_dataframe[EvaluationArgument.TRACEBACK.value] = lang_code_dataframe.parallel_apply( lambda row: __inspect_row(row[ColumnName.LANG.value], row[ColumnName.CODE.value], - row[ColumnName.ID.value], config), axis=1) + row[ColumnName.ID.value], + row[ColumnName.HISTORY.value], + config), axis=1) lang_code_dataframe[ColumnName.GRADE.value] = lang_code_dataframe.parallel_apply( lambda row: __get_grade_from_traceback(row[EvaluationArgument.TRACEBACK.value]), axis=1) From ccd93016a4040a3ae864f93552dab017ce9348b9 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 22:49:10 +0300 Subject: [PATCH 27/43] Small fix --- src/python/review/quality/penalty.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/review/quality/penalty.py b/src/python/review/quality/penalty.py index 229cdd73..b1334682 100644 --- a/src/python/review/quality/penalty.py +++ b/src/python/review/quality/penalty.py @@ -58,7 +58,7 @@ def get_previous_issues_by_language(lang_to_history: Optional[str], language: La return [] language_to_history = json.loads(lang_to_history) - history = language_to_history[language.value.lower()] + history = language_to_history.get(language.value.lower(), []) previous_issues = [] for issue_data in history: From 5f4d7b9d3963c70533465194b5d20aa150b11d66 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 22:50:21 +0300 Subject: [PATCH 28/43] Added from_language_version function --- src/python/review/common/language.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/python/review/common/language.py b/src/python/review/common/language.py index 48780467..b9c225b1 100644 --- a/src/python/review/common/language.py +++ b/src/python/review/common/language.py @@ -2,6 +2,7 @@ from pathlib import Path from typing import List +from src.python.review.application_config import LanguageVersion from src.python.review.common.file_system import Extension, get_extension_from_file @@ -13,6 +14,19 @@ class Language(Enum): JS = 'JAVASCRIPT' UNKNOWN = 'UNKNOWN' + @staticmethod + def from_language_version(language_version: LanguageVersion) -> 'Language': + lang_to_lang_version = { + LanguageVersion.PYTHON_3: Language.PYTHON, + LanguageVersion.JAVA_7: Language.JAVA, + LanguageVersion.JAVA_8: Language.JAVA, + LanguageVersion.JAVA_9: Language.JAVA, + LanguageVersion.JAVA_11: Language.JAVA, + LanguageVersion.KOTLIN: Language.KOTLIN, + } + + return lang_to_lang_version.get(language_version, Language.UNKNOWN) + EXTENSION_TO_LANGUAGE = { Extension.JAVA: Language.JAVA, From adcdc32dd9c818a52713d81fa3c51e085dc2a5e7 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 22:53:56 +0300 Subject: [PATCH 29/43] Added support for multiple languages --- .../{add_history.py => generate_history.py} | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) rename src/python/evaluation/inspectors/{add_history.py => generate_history.py} (65%) diff --git a/src/python/evaluation/inspectors/add_history.py b/src/python/evaluation/inspectors/generate_history.py similarity index 65% rename from src/python/evaluation/inspectors/add_history.py rename to src/python/evaluation/inspectors/generate_history.py index 3f6c301b..495fda2d 100644 --- a/src/python/evaluation/inspectors/add_history.py +++ b/src/python/evaluation/inspectors/generate_history.py @@ -12,12 +12,15 @@ write_df_to_file, ) from src.python.evaluation.common.util import ColumnName, EvaluationArgument +from src.python.evaluation.evaluation_run_tool import get_language from src.python.review.common.file_system import Extension, get_name_from_path, get_parent_folder +from src.python.review.common.language import Language TRACEBACK = EvaluationArgument.TRACEBACK.value GRADE = ColumnName.GRADE.value HISTORY = ColumnName.HISTORY.value USER = ColumnName.USER.value +LANG = ColumnName.LANG.value TIME = ColumnName.TIME.value EXTRACTED_ISSUES = 'extracted_issues' @@ -26,7 +29,8 @@ def configure_arguments(parser: argparse.ArgumentParser) -> None: parser.add_argument( RunToolArgument.SOLUTIONS_FILE_PATH.value.long_name, type=lambda value: Path(value).absolute(), - help=f'Path to csv file. Your dataset must include column-names: "{USER}", "{TIME}, "{TRACEBACK}".', + help=f'Path to csv file. Your dataset must include column-names: ' + f'"{USER}", "{LANG}", "{TIME}, "{TRACEBACK}".', ) parser.add_argument( @@ -49,29 +53,40 @@ def configure_arguments(parser: argparse.ArgumentParser) -> None: ) -def update_counter(history: str, counter: Counter) -> None: +def _update_counter(extracted_issues: str, counter: Counter) -> None: issue_classes = [] - if history: - issue_classes = history.split(',') + if extracted_issues: + issue_classes = extracted_issues.split(',') + counter.update(issue_classes) -def add_history(row, solutions_df: pd.DataFrame) -> str: +def _add_history(row, solutions_df: pd.DataFrame) -> str: counter = Counter() - filtered_df = solutions_df[(solutions_df[USER] == row[USER]) & (solutions_df[TIME] < row[TIME])] - filtered_df.apply(lambda row: update_counter(row[EXTRACTED_ISSUES], counter), axis=1) + filtered_df = solutions_df[ + (solutions_df[USER] == row[USER]) & (solutions_df[LANG] == row[LANG]) & (solutions_df[TIME] < row[TIME]) + ] + filtered_df.apply(lambda row: _update_counter(row[EXTRACTED_ISSUES], counter), axis=1) + + history = {} - history = {'python': [{'origin_class': key, 'number': value} for key, value in counter.items()]} + # If we were unable to identify the language version, we return an empty history + try: + lang_version = get_language(row[LANG]) + except KeyError: + return json.dumps(history) + + lang = Language.from_language_version(lang_version) + if len(counter) != 0: + history = {lang.value.lower(): [{'origin_class': key, 'number': value} for key, value in counter.items()]} return json.dumps(history) -def extract_issues(traceback: str) -> str: - issue_classes = [] +def _extract_issues(traceback: str) -> str: issues = get_issues_from_json(traceback) - for issue in issues: - issue_classes.append(issue.origin_class) + issue_classes = [issue.origin_class for issue in issues] return ','.join(issue_classes) @@ -83,9 +98,9 @@ def main(): pandarallel.initialize() solutions_file_path = args.solutions_file_path - solutions_df = get_solutions_df_by_file_path(solutions_file_path) - solutions_df[EXTRACTED_ISSUES] = solutions_df.parallel_apply(lambda row: extract_issues(row[TRACEBACK]), axis=1) - solutions_df[HISTORY] = solutions_df.parallel_apply(add_history, axis=1, args=(solutions_df,)) + solutions_df = get_solutions_df_by_file_path(solutions_file_path).head(1000) + solutions_df[EXTRACTED_ISSUES] = solutions_df.parallel_apply(lambda row: _extract_issues(row[TRACEBACK]), axis=1) + solutions_df[HISTORY] = solutions_df.parallel_apply(_add_history, axis=1, args=(solutions_df,)) columns_to_drop = [EXTRACTED_ISSUES] @@ -95,7 +110,7 @@ def main(): if not args.dont_drop_traceback: columns_to_drop.append(TRACEBACK) - solutions_df.drop(columns=columns_to_drop, inplace=True) + solutions_df.drop(columns=columns_to_drop, inplace=True, errors='ignore') output_path = args.output_path if output_path is None: From 9301f3a0b033ef0d836633edf2c2613584d24dd9 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 23:11:35 +0300 Subject: [PATCH 30/43] Small fix --- src/python/evaluation/inspectors/generate_history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/evaluation/inspectors/generate_history.py b/src/python/evaluation/inspectors/generate_history.py index 495fda2d..c848e929 100644 --- a/src/python/evaluation/inspectors/generate_history.py +++ b/src/python/evaluation/inspectors/generate_history.py @@ -98,7 +98,7 @@ def main(): pandarallel.initialize() solutions_file_path = args.solutions_file_path - solutions_df = get_solutions_df_by_file_path(solutions_file_path).head(1000) + solutions_df = get_solutions_df_by_file_path(solutions_file_path) solutions_df[EXTRACTED_ISSUES] = solutions_df.parallel_apply(lambda row: _extract_issues(row[TRACEBACK]), axis=1) solutions_df[HISTORY] = solutions_df.parallel_apply(_add_history, axis=1, args=(solutions_df,)) From 93e8a23fa3a7794a5f3184c7068822e887c97eae Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 23:12:01 +0300 Subject: [PATCH 31/43] Added description for generate_history.py --- src/python/evaluation/inspectors/README.md | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/python/evaluation/inspectors/README.md b/src/python/evaluation/inspectors/README.md index a0de1314..062df5f7 100644 --- a/src/python/evaluation/inspectors/README.md +++ b/src/python/evaluation/inspectors/README.md @@ -80,6 +80,37 @@ Required arguments: The resulting file will be stored in the same folder as the input file with all samples. +---- + +### Generate history + +[generate_history.py](generate_history.py) allows you to generate history based on issues from previous solutions. + +Please, note that your solutions file should consist of at least 4 obligatory columns: + +- `user`, +- `lang`, +- `time`, +- `traceback`. + +The output file is a new `csv` file with all columns from the input except for `traceback` and `grade` +(this behavior can be changed when you run the script). + +#### Usage + +Run the [generate_history.py](generate_history.py) with the arguments from command line. + +Required argument: + +- `solutions_file_path` — path to xlsx-file or csv-file with necessary columns, + +Optional arguments: +Argument | Description +--- | --- +|**‑o**, **‑‑output‑path**| The path where the dataset with history will be saved. If not specified, the dataset will be saved next to the original one. | +|**‑‑dont‑drop‑traceback**| The `traceback` column will not be removed from the final dataset. Default is false. | +|**‑‑dont‑drop‑grades**| The `grade` column will not be removed from the final dataset. Default is false.| + ___ ## Analysing From aad39bc0e38c0e8cdec862667c791cac606ade49 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 23:26:31 +0300 Subject: [PATCH 32/43] Small code refactoring --- src/python/evaluation/common/util.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/python/evaluation/common/util.py b/src/python/evaluation/common/util.py index 89643699..8de8d2fd 100644 --- a/src/python/evaluation/common/util.py +++ b/src/python/evaluation/common/util.py @@ -17,11 +17,11 @@ class ColumnName(Enum): OLD = 'old' NEW = 'new' IS_PUBLIC = 'is_public' - HISTORY = 'history' - USER = 'user' - TIME = 'time' DECREASED_GRADE = 'decreased_grade' PENALTY = 'penalty' + USER = 'user' + HISTORY = 'history' + TIME = 'time' @unique From b9e3ef6a02ae30ceeaa0cabec2af710a54e49aef Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 23:28:25 +0300 Subject: [PATCH 33/43] typo fix --- src/python/review/common/language.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python/review/common/language.py b/src/python/review/common/language.py index b9c225b1..d810c9f4 100644 --- a/src/python/review/common/language.py +++ b/src/python/review/common/language.py @@ -16,7 +16,7 @@ class Language(Enum): @staticmethod def from_language_version(language_version: LanguageVersion) -> 'Language': - lang_to_lang_version = { + version_to_lang = { LanguageVersion.PYTHON_3: Language.PYTHON, LanguageVersion.JAVA_7: Language.JAVA, LanguageVersion.JAVA_8: Language.JAVA, @@ -25,7 +25,7 @@ def from_language_version(language_version: LanguageVersion) -> 'Language': LanguageVersion.KOTLIN: Language.KOTLIN, } - return lang_to_lang_version.get(language_version, Language.UNKNOWN) + return version_to_lang.get(language_version, Language.UNKNOWN) EXTENSION_TO_LANGUAGE = { From 28641e72060230a28910338a50d99fde88fb1cfc Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Fri, 11 Jun 2021 23:34:43 +0300 Subject: [PATCH 34/43] Update README.md --- src/python/evaluation/inspectors/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/python/evaluation/inspectors/README.md b/src/python/evaluation/inspectors/README.md index 7e2dd48b..d68b094f 100644 --- a/src/python/evaluation/inspectors/README.md +++ b/src/python/evaluation/inspectors/README.md @@ -7,6 +7,7 @@ This module contains _preprocessing_ stage and _analysing_ stage. the `csv` or `xslx` file with student solutions and drop duplicates of code fragments (optional); - [distribute_grades.py](distribute_grades.py) allows distributing calculated grades and traceback for unique solutions into all solutions. +- [generate_history.py](generate_history.py) allows you to generate history based on issues from previous solutions. `Analysing` stage includes: - [diffs_between_df.py](diffs_between_df.py) allows finding a difference between @@ -93,6 +94,8 @@ Please, note that your solutions file should consist of at least 4 obligatory co - `time`, - `traceback`. +You can get such a file with [evaluation_run_tool.py](../evaluation_run_tool.py). + The output file is a new `csv` file with all columns from the input except for `traceback` and `grade` (this behavior can be changed when you run the script). From 8f85f4fcf542b8f2966cdd5da86a264e1c67a8cd Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 23:49:30 +0300 Subject: [PATCH 35/43] Fixed tests --- test/python/common/file_system/test_subprocess.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/python/common/file_system/test_subprocess.py b/test/python/common/file_system/test_subprocess.py index 1f2104dd..c5b02d9d 100644 --- a/test/python/common/file_system/test_subprocess.py +++ b/test/python/common/file_system/test_subprocess.py @@ -1,5 +1,7 @@ import os from pathlib import Path +from typing import Optional + from test.python.common import FILE_SYSTEM_DATA_FOLDER from test.python.evaluation.testing_config import get_testing_arguments @@ -15,8 +17,8 @@ ] -def inspect_code(config: EvaluationConfig, file: str, language: LanguageVersion) -> str: - command = config.build_command(file, language.value) +def inspect_code(config: EvaluationConfig, file: str, language: LanguageVersion, history: Optional[str] = None) -> str: + command = config.build_command(file, language.value, history) return run_in_subprocess(command) @@ -24,6 +26,7 @@ def inspect_code(config: EvaluationConfig, file: str, language: LanguageVersion) def test_synthetic_files(test_file: str, language: LanguageVersion): input_file = FILE_SYSTEM_DATA_FOLDER / test_file test_args = get_testing_arguments(to_add_traceback=True, to_add_tool_path=True) + test_args.with_history = False config = EvaluationConfig(test_args) expected_output = inspect_code(config, input_file, language) From 53068aa3b72ea472de36acf1bb53eaebfcc18715 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 23:50:18 +0300 Subject: [PATCH 36/43] Small fix --- src/python/evaluation/evaluation_config.py | 4 ++-- src/python/evaluation/evaluation_run_tool.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/python/evaluation/evaluation_config.py b/src/python/evaluation/evaluation_config.py index 42c2c46c..7dfd5606 100644 --- a/src/python/evaluation/evaluation_config.py +++ b/src/python/evaluation/evaluation_config.py @@ -33,13 +33,13 @@ def __init_output_file_name(self, output_file_name: Optional[str]): else: self.output_file_name = output_file_name - def build_command(self, inspected_file_path: Union[str, Path], lang: str, history: str) -> List[str]: + def build_command(self, inspected_file_path: Union[str, Path], lang: str, history: Optional[str]) -> List[str]: command = [LanguageVersion.PYTHON_3.value, self.tool_path, inspected_file_path, RunToolArgument.FORMAT.value.short_name, self.format] - if self.with_history is not None: + if self.with_history is not None and history is not None: command.extend([RunToolArgument.HISTORY.value.long_name, history]) if lang == LanguageVersion.JAVA_8.value or lang == LanguageVersion.JAVA_11.value: diff --git a/src/python/evaluation/evaluation_run_tool.py b/src/python/evaluation/evaluation_run_tool.py index 487aa1ab..f5b976ed 100644 --- a/src/python/evaluation/evaluation_run_tool.py +++ b/src/python/evaluation/evaluation_run_tool.py @@ -6,6 +6,7 @@ import time import traceback from pathlib import Path +from typing import Optional sys.path.append('') sys.path.append('../../..') @@ -79,7 +80,7 @@ def get_language(lang_key: str) -> LanguageVersion: raise KeyError(e) -def __inspect_row(lang: str, code: str, fragment_id: int, history: str, config: EvaluationConfig) -> str: +def __inspect_row(lang: str, code: str, fragment_id: int, history: Optional[str], config: EvaluationConfig) -> str: print(f'current id: {fragment_id}') # Tool does not work correctly with tmp files from module on macOS # thus we create a real file in the file system @@ -110,7 +111,7 @@ def inspect_solutions_df(config: EvaluationConfig, lang_code_dataframe: pd.DataF lambda row: __inspect_row(row[ColumnName.LANG.value], row[ColumnName.CODE.value], row[ColumnName.ID.value], - row[ColumnName.HISTORY.value], + row.get(ColumnName.HISTORY.value), config), axis=1) lang_code_dataframe[ColumnName.GRADE.value] = lang_code_dataframe.parallel_apply( From b7fb4d075acdd1ea61932f947768c4803075af1d Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 23:55:22 +0300 Subject: [PATCH 37/43] Small fix --- src/python/evaluation/evaluation_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/evaluation/evaluation_config.py b/src/python/evaluation/evaluation_config.py index 7dfd5606..b894d529 100644 --- a/src/python/evaluation/evaluation_config.py +++ b/src/python/evaluation/evaluation_config.py @@ -39,7 +39,7 @@ def build_command(self, inspected_file_path: Union[str, Path], lang: str, histor inspected_file_path, RunToolArgument.FORMAT.value.short_name, self.format] - if self.with_history is not None and history is not None: + if self.with_history and history is not None: command.extend([RunToolArgument.HISTORY.value.long_name, history]) if lang == LanguageVersion.JAVA_8.value or lang == LanguageVersion.JAVA_11.value: From 82fc856cc6b5b551abf162108ae21cf994bff7d2 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 11 Jun 2021 23:58:07 +0300 Subject: [PATCH 38/43] Fixed flake8 issues --- test/python/common/file_system/test_subprocess.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/python/common/file_system/test_subprocess.py b/test/python/common/file_system/test_subprocess.py index c5b02d9d..c7da2748 100644 --- a/test/python/common/file_system/test_subprocess.py +++ b/test/python/common/file_system/test_subprocess.py @@ -1,9 +1,8 @@ import os from pathlib import Path -from typing import Optional - from test.python.common import FILE_SYSTEM_DATA_FOLDER from test.python.evaluation.testing_config import get_testing_arguments +from typing import Optional import pytest from src.python.evaluation.evaluation_config import EvaluationConfig From eeb881556a1443accacf080f0895775c4505efb9 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sat, 12 Jun 2021 10:09:50 +0300 Subject: [PATCH 39/43] Removed duplicate --- whitelist.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/whitelist.txt b/whitelist.txt index 6d84aee0..9ac9d845 100644 --- a/whitelist.txt +++ b/whitelist.txt @@ -114,7 +114,6 @@ nrows groupby getuid Popen -inplace reindex datasets usecols From 498d7fcee3ece90ef224ebf220352a3131bbe815 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sat, 12 Jun 2021 10:16:22 +0300 Subject: [PATCH 40/43] Fixed tests --- test/python/common/file_system/test_subprocess.py | 1 - test/python/evaluation/test_data_path.py | 1 - test/python/evaluation/test_output_results.py | 1 - test/python/evaluation/test_tool_path.py | 1 - test/python/evaluation/test_xlsx_file_structure.py | 1 - test/python/evaluation/testing_config.py | 7 ++++--- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/test/python/common/file_system/test_subprocess.py b/test/python/common/file_system/test_subprocess.py index c7da2748..c3a60ffd 100644 --- a/test/python/common/file_system/test_subprocess.py +++ b/test/python/common/file_system/test_subprocess.py @@ -25,7 +25,6 @@ def inspect_code(config: EvaluationConfig, file: str, language: LanguageVersion, def test_synthetic_files(test_file: str, language: LanguageVersion): input_file = FILE_SYSTEM_DATA_FOLDER / test_file test_args = get_testing_arguments(to_add_traceback=True, to_add_tool_path=True) - test_args.with_history = False config = EvaluationConfig(test_args) expected_output = inspect_code(config, input_file, language) diff --git a/test/python/evaluation/test_data_path.py b/test/python/evaluation/test_data_path.py index effacc92..bae12c11 100644 --- a/test/python/evaluation/test_data_path.py +++ b/test/python/evaluation/test_data_path.py @@ -10,7 +10,6 @@ def test_incorrect_data_path(): with pytest.raises(FileNotFoundError): testing_arguments_dict = get_testing_arguments(to_add_traceback=True, to_add_tool_path=True) testing_arguments_dict.solutions_file_path = XLSX_DATA_FOLDER / 'do_not_exist.xlsx' - testing_arguments_dict.with_history = False config = EvaluationConfig(testing_arguments_dict) lang_code_dataframe = get_solutions_df(config.extension, config.solutions_file_path) assert inspect_solutions_df(config, lang_code_dataframe) diff --git a/test/python/evaluation/test_output_results.py b/test/python/evaluation/test_output_results.py index ad767181..44508688 100644 --- a/test/python/evaluation/test_output_results.py +++ b/test/python/evaluation/test_output_results.py @@ -21,7 +21,6 @@ def test_correct_output(test_file: str, target_file: str, output_type: bool): testing_arguments_dict = get_testing_arguments(to_add_tool_path=True) testing_arguments_dict.solutions_file_path = XLSX_DATA_FOLDER / test_file testing_arguments_dict.traceback = output_type - testing_arguments_dict.with_history = False config = EvaluationConfig(testing_arguments_dict) lang_code_dataframe = get_solutions_df(config.extension, config.solutions_file_path) diff --git a/test/python/evaluation/test_tool_path.py b/test/python/evaluation/test_tool_path.py index e42c1c45..8ee4cd07 100644 --- a/test/python/evaluation/test_tool_path.py +++ b/test/python/evaluation/test_tool_path.py @@ -11,7 +11,6 @@ def test_correct_tool_path(): try: testing_arguments_dict = get_testing_arguments(to_add_traceback=True, to_add_tool_path=True) testing_arguments_dict.solutions_file_path = XLSX_DATA_FOLDER / 'test_unsorted_order.xlsx' - testing_arguments_dict.with_history = False config = EvaluationConfig(testing_arguments_dict) lang_code_dataframe = get_solutions_df(config.extension, config.solutions_file_path) inspect_solutions_df(config, lang_code_dataframe) diff --git a/test/python/evaluation/test_xlsx_file_structure.py b/test/python/evaluation/test_xlsx_file_structure.py index e1b7c8fe..f043772d 100644 --- a/test/python/evaluation/test_xlsx_file_structure.py +++ b/test/python/evaluation/test_xlsx_file_structure.py @@ -18,7 +18,6 @@ def test_wrong_column(file_name: str): with pytest.raises(KeyError): testing_arguments_dict = get_testing_arguments(to_add_traceback=True, to_add_tool_path=True) testing_arguments_dict.solutions_file_path = XLSX_DATA_FOLDER / file_name - testing_arguments_dict.with_history = False config = EvaluationConfig(testing_arguments_dict) lang_code_dataframe = get_solutions_df(config.extension, config.solutions_file_path) assert inspect_solutions_df(config, lang_code_dataframe) diff --git a/test/python/evaluation/testing_config.py b/test/python/evaluation/testing_config.py index b27f1a95..f4bb9203 100644 --- a/test/python/evaluation/testing_config.py +++ b/test/python/evaluation/testing_config.py @@ -5,17 +5,18 @@ from src.python.review.reviewers.perform_review import OutputFormat -def get_testing_arguments(to_add_traceback=None, to_add_tool_path=None, to_add_with_history=None) -> Namespace: +def get_testing_arguments(to_add_traceback=None, to_add_tool_path=None, to_add_history=None) -> Namespace: testing_arguments = Namespace(format=OutputFormat.JSON.value, output_file_name=EvaluationArgument.RESULT_FILE_NAME_XLSX.value, - output_folder_path=None) + output_folder_path=None, + with_history=False) if to_add_traceback: testing_arguments.traceback = True if to_add_tool_path: testing_arguments.tool_path = MAIN_FOLDER.parent / 'review/run_tool.py' - if to_add_with_history: + if to_add_history: testing_arguments.with_history = True testing_arguments.solutions_file_path = None From 871b5432f28cca8960df23a1d70e62ec692a652d Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Sat, 12 Jun 2021 10:30:26 +0300 Subject: [PATCH 41/43] Added support for xlsx --- src/python/evaluation/inspectors/README.md | 4 ++-- src/python/evaluation/inspectors/generate_history.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/python/evaluation/inspectors/README.md b/src/python/evaluation/inspectors/README.md index d68b094f..87e0601e 100644 --- a/src/python/evaluation/inspectors/README.md +++ b/src/python/evaluation/inspectors/README.md @@ -96,8 +96,8 @@ Please, note that your solutions file should consist of at least 4 obligatory co You can get such a file with [evaluation_run_tool.py](../evaluation_run_tool.py). -The output file is a new `csv` file with all columns from the input except for `traceback` and `grade` -(this behavior can be changed when you run the script). +The output file is a new `xlsx` or `csv` (the same format with the input files) file with all columns from the input +except for `traceback` and `grade` (this behavior can be changed when you run the script). #### Usage diff --git a/src/python/evaluation/inspectors/generate_history.py b/src/python/evaluation/inspectors/generate_history.py index c848e929..8fa6f07a 100644 --- a/src/python/evaluation/inspectors/generate_history.py +++ b/src/python/evaluation/inspectors/generate_history.py @@ -13,7 +13,12 @@ ) from src.python.evaluation.common.util import ColumnName, EvaluationArgument from src.python.evaluation.evaluation_run_tool import get_language -from src.python.review.common.file_system import Extension, get_name_from_path, get_parent_folder +from src.python.review.common.file_system import ( + Extension, + get_name_from_path, + get_parent_folder, + get_restricted_extension, +) from src.python.review.common.language import Language TRACEBACK = EvaluationArgument.TRACEBACK.value @@ -29,7 +34,7 @@ def configure_arguments(parser: argparse.ArgumentParser) -> None: parser.add_argument( RunToolArgument.SOLUTIONS_FILE_PATH.value.long_name, type=lambda value: Path(value).absolute(), - help=f'Path to csv file. Your dataset must include column-names: ' + help=f'Path to csv or xlsx file. Your dataset must include column-names: ' f'"{USER}", "{LANG}", "{TIME}, "{TRACEBACK}".', ) @@ -118,7 +123,8 @@ def main(): dataset_name = get_name_from_path(solutions_file_path, with_extension=False) output_path = output_dir / f'{dataset_name}_with_history{Extension.CSV.value}' - write_df_to_file(solutions_df, output_path, Extension.CSV) + output_ext = get_restricted_extension(solutions_file_path, [Extension.XLSX, Extension.CSV]) + write_df_to_file(solutions_df, output_path, output_ext) if __name__ == '__main__': From db7663aca146b3d08724bdf2223ac49104380a3e Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Wed, 16 Jun 2021 13:56:51 +0300 Subject: [PATCH 42/43] Fixed PR issues --- src/python/evaluation/inspectors/README.md | 4 ++-- src/python/evaluation/inspectors/generate_history.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/python/evaluation/inspectors/README.md b/src/python/evaluation/inspectors/README.md index 87e0601e..762602e9 100644 --- a/src/python/evaluation/inspectors/README.md +++ b/src/python/evaluation/inspectors/README.md @@ -111,8 +111,8 @@ Optional arguments: Argument | Description --- | --- |**‑o**, **‑‑output‑path**| The path where the dataset with history will be saved. If not specified, the dataset will be saved next to the original one. | -|**‑‑dont‑drop‑traceback**| The `traceback` column will not be removed from the final dataset. Default is false. | -|**‑‑dont‑drop‑grades**| The `grade` column will not be removed from the final dataset. Default is false.| +|**‑‑to‑drop‑traceback**| The `traceback` column will be removed from the final dataset. Default is false. | +|**‑‑to‑drop‑grades**| The `grade` column will be removed from the final dataset. Default is false.| ___ diff --git a/src/python/evaluation/inspectors/generate_history.py b/src/python/evaluation/inspectors/generate_history.py index 8fa6f07a..d330dfe2 100644 --- a/src/python/evaluation/inspectors/generate_history.py +++ b/src/python/evaluation/inspectors/generate_history.py @@ -46,14 +46,14 @@ def configure_arguments(parser: argparse.ArgumentParser) -> None: ) parser.add_argument( - '--dont-drop-traceback', - help=f'The "{TRACEBACK}" column will not be removed from the final dataset.', + '--to-drop-traceback', + help=f'The "{TRACEBACK}" column will be removed from the final dataset.', action='store_true', ) parser.add_argument( - '--dont-drop-grade', - help=f'The "{GRADE}" column will not be removed from the final dataset.', + '--to-drop-grade', + help=f'The "{GRADE}" column will be removed from the final dataset.', action='store_true', ) @@ -109,10 +109,10 @@ def main(): columns_to_drop = [EXTRACTED_ISSUES] - if not args.dont_drop_grade: + if args.to_drop_grade: columns_to_drop.append(GRADE) - if not args.dont_drop_traceback: + if args.to_drop_traceback: columns_to_drop.append(TRACEBACK) solutions_df.drop(columns=columns_to_drop, inplace=True, errors='ignore') From 00808810d3c92e03079696439a81c43eb9e95d3b Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Fri, 18 Jun 2021 15:22:55 +0300 Subject: [PATCH 43/43] Removed old unnecessary files --- .../evaluation/qodana/dataset_marking.py | 284 ------------------ .../project_templates/java/build.gradle | 19 -- .../java/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - .../qodana/project_templates/java/gradlew | 185 ------------ .../qodana/project_templates/java/gradlew.bat | 89 ------ .../project_templates/java/settings.gradle | 2 - 7 files changed, 584 deletions(-) delete mode 100644 src/python/evaluation/qodana/dataset_marking.py delete mode 100644 src/python/evaluation/qodana/project_templates/java/build.gradle delete mode 100644 src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.jar delete mode 100644 src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.properties delete mode 100755 src/python/evaluation/qodana/project_templates/java/gradlew delete mode 100644 src/python/evaluation/qodana/project_templates/java/gradlew.bat delete mode 100644 src/python/evaluation/qodana/project_templates/java/settings.gradle diff --git a/src/python/evaluation/qodana/dataset_marking.py b/src/python/evaluation/qodana/dataset_marking.py deleted file mode 100644 index b99d26b4..00000000 --- a/src/python/evaluation/qodana/dataset_marking.py +++ /dev/null @@ -1,284 +0,0 @@ -import json -import logging -import os -import re -import sys -import traceback -from argparse import ArgumentParser, Namespace -from collections import defaultdict -from math import ceil -from pathlib import Path -from typing import Dict, List, Optional, Set - -sys.path.append('../../../..') - -import numpy as np -import pandas as pd -from src.python.evaluation.common.csv_util import write_dataframe_to_csv -from src.python.evaluation.common.util import ColumnName -from src.python.evaluation.qodana.util.models import QodanaColumnName, QodanaIssue, QodanaJsonField -from src.python.review.application_config import LanguageVersion -from src.python.review.common.file_system import ( - copy_directory, - copy_file, - create_directory, - Extension, - get_content_from_file, - get_name_from_path, - get_parent_folder, - remove_directory, - remove_slash, -) -from src.python.review.common.subprocess_runner import run_and_wait -from src.python.review.run_tool import positive_int - -logger = logging.getLogger(__name__) -logging.basicConfig(level=logging.INFO) - - -def configure_arguments(parser: ArgumentParser) -> None: - parser.add_argument( - 'dataset_path', - type=lambda value: Path(value).absolute(), - help=f"Dataset path. The dataset must contain at least three columns: '{ColumnName.ID.value}', " - f"'{ColumnName.CODE.value}' and '{ColumnName.LANG.value}', where '{ColumnName.ID.value}' is a unique " - f"solution number, '{ColumnName.LANG.value}' is the language in which the code is written in the " - f"'{ColumnName.CODE.value}' column. The '{ColumnName.LANG.value}' must belong to one of the following " - f"values: {', '.join(LanguageVersion.values())}. " - f"If '{ColumnName.LANG.value}' is not equal to any of the values, the row will be skipped.", - ) - - parser.add_argument( - 'inspections_output_path', - type=lambda value: Path(value).absolute(), - help='Path where id of all found inspections will be saved.', - ) - - parser.add_argument('-c', '--config', type=lambda value: Path(value).absolute(), help='Path to qodana.yaml') - - parser.add_argument( - '-l', - '--limit', - type=positive_int, - help='Allows you to read only the specified number of first rows from the dataset.', - ) - - parser.add_argument( - '-s', - '--chunk-size', - type=positive_int, - help='The number of files that qodana will process at a time.', - default=5000, - ) - - parser.add_argument( - '-o', - '--output-path', - type=lambda value: Path(value).absolute(), - help='The path where the labeled dataset will be saved. ' - 'If not specified, the labeled dataset will be saved next to the original one.', - ) - - -class DatasetLabel: - dataset_path: Path - config: Optional[Path] - limit: Optional[int] - chunk_size: Optional[int] - inspection_to_id: Dict[str, int] - dataset_output_path: Path - inspections_output_path: Path - - def __init__(self, args: Namespace): - self.dataset_path = args.dataset_path - self.config = args.config - self.limit = args.limit - self.chunk_size = args.chunk_size - - self.output_path = args.output_path - if self.output_path is None: - output_dir = get_parent_folder(self.dataset_path) - dataset_name = get_name_from_path(self.dataset_path) - self.output_path = output_dir / f'labeled_{dataset_name}' - - self.inspections_output_path = args.inspections_output_path - - def label(self) -> None: - dataset = pd.read_csv(self.dataset_path, nrows=self.limit) - - group_by_lang = dataset.groupby(ColumnName.LANG.value) - unique_languages = dataset[ColumnName.LANG.value].unique() - - logger.info(f'Unique languages: {unique_languages}') - - groups = [] - for language in unique_languages: - lang_group = group_by_lang.get_group(language) - - if language in LanguageVersion.values(): - try: - logger.info(f'Processing the language: {language}') - groups.append(self._label_language(lang_group, LanguageVersion(language))) - except NotImplementedError: - logger.warning(f'{language} needs implementation') - groups.append(lang_group) - else: - logger.warning(f'Unknown language: {language}') - groups.append(lang_group) - - logger.info('Dataset processing finished') - - dataset = pd.concat(groups) - - logger.info('Writing the dataset to a file.') - write_dataframe_to_csv(self.dataset_output_path, dataset) - - def _label_language(self, df: pd.DataFrame, language: LanguageVersion) -> pd.DataFrame: - number_of_chunks = 1 - if self.chunk_size is not None: - number_of_chunks = ceil(df.shape[0] / self.chunk_size) - - chunks = np.array_split(df, number_of_chunks) - labeled_chunks = [] - # Todo: run this in parallel - for index, chunk in enumerate(chunks): - logger.info(f'Processing chunk: {index + 1} / {number_of_chunks}') - labeled_chunks.append(self._label_chunk(chunk, language, index)) - - logger.info(f'{language} processing finished.') - result = pd.concat(labeled_chunks) - return result - - @classmethod - def _extract_fragment_id(cls, folder_name: str) -> int: - numbers = re.findall(r'\d+', folder_name) - if len(numbers) != 1: - raise ValueError(f'Can not extract fragment id from {folder_name}') - return numbers[0] - - @classmethod - def _get_fragment_id_from_fragment_file_path(cls, fragment_file_path: str) -> int: - folder_name = get_name_from_path(get_parent_folder(fragment_file_path), with_extension=False) - return cls._extract_fragment_id(folder_name) - - @classmethod - def _parse_inspections_files(cls, inspections_files: Set[Path]) -> Dict[int, List[QodanaIssue]]: - id_to_issues: Dict[int, List[QodanaIssue]] = defaultdict(list) - for file in inspections_files: - issues = json.loads(get_content_from_file(file))['problems'] - for issue in issues: - fragment_id = int(cls._get_fragment_id_from_fragment_file_path(issue['file'])) - qodana_issue = QodanaIssue( - line=issue['line'], - offset=issue['offset'], - length=issue['length'], - highlighted_element=issue['highlighted_element'], - description=issue['description'], - fragment_id=fragment_id, - problem_id=issue['problem_class']['id'], - ) - id_to_issues[fragment_id].append(qodana_issue) - return id_to_issues - - @classmethod - def _to_json(cls, issues: List[QodanaIssue]) -> str: - issues_json = { - QodanaJsonField.ISSUES.value: list(map(lambda i: i.to_json(), issues)), - } - return json.dumps(issues_json) - - def _label_chunk(self, chunk: pd.DataFrame, language: LanguageVersion, chunk_id: int) -> pd.DataFrame: - tmp_dir_path = self.dataset_path.parent.absolute() / f'qodana_project_{chunk_id}' - create_directory(tmp_dir_path) - - project_dir = tmp_dir_path / 'project' - results_dir = tmp_dir_path / 'results' - - logger.info('Copying the template') - self._copy_template(project_dir, language) - - if self.config: - logger.info('Copying the config') - self._copy_config(project_dir) - - logger.info('Creating main files') - self._create_main_files(project_dir, chunk, language) - - logger.info('Running qodana') - self._run_qodana(project_dir, results_dir) - - logger.info('Getting inspections') - inspections_files = self._get_inspections_files(results_dir) - inspections = self._parse_inspections_files(inspections_files) - - logger.info('Write inspections') - chunk[QodanaColumnName.INSPECTIONS.value] = chunk.apply( - lambda row: self._to_json(inspections.get(row[ColumnName.ID.value], [])), axis=1, - ) - - remove_directory(tmp_dir_path) - return chunk - - @staticmethod - def _copy_template(project_dir: Path, language: LanguageVersion) -> None: - if language.is_java(): - source = f'{remove_slash(os.path.dirname(os.path.abspath(__file__)))}/project_templates/java' - copy_directory(source, project_dir) - else: - raise NotImplementedError - - def _copy_config(self, project_dir: Path) -> None: - copy_file(self.config, project_dir) - - @staticmethod - def _create_main_files(project_dir: Path, chunk: pd.DataFrame, language: LanguageVersion) -> None: - if language.is_java(): - working_dir = project_dir / 'src' / 'main' / 'java' - for _, row in chunk.iterrows(): - solution_dir = working_dir / f'solution{row[ColumnName.ID.value]}' - create_directory(solution_dir) - file_path = solution_dir / f'Main{Extension.JAVA.value}' - with open(file_path, 'w') as file: - file.write(f'package solution{row[ColumnName.ID.value]};\n\n') - file.write(row[ColumnName.CODE.value]) - else: - raise NotImplementedError - - @staticmethod - def _run_qodana(project_dir: Path, results_dir: Path) -> None: - results_dir.mkdir() - command = [ - 'docker', 'run', - '-u', str(os.getuid()), - '--rm', - '-v', f'{project_dir}/:/data/project/', - '-v', f'{results_dir}/:/data/results/', - 'jetbrains/qodana', - ] - run_and_wait(command) - - @staticmethod - def _get_inspections_files(results_dir: Path) -> Set[Path]: - files = os.listdir(results_dir) - - file_name_regex = re.compile(r"(\w*).json") - return set(map(lambda f: results_dir / f, filter(lambda file: file_name_regex.match(file), files))) - - -def main(): - parser = ArgumentParser() - configure_arguments(parser) - - try: - args = parser.parse_args() - dataset_label = DatasetLabel(args) - dataset_label.label() - - except Exception: - traceback.print_exc() - logger.exception('An unexpected error') - return 2 - - -if __name__ == '__main__': - sys.exit(main()) diff --git a/src/python/evaluation/qodana/project_templates/java/build.gradle b/src/python/evaluation/qodana/project_templates/java/build.gradle deleted file mode 100644 index 95687b5b..00000000 --- a/src/python/evaluation/qodana/project_templates/java/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id 'java' -} - -group 'org.example' -version '1.0-SNAPSHOT' - -repositories { - mavenCentral() -} - -dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' -} - -test { - useJUnitPlatform() -} \ No newline at end of file diff --git a/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.jar b/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM diff --git a/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.properties b/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index be52383e..00000000 --- a/src/python/evaluation/qodana/project_templates/java/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/src/python/evaluation/qodana/project_templates/java/gradlew b/src/python/evaluation/qodana/project_templates/java/gradlew deleted file mode 100755 index 4f906e0c..00000000 --- a/src/python/evaluation/qodana/project_templates/java/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/src/python/evaluation/qodana/project_templates/java/gradlew.bat b/src/python/evaluation/qodana/project_templates/java/gradlew.bat deleted file mode 100644 index 107acd32..00000000 --- a/src/python/evaluation/qodana/project_templates/java/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/src/python/evaluation/qodana/project_templates/java/settings.gradle b/src/python/evaluation/qodana/project_templates/java/settings.gradle deleted file mode 100644 index 670936d0..00000000 --- a/src/python/evaluation/qodana/project_templates/java/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'gradle_qqodana_example' -