Skip to content

Commit

Permalink
Add isort dev tool
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman505050 committed Dec 11, 2024
1 parent c98bcc1 commit e13860a
Show file tree
Hide file tree
Showing 51 changed files with 193 additions and 174 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ci_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ jobs:
- name: Lint with flake8
run: |
# Run flake8 to lint the code
poetry run flake8 src --max-line-length=79 --exclude='src/core/infrastructure/database/migrations/*'
poetry run flake8 src --max-line-length=79 --exclude='src/core/infrastructure/database/migrations/*'\
- name: Check formatting code with black
run: |
poetry run black --check .
# - name: Test with unittest
# run: |
Expand Down
16 changes: 15 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ alembic = "^1.14.0"
black = "^24.10.0"
mypy = "^1.13.0"
flake8 = "^7.1.1"
isort = "^5.13.2"

[tool.isort]
profile = "black"
include_trailing_comma = true
lines_after_imports = 2
line_length = 79
skip = [
"src/core/infrastructure/database/migrations/versions",
".venv",
"venv"
]

[build-system]
requires = ["poetry-core"]
Expand Down
4 changes: 3 additions & 1 deletion src/config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from dotenv import load_dotenv
import os

from dotenv import load_dotenv


load_dotenv()

# Load environment variables
Expand Down
3 changes: 2 additions & 1 deletion src/core/application/transaction/dto/category.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from pydantic import BaseModel, Field
from uuid import UUID

from pydantic import BaseModel, Field

from core.domain.transaction.entities.category import CategoryEntity


Expand Down
5 changes: 3 additions & 2 deletions src/core/application/transaction/dto/currency.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from pydantic import BaseModel, Field, StringConstraints
from pydantic_core import PydanticCustomError
from typing import Annotated
from uuid import UUID

from pydantic import BaseModel, Field, StringConstraints
from pydantic_core import PydanticCustomError

from core.domain.transaction.entities.currency import CurrencyEntity
from core.shared.utils import custom_error_msg

Expand Down
3 changes: 2 additions & 1 deletion src/core/application/transaction/dto/operation.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from pydantic import BaseModel, Field
from uuid import UUID

from pydantic import BaseModel, Field

from core.domain.transaction.entities.operation import OperationEntity
from core.domain.transaction.enums.operation import OperationType

Expand Down
7 changes: 4 additions & 3 deletions src/core/application/transaction/dto/transaction.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from pydantic import BaseModel, Field
from uuid import UUID
from decimal import Decimal
import datetime
from decimal import Decimal
from uuid import UUID

from pydantic import BaseModel, Field

from core.domain.transaction.entities.transaction import TransactionEntity
from core.domain.transaction.enums.operation import OperationType
Expand Down
4 changes: 2 additions & 2 deletions src/core/application/transaction/use_cases/category/create.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from uuid import uuid4

from core.domain.transaction.entities.category import CategoryEntity
from core.domain.transaction.repositories.category import ICategoryRepository
from core.application.transaction.dto.category import (
CategoryDTO,
CreateCategoryDTO,
)
from core.domain.transaction.entities.category import CategoryEntity
from core.domain.transaction.repositories.category import ICategoryRepository
from core.domain.transaction.repositories.operation import IOperationRepository


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
from core.application.transaction.dto.currency import (
CurrencyDTO,
)
from core.application.transaction.dto.currency import CurrencyDTO
from core.domain.transaction.repositories.currency import ICurrencyRepository


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
from core.application.transaction.dto.operation import (
OperationDTO,
)
from core.application.transaction.dto.operation import OperationDTO
from core.domain.transaction.repositories.operation import IOperationRepository


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
TransactionDTO,
)
from core.domain.transaction.entities.transaction import TransactionEntity
from core.domain.transaction.repositories.category import ICategoryRepository
from core.domain.transaction.repositories.currency import ICurrencyRepository
from core.domain.transaction.repositories.transaction import (
ITransactionRepository,
)
from core.domain.transaction.repositories.category import ICategoryRepository
from core.domain.transaction.repositories.currency import ICurrencyRepository
from core.domain.transaction.value_objects.money import Money


Expand Down
3 changes: 2 additions & 1 deletion src/core/application/user/dto/role.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from pydantic import BaseModel
from uuid import UUID

from pydantic import BaseModel

from core.domain.user.entities.role import RoleEntity


Expand Down
3 changes: 2 additions & 1 deletion src/core/application/user/dto/user.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from pydantic import BaseModel, EmailStr, SecretStr, Field
from uuid import UUID

from pydantic import BaseModel, EmailStr, Field, SecretStr

from core.application.user.dto.role import RoleDTO
from core.domain.user.entities.user import UserEntity

Expand Down
5 changes: 3 additions & 2 deletions src/core/application/user/use_cases/get_user.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from pydantic import ValidationError
from loguru import logger
from uuid import UUID

from loguru import logger
from pydantic import ValidationError

from core.application.user.dto.user import UserDTO
from core.domain.user.repositories.user import IUserRepository

Expand Down
2 changes: 1 addition & 1 deletion src/core/application/user/use_cases/login.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from pydantic import ValidationError
from loguru import logger
from pydantic import ValidationError

from core.application.user.dto.user import LoginUserDTO, UserDTO
from core.application.user.exceptions.invalid_credentials import (
Expand Down
6 changes: 3 additions & 3 deletions src/core/application/user/use_cases/register.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from email_validator import validate_email, EmailNotValidError
from pydantic import ValidationError
from email_validator import EmailNotValidError, validate_email
from loguru import logger
from pydantic import ValidationError

from core.application.user.dto.user import RegisterUserDTO, UserDTO
from core.application.user.factories.user import UserFactory
from core.domain.user.entities.role import RoleEntity
from core.domain.user.exceptions import UserAlreadyExistsException
from core.domain.user.repositories.user import IUserRepository
from core.domain.user.repositories.role import IRoleRepository
from core.domain.user.repositories.user import IUserRepository
from core.shared.exceptions import NotFoundException


Expand Down
2 changes: 1 addition & 1 deletion src/core/domain/transaction/entities/currency.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import re
from dataclasses import dataclass
from uuid import UUID
import re


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion src/core/domain/transaction/entities/transaction.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import datetime
from dataclasses import dataclass
from uuid import UUID
import datetime

from core.domain.transaction.entities.category import CategoryEntity
from core.domain.transaction.value_objects.money import Money
Expand Down
25 changes: 13 additions & 12 deletions src/core/domain/transaction/exceptions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
from core.domain.transaction.exceptions.operation.delete import (
OperationNotDeletableException,
)
from core.domain.transaction.exceptions.operation.already_exist import (
OperationAlreadyExistException,
)
from core.domain.transaction.exceptions.category.already_exist import (
CategoryAlreadyExistException,
)
from core.domain.transaction.exceptions.category.delete import (
CategoryNotDeletableException,
)
from core.domain.transaction.exceptions.operation.not_found import (
OperationNotFoundException,
)
from core.domain.transaction.exceptions.category.not_found import (
CategoryNotFoundException,
)
from core.domain.transaction.exceptions.currency.not_found import (
CurrencyNotFoundException,
)
from core.domain.transaction.exceptions.currency.already_exist import (
CurrencyAlreadyExistException,
)
from core.domain.transaction.exceptions.currency.delete import (
CurrencyNotDeletableException,
)
from core.domain.transaction.exceptions.currency.not_found import (
CurrencyNotFoundException,
)
from core.domain.transaction.exceptions.operation.already_exist import (
OperationAlreadyExistException,
)
from core.domain.transaction.exceptions.operation.delete import (
OperationNotDeletableException,
)
from core.domain.transaction.exceptions.operation.not_found import (
OperationNotFoundException,
)
from core.domain.transaction.exceptions.transaction.not_found import (
TransactionNotFoundException,
)


__all__ = (
"OperationNotFoundException",
"OperationAlreadyExistException",
Expand Down
2 changes: 1 addition & 1 deletion src/core/domain/transaction/value_objects/data_range.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
import datetime
from dataclasses import dataclass


@dataclass(frozen=True)
Expand Down
2 changes: 1 addition & 1 deletion src/core/domain/user/entities/user.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import re
from dataclasses import dataclass
from uuid import UUID
import re

from core.domain.user.entities.role import RoleEntity

Expand Down
5 changes: 3 additions & 2 deletions src/core/domain/user/exceptions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from core.domain.user.exceptions.user_not_found import UserNotFoundException
from core.domain.user.exceptions.role_not_found import RoleNotFoundException
from core.domain.user.exceptions.user_already_exsist import (
UserAlreadyExistsException,
)
from core.domain.user.exceptions.role_not_found import RoleNotFoundException
from core.domain.user.exceptions.user_not_found import UserNotFoundException


__all__ = (
"UserNotFoundException",
Expand Down
7 changes: 4 additions & 3 deletions src/core/infrastructure/database/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from core.infrastructure.database.models.base import Base
from core.infrastructure.database.models.user import User
from core.infrastructure.database.models.role import Role
from core.infrastructure.database.models.user_roles import UserRoles
from core.infrastructure.database.models.category import Category
from core.infrastructure.database.models.currency import Currency
from core.infrastructure.database.models.operation import Operation
from core.infrastructure.database.models.role import Role
from core.infrastructure.database.models.transaction import Transaction
from core.infrastructure.database.models.user import User
from core.infrastructure.database.models.user_roles import UserRoles


__all__ = (
"Base",
Expand Down
3 changes: 1 addition & 2 deletions src/core/infrastructure/database/core.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from sqlalchemy.ext.asyncio import (
AsyncSession,
async_sessionmaker,
create_async_engine,
AsyncSession,
)
from sqlalchemy.pool import NullPool


from config import POSTGRES_URI


Expand Down
5 changes: 3 additions & 2 deletions src/core/infrastructure/database/migrations/env.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import asyncio
from logging.config import fileConfig

from alembic import context
from sqlalchemy import pool
from sqlalchemy.engine import Connection
from sqlalchemy.ext.asyncio import async_engine_from_config

from alembic import context

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
Expand All @@ -16,12 +16,13 @@
if config.config_file_name is not None:
fileConfig(config.config_file_name)

from config import POSTGRES_URI

# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
from core.infrastructure.database.models.base import Base
from config import POSTGRES_URI


target_metadata = Base.metadata
Expand Down
8 changes: 4 additions & 4 deletions src/core/infrastructure/database/models/base.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from sqlalchemy import DateTime, func
from sqlalchemy.orm import mapped_column, DeclarativeBase

from typing import Annotated
import datetime
from typing import Annotated

from sqlalchemy import DateTime, func
from sqlalchemy.orm import DeclarativeBase, mapped_column


class Base(DeclarativeBase):
Expand Down
9 changes: 4 additions & 5 deletions src/core/infrastructure/database/models/category.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from sqlalchemy import String, ForeignKey, UniqueConstraint
from uuid import UUID, uuid4

from sqlalchemy import ForeignKey, String, UniqueConstraint
from sqlalchemy.dialects.postgresql import UUID as PgUUID
from sqlalchemy.orm import Mapped, mapped_column, relationship
from sqlalchemy.dialects.postgresql import (
UUID as PgUUID,
)
from uuid import uuid4, UUID

from core.domain.transaction.entities.category import CategoryEntity
from core.infrastructure.database.models.base import (
Expand Down
7 changes: 3 additions & 4 deletions src/core/infrastructure/database/models/currency.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from uuid import UUID, uuid4

from sqlalchemy import String
from sqlalchemy.dialects.postgresql import UUID as PgUUID
from sqlalchemy.orm import Mapped, mapped_column
from sqlalchemy.dialects.postgresql import (
UUID as PgUUID,
)
from uuid import uuid4, UUID

from core.domain.transaction.entities.currency import CurrencyEntity
from core.infrastructure.database.models.base import (
Expand Down
Loading

0 comments on commit e13860a

Please sign in to comment.