diff --git a/barker/.flake8 b/barker/.flake8 deleted file mode 100644 index 1e46891..0000000 --- a/barker/.flake8 +++ /dev/null @@ -1,3 +0,0 @@ -[flake8] -max-line-length = 120 -exclude = .git,__pycache__,__init__.py,.mypy_cache,.pytest_cache diff --git a/barker/.pre-commit-config.yaml b/barker/.pre-commit-config.yaml index 510a444..6a8987d 100644 --- a/barker/.pre-commit-config.yaml +++ b/barker/.pre-commit-config.yaml @@ -6,18 +6,11 @@ repos: hooks: - id: black - - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 - hooks: - - id: flake8 - args: ['--config=barker/.flake8'] - - - repo: https://github.com/timothycrosley/isort - rev: 5.12.0 - hooks: - - id: isort - additional_dependencies: [toml] - exclude: ^.*/?setup\.py$ + # - repo: https://github.com/astral-sh/ruff-pre-commit + # # Ruff version. + # rev: v0.0.286 + # hooks: + # - id: ruff - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.4.0 diff --git a/barker/barker/core/arq.py b/barker/barker/core/arq.py index 93c21c6..1e405b6 100644 --- a/barker/barker/core/arq.py +++ b/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) diff --git a/barker/barker/models/device.py b/barker/barker/models/device.py index e56b93e..4685282 100644 --- a/barker/barker/models/device.py +++ b/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: diff --git a/barker/barker/models/guest_book.py b/barker/barker/models/guest_book.py index 1458020..392550c 100644 --- a/barker/barker/models/guest_book.py +++ b/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: diff --git a/barker/barker/models/inventory.py b/barker/barker/models/inventory.py index f6da297..b4ab756 100644 --- a/barker/barker/models/inventory.py +++ b/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: diff --git a/barker/barker/models/modifier_category.py b/barker/barker/models/modifier_category.py index 45eb644..6fb48e7 100644 --- a/barker/barker/models/modifier_category.py +++ b/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: diff --git a/barker/barker/models/overview.py b/barker/barker/models/overview.py index 6ada808..299e589 100644 --- a/barker/barker/models/overview.py +++ b/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: diff --git a/barker/barker/models/product.py b/barker/barker/models/product.py index 9e1a5a4..aab3559 100644 --- a/barker/barker/models/product.py +++ b/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: diff --git a/barker/barker/models/product_version.py b/barker/barker/models/product_version.py index f6af8fd..e2d98dc 100644 --- a/barker/barker/models/product_version.py +++ b/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: diff --git a/barker/barker/models/role.py b/barker/barker/models/role.py index bf266c1..443dff6 100644 --- a/barker/barker/models/role.py +++ b/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: diff --git a/barker/barker/models/settle_option.py b/barker/barker/models/settle_option.py index 355c737..bd36dfc 100644 --- a/barker/barker/models/settle_option.py +++ b/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) diff --git a/barker/barker/models/user.py b/barker/barker/models/user.py index 1a2f3d0..d8e1a4a 100644 --- a/barker/barker/models/user.py +++ b/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: diff --git a/barker/barker/printing/bill.py b/barker/barker/printing/bill.py index 765796d..cbc7dbe 100644 --- a/barker/barker/printing/bill.py +++ b/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) diff --git a/barker/barker/printing/cashier_report.py b/barker/barker/printing/cashier_report.py index e5e2d51..6389856 100644 --- a/barker/barker/printing/cashier_report.py +++ b/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 diff --git a/barker/barker/printing/kot.py b/barker/barker/printing/kot.py index 752548d..1f87d77 100644 --- a/barker/barker/printing/kot.py +++ b/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 diff --git a/barker/barker/routers/customer.py b/barker/barker/routers/customer.py index 7311abf..1e13f02 100644 --- a/barker/barker/routers/customer.py +++ b/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 diff --git a/barker/barker/routers/customer_discount.py b/barker/barker/routers/customer_discount.py index 8fbe3f7..60cb743 100644 --- a/barker/barker/routers/customer_discount.py +++ b/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 diff --git a/barker/barker/routers/device.py b/barker/barker/routers/device.py index 44fa127..5ef3088 100644 --- a/barker/barker/routers/device.py +++ b/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 diff --git a/barker/barker/routers/guest_book.py b/barker/barker/routers/guest_book.py index ff8df79..9954294 100644 --- a/barker/barker/routers/guest_book.py +++ b/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 diff --git a/barker/barker/routers/header_footer.py b/barker/barker/routers/header_footer.py index 7e77ee0..faf00be 100644 --- a/barker/barker/routers/header_footer.py +++ b/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 diff --git a/barker/barker/routers/menu_category.py b/barker/barker/routers/menu_category.py index 1ca6ae3..529d3c3 100644 --- a/barker/barker/routers/menu_category.py +++ b/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 diff --git a/barker/barker/routers/modifier.py b/barker/barker/routers/modifier.py index 3cdd583..087a36e 100644 --- a/barker/barker/routers/modifier.py +++ b/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 diff --git a/barker/barker/routers/modifier_category.py b/barker/barker/routers/modifier_category.py index f47439f..2ef7956 100644 --- a/barker/barker/routers/modifier_category.py +++ b/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 diff --git a/barker/barker/routers/printer.py b/barker/barker/routers/printer.py index b2ce10b..c0dd080 100644 --- a/barker/barker/routers/printer.py +++ b/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 diff --git a/barker/barker/routers/product.py b/barker/barker/routers/product.py index 61f3400..bbd88c8 100644 --- a/barker/barker/routers/product.py +++ b/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 diff --git a/barker/barker/routers/regime.py b/barker/barker/routers/regime.py index 304dbe9..e58beea 100644 --- a/barker/barker/routers/regime.py +++ b/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 diff --git a/barker/barker/routers/role.py b/barker/barker/routers/role.py index c767fd0..246622b 100644 --- a/barker/barker/routers/role.py +++ b/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 diff --git a/barker/barker/routers/sale_category.py b/barker/barker/routers/sale_category.py index a8ce2c7..7f82134 100644 --- a/barker/barker/routers/sale_category.py +++ b/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 diff --git a/barker/barker/routers/section.py b/barker/barker/routers/section.py index 51708d4..65e4408 100644 --- a/barker/barker/routers/section.py +++ b/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 diff --git a/barker/barker/routers/section_printer.py b/barker/barker/routers/section_printer.py index 2ea6c8a..95d31a7 100644 --- a/barker/barker/routers/section_printer.py +++ b/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 diff --git a/barker/barker/routers/settle_option.py b/barker/barker/routers/settle_option.py index 13882b9..0b0416f 100644 --- a/barker/barker/routers/settle_option.py +++ b/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 diff --git a/barker/barker/routers/table.py b/barker/barker/routers/table.py index c55753d..c2fedc2 100644 --- a/barker/barker/routers/table.py +++ b/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 diff --git a/barker/barker/routers/tax.py b/barker/barker/routers/tax.py index 30e8c4c..1b9a9e0 100644 --- a/barker/barker/routers/tax.py +++ b/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 diff --git a/barker/barker/routers/temporal_product.py b/barker/barker/routers/temporal_product.py index 25915e3..976bf52 100644 --- a/barker/barker/routers/temporal_product.py +++ b/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 diff --git a/barker/barker/routers/user.py b/barker/barker/routers/user.py index c8bbf9f..28c82c7 100644 --- a/barker/barker/routers/user.py +++ b/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() diff --git a/barker/barker/routers/voucher/change.py b/barker/barker/routers/voucher/change.py index 02245f8..7c8713a 100644 --- a/barker/barker/routers/voucher/change.py +++ b/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 diff --git a/barker/barker/routers/voucher/merge_move.py b/barker/barker/routers/voucher/merge_move.py index 180e6f0..bfc7dc1 100644 --- a/barker/barker/routers/voucher/merge_move.py +++ b/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 diff --git a/barker/barker/routers/voucher/receive_payment.py b/barker/barker/routers/voucher/receive_payment.py index ab0478f..91e15cb 100644 --- a/barker/barker/routers/voucher/receive_payment.py +++ b/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 diff --git a/barker/barker/routers/voucher/save.py b/barker/barker/routers/voucher/save.py index 232cff0..46681fa 100644 --- a/barker/barker/routers/voucher/save.py +++ b/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 diff --git a/barker/barker/routers/voucher/split.py b/barker/barker/routers/voucher/split.py index fc39d22..bbe287e 100644 --- a/barker/barker/routers/voucher/split.py +++ b/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 diff --git a/barker/barker/routers/voucher/update.py b/barker/barker/routers/voucher/update.py index 860d6f6..9f5de4f 100644 --- a/barker/barker/routers/voucher/update.py +++ b/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 diff --git a/barker/barker/schemas/discount_item.py b/barker/barker/schemas/discount_item.py index 9312bac..b681c91 100644 --- a/barker/barker/schemas/discount_item.py +++ b/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): diff --git a/barker/barker/schemas/guest_book.py b/barker/barker/schemas/guest_book.py index cca781b..96fb40c 100644 --- a/barker/barker/schemas/guest_book.py +++ b/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 diff --git a/barker/barker/schemas/login_history.py b/barker/barker/schemas/login_history.py index 6772a6e..bbb1ad9 100644 --- a/barker/barker/schemas/login_history.py +++ b/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 diff --git a/barker/barker/schemas/role.py b/barker/barker/schemas/role.py index eaf0f37..f488632 100644 --- a/barker/barker/schemas/role.py +++ b/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): diff --git a/barker/barker/schemas/tax.py b/barker/barker/schemas/tax.py index 8bf5b0e..f407f89 100644 --- a/barker/barker/schemas/tax.py +++ b/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): diff --git a/barker/barker/schemas/user.py b/barker/barker/schemas/user.py index db0efd9..6564d87 100644 --- a/barker/barker/schemas/user.py +++ b/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 diff --git a/barker/barker/worker.py b/barker/barker/worker.py index 460e453..dfec901 100644 --- a/barker/barker/worker.py +++ b/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 diff --git a/barker/pyproject.toml b/barker/pyproject.toml index 3456517..aa1be03 100644 --- a/barker/pyproject.toml +++ b/barker/pyproject.toml @@ -7,54 +7,69 @@ authors = ["tanshu "] [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" -SQLAlchemy = "^2.0.19" +psycopg2-binary = "^2.9.7" +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] -profile = "black" -atomic = true -include_trailing_comma = true -lines_after_imports = 2 -lines_between_types = 1 -use_parentheses = true -src_paths = ["poetry", "tests"] -skip_glob = ["*/setup.py"] -filter_files = true -known_first_party = "poetry" +# Note: Ruff supports a top-level `src` option in lieu of isort's `src_paths` setting. +# src = ["barker"] +# Only allow autofix behavior for `E` and `F` rules. +fixable = ["I"] + +[tool.ruff.isort] +# include-trailing-comma = true +lines-after-imports = 2 +lines-between-types = 1 +# use-parentheses = true [tool.black] line-length = 120