Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: optimize code #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,5 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

key.pem
3 changes: 1 addition & 2 deletions productSearch/apps.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from django.apps import AppConfig


class ProductsearchConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "productSearch"
name = "productSearch"
5 changes: 1 addition & 4 deletions productSearch/forms.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
from django import forms


class CameraCapture(forms.Form):

pass

pass
3 changes: 0 additions & 3 deletions productSearch/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
app_name = "productSearch"

urlpatterns = [

path("", views.capturecamera, name="capturecamera"),
path("view/", views.view, name="view"),


]
87 changes: 27 additions & 60 deletions productSearch/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,120 +6,87 @@
import requests
# Create your views here.

def isLogin(request):

def isLogin(request):
try:
context = {
"user_login" : request.session["login"],
"user_id" : request.session["user_id"],
"token" : request.session["token"],
"user_email" : -99
"user_login": request.session["login"],
"user_id": request.session["user_id"],
"token": request.session["token"],
"user_email": -99
}

except:

context = {
"user_login" : -99,
"user_id" : -99,
"user_token" : -99,
"user_email" : -99
"user_login": -99,
"user_id": -99,
"user_token": -99,
"user_email": -99
}

return context


def index(request):

try:
context = {
"user_login" : request.session["login"],
"user_id" : request.session["user_id"],
"token" : request.session["token"],
"user_email" : -99
"user_login": request.session["login"],
"user_id": request.session["user_id"],
"token": request.session["token"],
"user_email": -99
}

except:

context = {
"user_login" : -99,
"user_id" : -99,
"token" : -99,
"user_email" : -99
"user_login": -99,
"user_id": -99,
"token": -99,
"user_email": -99
}

if int(context["user_login"])==1:

if int(context["user_login"]) == 1:
return redirect("productSearch:capturecamera")

else:
return render(request=request, template_name="index.html", context=context)

def capturecamera(request):

def capturecamera(request):
context = isLogin(request)

if int(context["user_login"]) !=1:

if int(context["user_login"]) != 1:
return redirect("user:login")

if request.method=="POST":

if request.method == "POST":
if request.POST.get("flexRadioDefault") == "Kadın":

gender = 1

else:

gender = 0

try:

file = request.FILES["chooseFile"]
except:

messages.info(request, "Lütfen bir dosya seçin veya yükleyin.")
return redirect("index")

imgId = uuid.uuid1()
imgId = str(imgId)+".png"

file_name = default_storage.save(imgId, file)

request.session["file_name"] = file_name

url = 'https://prediction.hepsitrend.tech:8443/predict/?user_id={}&gender={}'.format(request.session["user_id"],gender)
url = 'https://prediction.hepsitrend.tech:8443/predict/?user_id={}&gender={}'.format(request.session["user_id"], gender)
files = {'file': open('static/uploads/{}'.format(file_name), 'rb')}
response = requests.post(url, files=files, auth=BearerAuth(request.session["token"]))

print(request.session["token"])

if int(response.status_code) != 200:

messages.info(request, "İşlem sırasında bir hata oluştu, lütfen tekrar deneyiniz.")

return render(request, "cameraCapture.html", context)

context["products"] = response.json()

context["products"] = response.json()
del context["products"][0]

context["products"].insert(0, {"pr_id":-99, "img_url":file_name})

context["products"].insert(0, {"pr_id": -99, "img_url": file_name})
return render(request, "view.html", context)

else:

return render(request, "cameraCapture.html", context)

def view(request):

pass



class BearerAuth(requests.auth.AuthBase):
def __init__(self, token):
self.token = token

def __call__(self, r):
r.headers["authorization"] = "Bearer " + self.token
return r
return r
Loading