restructure project

Dockerfile

@@ -1,20 +1,32 @@
+# Use an official Python runtime as a parent image
 FROM python:3.9
 
-WORKDIR /code
+# Create a non-root user with a specified user ID
+RUN useradd -m -u 1000 user
 
-COPY ./requirements.txt /code/requirements.txt
+# Set environment variables for the non-root user
+ENV HOME=/home/user \
+    PATH=/home/user/.local/bin:$PATH \
+    NAME=EduConnect
 
-RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+# Set the non-root user's home directory as the working directory
+WORKDIR $HOME
 
-RUN useradd -m -u 1000 user
+# Copy the application files into the non-root user's home directory, ensuring the user owns the copied files
+COPY --chown=user:user . ./app
 
+# Change to the non-root user
 USER user
 
-ENV HOME=/home/user \
-	PATH=/home/user/.local/bin:$PATH
-
+# Set the working directory to where the application files are
 WORKDIR $HOME/app
 
-COPY --chown=user . $HOME/app
+# Install any needed packages specified in requirements.txt
+# As the non-root user, ensure packages are installed to the user's home directory
+RUN pip install --no-cache-dir --user -r requirements.txt
+
+# Make port 7860 available to the world outside this container
+EXPOSE 7860
 
-CMD ["uvicorn", "api.main:app", "--host", "0.0.0.0", "--port", "7860"]
+# Run the FastAPI application using Uvicorn, binding to port 7860
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7860"]

README.md

@@ -9,3 +9,37 @@ license: apache-2.0
 ---
 
 Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+
+```
+EduConnect/
+├── app/
+│   ├── __init__.py                  # Initializes the FastAPI app and global configurations
+│   ├── main.py                      # Entry point for the FastAPI application, defining routes
+│   ├── dependencies.py              # Dependency utilities for JWT token verification, etc.
+│   ├── models.py                    # Database models for ORM
+│   ├── schemas.py                   # Pydantic schemas for request and response validation
+│   ├── crud.py                      # CRUD operations interfacing with the database
+│   ├── api/
+│   │   ├── __init__.py
+│   │   ├── userlogin.py             # Endpoint for user login functionality
+│   │   ├── userlogout.py            # Endpoint for user logout functionality
+│   │   ├── userchat.py              # Endpoint for chat functionality
+│   │   └── userhistory.py           # Endpoint for loading chat history
+│   ├── admin/
+│   │   ├── __init__.py
+│   │   ├── admin_functions.py       # Contains server-side logic for admin tasks
+│   │   └── templates/               # Jinja2 templates for admin UI
+│   │       ├── admin_login.html     # Template for admin login page
+│   │       └── user_registration.html # Template for user registration page
+│   └── utils/
+│       ├── __init__.py
+│       ├── authentication.py        # Integrates MTCNN and Facenet for login authentication
+│       └── database.py              # ChromaDB integration and database utilities
+├── static/
+│   ├── css/
+│   ├── js/
+│   └── images/
+├── Dockerfile                       # Docker configuration for setting up the environment
+├── requirements.txt                 # Lists all Python library dependencies
+└── .env                             # Environment variables for configuration settings
+```

app/api/login.py

@@ -0,0 +1,23 @@
+# # app/api/login.py
+# from fastapi import APIRouter, HTTPException, Depends, File, UploadFile
+# from ..utils.authentication import verify_user
+# from ..schemas import LoginSchema
+# from ..crud import get_user_by_email, create_access_token
+
+# router = APIRouter()
+
+# @router.post("/login/")
+# async def login(user_image: UploadFile = File(...)):
+#     # Use MTCNN and Facenet to embed the image and verify user
+#     user_verified, user_email = verify_user(user_image.file)
+#     if not user_verified:
+#         raise HTTPException(status_code=400, detail="Authentication Failed")
+
+#     # Query ChromaDB for similarity and retrieve user details
+#     user = get_user_by_email(user_email)
+#     if not user:
+#         raise HTTPException(status_code=404, detail="User not found")
+
+#     # Generate JWT session token
+#     access_token = create_access_token(data={"sub": user.email})
+#     return {"access_token": access_token, "token_type": "bearer"}

{api → app}/main.py

@@ -1,9 +1,8 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import FileResponse
 
-from transformers import pipeline
 
 app = FastAPI()
 
@@ -17,15 +16,12 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-pipe_flan = pipeline("text2text-generation", model="google/flan-t5-small")
+# Mount static files
+app.mount("/static", StaticFiles(directory="static"), name="static")
 
-@app.get("/infer_t5")
-def t5(input):
-    output = pipe_flan(input)
-    return {"output": output[0]["generated_text"]}
-
-app.mount("/", StaticFiles(directory="static", html=True), name="static")
+# Setup Jinja2Templates to point to the templates directory
+templates = Jinja2Templates(directory="app/admin/templates")
 
 @app.get("/")
-def index() -> FileResponse:
-    return FileResponse(path="/app/static/index.html", media_type="text/html")
+async def get_admin_login(request: Request):
+    return templates.TemplateResponse("admin_login.html", {"request": request})

requirements.txt

@@ -1,6 +1,13 @@
-fastapi==0.74.*
-requests==2.27.*
-sentencepiece==0.1.*
-torch==1.11.*
-transformers==4.*
-uvicorn[standard]==0.17.*
+fastapi==0.74.*                # Core framework for building APIs.
+uvicorn[standard]==0.17.*      # ASGI server for FastAPI, supports live reloading.
+requests==2.27.*               # For making HTTP requests, if needed by your app.
+torch==1.11.*                  # PyTorch, for handling deep learning models.
+transformers==4.*              # From Hugging Face, for working with pre-trained LLMs.
+sentencepiece==0.1.*           # For chat text processing
+mtcnn==0.1.1                   # For face detection in images.
+python-jose[cryptography]==3.3.*  # For creating, parsing, and verifying JWT tokens.
+python-multipart==0.0.5        # Necessary for form data handling, including file uploads.
+numpy==1.22.*                  # Fundamental package for scientific computing.
+chromadb==0.4.22               # Vector database interaction libraries.
+keras-facenet==0.3.2           # For face recognition and embedding, used alongside MTCNN.
+jinja2==3.0.*                  # For Admin site redndering

static/css/mvp.css

@@ -0,0 +1,536 @@
+/* MVP.css v1.14 - https://github.com/andybrewer/mvp */
+
+:root {
+    --active-brightness: 0.85;
+    --border-radius: 5px;
+    --box-shadow: 2px 2px 10px;
+    --color-accent: #118bee15;
+    --color-bg: #fff;
+    --color-bg-secondary: #e9e9e9;
+    --color-link: #118bee;
+    --color-secondary: #920de9;
+    --color-secondary-accent: #920de90b;
+    --color-shadow: #f4f4f4;
+    --color-table: #118bee;
+    --color-text: #000;
+    --color-text-secondary: #999;
+    --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+    --hover-brightness: 1.2;
+    --justify-important: center;
+    --justify-normal: left;
+    --line-height: 1.5;
+    --width-card: 285px;
+    --width-card-medium: 460px;
+    --width-card-wide: 800px;
+    --width-content: 1080px;
+}
+
+@media (prefers-color-scheme: dark) {
+    :root[color-mode="user"] {
+        --color-accent: #0097fc4f;
+        --color-bg: #333;
+        --color-bg-secondary: #555;
+        --color-link: #0097fc;
+        --color-secondary: #e20de9;
+        --color-secondary-accent: #e20de94f;
+        --color-shadow: #bbbbbb20;
+        --color-table: #0097fc;
+        --color-text: #f7f7f7;
+        --color-text-secondary: #aaa;
+    }
+}
+
+html {
+    scroll-behavior: smooth;
+}
+
+@media (prefers-reduced-motion: reduce) {
+    html {
+        scroll-behavior: auto;
+    }
+}
+
+/* Layout */
+article aside {
+    background: var(--color-secondary-accent);
+    border-left: 4px solid var(--color-secondary);
+    padding: 0.01rem 0.8rem;
+}
+
+body {
+    background: var(--color-bg);
+    color: var(--color-text);
+    font-family: var(--font-family);
+    line-height: var(--line-height);
+    margin: 0;
+    overflow-x: hidden;
+    padding: 0;
+}
+
+footer,
+header,
+main {
+    margin: 0 auto;
+    max-width: var(--width-content);
+    padding: 3rem 1rem;
+}
+
+hr {
+    background-color: var(--color-bg-secondary);
+    border: none;
+    height: 1px;
+    margin: 4rem 0;
+    width: 100%;
+}
+
+section {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: var(--justify-important);
+}
+
+section img,
+article img {
+    max-width: 100%;
+}
+
+section pre {
+    overflow: auto;
+}
+
+section aside {
+    border: 1px solid var(--color-bg-secondary);
+    border-radius: var(--border-radius);
+    box-shadow: var(--box-shadow) var(--color-shadow);
+    margin: 1rem;
+    padding: 1.25rem;
+    width: var(--width-card);
+}
+
+section aside:hover {
+    box-shadow: var(--box-shadow) var(--color-bg-secondary);
+}
+
+[hidden] {
+    display: none;
+}
+
+/* Headers */
+article header,
+div header,
+main header {
+    padding-top: 0;
+}
+
+header {
+    text-align: var(--justify-important);
+}
+
+header a b,
+header a em,
+header a i,
+header a strong {
+    margin-left: 0.5rem;
+    margin-right: 0.5rem;
+}
+
+header nav img {
+    margin: 1rem 0;
+}
+
+section header {
+    padding-top: 0;
+    width: 100%;
+}
+
+/* Nav */
+nav {
+    align-items: center;
+    display: flex;
+    font-weight: bold;
+    justify-content: space-between;
+    margin-bottom: 7rem;
+}
+
+nav ul {
+    list-style: none;
+    padding: 0;
+}
+
+nav ul li {
+    display: inline-block;
+    margin: 0 0.5rem;
+    position: relative;
+    text-align: left;
+}
+
+/* Nav Dropdown */
+nav ul li:hover ul {
+    display: block;
+}
+
+nav ul li ul {
+    background: var(--color-bg);
+    border: 1px solid var(--color-bg-secondary);
+    border-radius: var(--border-radius);
+    box-shadow: var(--box-shadow) var(--color-shadow);
+    display: none;
+    height: auto;
+    left: -2px;
+    padding: .5rem 1rem;
+    position: absolute;
+    top: 1.7rem;
+    white-space: nowrap;
+    width: auto;
+    z-index: 1;
+}
+
+nav ul li ul::before {
+    /* fill gap above to make mousing over them easier */
+    content: "";
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: -0.5rem;
+    height: 0.5rem;
+}
+
+nav ul li ul li,
+nav ul li ul li a {
+    display: block;
+}
+
+/* Typography */
+code,
+samp {
+    background-color: var(--color-accent);
+    border-radius: var(--border-radius);
+    color: var(--color-text);
+    display: inline-block;
+    margin: 0 0.1rem;
+    padding: 0 0.5rem;
+}
+
+details {
+    margin: 1.3rem 0;
+}
+
+details summary {
+    font-weight: bold;
+    cursor: pointer;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    line-height: var(--line-height);
+    text-wrap: balance;
+}
+
+mark {
+    padding: 0.1rem;
+}
+
+ol li,
+ul li {
+    padding: 0.2rem 0;
+}
+
+p {
+    margin: 0.75rem 0;
+    padding: 0;
+    width: 100%;
+}
+
+pre {
+    margin: 1rem 0;
+    max-width: var(--width-card-wide);
+    padding: 1rem 0;
+}
+
+pre code,
+pre samp {
+    display: block;
+    max-width: var(--width-card-wide);
+    padding: 0.5rem 2rem;
+    white-space: pre-wrap;
+}
+
+small {
+    color: var(--color-text-secondary);
+}
+
+sup {
+    background-color: var(--color-secondary);
+    border-radius: var(--border-radius);
+    color: var(--color-bg);
+    font-size: xx-small;
+    font-weight: bold;
+    margin: 0.2rem;
+    padding: 0.2rem 0.3rem;
+    position: relative;
+    top: -2px;
+}
+
+/* Links */
+a {
+    color: var(--color-link);
+    display: inline-block;
+    font-weight: bold;
+    text-decoration: underline;
+}
+
+a:active {
+    filter: brightness(var(--active-brightness));
+}
+
+a:hover {
+    filter: brightness(var(--hover-brightness));
+}
+
+a b,
+a em,
+a i,
+a strong,
+button,
+input[type="submit"] {
+    border-radius: var(--border-radius);
+    display: inline-block;
+    font-size: medium;
+    font-weight: bold;
+    line-height: var(--line-height);
+    margin: 0.5rem 0;
+    padding: 1rem 2rem;
+}
+
+button,
+input[type="submit"] {
+    font-family: var(--font-family);
+}
+
+button:active,
+input[type="submit"]:active {
+    filter: brightness(var(--active-brightness));
+}
+
+button:hover,
+input[type="submit"]:hover {
+    cursor: pointer;
+    filter: brightness(var(--hover-brightness));
+}
+
+a b,
+a strong,
+button,
+input[type="submit"] {
+    background-color: var(--color-link);
+    border: 2px solid var(--color-link);
+    color: var(--color-bg);
+}
+
+a em,
+a i {
+    border: 2px solid var(--color-link);
+    border-radius: var(--border-radius);
+    color: var(--color-link);
+    display: inline-block;
+    padding: 1rem 2rem;
+}
+
+article aside a {
+    color: var(--color-secondary);
+}
+
+/* Images */
+figure {
+    margin: 0;
+    padding: 0;
+}
+
+figure img {
+    max-width: 100%;
+}
+
+figure figcaption {
+    color: var(--color-text-secondary);
+}
+
+/* Forms */
+button:disabled,
+input:disabled {
+    background: var(--color-bg-secondary);
+    border-color: var(--color-bg-secondary);
+    color: var(--color-text-secondary);
+    cursor: not-allowed;
+}
+
+button[disabled]:hover,
+input[type="submit"][disabled]:hover {
+    filter: none;
+}
+
+form {
+    border: 1px solid var(--color-bg-secondary);
+    border-radius: var(--border-radius);
+    box-shadow: var(--box-shadow) var(--color-shadow);
+    display: block;
+    max-width: var(--width-card-wide);
+    min-width: var(--width-card);
+    padding: 1.5rem;
+    text-align: var(--justify-normal);
+}
+
+form header {
+    margin: 1.5rem 0;
+    padding: 1.5rem 0;
+}
+
+input,
+label,
+select,
+textarea {
+    display: block;
+    font-size: inherit;
+    max-width: var(--width-card-wide);
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+    display: inline-block;
+}
+
+input[type="checkbox"]+label,
+input[type="radio"]+label {
+    display: inline-block;
+    font-weight: normal;
+    position: relative;
+    top: 1px;
+}
+
+input[type="range"] {
+    padding: 0.4rem 0;
+}
+
+input,
+select,
+textarea {
+    border: 1px solid var(--color-bg-secondary);
+    border-radius: var(--border-radius);
+    margin-bottom: 1rem;
+    padding: 0.4rem 0.8rem;
+}
+
+input[type="text"],
+textarea {
+    width: calc(100% - 1.6rem);
+}
+
+input[readonly],
+textarea[readonly] {
+    background-color: var(--color-bg-secondary);
+}
+
+label {
+    font-weight: bold;
+    margin-bottom: 0.2rem;
+}
+
+/* Popups */
+dialog {
+    border: 1px solid var(--color-bg-secondary);
+    border-radius: var(--border-radius);
+    box-shadow: var(--box-shadow) var(--color-shadow);
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 50%;
+    z-index: 999;
+}
+
+/* Tables */
+table {
+    border: 1px solid var(--color-bg-secondary);
+    border-radius: var(--border-radius);
+    border-spacing: 0;
+    display: inline-block;
+    max-width: 100%;
+    overflow-x: auto;
+    padding: 0;
+    white-space: nowrap;
+}
+
+table td,
+table th,
+table tr {
+    padding: 0.4rem 0.8rem;
+    text-align: var(--justify-important);
+}
+
+table thead {
+    background-color: var(--color-table);
+    border-collapse: collapse;
+    border-radius: var(--border-radius);
+    color: var(--color-bg);
+    margin: 0;
+    padding: 0;
+}
+
+table thead tr:first-child th:first-child {
+    border-top-left-radius: var(--border-radius);
+}
+
+table thead tr:first-child th:last-child {
+    border-top-right-radius: var(--border-radius);
+}
+
+table thead th:first-child,
+table tr td:first-child {
+    text-align: var(--justify-normal);
+}
+
+table tr:nth-child(even) {
+    background-color: var(--color-accent);
+}
+
+/* Quotes */
+blockquote {
+    display: block;
+    font-size: x-large;
+    line-height: var(--line-height);
+    margin: 1rem auto;
+    max-width: var(--width-card-medium);
+    padding: 1.5rem 1rem;
+    text-align: var(--justify-important);
+}
+
+blockquote footer {
+    color: var(--color-text-secondary);
+    display: block;
+    font-size: small;
+    line-height: var(--line-height);
+    padding: 1.5rem 0;
+}
+
+/* Scrollbars */
+* {
+    scrollbar-width: thin;
+    scrollbar-color: rgb(202, 202, 232) auto;
+}
+
+*::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+}
+
+*::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+*::-webkit-scrollbar-thumb {
+    background-color: rgb(202, 202, 232);
+    border-radius: 10px;
+}

static/index.html

@@ -1,24 +0,0 @@
-<main>
-    <section id="text-gen">
-      <h2>Text generation using Flan T5</h2>
-      <p>
-        Model:
-        <a
-          href="https://huggingface.co/google/flan-t5-small"
-          rel="noreferrer"
-          target="_blank"
-          >google/flan-t5-small
-        </a>
-      </p>
-      <form class="text-gen-form">
-        <label for="text-gen-input">Text prompt</label>
-        <input
-          id="text-gen-input"
-          type="text"
-          value="German: There are many ducks"
-        />
-        <button id="text-gen-submit">Submit</button>
-        <p class="text-gen-output"></p>
-      </form>
-    </section>
-  </main>

static/style.css

@@ -1,45 +0,0 @@
-body {
-    --text: hsl(0 0% 15%);
-    padding: 2.5rem;
-    font-family: sans-serif;
-    color: var(--text);
-  }
-  
-  body.dark-theme {
-    --text: hsl(0 0% 90%);
-    background-color: hsl(223 39% 7%);
-  }
-  
-  main {
-    max-width: 80rem;
-    text-align: center;
-  }
-  
-  section {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  
-  a {
-    color: var(--text);
-  }
-  
-  form {
-    width: 30rem;
-    margin: 0 auto;
-  }
-  
-  input {
-    width: 100%;
-  }
-  
-  button {
-    cursor: pointer;
-  }
-  
-  .text-gen-output {
-    min-height: 1.2rem;
-    margin: 1rem;
-    border: 0.5px solid grey;
-  }