From 6d3c0ee39e2661c6840d6eedb8d90b114e7997fb Mon Sep 17 00:00:00 2001 From: Untone Date: Mon, 19 Feb 2024 14:45:55 +0300 Subject: [PATCH] isort+authfix --- main.py | 3 +-- orm/rating.py | 1 - pyproject.toml | 49 ++++++++++++++++++++++++++++++++++++++++++ resolvers/__init__.py | 1 - resolvers/author.py | 1 - resolvers/community.py | 1 - resolvers/editor.py | 3 +-- resolvers/follower.py | 1 - resolvers/reaction.py | 3 +-- resolvers/reader.py | 1 - resolvers/topic.py | 1 - server.py | 1 - services/auth.py | 5 +++-- services/db.py | 2 +- services/rediscache.py | 1 - services/search.py | 1 - services/viewed.py | 8 +------ settings.py | 1 - 18 files changed, 57 insertions(+), 27 deletions(-) diff --git a/main.py b/main.py index fb68cd3f..2582cbd9 100644 --- a/main.py +++ b/main.py @@ -8,13 +8,12 @@ from starlette.applications import Starlette from starlette.routing import Route from services.rediscache import redis +from services.schema import resolvers from services.search import search_service from services.sentry import start_sentry from services.viewed import ViewedStorage from services.webhook import WebhookEndpoint from settings import DEV_SERVER_PID_FILE_NAME, MODE -from services.schema import resolvers - import_module('resolvers') schema = make_executable_schema(load_schema_from_path('schema/'), resolvers) diff --git a/orm/rating.py b/orm/rating.py index 765f33b6..eebaad90 100644 --- a/orm/rating.py +++ b/orm/rating.py @@ -1,6 +1,5 @@ from orm.reaction import ReactionKind - RATING_REACTIONS = [ ReactionKind.LIKE.value, ReactionKind.ACCEPT.value, diff --git a/pyproject.toml b/pyproject.toml index a161dc7a..e6d4437d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,56 @@ dogpile-cache = "^1.3.1" [tool.poetry.group.dev.dependencies] ruff = "^0.2.1" +isort = "^5.13.2" +pyright = "^1.1.350" [build-system] requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" + +[tool.isort] +multi_line_output = 3 +include_trailing_comma = true +force_grid_wrap = 0 +use_parentheses = true +ensure_newline_before_comments = true +line_length = 120 + +[tool.ruff] +select = ["E4", "E7", "E9", "F"] +ignore = [] +line-length = 120 +target-version = "py312" + +[tool.pyright] +venvPath = "." +venv = ".venv" +include = ["."] +useLibraryCodeForTypes = false +disableLanguageServices = false +disableOrganizeImports = false +reportMissingImports = true +reportMissingModuleSource = "warning" +reportImportCycles = "warning" +maxMemoryForLargeFile = 4096 +pythonVersion = "3.12" +autoImportCompletions = true +useVirtualEnv = true +typeCheckingMode = "basic" +disableJediCompletion = true +disableCompletion = false +disableSnippetCompletion = false +disableGoToDefinition = false +disableRenaming = false +disableSignatureHelp = false +diagnostics = true +logLevel = "debug" +pluginSearchPaths = [] +typings = {} +mergeTypeStubPackages = false + +[tool.pytest.ini_options] +pythonpath = ["tests"] + +[tool.pytest] +python_files = "*_test.py" diff --git a/resolvers/__init__.py b/resolvers/__init__.py index 9237f6e3..112c5232 100644 --- a/resolvers/__init__.py +++ b/resolvers/__init__.py @@ -29,7 +29,6 @@ from resolvers.reader import ( ) from resolvers.topic import get_topic, get_topics_all, get_topics_by_author, get_topics_by_community - __all__ = [ # author 'get_author', diff --git a/resolvers/author.py b/resolvers/author.py index a9a45af3..9e942cb4 100644 --- a/resolvers/author.py +++ b/resolvers/author.py @@ -19,7 +19,6 @@ from services.schema import mutation, query from services.unread import get_total_unread_counter from services.viewed import ViewedStorage - logging.basicConfig() logger = logging.getLogger('\t[resolvers.author]\t') logger.setLevel(logging.DEBUG) diff --git a/resolvers/community.py b/resolvers/community.py index 80142034..b304bedd 100644 --- a/resolvers/community.py +++ b/resolvers/community.py @@ -9,7 +9,6 @@ from orm.shout import ShoutCommunity from services.db import local_session from services.schema import query - logger = logging.getLogger('\t[resolvers.community]\t') logger.setLevel(logging.DEBUG) diff --git a/resolvers/editor.py b/resolvers/editor.py index 22f6888b..5c3f812b 100644 --- a/resolvers/editor.py +++ b/resolvers/editor.py @@ -5,11 +5,11 @@ from sqlalchemy import and_, select from sqlalchemy.orm import joinedload from orm.author import Author +from orm.rating import is_negative, is_positive from orm.reaction import Reaction, ReactionKind from orm.shout import Shout, ShoutAuthor, ShoutTopic from orm.topic import Topic from resolvers.follower import reactions_follow, reactions_unfollow -from orm.rating import is_negative, is_positive from services.auth import login_required from services.db import local_session from services.diff import apply_diff, get_diff @@ -17,7 +17,6 @@ from services.notify import notify_shout from services.schema import mutation, query from services.search import search_service - logger = logging.getLogger('[resolver.editor]') logger.setLevel(logging.DEBUG) diff --git a/resolvers/follower.py b/resolvers/follower.py index 4e865e03..63e5d601 100644 --- a/resolvers/follower.py +++ b/resolvers/follower.py @@ -16,7 +16,6 @@ from services.db import local_session from services.notify import notify_follower from services.schema import mutation, query - logging.basicConfig() logger = logging.getLogger('\t[resolvers.reaction]\t') logger.setLevel(logging.DEBUG) diff --git a/resolvers/reaction.py b/resolvers/reaction.py index 4a8f0f20..3bddc8c3 100644 --- a/resolvers/reaction.py +++ b/resolvers/reaction.py @@ -7,8 +7,8 @@ from sqlalchemy.orm import aliased, joinedload from sqlalchemy.sql import union from orm.author import Author -from orm.reaction import Reaction, ReactionKind from orm.rating import RATING_REACTIONS, is_negative, is_positive +from orm.reaction import Reaction, ReactionKind from orm.shout import Shout from resolvers.editor import handle_proposing from resolvers.follower import reactions_follow @@ -18,7 +18,6 @@ from services.notify import notify_reaction from services.schema import mutation, query from services.viewed import ViewedStorage - logger = logging.getLogger('\t[resolvers.reaction]\t') logger.setLevel(logging.DEBUG) diff --git a/resolvers/reader.py b/resolvers/reader.py index c78f977c..4309bbeb 100644 --- a/resolvers/reader.py +++ b/resolvers/reader.py @@ -17,7 +17,6 @@ from services.schema import query from services.search import search_text from services.viewed import ViewedStorage - logger = logging.getLogger('[resolvers.reader] ') logger.setLevel(logging.DEBUG) diff --git a/resolvers/topic.py b/resolvers/topic.py index c9e83c3a..6074dbd8 100644 --- a/resolvers/topic.py +++ b/resolvers/topic.py @@ -11,7 +11,6 @@ from services.db import local_session from services.schema import mutation, query from services.viewed import ViewedStorage - logger = logging.getLogger('\t[resolvers.topic]\t') logger.setLevel(logging.DEBUG) diff --git a/server.py b/server.py index e33cdbe4..b33c8c91 100644 --- a/server.py +++ b/server.py @@ -1,7 +1,6 @@ from granian.constants import Interfaces from granian.server import Granian - if __name__ == '__main__': print('[server] started') diff --git a/services/auth.py b/services/auth.py index d0a26b13..3abd2731 100644 --- a/services/auth.py +++ b/services/auth.py @@ -45,8 +45,9 @@ def cache_auth_request(f): cache_key = auth_cache_key(req) result = region.get(cache_key) if result is None: - result = await f(*args, **kwargs) - region.set(cache_key, result) + [user_id, user_roles] = await f(*args, **kwargs) + if user_id: + region.set(cache_key, [user_id, user_roles]) return result return decorated_function diff --git a/services/db.py b/services/db.py index 06a84fc5..3dcbd962 100644 --- a/services/db.py +++ b/services/db.py @@ -1,6 +1,6 @@ -from functools import wraps import logging import time +from functools import wraps from typing import Any, Callable, Dict, TypeVar from dogpile.cache import make_region diff --git a/services/rediscache.py b/services/rediscache.py index 129213aa..661b1dc7 100644 --- a/services/rediscache.py +++ b/services/rediscache.py @@ -4,7 +4,6 @@ import redis.asyncio as aredis from settings import REDIS_URL - logger = logging.getLogger('[services.redis] ') logger.setLevel(logging.DEBUG) diff --git a/services/search.py b/services/search.py index 87dd3c4f..95f939f0 100644 --- a/services/search.py +++ b/services/search.py @@ -7,7 +7,6 @@ from opensearchpy import OpenSearch from services.rediscache import redis - os_logger = logging.getLogger(name='opensearch') os_logger.setLevel(logging.INFO) logger = logging.getLogger('\t[services.search]\t') diff --git a/services/viewed.py b/services/viewed.py index fb824a9d..cad4e6b7 100644 --- a/services/viewed.py +++ b/services/viewed.py @@ -8,19 +8,13 @@ from typing import Dict # ga from google.analytics.data_v1beta import BetaAnalyticsDataClient -from google.analytics.data_v1beta.types import ( - DateRange, - Dimension, - Metric, - RunReportRequest, -) +from google.analytics.data_v1beta.types import DateRange, Dimension, Metric, RunReportRequest from orm.author import Author from orm.shout import Shout, ShoutAuthor, ShoutTopic from orm.topic import Topic from services.db import local_session - # Настройка журналирования logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger('\t[services.viewed]\t') diff --git a/settings.py b/settings.py index 1615f6c4..2fb628c1 100644 --- a/settings.py +++ b/settings.py @@ -1,7 +1,6 @@ import sys from os import environ - PORT = 8080 DB_URL = ( environ.get('DATABASE_URL', '').replace('postgres://', 'postgresql://')