From 0aad52b07c50dd8ac5604ba98f565c892b92c2ac Mon Sep 17 00:00:00 2001
From: igoorsimoess <igor.s.simoes@gmail.com>
Date: Wed, 21 Dec 2022 13:06:53 -0300
Subject: [PATCH] ImageDetectionWorking

---
 .../src/CV/CV/__pycache__/urls.cpython-38.pyc | Bin 1518 -> 1505 bytes
 back-end/back-end/src/CV/CV/urls.py           |   2 +-
 .../__pycache__/models.cpython-38.pyc         | Bin 807 -> 807 bytes
 .../__pycache__/serializers.cpython-38.pyc    | Bin 1604 -> 1605 bytes
 .../__pycache__/views.cpython-38.pyc          | Bin 1988 -> 2110 bytes
 .../src/CV/ImageDetection/serializers.py      |   2 +-
 .../back-end/src/CV/ImageDetection/views.py   |  11 +++++++----
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/back-end/back-end/src/CV/CV/__pycache__/urls.cpython-38.pyc b/back-end/back-end/src/CV/CV/__pycache__/urls.cpython-38.pyc
index 9e42330fc7f4585588a331ceaa035185bcffd264..3f876b67fc1abd91a5193abe7710a3b064238088 100644
GIT binary patch
delta 134
zcmaFI{g9hCl$V!_0SI*27bmAp<Xzy+mBQW2%*c?+lERb9lqHfS+ROxG^QN+<@&nn7
zU>;v8YYKmgK#E{5Q!`UKb1HW#Z<ZJki>C<nGKn)pNu&q|GiZuz{Be?rozF8jF+J5~
c@+szZtVP^Fn<jU#>}Hb&GK!=pd$KMC0ANBO_y7O^

delta 147
zcmaFJ{f?VAl$V!_0SF!~Ta+9zk#~VNcM4B0Gb2MPOA2o)Q<g}UXfqR#&6moW$`52S
zf_eO@tSJI1f+<41OwCN`%&FX|yjfyEES@6V%OuVaC6OW$%%CZ{@yAIfPS%pt;*!)T
q&Xma~nAZv1;`7W+Oiy)5ElEu-$;{82T+OnZO$KOxk<4Tp)};U?M=0a~

diff --git a/back-end/back-end/src/CV/CV/urls.py b/back-end/back-end/src/CV/CV/urls.py
index 5f21f00..4640ac4 100644
--- a/back-end/back-end/src/CV/CV/urls.py
+++ b/back-end/back-end/src/CV/CV/urls.py
@@ -23,7 +23,7 @@
 router = routers.DefaultRouter()
 router.register(r'users', views.UserViewSet)
 router.register(r'groups', views.GroupViewSet)
-router.register(r'teste', views.ImageDetectionViewSet, basename='detection')
+router.register(r'ImageDetection', views.ImageDetectionViewSet, basename='ImageDetection')
 
 urlpatterns = [
     path("admin/", admin.site.urls),
diff --git a/back-end/back-end/src/CV/ImageDetection/__pycache__/models.cpython-38.pyc b/back-end/back-end/src/CV/ImageDetection/__pycache__/models.cpython-38.pyc
index caf173530b4cf0c560ce08088c79d0880743a7a3..6e9f80d74567bfb76d56b174b1daec86fb34fea3 100644
GIT binary patch
delta 19
ZcmZ3^ww#SCl$V!_0SNA|+sGx$3;-($1V#V=

delta 19
ZcmZ3^ww#SCl$V!_0SJ~Z-N+@&3;-#B1Oos7

diff --git a/back-end/back-end/src/CV/ImageDetection/__pycache__/serializers.cpython-38.pyc b/back-end/back-end/src/CV/ImageDetection/__pycache__/serializers.cpython-38.pyc
index 3812f66726a4643a6a4f91ea708605e27496d036..2e45eff1aa3d14c2240e96a23c4cccb26e75de00 100644
GIT binary patch
delta 38
scmX@YbCicSl$V!_0SIohE>6C(k@qGGR~2`1QEFmIYKp?<_bj1|0N0@m00000

delta 37
rcmX@gbA*RCl$V!_0SKxVE=s<<k@qGG=Pj<}qSVBa)RfI1SV9>A*69p*

diff --git a/back-end/back-end/src/CV/ImageDetection/__pycache__/views.cpython-38.pyc b/back-end/back-end/src/CV/ImageDetection/__pycache__/views.cpython-38.pyc
index e474bc85aac67c108334d8d8545f0d644bc07887..186f7e546183bed353d297f589d8ae0c919ecd41 100644
GIT binary patch
delta 805
zcmZuvO>fgc5cRC>wVT+9lO`=iswkBZ4TzK@2gHXe3Ic(E3M%D-tn4<#O6=fuMS~I*
zsa%Uxxj&#4M=nT6aO1><zhH?2KY;(hj9ZmbYI~n%-|Xyo-`nryZ=U<ibqg9kUoU-V
z|K4$D;mgitbx&wwqUZH1tqN#&HBk`7cbX_l9#psV)+92HaFKBjnHn-BQAVbG$kc_k
zqBXpo?7i23%(<_k@TpXTC{!~2$(GWOu*;{hZ9JXcVQ=d$hBOpMu%Q43#BQ3g)y)zu
zDie4FIzfe?N-#+<K~N*G2<ik=1P2X{qB9iDAW+ruPQ<lw{PWPC+|oXO(x1TQGR7ka
zv^@|Y*ghNUIAh0VY@~0&*ccgm`o0zzLZ8tBQy9YBhOwFOktw*awi!xdKg!H*-|xsb
zv(4t>(WeqW>9!a1Ousn@J27C-%!*|@iqi+C^LQC`G?c$48&*6=IlUv3_#8!i;D^Fj
zEn{Q2G0dzadLg>)Bz7>@;8-MkYqZm=b*Ylf>_<ZO;tT1nd1d~uLb*8Sv0@&F%C7_~
zL5Zcm%!O+wOfYfDNfW5zKNHg1d;ywiz~^q#)~6bB78BH5k)a3H+pGXJyaYD$Af|j{
zD*eHSa5Y`BE{0iA1b*0wnlF=NkRP(;Jft%{@5<LJs0m%9+~>UZw5FMT9aUKG$s44y
UqV^s*`C9`U9Of`YsPd}$2P`|A0RR91

delta 624
zcmZvZ&r2Io5XaxV-S>7~ck|2mBLzvQg(O(5M-M>?J$O<OQ6ZNS@|KWb8rh9#U_%AH
zRt&FyK<uTo^wxV%g<g8-c@G}@CzST)%vP$kean0pzB6xTcHXDV=d`!uc@D!<{_v)`
zF!JW%{b(_)tur;DoHM2zUv@I5Mm>wlq;gSlZ<HJ=o=TyTx>2T-wau#O(f4!xi$Bv}
z;I*8=%E63o@RMm5T@Njk2pb$QA#n8%zW0*UAVo+M3_^yGCFBSbgeihW$P=aszZ?AV
zX33jFQ10DMq&3n0IyA{s_VKH+1#2tlN6=woP@vc)9~u#lj8hnzkvZm<tYau%U>#E#
z%6tVw5efWPu^EeYx6$(Tg_v8YilB&9Vx#5vV|mbcp&DV`JRTemVyoYKuG-DMz7hp^
zq<@N~((UBQ&?UV25G}M3jHf`a%gXA#)d&pTUk$z9KdaGiWd$DVZ?g2DMDg2ZiI;RN
zXvZqb0*0%3{lpr;vVLck>veadr~Lihwtuwk_XB#iWTOFP{;yDM*SbA*xbLq4W`xur
R18(x=!3LMR+~zr%6W8KrY~cU^

diff --git a/back-end/back-end/src/CV/ImageDetection/serializers.py b/back-end/back-end/src/CV/ImageDetection/serializers.py
index 7e681de..fc83f3c 100644
--- a/back-end/back-end/src/CV/ImageDetection/serializers.py
+++ b/back-end/back-end/src/CV/ImageDetection/serializers.py
@@ -19,4 +19,4 @@ class Meta:
 class ImageDetectionSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = ImageDetection
-        fields = ["created_at", "image", "model_evaluation", "model_evaluation_dict"] 
\ No newline at end of file
+        fields = ["created _at", "image", "model_evaluation", "model_evaluation_dict"] 
\ No newline at end of file
diff --git a/back-end/back-end/src/CV/ImageDetection/views.py b/back-end/back-end/src/CV/ImageDetection/views.py
index 6f40de2..81c0fb8 100644
--- a/back-end/back-end/src/CV/ImageDetection/views.py
+++ b/back-end/back-end/src/CV/ImageDetection/views.py
@@ -5,11 +5,11 @@
 from ImageDetection.serializers import UserSerializer, GroupSerializer, ImageDetectionSerializer
 import torch
 from rest_framework.decorators import action
-    # queryset = Group.objects.all().order_by()
 from rest_framework.decorators import action
+
 # Create your views here.
 import os
-
+from django.http import JsonResponse
 class UserViewSet(viewsets.ModelViewSet):
     queryset = User.objects.all()
     serializer_class = UserSerializer
@@ -33,7 +33,10 @@ class ImageDetectionViewSet(viewsets.ModelViewSet):
 
     @action(methods=["GET", "POST"], url_path='evaluate', detail=False)
     def evaluate(self, request, model=model):
-        image = request.POST.get("image", None)
+        image = request.POST.get("image", "../../../../static/imagem.png" )
+        image = request.GET.get("image", "../../../../static/imagem.png" )
+        # image = request.GET.get("")
         model_evaluation = model(image)
         model_evaluation_dict = model_evaluation.pandas().xyxy[0].to_dict(orient="records")
-        return model_evaluation_dict 
\ No newline at end of file
+        return JsonResponse(model_evaluation_dict, safe=False)
+