Skip to content

Commit 159f88b

Browse files
committed
Deployment settings
1 parent c85a448 commit 159f88b

File tree

5 files changed

+51
-41
lines changed

5 files changed

+51
-41
lines changed

BEProjectsApp/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
views.MyProjectSearch.as_view(),
4343
name="MyProjectSearch",
4444
),
45-
path("check", views.PlagiarismCheck.as_view(), name="Plagiarism_Check"),
45+
# path("check", views.PlagiarismCheck.as_view(), name="Plagiarism_Check"),
4646
path(
4747
"contributor_populate",
4848
views.Contributor_populate.as_view(),

BEProjectsApp/views.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from .permissions import IsUserOrReadOnly, Permit
1717
from .filters import BrowseProjectFilter, ProjectFilter
1818

19-
from rest_framework import generics, status, viewsets, mixins, filters, serializers
19+
from rest_framework import generics, status, viewsets
2020
from django.contrib.auth import authenticate, login
2121
from rest_framework.authentication import TokenAuthentication
2222
from rest_framework.authtoken.models import Token
@@ -32,8 +32,8 @@
3232
from django.shortcuts import get_object_or_404
3333
from django_filters.rest_framework import DjangoFilterBackend
3434
from django.db.models import Q
35-
from sklearn.feature_extraction.text import TfidfVectorizer
36-
from sklearn.metrics.pairwise import cosine_similarity
35+
# from sklearn.feature_extraction.text import TfidfVectorizer
36+
# from sklearn.metrics.pairwise import cosine_similarity
3737

3838

3939
class ProjectViewSet(viewsets.ModelViewSet):
@@ -684,29 +684,29 @@ def update_project_report(request, pk):
684684
)
685685

686686

687-
class PlagiarismCheck(generics.GenericAPIView):
688-
def get(self, request):
689-
690-
l = []
691-
p = Project.objects.filter(approved=True)
692-
for x in p:
693-
l.append(x.abstract)
694-
l.append(request.data["abstract"])
695-
print(l)
696-
vectorizer = TfidfVectorizer()
697-
X = vectorizer.fit_transform(l)
698-
699-
scores = cosine_similarity(X, X[-1])
700-
print(scores)
701-
target = scores.flatten().argsort()[-2]
702-
print(target)
703-
final = []
704-
705-
d = {
706-
"match_score": float(scores[target]),
707-
"Match_project": Project.objects.filter(approved=True)[int(target)].title,
708-
}
709-
return JsonResponse(d, status=status.HTTP_200_OK, safe=False)
687+
# class PlagiarismCheck(generics.GenericAPIView):
688+
# def get(self, request):
689+
690+
# l = []
691+
# p = Project.objects.filter(approved=True)
692+
# for x in p:
693+
# l.append(x.abstract)
694+
# l.append(request.data["abstract"])
695+
# print(l)
696+
# vectorizer = TfidfVectorizer()
697+
# X = vectorizer.fit_transform(l)
698+
699+
# scores = cosine_similarity(X, X[-1])
700+
# print(scores)
701+
# target = scores.flatten().argsort()[-2]
702+
# print(target)
703+
# final = []
704+
705+
# d = {
706+
# "match_score": float(scores[target]),
707+
# "Match_project": Project.objects.filter(approved=True)[int(target)].title,
708+
# }
709+
# return JsonResponse(d, status=status.HTTP_200_OK, safe=False)
710710

711711

712712
# Populate Database Script

BEProjectsWeb/settings.py

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,15 @@
1212

1313
import os
1414

15+
import dj_database_url
16+
import dotenv
17+
import django_heroku
18+
1519
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
1620
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
21+
dotenv_file = os.path.join(BASE_DIR, ".env")
22+
if os.path.isfile(dotenv_file):
23+
dotenv.load_dotenv(dotenv_file)
1724
MEDIA_DIR = os.path.join(BASE_DIR, "media")
1825

1926
# Quick-start development settings - unsuitable for production
@@ -25,7 +32,7 @@
2532
# SECURITY WARNING: don't run with debug turned on in production!
2633
DEBUG = True
2734

28-
ALLOWED_HOSTS = []
35+
ALLOWED_HOSTS = ['dj-archive.herokuapp.com']
2936

3037
# Rest framework settings
3138
REST_FRAMEWORK = {
@@ -59,6 +66,7 @@
5966
MIDDLEWARE = [
6067
"corsheaders.middleware.CorsMiddleware",
6168
"django.middleware.security.SecurityMiddleware",
69+
'whitenoise.middleware.WhiteNoiseMiddleware',
6270
"django.contrib.sessions.middleware.SessionMiddleware",
6371
"django.middleware.common.CommonMiddleware",
6472
"django.middleware.csrf.CsrfViewMiddleware",
@@ -91,13 +99,8 @@
9199
# Database
92100
# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
93101

94-
DATABASES = {
95-
"default": {
96-
"ENGINE": "django.db.backends.sqlite3",
97-
"NAME": os.path.join(BASE_DIR, "db.sqlite3"),
98-
}
99-
}
100-
102+
DATABASES = {}
103+
DATABASES['default'] = dj_database_url.config(conn_max_age=600)
101104

102105
# Password validation
103106
# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
@@ -130,6 +133,8 @@
130133
# https://docs.djangoproject.com/en/2.1/howto/static-files/
131134

132135
STATIC_URL = "/static/"
136+
STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
137+
STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
133138

134139
MEDIA_URL = "/media/"
135140
MEDIA_ROOT = MEDIA_DIR
@@ -152,3 +157,8 @@
152157
}
153158

154159
AUTH_USER_MODEL = "BEProjectsApp.User"
160+
161+
django_heroku.settings(locals())
162+
163+
options = DATABASES['default'].get('OPTIONS', {})
164+
options.pop('sslmode', None)

Procfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
web: gunicorn BEProjectsWeb.wsgi

requirements.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@ astroid==2.4.2
33
attrs==18.2.0
44
black==18.9b0
55
certifi==2018.11.29
6-
chardet==3.0.4
76
Click==7.0
87
colorama==0.4.3
98
coreapi==2.3.3
109
coreschema==0.0.4
10+
dj-database-url==0.5.0
1111
Django==2.1.5
1212
django-cors-headers==3.4.0
1313
django-filter==2.0.0
14+
django-heroku==0.3.1
1415
django-rest-swagger==2.2.0
1516
django-templated-mail==1.1.1
1617
djangorestframework==3.9.1
1718
djangorestframework-jwt==1.11.0
1819
djangorestframework-simplejwt==4.1.0
1920
djoser==1.1.5
21+
gunicorn
2022
httpie==1.0.2
2123
idna==2.8
2224
isort==4.3.21
@@ -26,23 +28,20 @@ joblib==0.16.0
2628
lazy-object-proxy==1.4.3
2729
MarkupSafe==1.1.1
2830
mccabe==0.6.1
29-
numpy==1.19.1
31+
numpy
3032
openapi-codec==1.3.2
3133
pandas==1.1.3
3234
Pygments==2.3.1
3335
PyJWT==1.7.1
3436
pylint==2.5.3
3537
python-dateutil==2.8.1
38+
python-dotenv==0.18.0
3639
pytz==2018.7
3740
requests==2.21.0
38-
scikit-learn==0.23.2
39-
scipy==1.5.2
4041
simplejson==3.17.0
4142
six==1.15.0
42-
sklearn==0.0
4343
threadpoolctl==2.1.0
4444
toml==0.10.0
4545
typed-ast==1.4.1
4646
uritemplate==3.0.1
47-
urllib3==1.26.5
4847
wrapt==1.12.1

0 commit comments

Comments
 (0)