Chore: Moved from isort + flake8 to ruff. There are a few formatting differences in isort and ruff

Chore: Updated dependencies

barker/.flake8

@@ -1,3 +0,0 @@
-[flake8]
-max-line-length = 120
-exclude = .git,__pycache__,__init__.py,.mypy_cache,.pytest_cache

barker/.pre-commit-config.yaml

@@ -6,18 +6,11 @@ repos:
     hooks:
       - id: black
 
-  - repo: https://github.com/PyCQA/flake8
+  # - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 6.0.0
+  #   # Ruff version.
-    hooks:
+  #   rev: v0.0.286
-      - id: flake8
+  #   hooks:
-        args: ['--config=barker/.flake8']
+  #     - id: ruff
-
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        additional_dependencies: [toml]
-        exclude: ^.*/?setup\.py$
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0

barker/barker/core/arq.py

@@ -1,5 +1,6 @@
 from arq.connections import RedisSettings
-from barker.core.config import settings as sett
+
+from .config import settings as sett
 
 
 settings = RedisSettings(host=sett.REDIS_HOST, port=sett.REDIS_PORT)

barker/barker/models/device.py

@@ -5,11 +5,11 @@ import uuid
 from datetime import datetime
 from typing import TYPE_CHECKING, List
 
-from barker.models.login_history import LoginHistory
 from sqlalchemy import Boolean, DateTime, ForeignKey, Text, Uuid, desc, text
 from sqlalchemy.orm import Mapped, Session, mapped_column, relationship
 
 from ..db.base_class import reg
+from .login_history import LoginHistory
 
 
 if TYPE_CHECKING:

barker/barker/models/guest_book.py

@@ -3,7 +3,6 @@ import uuid
 from datetime import datetime
 from typing import TYPE_CHECKING, Optional
 
-from barker.models.guest_book_type import GuestBookType
 from sqlalchemy import (
     CheckConstraint,
     DateTime,
@@ -17,6 +16,7 @@ from sqlalchemy import (
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..db.base_class import reg
+from .guest_book_type import GuestBookType
 
 
 if TYPE_CHECKING:

barker/barker/models/inventory.py

@@ -3,7 +3,6 @@ import uuid
 from decimal import Decimal
 from typing import TYPE_CHECKING, List
 
-from barker.models.product import Product
 from sqlalchemy import (
     Boolean,
     ColumnElement,
@@ -21,6 +20,7 @@ from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..db.base_class import reg
+from .product import Product
 
 
 if TYPE_CHECKING:

barker/barker/models/modifier_category.py

@@ -2,11 +2,11 @@ import uuid
 
 from typing import TYPE_CHECKING, List
 
-from barker.models.modifier_category_product import ModifierCategoryProduct
 from sqlalchemy import Boolean, Integer, Text, Uuid, text
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..db.base_class import reg
+from .modifier_category_product import ModifierCategoryProduct
 
 
 if TYPE_CHECKING:

barker/barker/models/overview.py

@@ -4,11 +4,11 @@ import uuid
 
 from typing import TYPE_CHECKING
 
-from barker.models.overview_status import OverviewStatus
 from sqlalchemy import Enum, ForeignKey, Uuid, text
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..db.base_class import reg
+from .overview_status import OverviewStatus
 
 
 if TYPE_CHECKING:

barker/barker/models/product.py

@@ -2,11 +2,11 @@ import uuid
 
 from typing import TYPE_CHECKING, List
 
-from barker.models.modifier_category_product import ModifierCategoryProduct
 from sqlalchemy import Uuid, text
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..db.base_class import reg
+from .modifier_category_product import ModifierCategoryProduct
 
 
 if TYPE_CHECKING:

barker/barker/models/product_version.py

@@ -4,7 +4,6 @@ from datetime import date
 from decimal import Decimal
 from typing import TYPE_CHECKING
 
-from barker.models.product import Product
 from sqlalchemy import (
     Boolean,
     Date,
@@ -22,6 +21,7 @@ from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..db.base_class import reg
+from .product import Product
 
 
 if TYPE_CHECKING:

barker/barker/models/role.py

@@ -2,11 +2,11 @@ import uuid
 
 from typing import TYPE_CHECKING, List
 
-from barker.models.role_permission import RolePermission
 from sqlalchemy import Text, Uuid, text
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..db.base_class import reg
+from .role_permission import RolePermission
 
 
 if TYPE_CHECKING:

barker/barker/models/settle_option.py

@@ -1,10 +1,10 @@
-from barker.models.reporting_level import ReportingLevel
-from barker.models.voucher_type import VoucherType
 from sqlalchemy import Boolean, Enum, Integer, Text
 from sqlalchemy.orm import Mapped, mapped_column
 from sqlalchemy.sql import expression
 
 from ..db.base_class import reg
+from .reporting_level import ReportingLevel
+from .voucher_type import VoucherType
 
 
 @reg.mapped_as_dataclass(unsafe_hash=True)

barker/barker/models/user.py

@@ -3,13 +3,13 @@ import uuid
 from hashlib import md5
 from typing import TYPE_CHECKING, List
 
-from barker.models.login_history import LoginHistory
-from barker.models.user_role import UserRole
 from sqlalchemy import Boolean, Index, Text, Uuid, desc, func, select, text
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import Mapped, Session, mapped_column, relationship
 
 from ..db.base_class import reg
+from .login_history import LoginHistory
+from .user_role import UserRole
 
 
 if TYPE_CHECKING:

barker/barker/printing/bill.py

@@ -8,11 +8,11 @@ from decimal import Decimal
 from typing import Dict, List, Tuple
 
 from arq import ArqRedis, create_pool
-from barker.core.config import settings
 from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import Session
 
 from ..core.arq import settings as redis_settings
+from ..core.config import settings
 from ..models.bill import Bill
 from ..models.db_setting import DbSetting
 from ..models.inventory import Inventory
@@ -118,7 +118,7 @@ def get_tax_item(id_: uuid.UUID, tax_name: str, amount: Decimal, taxes: Dict[str
             if not match or len(match.groups()) != 3:
                 raise Exception("Error in tax as it has multiple items, but the format is wrong.")
             sub_amount: Decimal = round(amount * Decimal(match.group(2)) / Decimal(match.group(3)), 2)
-            if not match.group(1) in taxes:
+            if match.group(1) not in taxes:
                 taxes[match.group(1)] = Decimal(0)
             taxes[match.group(1)] += round(sub_amount, 2)
 

barker/barker/printing/cashier_report.py

@@ -5,7 +5,6 @@ import uuid
 from datetime import datetime, timedelta
 
 from arq import ArqRedis, create_pool
-from barker.schemas.cashier_report import CashierReport
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -14,6 +13,7 @@ from ..core.config import settings
 from ..models.device import Device
 from ..models.printer import Printer
 from ..models.section_printer import SectionPrinter
+from ..schemas.cashier_report import CashierReport
 from . import currency_format
 
 

barker/barker/printing/kot.py

@@ -5,11 +5,11 @@ from datetime import timedelta
 from typing import Any
 
 from arq import ArqRedis, create_pool
-from barker.core.config import settings
 from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import Session
 
 from ..core.arq import settings as redis_settings
+from ..core.config import settings
 from ..models.inventory import Inventory
 from ..models.kot import Kot
 from ..models.printer import Printer

barker/barker/routers/customer.py

@@ -3,13 +3,13 @@ import uuid
 from decimal import Decimal
 from typing import Sequence
 
-import barker.schemas.customer as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import delete, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
+import barker.schemas.customer as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.customer import Customer

barker/barker/routers/customer_discount.py

@@ -2,12 +2,12 @@ import uuid
 
 from decimal import Decimal
 
-import barker.schemas.discount_item as schemas
-
 from fastapi import APIRouter, Security
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
+import barker.schemas.discount_item as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.customer import Customer

barker/barker/routers/device.py

@@ -1,11 +1,11 @@
 import uuid
 
-import barker.schemas.device as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import delete, select
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.device as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.device import Device

barker/barker/routers/guest_book.py

@@ -2,20 +2,20 @@ import uuid
 
 from datetime import date, datetime, timedelta
 
-import barker.schemas.guest_book as schemas
-
-from barker.models.guest_book_status import GuestBookStatus
-from barker.models.guest_book_type import GuestBookType
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import and_, desc, func, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import joinedload
 
+import barker.schemas.guest_book as schemas
+
 from ..core.config import settings
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.customer import Customer
 from ..models.guest_book import GuestBook
+from ..models.guest_book_status import GuestBookStatus
+from ..models.guest_book_type import GuestBookType
 from ..models.voucher import Voucher
 from ..schemas.user_token import UserToken
 

barker/barker/routers/header_footer.py

@@ -1,9 +1,9 @@
-import barker.schemas.header_footer as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.header_footer as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.db_setting import DbSetting

barker/barker/routers/menu_category.py

@@ -3,12 +3,12 @@ import uuid
 from datetime import date
 from operator import and_, or_
 
-import barker.schemas.menu_category as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import distinct, select, update
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.menu_category as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.menu_category import MenuCategory

barker/barker/routers/modifier.py

@@ -2,12 +2,12 @@ import uuid
 
 from decimal import Decimal
 
-import barker.schemas.modifier as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.modifier as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.modifier import Modifier

barker/barker/routers/modifier_category.py

@@ -3,20 +3,20 @@ import uuid
 from datetime import date
 from functools import reduce
 
-import barker.schemas.modifier_category as schemas
-
-from barker.schemas.product_link import ProductLink as ProductLinkSchema
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import and_, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, joinedload
 
+import barker.schemas.modifier_category as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.menu_category import MenuCategory
 from ..models.modifier_category import ModifierCategory
 from ..models.product import Product
 from ..models.product_version import ProductVersion
+from ..schemas.product_link import ProductLink as ProductLinkSchema
 from ..schemas.user_token import UserToken
 from . import effective_date
 

barker/barker/routers/printer.py

@@ -1,11 +1,11 @@
 import uuid
 
-import barker.schemas.printer as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.printer as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.printer import Printer

barker/barker/routers/product.py

@@ -3,14 +3,14 @@ import uuid
 from datetime import date, timedelta
 from decimal import Decimal
 
-import barker.schemas.product as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import and_, insert, or_, select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, joinedload
 from sqlalchemy.sql.functions import count, func
 
+import barker.schemas.product as schemas
+
 from ..core.config import settings
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture

barker/barker/routers/regime.py

@@ -1,10 +1,10 @@
-import barker.schemas.regime as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import func, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.sql.functions import count
 
+import barker.schemas.regime as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.bill import Bill

barker/barker/routers/role.py

@@ -1,13 +1,13 @@
 import uuid
 
-import barker.schemas.role as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.functions import count
 
+import barker.schemas.role as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.permission import Permission

barker/barker/routers/sale_category.py

@@ -2,13 +2,13 @@ import uuid
 
 from decimal import Decimal
 
-import barker.schemas.sale_category as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.sql.functions import count
 
+import barker.schemas.sale_category as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.product_version import ProductVersion

barker/barker/routers/section.py

@@ -1,11 +1,11 @@
 import uuid
 
-import barker.schemas.section as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import delete, select
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.section as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.section import Section

barker/barker/routers/section_printer.py

@@ -2,14 +2,14 @@ import uuid
 
 from itertools import chain
 
-import barker.schemas.section_printer as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import and_, delete, or_, select
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
+import barker.schemas.section_printer as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.sale_category import SaleCategory

barker/barker/routers/settle_option.py

@@ -1,9 +1,9 @@
-import barker.schemas.settle_option as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import func, select
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.settle_option as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.reporting_level import ReportingLevel

barker/barker/routers/table.py

@@ -2,12 +2,12 @@ import uuid
 
 from datetime import timedelta
 
-import barker.schemas.table as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import select, update
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.table as schemas
+
 from ..core.config import settings
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture

barker/barker/routers/tax.py

@@ -3,13 +3,13 @@ import uuid
 
 from decimal import Decimal
 
-import barker.schemas.tax as schemas
-
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.sql.functions import count
 
+import barker.schemas.tax as schemas
+
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.inventory import Inventory

barker/barker/routers/temporal_product.py

@@ -2,14 +2,14 @@ import uuid
 
 from datetime import date, timedelta
 
-import barker.schemas.product as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import and_, delete, distinct, or_, select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, joinedload
 from sqlalchemy.sql.functions import count, func
 
+import barker.schemas.product as schemas
+
 from ..core.config import settings
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture

barker/barker/routers/user.py

@@ -1,22 +1,23 @@
 import uuid
 
-import barker.schemas.user as schemas
-
-from barker.core.security import get_current_active_user as get_user
-from barker.db.session import SessionFuture
-from barker.models.kot import Kot
-from barker.models.login_history import LoginHistory
-from barker.models.reprint import Reprint
-from barker.models.role import Role
-from barker.models.user import User
-from barker.models.user_role import UserRole
-from barker.models.voucher import Voucher
-from barker.schemas.user_token import UserToken
 from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import delete, select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
+import barker.schemas.user as schemas
+
+from ..core.security import get_current_active_user as get_user
+from ..db.session import SessionFuture
+from ..models.kot import Kot
+from ..models.login_history import LoginHistory
+from ..models.reprint import Reprint
+from ..models.role import Role
+from ..models.user import User
+from ..models.user_role import UserRole
+from ..models.voucher import Voucher
+from ..schemas.user_token import UserToken
+
 
 router = APIRouter()
 

barker/barker/routers/voucher/change.py

@@ -1,16 +1,16 @@
 import uuid
 
-import barker.schemas.voucher as schemas
-
-from barker.models.overview_status import OverviewStatus
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
+import barker.schemas.voucher as schemas
+
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionFuture
 from ...models.overview import Overview
+from ...models.overview_status import OverviewStatus
 from ...models.reprint import Reprint
 from ...models.settle_option import SettleOption
 from ...models.voucher import Voucher

barker/barker/routers/voucher/merge_move.py

@@ -3,13 +3,13 @@ import uuid
 
 from datetime import datetime
 
-import barker.schemas.merge_move as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import delete, func, select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
+import barker.schemas.merge_move as schemas
+
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionFuture
 from ...models.bill import Bill

barker/barker/routers/voucher/receive_payment.py

@@ -1,11 +1,11 @@
 import uuid
 
-import barker.schemas.receive_payment as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import delete, select
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.receive_payment as schemas
+
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionFuture
 from ...models.overview import Overview

barker/barker/routers/voucher/save.py

@@ -4,13 +4,13 @@ import uuid
 from datetime import datetime, timedelta
 from decimal import Decimal
 
-import barker.schemas.voucher as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import and_, func, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
+import barker.schemas.voucher as schemas
+
 from ...core.config import settings
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionFuture

barker/barker/routers/voucher/split.py

@@ -4,13 +4,13 @@ from collections import defaultdict
 from datetime import datetime
 from decimal import Decimal
 
-import barker.schemas.split as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import delete, func, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
+import barker.schemas.split as schemas
+
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionFuture
 from ...models.inventory import Inventory

barker/barker/routers/voucher/update.py

@@ -3,12 +3,12 @@ import uuid
 from datetime import datetime, timedelta
 from decimal import Decimal
 
-import barker.schemas.voucher as schemas
-
 from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import and_, func, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 
+import barker.schemas.voucher as schemas
+
 from ...core.config import settings
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionFuture

barker/barker/schemas/discount_item.py

@@ -1,9 +1,8 @@
 import uuid
 
-from barker.schemas import to_camel
 from pydantic import BaseModel, ConfigDict, Field
 
-from . import Daf
+from . import Daf, to_camel
 
 
 class DiscountItem(BaseModel):

barker/barker/schemas/guest_book.py

@@ -2,7 +2,6 @@ import uuid
 
 from datetime import date, datetime
 
-from barker.models.guest_book_status import GuestBookStatus
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -12,6 +11,7 @@ from pydantic import (
     model_validator,
 )
 
+from ..models.guest_book_status import GuestBookStatus
 from . import to_camel
 
 

barker/barker/schemas/login_history.py

@@ -2,9 +2,10 @@ import uuid
 
 from datetime import datetime
 
-from barker.schemas import to_camel
 from pydantic import BaseModel, ConfigDict
 
+from . import to_camel
+
 
 class LoginHistory(BaseModel):
     id_: uuid.UUID

barker/barker/schemas/role.py

@@ -1,9 +1,9 @@
 import uuid
 
-from barker.schemas.permission import PermissionItem
 from pydantic import BaseModel, ConfigDict, Field
 
 from . import to_camel
+from .permission import PermissionItem
 
 
 class RoleIn(BaseModel):

barker/barker/schemas/tax.py

@@ -1,9 +1,9 @@
 import uuid
 
-from barker.schemas.regime import RegimeLink
 from pydantic import BaseModel, ConfigDict, Field
 
 from . import Daf, to_camel
+from .regime import RegimeLink
 
 
 class TaxIn(BaseModel):

barker/barker/schemas/user.py

@@ -2,10 +2,11 @@ import uuid
 
 from datetime import datetime
 
-from barker.schemas import to_camel
-from barker.schemas.role import RoleItem
 from pydantic import BaseModel, ConfigDict, field_serializer
 
+from . import to_camel
+from .role import RoleItem
+
 
 class UserIn(BaseModel):
     name: str

barker/barker/worker.py

@@ -1,6 +1,7 @@
 import sys
 
 from aiohttp import ClientSession
+
 from barker.core.arq import settings
 from barker.core.config import settings as sett
 from barker.tasks.printing import sent_to_printer

barker/pyproject.toml

@@ -7,54 +7,69 @@ authors = ["tanshu <git@tanshu.com>"]
 [tool.poetry.dependencies]
 python = "^3.11"
 uvicorn = {extras = ["standard"], version = "^0.21.1"}
-fastapi = {extras = ["all"], version = "^0.101.1"}
+fastapi = {extras = ["all"], version = "^0.103.0"}
 python-jose = {extras = ["cryptography"], version = "^3.3.0"}
 passlib = {extras = ["bcrypt"], version = "^1.7.4"}
-psycopg2-binary = "^2.9.6"
+psycopg2-binary = "^2.9.7"
-SQLAlchemy = "^2.0.19"
+SQLAlchemy = "^2.0.20"
 python-multipart = "^0.0.6"
 PyJWT = "^2.8.0"
-alembic = "^1.11.1"
+alembic = "^1.11.3"
 itsdangerous = "^2.1.2"
 python-dotenv = "^1.0.0"
-pydantic = {extras = ["dotenv"], version = "^2.1.1"}
+pydantic = {extras = ["dotenv"], version = "^2.3.0"}
 starlette = "^0.27.0"
 arq = "^0.25.0"
 aiohttp = "^3.8.5"
-cryptography = "^41.0.2"
+cryptography = "^41.0.3"
 gunicorn = "^21.2.0"
 
-[tool.poetry.dev-dependencies]
-flake8 = "^6.0.0"
-black = "^23.7.0"
-isort = {extras = ["toml"], version = "^5.12.0"}
-pre-commit = "^3.3.3"
-mypy = "^1.4.1"
-types-python-jose = "^3.3.4.8"
-
 [tool.poetry.group.dev.dependencies]
+# flake8 = "^6.1.0"
+black = "^23.7.0"
+# isort = {extras = ["toml"], version = "^5.12.0"}
+pre-commit = "^3.3.3"
+mypy = "^1.5.1"
+types-python-jose = "^3.3.4.8"
 tomli = "^2.0.1"
+ruff = "^0.0.286"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
-line-length = 120
 # Assume Python 3.11.
 target-version = "py311"
+line-length = 120
+exclude = [
+    ".git",
+    "__pycache__",
+    "__init__.py",
+    ".mypy_cache",
+    ".pytest_cache",
+]
+ignore = []
+select = [
+    # Pyflakes
+    "F",
+    # Pycodestyle
+    "E",
+    "W",
+    # isort
+    "I001"
+]
 
-[tool.isort]
+# Note: Ruff supports a top-level `src` option in lieu of isort's `src_paths` setting.
-profile = "black"
+# src = ["barker"]
-atomic = true
+# Only allow autofix behavior for `E` and `F` rules.
-include_trailing_comma = true
+fixable = ["I"]
-lines_after_imports = 2
+
-lines_between_types = 1
+[tool.ruff.isort]
-use_parentheses = true
+# include-trailing-comma = true
-src_paths = ["poetry", "tests"]
+lines-after-imports = 2
-skip_glob = ["*/setup.py"]
+lines-between-types = 1
-filter_files = true
+# use-parentheses = true
-known_first_party = "poetry"
 
 [tool.black]
 line-length = 120