From f3c0e24d0030354e86a6c23819e24803056c917a Mon Sep 17 00:00:00 2001 From: "milinsoft@gmail.com" Date: Sun, 12 May 2024 21:59:02 +0200 Subject: [PATCH] docker --- .pre-commit-config.yaml | 2 +- app/utils/repository.py | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8363518..ac67eb2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ --- default_language_version: - python: python3 + python: python3.11 node: "14.18.0" repos: - repo: https://github.com/pre-commit/mirrors-prettier diff --git a/app/utils/repository.py b/app/utils/repository.py index 308f465..25ca3e9 100644 --- a/app/utils/repository.py +++ b/app/utils/repository.py @@ -1,10 +1,8 @@ from abc import ABC, abstractmethod from collections.abc import Sequence -from typing import TYPE_CHECKING, Any, List, Literal +from typing import TYPE_CHECKING, Any, List from sqlalchemy import func, insert, select, update -from sqlalchemy.sql._typing import _ColumnExpressionOrStrLabelArgument -from sqlalchemy.sql.base import _NoArg if TYPE_CHECKING: from pydantic import BaseModel @@ -35,9 +33,9 @@ def get_one(self, filters=None, order_by=None) -> type["BaseModel"]: def get_all( self, filters=None, - order_by: (Literal[None, _NoArg.NO_ARG] | _ColumnExpressionOrStrLabelArgument[Any]) = None, - aggregate_func: func | None = None, - column_name: str | None = None, + order_by=None, + aggregate_func: [func, None] = None, + column_name: [str, None] = None, ) -> list[type["BaseModel"]]: raise NotImplementedError @@ -62,7 +60,7 @@ def create_multi(self, data: Sequence[dict]) -> list[type["BaseModel"]]: res = self.session.execute(stmt).scalars().all() return res - def _build_selectee(self, aggregate_function: func | None = None, column_name: str | None = None) -> Any: + def _build_selectee(self, aggregate_function: [func, None] = None, column_name: [str, None] = None) -> Any: # TODO: docstring selectee = self.model if column_name: