From 958d658693ac99da0e83c30e58d21fafb0bffed6 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Mon, 28 Nov 2022 17:25:47 -0300 Subject: [PATCH] Run pre-commit Co-authored-by: Ezequiel Bellver Co-authored-by: Juan Barmasch --- README.md | 2 +- bsition/api/api.py | 2 +- bsition/api/components/document.py | 3 +-- bsition/api/components/table.py | 3 +-- bsition/api/components/user.py | 3 +-- bsition/backend/configure.py | 2 +- bsition/backend/elastic.py | 4 +++- bsition/backend/mongo.py | 13 ++++++++++++- bsition/backend/postgres.py | 15 ++++++++------- 9 files changed, 29 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 533bf96..7bfb5f4 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ POSTGRES_USER=root POSTGRES_PASSWORD=password ``` -En un ambiente de testeo (como es el caso) puede simplemente copiar el archivo pero, si se corriese en producción, se deberían cambiar las contraseñas. +En un ambiente de testeo (como es el caso) puede simplemente copiar el archivo pero, si se corriese en producción, se deberían cambiar las contraseñas. Debe dejar los URLs de las bases de datos como se indicaron pues así se las configuró con docker. diff --git a/bsition/api/api.py b/bsition/api/api.py index e16fd6e..2534cc6 100644 --- a/bsition/api/api.py +++ b/bsition/api/api.py @@ -2,8 +2,8 @@ from dotenv import load_dotenv from fastapi import FastAPI from bsition.api.components.document import documents_routes -from bsition.api.components.user import users_routes from bsition.api.components.table import tables_routes +from bsition.api.components.user import users_routes from bsition.api.routes.auth import auth_routes app = FastAPI() diff --git a/bsition/api/components/document.py b/bsition/api/components/document.py index cf40894..51f604c 100644 --- a/bsition/api/components/document.py +++ b/bsition/api/components/document.py @@ -4,9 +4,8 @@ from fastapi import APIRouter, Response, status from pydantic import BaseModel from pydantic.types import Optional -from bsition.backend import mongo -from bsition.backend import elastic from bsition.api.middleware.verify_token import VerifyTokenRoute +from bsition.backend import elastic, mongo documents_routes = APIRouter(route_class=VerifyTokenRoute) diff --git a/bsition/api/components/table.py b/bsition/api/components/table.py index f6287be..9c63e92 100644 --- a/bsition/api/components/table.py +++ b/bsition/api/components/table.py @@ -2,8 +2,8 @@ from fastapi import APIRouter, Response, status from pydantic import BaseModel from pydantic.utils import Optional -from bsition.backend import postgres from bsition.api.middleware.verify_token import VerifyTokenRoute +from bsition.backend import postgres tables_routes = APIRouter(route_class=VerifyTokenRoute) @@ -77,4 +77,3 @@ def add_filter(aux: Filter, name: str): @tables_routes.get("/tables/{name}/filter") def filter(name: str): return postgres.filter(name) - diff --git a/bsition/api/components/user.py b/bsition/api/components/user.py index f8e0eb3..667fd66 100644 --- a/bsition/api/components/user.py +++ b/bsition/api/components/user.py @@ -1,8 +1,8 @@ from fastapi import APIRouter, Response, status from pydantic import BaseModel -from bsition.backend import postgres from bsition.api.middleware.verify_token import VerifyTokenRoute +from bsition.backend import postgres users_routes = APIRouter() @@ -35,4 +35,3 @@ def get_by_id(id: str): def edit_user(aux: User, id: str, response: Response): postgres.edit_user(id, aux.username, aux.password) response.status_code = status.HTTP_202_ACCEPTED - diff --git a/bsition/backend/configure.py b/bsition/backend/configure.py index b5185fc..dceafef 100644 --- a/bsition/backend/configure.py +++ b/bsition/backend/configure.py @@ -1,7 +1,7 @@ from dotenv import load_dotenv -from bsition.backend.postgres import * from bsition.backend.elastic import * +from bsition.backend.postgres import * def configure(): diff --git a/bsition/backend/elastic.py b/bsition/backend/elastic.py index b7c4491..c091a93 100644 --- a/bsition/backend/elastic.py +++ b/bsition/backend/elastic.py @@ -54,6 +54,8 @@ def search(index, query): print(resp["hits"]) print(hit["_source"]) print("%(name)s: %(data)s" % hit["_source"]) - hits.append(str(hit["highlight"]) + " ---- " + "%(name)s: %(data)s" % hit["_source"]) + hits.append( + str(hit["highlight"]) + " ---- " + "%(name)s: %(data)s" % hit["_source"] + ) return hits diff --git a/bsition/backend/mongo.py b/bsition/backend/mongo.py index 4f5ae68..699c853 100644 --- a/bsition/backend/mongo.py +++ b/bsition/backend/mongo.py @@ -14,7 +14,18 @@ def get_database(): def get_documents(): dbname = get_database() docs_coll = dbname["docs"] - pipeline = [{'$project': {"id": {'$toString': "$_id"}, "_id": 0, "data": 1, "name": 1, "access": 1, "owner": 1}}] + pipeline = [ + { + "$project": { + "id": {"$toString": "$_id"}, + "_id": 0, + "data": 1, + "name": 1, + "access": 1, + "owner": 1, + } + } + ] return list(docs_coll.aggregate(pipeline)) diff --git a/bsition/backend/postgres.py b/bsition/backend/postgres.py index b4af75c..56140d1 100644 --- a/bsition/backend/postgres.py +++ b/bsition/backend/postgres.py @@ -1,7 +1,7 @@ import inspect from os import getenv -from psycopg2 import sql, connect +from psycopg2 import connect, sql def get_connection(): @@ -55,7 +55,9 @@ def edit_columns(name, columns, data, id): for column in columns: cur.execute( sql.SQL("UPDATE {table} SET {col} = %s WHERE row_number = {id}").format( - table=sql.Identifier(name), col=sql.Identifier(column), id=sql.Literal(id) + table=sql.Identifier(name), + col=sql.Identifier(column), + id=sql.Literal(id), ), [data[i]], ) @@ -255,9 +257,7 @@ def add_user(username, password): def get_users(): conn = get_connection() cur = conn.cursor() - cur.execute( - "SELECT * FROM users" - ) + cur.execute("SELECT * FROM users") return list(cur.fetchall()) @@ -296,8 +296,9 @@ def edit_user(id, username, password): print(id) cur.execute( sql.SQL("UPDATE users SET {col} = {value} WHERE id = {id}").format( - col=sql.Identifier(column), value=sql.Literal(data[i]), id=sql.Literal(id) + col=sql.Identifier(column), + value=sql.Literal(data[i]), + id=sql.Literal(id), ), ) conn.commit() -