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

Adding updated files from lab env #152

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1b1cd99
Adding updated files from lab env
JackSavino Oct 23, 2023
00b2c3e
Updating from lab env
JackSavino Oct 23, 2023
a9557a5
Adding updated files from theia lab env
JackSavino Oct 23, 2023
78ce8a4
Updated files
JackSavino Oct 23, 2023
0e6991d
Adding updated files
JackSavino Oct 23, 2023
0641030
Adding updated files from lab env
JackSavino Oct 23, 2023
7749fec
Adding files from lab env
JackSavino Oct 24, 2023
5dd2ba3
Adding files from lab env updates
JackSavino Oct 24, 2023
e1970a1
Adding files from lab env
JackSavino Oct 24, 2023
a7efb95
Adding updated files from theia lab env
JackSavino Oct 24, 2023
e1e975b
Update linter.yml
JackSavino Oct 24, 2023
94c4ab3
Update linter.yml
JackSavino Oct 24, 2023
597d192
Adding updated files for capstone from lab env
JackSavino Oct 25, 2023
75558c5
Adding updated files
JackSavino Oct 25, 2023
7e9c233
Adding updated capstone files from lab env
JackSavino Oct 25, 2023
be86d04
Adding new files from lab env
JackSavino Oct 26, 2023
1111ad9
Adding changes
JackSavino Oct 26, 2023
6852ec9
Update restapis.py
JackSavino Oct 26, 2023
09dc962
Adding updated files from lab env
JackSavino Oct 27, 2023
8dff57c
Adding updated files from lab env
JackSavino Oct 29, 2023
f53acd7
Update restapis.py
JackSavino Oct 29, 2023
56c222f
Adding updated files from lab
JackSavino Oct 31, 2023
29f4bf7
Adding files
JackSavino Oct 31, 2023
e9ef198
Adding files from lab env
JackSavino Oct 31, 2023
6f00fad
Adding updated files from theia lab env
JackSavino Nov 1, 2023
5b663b7
Adding files for capstone proj
JackSavino Nov 1, 2023
8b680b4
Adding files from theia lab env
JackSavino Nov 1, 2023
7b8582e
Adding files from lab
JackSavino Nov 2, 2023
78bfd8b
Adding updated file
JackSavino Nov 2, 2023
53b3ad4
Adding files from lab env
JackSavino Nov 3, 2023
b4314a3
Adding file entrypoint.sh
JackSavino Nov 3, 2023
61057b9
Adding updated settings.py file
JackSavino Nov 3, 2023
ec83851
Adding updated files
JackSavino Nov 3, 2023
ef4d9b3
Adding updated add_review.html file
JackSavino Nov 3, 2023
b376526
Adding updated files
JackSavino Nov 6, 2023
6a6e0b7
Adding updated files from lab env
JackSavino Nov 6, 2023
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
28 changes: 28 additions & 0 deletions server/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM python:3.8.2

ENV PYTHONBUFFERED 1
ENV PYTHONWRITEBYTECODE 1

RUN apt-get update \
&& apt-get install -y netcat

ENV APP=/app

# Change the workdir.
WORKDIR $APP

# Install the requirements
COPY requirements.txt $APP

RUN pip3 install -r requirements.txt

# Copy the rest of the files
COPY . $APP

EXPOSE 8000

RUN chmod +x ./entrypoint.sh

ENTRYPOINT ["/bin/bash","/app/entrypoint.sh"]

CMD ["gunicorn", "--bind", ":8000", "--workers", "3", "djangobackend.wsgi"]
Binary file added server/db.sqlite3
Binary file not shown.
29 changes: 29 additions & 0 deletions server/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
run: dealership
name: dealership
spec:
replicas: 1
selector:
matchLabels:
run: dealership
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
labels:
run: dealership
spec:
containers:
- image: us.icr.io/sn-labs-jacksavino/dealership:latest
imagePullPolicy: Always
name: dealership
ports:
- containerPort: 8000
protocol: TCP
restartPolicy: Always
17 changes: 13 additions & 4 deletions server/djangoapp/admin.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
from django.contrib import admin
# from .models import related models


# Register your models here.
from .models import CarMake, CarModel

# CarModelInline class
class CarModelInline(admin.StackedInline):
model = CarModel
extra = 2

# CarModelAdmin class
class CarModelAdmin(admin.ModelAdmin):
list_display = ('name', 'type', 'year')
list_filter = ['year']
search_fields = ['name', 'type']

# CarMakeAdmin class with CarModelInline
class CarMakeAdmin(admin.ModelAdmin):
inlines = [CarModelInline]
list_display = ('name', 'description')

# Register models here
admin.site.register(CarMake, CarMakeAdmin)
admin.site.register(CarModel, CarModelAdmin)
123 changes: 107 additions & 16 deletions server/djangoapp/models.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,118 @@
from django.db import models
from django.utils.timezone import now
from django.core import serializers
import uuid
import json

# Car Make model
class CarMake(models.Model):
name = models.CharField(null=False, max_length=100, default='Make')
description = models.CharField(max_length=500)

# Create your models here.
def __str__(self):
return "Name: " + self.name

# <HINT> Create a Car Make model `class CarMake(models.Model)`:
# - Name
# - Description
# - Any other fields you would like to include in car make model
# - __str__ method to print a car make object
# Car Model model
class CarModel(models.Model):
make = models.ForeignKey(CarMake, null=False, on_delete=models.CASCADE)
# - Many-To-One relationship to Car Make model (One Car Make has many Car Models, using ForeignKey field)
name = models.CharField(null=False, max_length=40, default='undefined')
# - Name
id = models.IntegerField(default=1, primary_key=True)
# - Dealer id, used to refer a dealer created in cloudant database

COUPE = 'Coupe'
MINIVAN = 'Minivan'
SEDAN = 'Sedan'
SUV = 'SUV'
TRUCK = 'Truck'
WAGON = 'Wagon'
CAR_TYPES = [
(COUPE, 'Coupe'),
(MINIVAN, 'Minivan'),
(SEDAN, 'Sedan'),
(SUV, 'SUV'),
(TRUCK, 'Truck'),
(WAGON, 'Wagon'),
]

type = models.CharField(
null=False,
max_length=50,
choices=CAR_TYPES,
default=SEDAN
)

year = models.IntegerField(default=now().year)

# <HINT> Create a Car Model model `class CarModel(models.Model):`:
# - Many-To-One relationship to Car Make model (One Car Make has many Car Models, using ForeignKey field)
# - Name
# - Dealer id, used to refer a dealer created in cloudant database
# - Type (CharField with a choices argument to provide limited choices such as Sedan, SUV, WAGON, etc.)
# - Year (DateField)
# - Any other fields you would like to include in car model
# - __str__ method to print a car make object
def __str__(self):
return "Name: " + self.name

# Get dealer data
class CarDealer:

# <HINT> Create a plain Python class `CarDealer` to hold dealer data
def __init__(self, address, city, id, lat, long, st, zip, full_name):
# Dealer name
self.full_name = full_name

# Dealer address
self.address = address
# Dealer city
self.city = city

# Dealer id
self.id = id
# Location lat
self.lat = lat
# Location long
self.long = long

# Dealer state
self.st = st
# Dealer zip
self.zip = zip

# <HINT> Create a plain Python class `DealerReview` to hold review data
def __str__(self):
return "Dealer Name: " + self.full_name

# Get review data
class DealerReview:

def __init__(self, dealership, name, purchase, review):
# Required attributes
self.dealership = dealership
self.name = name
self.purchase = purchase
self.review = review
# Optional attributes
self.purchase_date = ""
self.purchase_make = ""
self.purchase_model = ""
self.purchase_year = ""
self.sentiment = ""
self.id = ""

def __str__(self):
return "Review: " + self.review

def to_json(self):
return json.dumps(self, default=lambda o: o.__dict__,
sort_keys=True, indent=4)

# Post review data
class ReviewPost:

def __init__(self, dealership, name, purchase, review):
self.dealership = dealership
self.name = name
self.purchase = purchase
self.review = review
self.purchase_date = ""
self.car_make = ""
self.car_model = ""
self.car_year = ""

def to_json(self):
return json.dumps(self, default=lambda o: o.__dict__,
sort_keys=True, indent=4)

130 changes: 112 additions & 18 deletions server/djangoapp/restapis.py
Original file line number Diff line number Diff line change
@@ -1,34 +1,128 @@
import requests
import json
# import related models here
from .models import CarDealer, DealerReview
from requests.auth import HTTPBasicAuth
from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
from ibm_watson import NaturalLanguageUnderstandingV1
from ibm_watson.natural_language_understanding_v1 import Features,SentimentOptions
import time

def get_request(url, **kwargs):
# If argument contains API key
api_key = kwargs.get("api_key")
print("GET from {} ".format(url))
try:
if api_key:
params = dict()
params["text"] = kwargs["text"]
params["version"] = kwargs["version"]
params["features"] = kwargs["features"]
params["return_analyzed_text"] = kwargs["return_analyzed_text"]
response = requests.get(url, params=params, headers={'Content-Type': 'application/json'},
auth=HTTPBasicAuth('apikey', api_key))
else:
# Call get method of requests library with URL and parameters
response = requests.get(url, headers={'Content-Type': 'application/json'},
params=kwargs)
except:
# If any error occurs
print("Network exception occurred")

# Create a `get_request` to make HTTP GET requests
# e.g., response = requests.get(url, params=params, headers={'Content-Type': 'application/json'},
# auth=HTTPBasicAuth('apikey', api_key))
status_code = response.status_code
print("With status {} ".format(status_code))
json_data = json.loads(response.text)
return json_data


# Create a `post_request` to make HTTP POST requests
# e.g., response = requests.post(url, params=kwargs, json=payload)
def post_request(url, payload, **kwargs):
print(kwargs)
print("POST to {} ".format(url))
print(payload)
response = requests.post(url, params=kwargs, json=payload)
status_code = response.status_code
print("With status {} ".format(status_code))
json_data = json.loads(response.text)
return json_data


# Create a get_dealers_from_cf method to get dealers from a cloud function
# def get_dealers_from_cf(url, **kwargs):
# - Call get_request() with specified arguments
# - Parse JSON results into a CarDealer object list
def get_dealers_from_cf(url, **kwargs):
results = []
state = kwargs.get("state")
if state:
json_result = get_request(url, state=state)
else:
json_result = get_request(url)

if json_result:
# Get the row list in JSON as dealers
dealers = json_result
# For each dealer object
for dealer in dealers:
# Get its content in `doc` object
dealer_doc = dealer["doc"]
# Create a CarDealer object with values in `doc` object
dealer_obj = CarDealer(address=dealer_doc["address"], city=dealer_doc["city"], full_name=dealer_doc["full_name"],
id=dealer_doc["id"], lat=dealer_doc["lat"], long=dealer_doc["long"],
st=dealer_doc["st"], zip=dealer_doc["zip"])
results.append(dealer_obj)

# Create a get_dealer_reviews_from_cf method to get reviews by dealer id from a cloud function
# def get_dealer_by_id_from_cf(url, dealerId):
# - Call get_request() with specified arguments
# - Parse JSON results into a DealerView object list
return results


# Create an `analyze_review_sentiments` method to call Watson NLU and analyze text
# def analyze_review_sentiments(text):
# - Call get_request() with specified arguments
# - Get the returned sentiment label such as Positive or Negative
def get_dealer_by_id_from_cf(url, id):
json_result = get_request(url, id=id)

if json_result:
dealers = json_result[0]
dealer_doc = dealers
dealer_obj = CarDealer(address=dealer_doc["address"], city=dealer_doc["city"],
id=dealer_doc["id"], lat=dealer_doc["lat"], long=dealer_doc["long"], full_name=dealer_doc["full_name"],
st=dealer_doc["st"], zip=dealer_doc["zip"])
return dealer_obj


def get_dealer_reviews_from_cf(url, **kwargs):
results = []
id = kwargs.get("id")
if id:
json_result = get_request(url, id=id)
else:
json_result = get_request(url)
if json_result:
reviews = json_result["data"]["docs"]

for dealer_review in reviews:
review_obj = DealerReview(dealership=dealer_review["dealership"],
name=dealer_review["name"],
purchase=dealer_review["purchase"],
review=dealer_review["review"])
if "id" in dealer_review:
review_obj.id = dealer_review["id"]
if "purchase_date" in dealer_review:
review_obj.purchase_date = dealer_review["purchase_date"]
if "car_make" in dealer_review:
review_obj.car_make = dealer_review["car_make"]
if "car_model" in dealer_review:
review_obj.car_model = dealer_review["car_model"]
if "car_year" in dealer_review:
review_obj.car_year = dealer_review["car_year"]

sentiment = analyze_review_sentiments(review_obj.review)
print(sentiment)
review_obj.sentiment = sentiment
results.append(review_obj)

return results


def analyze_review_sentiments(text):
url = "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/instances/39e30a1e-daa0-43f9-baee-a2a9eab7d505"
api_key = "lbhukj5iEH9QDmXoMTQWFJqlOs4X-i3_NPC9R_7XNsw2"
authenticator = IAMAuthenticator(api_key)
natural_language_understanding = NaturalLanguageUnderstandingV1(version='2021-08-01',authenticator=authenticator)
natural_language_understanding.set_service_url(url)
response = natural_language_understanding.analyze( text=text+"hello hello hello",features=Features(sentiment=SentimentOptions(targets=[text+"hello hello hello"]))).get_result()
label=json.dumps(response, indent=2)
label = response['sentiment']['document']['label']

return(label)
26 changes: 26 additions & 0 deletions server/djangoapp/static/css/about.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
body {
font-family: Arial, sans-serif;
background-color: #f4f4f4;
text-align: center;
}

h1 {
font-size: 36px;
color: #333;
background-color: #ff9900;
padding: 20px;
border-radius: 10px;
margin: 40px;
}

.small-text {
font-size: 28px;
color: #439;
}

p {
font-size: 18px;
font-style: italic;
color: #555;
margin: 10px;
}
Loading