Spaces:

asFrants
/

TextSummarization

Sleeping

App Files Files Community

asFrants commited on Feb 16, 2024

Commit

11fe449

1 Parent(s): d0f5098

remove templates

Browse files

Files changed (6) hide show

main.py +19 -11
models/security.py +8 -6
templates/components/_base_old.html +0 -28
templates/components/_footer.html +0 -26
templates/components/_header.html +0 -32
templates/components/_page_loader.html +0 -12

main.py CHANGED Viewed

@@ -6,16 +6,18 @@ from fastapi import FastAPI, Request, Depends
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
 from loguru import logger
-from app import Summarizer, TextRequest
 from app import (
     EN_SENTIMENT_MODEL,
     EN_SUMMARY_MODEL,
 )
-from app import DEFAULT_EN_TEXT
 from models.forms import VerificationForm
 from models.exceptions import MyHTTPException, my_http_exception_handler
-from models.security import AuthUsers
 app = FastAPI()
@@ -70,22 +72,29 @@ async def verify_page(request: Request):
 @app.post("/verify")
-async def verify(request: Request, checked_user: bool = Depends(users.get_cookie_data)):
     form = VerificationForm(request)
     await form.load_data()
     if await form.is_valid():
         logger.info("Form is valid")
         response = RedirectResponse("/index", status_code=302)
-        if not checked_user:
-            user_token = users.generate_user_token()
-            users.add_user_session(user_token)
-            response.set_cookie(key="Authorization", value=user_token)
-            logger.info(f"Issued token: {user_token}")
         return response
     logger.info("Validation error")
     return await verify_page(request)
 @app.get("/")
 async def get_main_page():
     return RedirectResponse("/index", status_code=302)
@@ -100,7 +109,7 @@ def get_summary(text: TextRequest, lang: str, request: gr.Request):
     return "Sorry. You are not verified."
-with gr.Blocks() as demo:
     with gr.Column(scale=2, min_width=600):
         en_sum_description = gr.Markdown(value=f"Model for Summary: {EN_SUMMARY_MODEL}")
         en_sent_description = gr.Markdown(
@@ -130,6 +139,5 @@ with gr.Blocks() as demo:
         [en_outputs],
     )
-# demo.launch(server_name="127.0.0.1", server_port=8080, share=False)
 # mounting at the root path
 app = gr.mount_gradio_app(app, demo, path="/index")

 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
+from typing import Annotated
 from loguru import logger
+from app import Summarizer, TextRequest, Result
 from app import (
+    DEFAULT_EN_TEXT,
     EN_SENTIMENT_MODEL,
     EN_SUMMARY_MODEL,
 )
 from models.forms import VerificationForm
 from models.exceptions import MyHTTPException, my_http_exception_handler
+from models.security import AuthUsers, check_api_credentials
 app = FastAPI()
 @app.post("/verify")
+async def verify(request: Request, token: str = Depends(users.get_cookie_data)):
     form = VerificationForm(request)
     await form.load_data()
     if await form.is_valid():
         logger.info("Form is valid")
         response = RedirectResponse("/index", status_code=302)
+        response.set_cookie(key="Authorization", value=token)
         return response
     logger.info("Validation error")
     return await verify_page(request)
+@app.post("/get_summary_api", response_model=Result)
+async def summ_api(
+    request: TextRequest,
+    lang: str,
+    username: Annotated[str, Depends(check_api_credentials)],
+):
+    results = pipe.summarize(request.text, lang=lang)
+    logger.info(f"API response: {results}")
+    return results
 @app.get("/")
 async def get_main_page():
     return RedirectResponse("/index", status_code=302)
     return "Sorry. You are not verified."
+with gr.Blocks(css="/static/css/style.css") as demo:
     with gr.Column(scale=2, min_width=600):
         en_sum_description = gr.Markdown(value=f"Model for Summary: {EN_SUMMARY_MODEL}")
         en_sent_description = gr.Markdown(
         [en_outputs],
     )
 # mounting at the root path
 app = gr.mount_gradio_app(app, demo, path="/index")

models/security.py CHANGED Viewed

@@ -21,9 +21,9 @@ security = HTTPBasic()
 class AuthUsers:
     REQUESTS_LIMIT = 3  # 3 REQUESTS PER MINUTE
-    AUTH_TIME = 10  # 10 MINUTES
     users: set
-    users_auth: defaultdict(list)
     def __init__(self):
         self.users = set()
@@ -66,12 +66,14 @@ class AuthUsers:
     def get_cookie_data(
         self, user_token: str = Cookie(default=None, alias="Authorization")
-    ) -> list:
-        if not user_token or user_token not in self.users:
             logger.info("Unauthorized user")
-            return False
         logger.info(f"Verified user with token: {user_token}")
-        return True
 credentials_exception = MyHTTPException(

 class AuthUsers:
     REQUESTS_LIMIT = 3  # 3 REQUESTS PER MINUTE
+    AUTH_TIME = 1  # 1 MINUTES
     users: set
+    users_auth: defaultdict
     def __init__(self):
         self.users = set()
     def get_cookie_data(
         self, user_token: str = Cookie(default=None, alias="Authorization")
+    ) -> str:
+        if not user_token:
+            user_token = self.generate_user_token()
+        if user_token not in self.users:
+            self.users.add(user_token)
             logger.info("Unauthorized user")
         logger.info(f"Verified user with token: {user_token}")
+        return user_token
 credentials_exception = MyHTTPException(

templates/components/_base_old.html DELETED Viewed

@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    {% include 'components/_head.html' %}
-    {% block page_head %}{% endblock %}
-</head>
-<body style="width: 100%; margin: 0; padding: 0; display: flex;
-    flex-direction: column; flex-grow: 1;" class="bg-dark">
-    {% include 'components/_page_loader.html' %}
-    {% with messages = get_flashed_messages(request) %}
-        {%if messages %}
-            {% for message in messages %}
-                <div class="alert alert-primary">
-                    <strong> {{ message }} </strong>
-                </div>
-            {% endfor %}
-        {% endif %}
-    {% endwith %}
-    {% block page_content %}{% endblock %}
-    {% include 'components/_scripts.html' %}
-</body>
-</html>

templates/components/_footer.html DELETED Viewed

@@ -1,26 +0,0 @@
-<footer class="footer pt-4 pb-5 bg-dark text-white">
-    <div class="container col-6 align-items-center">
-        <div class="d-flex justify-content-center">
-            <a href="https://www.facebook.com/alexander_frantsev/" data-toggle="tooltip" data-placement="top" title="facebook" class="icon m-3">
-                <span class="fab fa-facebook"></span>
-            </a>
-            <a href="https://instagram.com/asfrants/" data-toggle="tooltip" data-placement="top" title="instagram" class="icon m-3">
-                <span class="fab fa-instagram"></span>
-            </a>
-            <a href="https://t.me/as_frantsev/" data-toggle="tooltip" data-placement="top" title="telegram" class="icon m-3">
-                <span class="fab fa-telegram"></span>
-            </a>
-            <a href="https://linkedin.com/in/asfrantsev" data-toggle="tooltip" data-placement="top" title="linkedin" class="icon m-3">
-                <span class="fab fa-linkedin"></span>
-            </a>
-            <a href="https://github.com/whoknowswhocares" data-toggle="tooltip" data-placement="top" title="github" class="icon m-3">
-                <span class="fab fa-github"></span>
-            </a>
-        </div>
-        <div class="col mb-md-0">
-            <div class="d-flex text-center justify-content-center align-items-center" role="contentinfo">
-                <p class="fw-normal mb-0">Copyright © FTech 2023-2024. All rights reserved.</p>
-            </div>
-        </div>
-    </div>
-</footer>

templates/components/_header.html DELETED Viewed

@@ -1,32 +0,0 @@
-<header class="header-global">
-    <nav id="navbar-main" aria-label="Primary navigation" class="navbar navbar-main navbar-expand-lg navbar-theme-primary headroom navbar-dark">
-        <div class="container position-relative">
-            <div class="d-flex align-items-center">
-                <img class="navbar-brand-dark" src="{{ url_for('static',path='/favicon/favicon.svg')}}" alt="menuimage">
-                <button class="navbar-toggler ms-1" type="button" data-bs-toggle="collapse" data-bs-target="#navbar_global"
-                aria-controls="navbar_global" aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-            </div>
-            <div class="navbar-collapse collapse me-auto" id="navbar_global">
-                <div class="navbar-collapse-header">
-                    <div class="row">
-                        <div class="col-1 collapse-close">
-                            <div class="col-1 collapse-close">
-                                <a href="#navbar_global" class="fas fa-times" data-bs-toggle="collapse"
-                                    data-bs-target="#navbar_global" aria-controls="navbar_global"
-                                    aria-expanded="false" title="close" aria-label="Toggle navigation">
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </nav>
-</header>

templates/components/_page_loader.html DELETED Viewed

@@ -1,12 +0,0 @@
-<main>
-    <div class="preloader bg-dark flex-column justify-content-center align-items-center">
-        <svg id="loader-logo" xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 64 78.4">
-        </svg>
-        <div class="loader">
-            <span class="loader-text"></span>
-            <span class="load"></span>
-        </div>
-    </div>
-</main>