Compare commits
No commits in common. "30cce3608ae05cb92f72a88d322ad68fbd89cc5c" and "a2da35691253271ffccdfd224ebac232f3b89403" have entirely different histories.
30cce3608a
...
a2da356912
@ -43,7 +43,7 @@ def add_poems_to_db(db: Session):
|
||||
f1.close()
|
||||
|
||||
|
||||
def filter_ann(schema: pydantic_schemas.SortAnnouncements, db: Annotated[Session, Depends(auth_utils.get_session)]):
|
||||
def filter_ann(schema: pydantic_schemas.SortAnnouncements, db: Annotated[Session, Depends(auth_utils.get_db)]):
|
||||
"""Функция для последовательного применения различных фильтров (через схему SortAnnouncements)"""
|
||||
res = db.query(orm_models.Announcement)
|
||||
fields = schema.__dict__ # параметры передоваемой схемы SortAnnouncements (ключи и значения)
|
||||
@ -58,7 +58,7 @@ def filter_ann(schema: pydantic_schemas.SortAnnouncements, db: Annotated[Session
|
||||
return res.all()
|
||||
|
||||
|
||||
def check_obsolete(db: Annotated[Session, Depends(auth_utils.get_session)], current_date: datetime.date):
|
||||
def check_obsolete(db: Annotated[Session, Depends(auth_utils.get_db)], current_date: datetime.date):
|
||||
"""
|
||||
Функция участвует в процессе обновления поля obsolete у всех объявлений раз в сутки
|
||||
"""
|
||||
|
||||
39
back/api.py
39
back/api.py
@ -22,6 +22,7 @@ import pathlib
|
||||
import shutil
|
||||
import os
|
||||
|
||||
from .db import database
|
||||
from . import add_poems_and_filters, auth_utils, orm_models, pydantic_schemas
|
||||
|
||||
# создаем приложение Fastapi
|
||||
@ -30,8 +31,6 @@ app = FastAPI()
|
||||
# Jinja2 - шаблоны
|
||||
templates = Jinja2Templates(directory="./front/dist")
|
||||
|
||||
# хранение картинок для стихов
|
||||
app.mount("/poem_pic", StaticFiles(directory = "./poem_pic"))
|
||||
# создаем эндпоинт для хранения статических файлов
|
||||
app.mount("/static", StaticFiles(directory = "./front/dist"))
|
||||
# проверяем, что папка uploads еще не создана
|
||||
@ -43,7 +42,7 @@ app.mount("/uploads", StaticFiles(directory = "./uploads"))
|
||||
|
||||
# получение списка объявлений
|
||||
@app.get("/api/announcements", response_model=List[pydantic_schemas.Announcement])#адрес объявлений
|
||||
async def announcements_list(db: Annotated[Session, Depends(auth_utils.get_session)], obsolete: Union[bool, None] = False, user_id: Union[int, None] = None,
|
||||
def announcements_list(db: Annotated[Session, Depends(auth_utils.get_db)], obsolete: Union[bool, None] = False, user_id: Union[int, None] = None,
|
||||
metro: Union[str, None] = None,category: Union[str, None] = None):
|
||||
# параметры для сортировки (схема pydantic schemas.SortAnnouncements)
|
||||
params_to_sort = pydantic_schemas.SortAnnouncements(obsolete=obsolete, user_id=user_id, metro=metro, category=category)
|
||||
@ -55,7 +54,7 @@ async def announcements_list(db: Annotated[Session, Depends(auth_utils.get_sessi
|
||||
|
||||
# получаем данные одного объявления
|
||||
@app.get("/api/announcement", response_model=pydantic_schemas.AnnResponce)
|
||||
async def single_announcement(ann_id:int, db: Annotated[Session, Depends(auth_utils.get_session)]): # передаем индекс обявления
|
||||
def single_announcement(ann_id:int, db: Annotated[Session, Depends(auth_utils.get_db)]): # передаем индекс обявления
|
||||
# Считываем данные из Body и отображаем их на странице.
|
||||
# В последствии будем вставлять данные в html-форму
|
||||
try:
|
||||
@ -67,10 +66,10 @@ async def single_announcement(ann_id:int, db: Annotated[Session, Depends(auth_ut
|
||||
|
||||
# Занести объявление в базу данных
|
||||
@app.put("/api/announcement")
|
||||
async def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form()], bestBy: Annotated[datetime.date, Form()],
|
||||
def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form()], bestBy: Annotated[datetime.date, Form()],
|
||||
address: Annotated[str, Form()], longtitude: Annotated[float, Form()], latitude: Annotated[float, Form()],
|
||||
description: Annotated[str, Form()], metro: Annotated[str, Form()], current_user: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_active_user)],
|
||||
db: Annotated[Session, Depends(auth_utils.get_session)], src: Union[UploadFile, None] = None, trashId: Annotated[int, Form()] = None):
|
||||
db: Annotated[Session, Depends(auth_utils.get_db)], src: Union[UploadFile, None] = None, trashId: Annotated[int, Form()] = None):
|
||||
try:
|
||||
# имя загруженного файла по умолчанию - пустая строка
|
||||
uploaded_name = ""
|
||||
@ -102,7 +101,7 @@ async def put_in_db(name: Annotated[str, Form()], category: Annotated[str, Form(
|
||||
|
||||
# Удалить объявления из базы
|
||||
@app.delete("/api/announcement") #адрес объявления
|
||||
async def delete_from_db(announcement: pydantic_schemas.DelAnnouncement, db: Annotated[Session, Depends(auth_utils.get_session)]): # функция удаления объекта из БД
|
||||
def delete_from_db(announcement: pydantic_schemas.DelAnnouncement, db: Annotated[Session, Depends(auth_utils.get_db)]): # функция удаления объекта из БД
|
||||
try:
|
||||
# находим объект с заданным id в бд
|
||||
to_delete = db.query(orm_models.Announcement).filter(orm_models.Announcement.id==announcement.id).first()
|
||||
@ -115,8 +114,8 @@ async def delete_from_db(announcement: pydantic_schemas.DelAnnouncement, db: Ann
|
||||
|
||||
# Забронировать объявление
|
||||
@app.post("/api/book")
|
||||
async def change_book_status(data: pydantic_schemas.Book, current_user: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_user)],
|
||||
db: Annotated[Session, Depends(auth_utils.get_session)]):
|
||||
def change_book_status(data: pydantic_schemas.Book, current_user: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_user)],
|
||||
db: Annotated[Session, Depends(auth_utils.get_db)]):
|
||||
# Находим объявление по данному id
|
||||
announcement_to_change = db.query(orm_models.Announcement).filter(orm_models.Announcement.id == data.id).first()
|
||||
# Проверяем, что объявление с данным id существует
|
||||
@ -136,7 +135,7 @@ async def change_book_status(data: pydantic_schemas.Book, current_user: Annotate
|
||||
|
||||
# reginstration
|
||||
@app.post("/api/signup")
|
||||
async def create_user(nickname: Annotated[str, Form()], password: Annotated[str, Form()], db: Annotated[Session, Depends(auth_utils.get_session)],
|
||||
def create_user(nickname: Annotated[str, Form()], password: Annotated[str, Form()], db: Annotated[Session, Depends(auth_utils.get_db)],
|
||||
name: Annotated[str, Form()]=None, surname: Annotated[str, Form()]=None, avatar: Annotated[UploadFile, Form()]=None):
|
||||
|
||||
# проверяем, что юзера с введенным никнеймом не существует в бд
|
||||
@ -155,7 +154,7 @@ async def create_user(nickname: Annotated[str, Form()], password: Annotated[str,
|
||||
# функция для генерации токена после успешного входа пользователя
|
||||
@app.post("/api/token", response_model=pydantic_schemas.Token)
|
||||
async def login_for_access_token(
|
||||
form_data: Annotated[OAuth2PasswordRequestForm, Depends()], db: Annotated[Session, Depends(auth_utils.get_session)]
|
||||
form_data: Annotated[OAuth2PasswordRequestForm, Depends()], db: Annotated[Session, Depends(auth_utils.get_db)]
|
||||
):
|
||||
# пробуем найти юзера в бд по введенным паролю и никнейму
|
||||
user = auth_utils.authenticate_user(db, form_data.username, form_data.password)
|
||||
@ -183,7 +182,7 @@ async def read_users_me(current_user: Annotated[pydantic_schemas.User, Depends(a
|
||||
|
||||
# изменяем рейтинг пользователя
|
||||
@app.post("/api/user/rating")
|
||||
async def add_points(data: pydantic_schemas.AddRating, current_user: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_user)], db: Annotated[Session, Depends(auth_utils.get_session)]):
|
||||
def add_points(data: pydantic_schemas.AddRating, current_user: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_user)], db: Annotated[Session, Depends(auth_utils.get_db)]):
|
||||
# проверяем,
|
||||
if current_user.id != data.user_id:
|
||||
user = auth_utils.get_user_by_id(db, data.user_id)
|
||||
@ -198,7 +197,7 @@ async def add_points(data: pydantic_schemas.AddRating, current_user: Annotated[p
|
||||
|
||||
# получаем рейтинг пользователя
|
||||
@app.get("/api/user/rating")
|
||||
async def add_points(user_id: int, db: Annotated[Session, Depends(auth_utils.get_session)]):
|
||||
def add_points(user_id: int, db: Annotated[Session, Depends(auth_utils.get_db)]):
|
||||
user = auth_utils.get_user_by_id(db, user_id=user_id)
|
||||
if not user:
|
||||
raise HTTPException(status_code=404, detail="Item not found")
|
||||
@ -206,13 +205,11 @@ async def add_points(user_id: int, db: Annotated[Session, Depends(auth_utils.get
|
||||
|
||||
|
||||
# Отправляем стихи
|
||||
@app.get("/api/user/poem", response_model=pydantic_schemas.Poem)
|
||||
async def poems_to_front(db: Annotated[Session, Depends(auth_utils.get_session)]):
|
||||
@app.get("/api/user/poem", response_model=pydantic_schemas.Poem) # пока не работает
|
||||
def poems_to_front(db: Annotated[Session, Depends(auth_utils.get_db)]): # db: Annotated[Session, Depends(utils.get_db)]
|
||||
num_of_poems = db.query(orm_models.Poems).count() # определяем кол-во стихов в бд
|
||||
# если стихов в бд нет
|
||||
if num_of_poems < 1:
|
||||
add_poems_and_filters.add_poems_to_db(db) # добавляем поэмы в базу данных
|
||||
num_of_poems = db.query(orm_models.Poems).count() # определяем кол-во стихов в бд
|
||||
add_poems_and_filters.add_poems_to_db(database) # добавляем поэмы в базу данных
|
||||
rand_id = random.randint(1, num_of_poems) # генерируем номер стихотворения
|
||||
poem = db.query(orm_models.Poems).filter(orm_models.Poems.id == rand_id).first() # находим стих в бд
|
||||
if not poem:
|
||||
@ -221,7 +218,7 @@ async def poems_to_front(db: Annotated[Session, Depends(auth_utils.get_session)]
|
||||
|
||||
|
||||
@app.get("/api/trashbox", response_model=List[pydantic_schemas.TrashboxResponse])
|
||||
async def get_trashboxes(data: pydantic_schemas.TrashboxRequest = Depends()):#крутая функция для работы с api
|
||||
def get_trashboxes(data: pydantic_schemas.TrashboxRequest = Depends()):#крутая функция для работы с api
|
||||
# json, передаваемый стороннему API
|
||||
BASE_URL= "https://geointelect2.gate.petersburg.ru"
|
||||
my_token="eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhU1RaZm42bHpTdURYcUttRkg1SzN5UDFhT0FxUkhTNm9OendMUExaTXhFIn0.eyJleHAiOjE3ODYyMjUzMzMsImlhdCI6MTY5MTUzMDkzMywianRpIjoiYjU0MmU3MTQtYzJkMS00NTY2LWJkY2MtYmQ5NzA0ODY1ZjgzIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6IjJhOTgwMzUyLTY1M2QtNGZlZC1iMDI1LWQ1N2U0NDRjZmM3NiIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiIyYTk4MDM1Mi02NTNkLTRmZWQtYjAyNS1kNTdlNDQ0Y2ZjNzYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.FTKiC1hpWcOkmSW9QZpC-RY7Ko50jw1mDMfXIWYxlQ-zehLm2CLmOnHvYoOoI39k2OzeCIAB9ZdRrrGZc6G9Z1eFELUjNGEqKxSC1Phj9ATemKgbOKEttk-OGc-rFr9VPA8_SnfvLts6wTI2YK33YBIxCF5nCbnr4Qj3LeEQ0d6Hy8PO4ATrBF5EOeuAZRprvIEjXe_f8N9ONKckCPB-xFB4P2pZlVXGoCNoewGEcY3zXH4khezN6zcVr6tpc6G8dBv9EqT_v92IDSg-aXQk6ysA0cO0-6x5w1-_qU0iHGIAPsLNV9IKBoFbjc0JH6cWabldPRH12NP1trvYfqKDGQ"
|
||||
@ -280,8 +277,8 @@ async def react_app(req: Request, rest_of_path: str):
|
||||
|
||||
|
||||
@app.post("/api/announcement/dispose")
|
||||
async def dispose(data: pydantic_schemas.DisposeRequest, current_user_schema: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_user)],
|
||||
db: Annotated[Session, Depends(auth_utils.get_session)]):
|
||||
def dispose(data: pydantic_schemas.DisposeRequest, current_user_schema: Annotated[pydantic_schemas.User, Depends(auth_utils.get_current_user)],
|
||||
db: Annotated[Session, Depends(auth_utils.get_db)]):
|
||||
# Находим в бд текущего юзера
|
||||
current_user = auth_utils.get_user_by_id(db, current_user_schema.id)
|
||||
# Начисляем баллы пользователю за утилизацию
|
||||
|
||||
@ -1,55 +1,54 @@
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Annotated, Union
|
||||
import os
|
||||
|
||||
from fastapi import Depends, HTTPException, status
|
||||
from fastapi.security import OAuth2PasswordBearer
|
||||
from jose import JWTError, jwt
|
||||
from passlib.context import CryptContext
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from dotenv import load_dotenv
|
||||
|
||||
from .db import SessionLocal
|
||||
from .db import database
|
||||
from . import orm_models, pydantic_schemas
|
||||
|
||||
load_dotenv("unimportant.env")
|
||||
SECRET_KEY = os.getenv("SECRET_KEY")
|
||||
ALGORITHM = os.getenv("ALGORITHM")
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES = os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES")
|
||||
|
||||
SECRET_KEY = "651a52941cf5de14d48ef5d7af115709"
|
||||
ALGORITHM = "HS256"
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES = 1440
|
||||
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/token")
|
||||
|
||||
|
||||
async def get_session() -> AsyncSession:
|
||||
async with SessionLocal() as session:
|
||||
yield session
|
||||
def get_db():
|
||||
db = database
|
||||
try:
|
||||
yield db
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
|
||||
async def verify_password(plain_password, hashed_password):
|
||||
def verify_password(plain_password, hashed_password):
|
||||
return pwd_context.verify(plain_password, hashed_password)
|
||||
|
||||
|
||||
async def get_password_hash(password):
|
||||
def get_password_hash(password):
|
||||
return pwd_context.hash(password)
|
||||
|
||||
|
||||
async def get_user_by_nickname(db: Annotated[AsyncSession, Depends(get_session)], nickname: str):
|
||||
user_with_required_id = db.select(orm_models.User).where(orm_models.User.nickname == nickname).first()
|
||||
def get_user_by_nickname(db: Annotated[Session, Depends(get_db)], nickname: str):
|
||||
user_with_required_id = db.query(orm_models.User).filter(orm_models.User.nickname == nickname).first()
|
||||
if user_with_required_id:
|
||||
return user_with_required_id
|
||||
return None
|
||||
|
||||
|
||||
async def get_user_by_id(db: Annotated[AsyncSession, Depends(get_session)], user_id: int):
|
||||
user_with_required_id = db.select(orm_models.User).where(orm_models.User.id == user_id).first()
|
||||
def get_user_by_id(db: Annotated[Session, Depends(get_db)], user_id: int):
|
||||
user_with_required_id = db.query(orm_models.User).filter(orm_models.User.id == user_id).first()
|
||||
if user_with_required_id:
|
||||
return user_with_required_id
|
||||
return None
|
||||
|
||||
|
||||
async def authenticate_user(db: Annotated[AsyncSession, Depends(get_session)], nickname: str, password: str):
|
||||
def authenticate_user(db: Annotated[Session, Depends(get_db)], nickname: str, password: str):
|
||||
user = get_user_by_nickname(db=db, nickname=nickname)
|
||||
if not user:
|
||||
return False
|
||||
@ -58,7 +57,7 @@ async def authenticate_user(db: Annotated[AsyncSession, Depends(get_session)], n
|
||||
return user
|
||||
|
||||
|
||||
async def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None):
|
||||
def create_access_token(data: dict, expires_delta: Union[timedelta, None] = None):
|
||||
to_encode = data.copy()
|
||||
if expires_delta:
|
||||
expire = datetime.utcnow() + expires_delta
|
||||
@ -69,7 +68,7 @@ async def create_access_token(data: dict, expires_delta: Union[timedelta, None]
|
||||
return encoded_jwt
|
||||
|
||||
|
||||
async def get_current_user(db: Annotated[AsyncSession, Depends(get_session)], token: Annotated[str, Depends(oauth2_scheme)]):
|
||||
async def get_current_user(db: Annotated[Session, Depends(get_db)], token: Annotated[str, Depends(oauth2_scheme)]):
|
||||
credentials_exception = HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Could not validate credentials",
|
||||
|
||||
35
back/db.py
35
back/db.py
@ -1,21 +1,32 @@
|
||||
from asyncio import current_task
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_scoped_session, create_async_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from typing import AsyncGenerator
|
||||
|
||||
from sqlalchemy import create_engine, MetaData
|
||||
# from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
from sqlalchemy.orm import sessionmaker, DeclarativeBase
|
||||
from sqlalchemy.ext.declarative import declarative_base
|
||||
|
||||
|
||||
SQLALCHEMY_DATABASE_URL = 'postgresql+asyncpg://postgres:D560c34V112Ak@localhost/porridger'
|
||||
SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db"
|
||||
|
||||
engine = create_async_engine(SQLALCHEMY_DATABASE_URL, echo=True)
|
||||
engine = create_engine(
|
||||
SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
|
||||
)
|
||||
|
||||
SessionLocal = sessionmaker(bind=engine, class_=AsyncSession, expire_on_commit=False)
|
||||
SessionLocal = sessionmaker(bind=engine, autoflush=True, autocommit=False)
|
||||
|
||||
async_session = async_scoped_session(SessionLocal, scopefunc=current_task)
|
||||
database = SessionLocal()
|
||||
Base = declarative_base()
|
||||
|
||||
|
||||
# Создаем таблицы
|
||||
async def init_models():
|
||||
async with engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.drop_all)
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
# # add your model's MetaData object here
|
||||
# # for 'autogenerate' support
|
||||
# # in your application's model:
|
||||
|
||||
# class Base(DeclarativeBase):
|
||||
# metadata = MetaData(naming_convention={
|
||||
# "ix": "ix_%(column_0_label)s",
|
||||
# "uq": "uq_%(table_name)s_%(column_0_name)s",
|
||||
# "ck": "ck_%(table_name)s_`%(constraint_name)s`",
|
||||
# "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
|
||||
# "pk": "pk_%(table_name)s"
|
||||
# })
|
||||
@ -1,6 +0,0 @@
|
||||
from sqlalchemy import Table, MetaData, text
|
||||
from .db import engine, Base
|
||||
|
||||
tbl = Table('Poems', MetaData(), autoload_with=engine)
|
||||
tbl.drop(engine, checkfirst=False)
|
||||
a = input()
|
||||
@ -66,3 +66,24 @@ class Poems(Base):#класс поэзии
|
||||
author = Column(String) # автор стихотворения
|
||||
|
||||
|
||||
# Создаем описанные выше таблицы
|
||||
Base.metadata.create_all(bind=engine)
|
||||
|
||||
|
||||
|
||||
# from typing import AsyncGenerator
|
||||
# from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
# from fastapi_users.db import SQLAlchemyBaseUserTableUUID, SQLAlchemyUserDatabase
|
||||
# # This function can be called during the initialization of the FastAPI app.
|
||||
# async def create_db_and_tables():
|
||||
# async with engine.begin() as conn:
|
||||
# await conn.run_sync(Base.metadata.create_all)
|
||||
|
||||
|
||||
# async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
|
||||
# async with async_session_maker() as session:
|
||||
# yield session
|
||||
|
||||
|
||||
# async def get_user_db(session: AsyncSession = Depends(get_async_session)):
|
||||
# yield SQLAlchemyUserDatabase(session, User)
|
||||
@ -7,7 +7,7 @@ from .db import database
|
||||
app = Rocketry(execution="async")
|
||||
|
||||
# Create task:
|
||||
@app.task('minutely')
|
||||
@app.task('daily')
|
||||
async def daily_check():
|
||||
# Фильтруем по сроку годности
|
||||
add_poems_and_filters.check_obsolete(database, current_date=datetime.date.today())
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
TOKEN = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhU1RaZm42bHpTdURYcUttRkg1SzN5UDFhT0FxUkhTNm9OendMUExaTXhFIn0.eyJleHAiOjE3ODYyMjUzMzMsImlhdCI6MTY5MTUzMDkzMywianRpIjoiYjU0MmU3MTQtYzJkMS00NTY2LWJkY2MtYmQ5NzA0ODY1ZjgzIiwiaXNzIjoiaHR0cHM6Ly9rYy5wZXRlcnNidXJnLnJ1L3JlYWxtcy9lZ3MtYXBpIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImJjYjQ2NzljLTU3ZGItNDU5ZC1iNWUxLWRlOGI4Yzg5MTMwMyIsInR5cCI6IkJlYXJlciIsImF6cCI6ImFkbWluLXJlc3QtY2xpZW50Iiwic2Vzc2lvbl9zdGF0ZSI6IjJhOTgwMzUyLTY1M2QtNGZlZC1iMDI1LWQ1N2U0NDRjZmM3NiIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiLyoiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImRlZmF1bHQtcm9sZXMtZWdzLWFwaSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImVtYWlsIHByb2ZpbGUiLCJzaWQiOiIyYTk4MDM1Mi02NTNkLTRmZWQtYjAyNS1kNTdlNDQ0Y2ZjNzYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsIm5hbWUiOiLQktC70LDQtNC40LzQuNGAINCv0LrQvtCy0LvQtdCyIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZTBmYzc2OGRhOTA4MjNiODgwZGQzOGVhMDJjMmQ5NTciLCJnaXZlbl9uYW1lIjoi0JLQu9Cw0LTQuNC80LjRgCIsImZhbWlseV9uYW1lIjoi0K_QutC-0LLQu9C10LIifQ.FTKiC1hpWcOkmSW9QZpC-RY7Ko50jw1mDMfXIWYxlQ-zehLm2CLmOnHvYoOoI39k2OzeCIAB9ZdRrrGZc6G9Z1eFELUjNGEqKxSC1Phj9ATemKgbOKEttk-OGc-rFr9VPA8_SnfvLts6wTI2YK33YBIxCF5nCbnr4Qj3LeEQ0d6Hy8PO4ATrBF5EOeuAZRprvIEjXe_f8N9ONKckCPB-xFB4P2pZlVXGoCNoewGEcY3zXH4khezN6zcVr6tpc6G8dBv9EqT_v92IDSg-aXQk6ysA0cO0-6x5w1-_qU0iHGIAPsLNV9IKBoFbjc0JH6cWabldPRH12NP1trvYfqKDGQ"
|
||||
DOMAIN = "https://geointelect2.gate.petersburg.ru"
|
||||
SECRET_KEY = "651a52941cf5de14d48ef5d7af115709"
|
||||
ALGORITHM = "HS256"
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES = 1440
|
||||
DOMAIN = "https://geointelect2.gate.petersburg.ru"
|
||||
Loading…
x
Reference in New Issue
Block a user