add user registration/login/SQL database

db_utils.py

@@ -0,0 +1,16 @@
+from sqlalchemy import create_engine
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker
+
+SQLALCHEMY_DATABASE_URL = "sqlite:///./embedding_db.db"
+ 
+engine = create_engine(SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False})
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+Base = declarative_base()
+
+def get_db():
+    db = SessionLocal()
+    try: 
+        yield db
+    finally:
+        db.close() 

main.py

@@ -7,14 +7,21 @@
 # License: MIT License
 
 # IMPORTS
-from fastapi import FastAPI, Request, Form, File, UploadFile, BackgroundTasks
+from fastapi import FastAPI, Request, Form, File, UploadFile, BackgroundTasks, Depends
 from fastapi.templating import Jinja2Templates
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import HTMLResponse, Response
+from sqlalchemy.orm.session import Session
 import pandas as pd
+import time
+from uuid import uuid1
 from scrape_onet import get_onet_code, get_onet_description, get_onet_tasks
 from match_utils import neighborhoods, get_resume, skillNER, sim_result_loop, get_links
-import time
+from db_utils import get_db, Base, engine
+from user_utils import DBUsers, Hash
+
+# DB SETUP
+Base.metadata.create_all(engine)
 
 # APP SETUP
 app = FastAPI()
@@ -24,6 +31,43 @@ templates = Jinja2Templates(directory="templates/")
 # LOAD DATA
 onet = pd.read_csv('static/ONET_JobTitles.csv')
 
+@app.get("/register/", response_class=HTMLResponse)
+def get_register(request: Request):
+    return templates.TemplateResponse('register.html', context={'request': request})
+
+@app.get("/login/", response_class=HTMLResponse)
+def get_login(request: Request):
+    return templates.TemplateResponse('login.html', context={'request': request})
+
+@app.post('/register/', response_class=HTMLResponse)
+def post_register(request: Request, username: str = Form(...), password: str = Form(...), email: str = Form(...), db: Session = Depends(get_db)):
+    new_user = DBUsers(id = str(uuid1()), username = username, email = email, password = Hash.bcrypt(password))
+    db.add(new_user)
+    db.commit()
+    db.refresh(new_user)
+    message = "You have registered successfully. Please log in to continue"
+    return templates.TemplateResponse('register.html', context={'request': request, 'message': message})
+
+@app.post("/login/", response_class=HTMLResponse)
+def post_login(request: Request, username: str = Form(...), password: str = Form(...), db: Session = Depends(get_db)):
+    un = db.query(DBUsers).filter(DBUsers.username == username).first()
+    pw = db.query(DBUsers).filter(DBUsers.username == username).first().password
+    if un and Hash.verify(password, pw) == True:
+        response = Response()
+        response.set_cookie(key="id", value=db.query(DBUsers).filter(DBUsers.username == username).first().id)
+        message = "You have been successfully logged in."
+        return templates.TemplateResponse('login.html', context={'request': request, "message": message})
+    else:
+        message = "Username or password not found. Please try again."
+        return templates.TemplateResponse('login.html', context={'request': request, "message": message})
+
+@app.get("/logout/", response_class=HTMLResponse)
+def get_logout(request: Request):
+    with open('static/log.txt', 'w') as l:
+        l.write('')
+    message = "You have been successfully logged out."
+    return templates.TemplateResponse('login.html', context={'request': request, "message": message})
+
 ### JOB INFORMATION CENTER ###
 # GET
 @app.get("/")
@@ -61,13 +105,11 @@ def get_matches(request: Request):
 # POST
 @app.post('/find-my-match/', response_class=HTMLResponse)
 async def post_matches(request: Request, resume: UploadFile = File(...)):
-    t = time.time()
     resume = get_resume(resume)
     skills = await skillNER(resume)
     simResults = await sim_result_loop(resume)
-    links = get_links(simResults)
-    print(time.time() - t)
-    return templates.TemplateResponse('find_my_match.html', context={'request': request, 'resume': resume, 'skills': skills, 'simResults': simResults, 'links': links})
+    links = get_links(simResults[0])
+    return templates.TemplateResponse('find_my_match.html', context={'request': request, 'resume': resume, 'skills': skills, 'simResults': simResults[0], 'links': links})
 
 @app.get("/find-match/", response_class=HTMLResponse)
 def find_match(request: Request):

match_utils.py

@@ -91,7 +91,7 @@ async def sim_result_loop(resume):
     simResults.reset_index(drop=True, inplace=True)
     for x in range(len(simResults)):
         simResults.iloc[x,1] = format_sim(simResults.iloc[x,1])
-    return simResults
+    return simResults, embeds
 
 async def skillNER(resume):
     def clean_my_text(text):

requirements.txt

@@ -16,4 +16,7 @@ python-dotenv==0.21.1
 transformers==4.25.1
 torch==1.13.1
 accelerate==0.16.0
-plotly-express==0.4.1
+plotly-express==0.4.1
+sqlalchemy==2.0.3
+bcrypt==4.0.1
+passlib==1.7.4

static/styles.css

@@ -230,6 +230,19 @@ html {
     align-content: left;
 }
 
+.form__login {
+    display: flex;
+    flex-direction: column;
+    justify-content: center; 
+    align-items: center;
+}
+
+.form__login-label {
+    font-size: 14px;
+    color: #2c2161;
+    text-align: center;
+}
+
 .output__table-item {
     font-size: 14px;
     color: #2c2161;

templates/candidate_matcher.html

@@ -17,6 +17,7 @@
             <li class="navbar__navigation-item"><a href="/explore-job-neighborhoods/" class="navbar__link">Explore Job Neighborhoods</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-match/" class="navbar__link">Find My Match</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-hire/" class="navbar__link">Find My Next Hire</a></li>
+            <li class="navbar__navigation-item"><a href="/login/" class="navbar__link">Login</a></li>
         </ul>
     </header>
     <main class="main">

templates/find_hire.html

@@ -17,6 +17,7 @@
             <li class="navbar__navigation-item"><a href="/explore-job-neighborhoods/" class="navbar__link">Explore Job Neighborhoods</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-match/" class="navbar__link">Find My Match</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-hire/" class="navbar__link">Find My Next Hire</a></li>
+            <li class="navbar__navigation-item"><a href="/login/" class="navbar__link">Login</a></li>
         </ul>
     </header>
     <main class="main">

templates/find_match.html

@@ -17,6 +17,7 @@
             <li class="navbar__navigation-item"><a href="/explore-job-neighborhoods/" class="navbar__link">Explore Job Neighborhoods</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-match/" class="navbar__link">Find My Match</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-hire/" class="navbar__link">Find My Next Hire</a></li>
+            <li class="navbar__navigation-item"><a href="/login/" class="navbar__link">Login</a></li>
         </ul>
     </header>
     <main class="main">

templates/find_my_match.html

@@ -17,6 +17,7 @@
             <li class="navbar__navigation-item"><a href="/explore-job-neighborhoods/" class="navbar__link">Explore Job Neighborhoods</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-match/" class="navbar__link">Find My Match</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-hire/" class="navbar__link">Find My Next Hire</a></li>
+            <li class="navbar__navigation-item"><a href="/login/" class="navbar__link">Login</a></li>
         </ul>
     </header>
     <main class="main">

templates/job_list.html

@@ -17,6 +17,7 @@
             <li class="navbar__navigation-item"><a href="/explore-job-neighborhoods/" class="navbar__link">Explore Job Neighborhoods</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-match/" class="navbar__link">Find My Match</a></li>
             <li class="navbar__navigation-item"><a href="/find-my-hire/" class="navbar__link">Find My Next Hire</a></li>
+            <li class="navbar__navigation-item"><a href="/login/" class="navbar__link">Login</a></li>
         </ul>
     </header>
     <main class="main">

templates/login.html

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Dashboard</title>
+    <link rel="stylesheet" href="/static/styles.css">
+</head>
+<body>
+    <header class="navbar">
+        <div class="navbar__brand">
+            <img src="/static/PF.png" class="navbar__logo" alt="Pathfinder logo" />
+            <a href="/" class="navbar__logo">Pathfinder</a>
+        </div>
+        <ul class="navbar__navigation">
+            <li class="navbar__navigation-item"><a href="/explore-job-neighborhoods/" class="navbar__link">Explore Job Neighborhoods</a></li>
+            <li class="navbar__navigation-item"><a href="/find-my-match/" class="navbar__link">Find My Match</a></li>
+            <li class="navbar__navigation-item"><a href="/find-my-hire/" class="navbar__link">Find My Next Hire</a></li>
+            <li class="navbar__navigation-item"><a href="/login/" class="navbar__link">Login</a></li>
+        </ul>
+    </header>
+    <main class="main">
+        <h1 class="pagetitle">User Login</h1>
+        <h2 class="pagesubtitle">Welcome to Pathfinder!</h2>
+        <h2 class="pagesubtitle">Enter your username and password below to get started</h2>
+        <section>
+            <form class="form__login" method="POST" enctype="application/x-www-form-urlencoded">
+                <label for="username" class="form__login-label" style="color: #2c2161">username:</label>
+                <input type="text" name="username" id="username" style="margin-bottom: 20px" class="form__input-field" />
+                <label for="password" class="form__login-label" style="color: #2c2161">password:</label>
+                <input type="text" name="password" id="password" class="form__input-field" />
+                <br>
+                <br>
+                <br>
+                <button type="submit" class="form__submit">Submit</button>
+                <br>
+                <button formaction="/register/" formmethod="GET" type="submit" class="form__submit">Create a new account</button>
+            </form>
+            <br>
+            <br>
+            {% if message %}
+                <h2 class="pagesubtitle">{{ message }}</h2>
+            {% endif %}
+        </section>
+        <br>
+        <br>
+    </main>
+    <footer class="footer">
+        <ul class="footer__text">
+            <li class="footer__text-item">© 2023 Pathfinder</li>
+        </ul>
+    </footer>
+</body>
+</html>

templates/register.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Dashboard</title>
+    <link rel="stylesheet" href="/static/styles.css">
+</head>
+<body>
+    <header class="navbar">
+        <div class="navbar__brand">
+            <img src="/static/PF.png" class="navbar__logo" alt="Pathfinder logo" />
+            <a href="/" class="navbar__logo">Pathfinder</a>
+        </div>
+        <ul class="navbar__navigation">
+            <li class="navbar__navigation-item"><a href="/explore-job-neighborhoods/" class="navbar__link">Explore Job Neighborhoods</a></li>
+            <li class="navbar__navigation-item"><a href="/find-my-match/" class="navbar__link">Find My Match</a></li>
+            <li class="navbar__navigation-item"><a href="/find-my-hire/" class="navbar__link">Find My Next Hire</a></li>
+            <li class="navbar__navigation-item"><a href="/login/" class="navbar__link">Login</a></li>
+        </ul>
+    </header>
+    <main class="main">
+        <h1 class="pagetitle">User Registration</h1>
+        <h2 class="pagesubtitle">Welcome to Pathfinder!</h2>
+        <h2 class="pagesubtitle">Fill out the form below to register for an account</h2>
+        <section>
+            <form class="form__login" method="POST">
+                <label for="username" class="form__login-label" style="color: #2c2161;">username:</label>
+                <input type="text" name="username" id="username" style="margin-bottom: 20px" class="form__input-field" />
+                <label for="password" class="form__login-label" style="color: #2c2161;">password:</label>
+                <input type="text" name="password" id="password" style="margin-bottom: 20px" class="form__input-field" />
+                <label for="email" class="form__login-label" style="color: #2c2161;">email:</label>
+                <input type="text" name="email" id="email" style="margin-bottom: 20px" class="form__input-field" />
+                <br>
+                <br>
+                <button type="submit" class="form__submit">Submit</button>
+            </form>
+            <br>
+            <br>
+            {% if message %}
+                <h2 class="pagesubtitle">{{ message }}</h2>
+            {% endif %}
+            <br>
+            <br>
+        </section>
+    </main>
+    <footer class="footer">
+        <ul class="footer__text">
+            <li class="footer__text-item">© 2023 Pathfinder</li>
+        </ul>
+    </footer>
+</body>
+</html>

user_utils.py

@@ -0,0 +1,19 @@
+from db_utils import Base
+from sqlalchemy import Column, String
+from passlib.context import CryptContext
+
+pwd_cxt = CryptContext(schemes=['bcrypt'], deprecated="auto")
+
+class Hash():
+    def bcrypt(password: str):
+        return pwd_cxt.hash(password)
+
+    def verify(plain_password: str, hashed_password: str):
+        return pwd_cxt.verify(plain_password, hashed_password)
+
+class DBUsers(Base):
+    __tablename__ = 'users'
+    id = Column(String, primary_key=True)
+    username = Column(String)
+    password = Column(String)
+    email = Column(String)