From b62bf1bcca6192efb917acc77dc8fdcc7b245e2e Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Tue, 15 Aug 2023 06:38:19 +0530 Subject: [PATCH] Chore: Refactored import of BaseModel from pydantic --- brewman/brewman/schemas/balance_sheet.py | 2 +- brewman/brewman/schemas/batch_integrity.py | 2 +- brewman/brewman/schemas/cash_flow.py | 2 +- brewman/brewman/schemas/client.py | 2 +- brewman/brewman/schemas/closing_stock.py | 2 +- brewman/brewman/schemas/daybook.py | 2 +- brewman/brewman/schemas/ledger.py | 2 +- brewman/brewman/schemas/message.py | 2 +- brewman/brewman/schemas/net_transactions.py | 2 +- brewman/brewman/schemas/non_contract_purchase.py | 2 +- brewman/brewman/schemas/permission.py | 3 +-- brewman/brewman/schemas/product_ledger.py | 2 +- brewman/brewman/schemas/profit_loss.py | 2 +- brewman/brewman/schemas/purchase_entries.py | 2 +- brewman/brewman/schemas/purchases.py | 2 +- brewman/brewman/schemas/raw_material_cost.py | 2 +- brewman/brewman/schemas/recipe_template.py | 2 +- brewman/brewman/schemas/reconcile.py | 2 +- brewman/brewman/schemas/role.py | 3 +-- brewman/brewman/schemas/stock_movement.py | 2 +- brewman/brewman/schemas/trial_balance.py | 2 +- brewman/brewman/schemas/user.py | 2 +- 22 files changed, 22 insertions(+), 24 deletions(-) diff --git a/brewman/brewman/schemas/balance_sheet.py b/brewman/brewman/schemas/balance_sheet.py index ad5e6230..ac542435 100644 --- a/brewman/brewman/schemas/balance_sheet.py +++ b/brewman/brewman/schemas/balance_sheet.py @@ -2,12 +2,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/batch_integrity.py b/brewman/brewman/schemas/batch_integrity.py index 939188bd..742edb40 100644 --- a/brewman/brewman/schemas/batch_integrity.py +++ b/brewman/brewman/schemas/batch_integrity.py @@ -4,12 +4,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/cash_flow.py b/brewman/brewman/schemas/cash_flow.py index f7afd091..4c10531b 100644 --- a/brewman/brewman/schemas/cash_flow.py +++ b/brewman/brewman/schemas/cash_flow.py @@ -2,12 +2,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/client.py b/brewman/brewman/schemas/client.py index 7d8076c4..70720d06 100644 --- a/brewman/brewman/schemas/client.py +++ b/brewman/brewman/schemas/client.py @@ -3,12 +3,12 @@ import uuid from datetime import datetime from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/closing_stock.py b/brewman/brewman/schemas/closing_stock.py index 25f3b01c..c4884c21 100644 --- a/brewman/brewman/schemas/closing_stock.py +++ b/brewman/brewman/schemas/closing_stock.py @@ -4,12 +4,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel from .cost_centre import CostCentreLink diff --git a/brewman/brewman/schemas/daybook.py b/brewman/brewman/schemas/daybook.py index 2ca78027..050f5498 100644 --- a/brewman/brewman/schemas/daybook.py +++ b/brewman/brewman/schemas/daybook.py @@ -4,12 +4,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/ledger.py b/brewman/brewman/schemas/ledger.py index a8d8d72e..2af5b687 100644 --- a/brewman/brewman/schemas/ledger.py +++ b/brewman/brewman/schemas/ledger.py @@ -4,12 +4,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel from .account import AccountLink diff --git a/brewman/brewman/schemas/message.py b/brewman/brewman/schemas/message.py index 1b78abd2..8b65c800 100644 --- a/brewman/brewman/schemas/message.py +++ b/brewman/brewman/schemas/message.py @@ -1,4 +1,4 @@ -from pydantic.main import BaseModel +from pydantic import BaseModel class Message(BaseModel): diff --git a/brewman/brewman/schemas/net_transactions.py b/brewman/brewman/schemas/net_transactions.py index d47286b9..a5d7d905 100644 --- a/brewman/brewman/schemas/net_transactions.py +++ b/brewman/brewman/schemas/net_transactions.py @@ -2,12 +2,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/non_contract_purchase.py b/brewman/brewman/schemas/non_contract_purchase.py index a2564ba1..d5a003e3 100644 --- a/brewman/brewman/schemas/non_contract_purchase.py +++ b/brewman/brewman/schemas/non_contract_purchase.py @@ -2,12 +2,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/permission.py b/brewman/brewman/schemas/permission.py index c7b2e28b..7e0c05d5 100644 --- a/brewman/brewman/schemas/permission.py +++ b/brewman/brewman/schemas/permission.py @@ -1,8 +1,7 @@ import uuid from brewman.schemas import to_camel -from pydantic import ConfigDict -from pydantic.main import BaseModel +from pydantic import BaseModel, ConfigDict class PermissionItem(BaseModel): diff --git a/brewman/brewman/schemas/product_ledger.py b/brewman/brewman/schemas/product_ledger.py index 8884d3c2..855a3e8f 100644 --- a/brewman/brewman/schemas/product_ledger.py +++ b/brewman/brewman/schemas/product_ledger.py @@ -4,12 +4,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel from .product import ProductLink diff --git a/brewman/brewman/schemas/profit_loss.py b/brewman/brewman/schemas/profit_loss.py index 21f690e4..f66fab3f 100644 --- a/brewman/brewman/schemas/profit_loss.py +++ b/brewman/brewman/schemas/profit_loss.py @@ -2,12 +2,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/purchase_entries.py b/brewman/brewman/schemas/purchase_entries.py index 3729dc2b..403954b5 100644 --- a/brewman/brewman/schemas/purchase_entries.py +++ b/brewman/brewman/schemas/purchase_entries.py @@ -2,12 +2,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/purchases.py b/brewman/brewman/schemas/purchases.py index d2909bf4..30e840e1 100644 --- a/brewman/brewman/schemas/purchases.py +++ b/brewman/brewman/schemas/purchases.py @@ -2,12 +2,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/raw_material_cost.py b/brewman/brewman/schemas/raw_material_cost.py index 888bc7ef..65176d78 100644 --- a/brewman/brewman/schemas/raw_material_cost.py +++ b/brewman/brewman/schemas/raw_material_cost.py @@ -4,12 +4,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/recipe_template.py b/brewman/brewman/schemas/recipe_template.py index e01727aa..1c23f31d 100644 --- a/brewman/brewman/schemas/recipe_template.py +++ b/brewman/brewman/schemas/recipe_template.py @@ -3,12 +3,12 @@ import uuid from datetime import date, datetime from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/reconcile.py b/brewman/brewman/schemas/reconcile.py index 5a63dab3..3574da38 100644 --- a/brewman/brewman/schemas/reconcile.py +++ b/brewman/brewman/schemas/reconcile.py @@ -4,12 +4,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel from .account import AccountLink diff --git a/brewman/brewman/schemas/role.py b/brewman/brewman/schemas/role.py index 4dfb44cc..d5b68130 100644 --- a/brewman/brewman/schemas/role.py +++ b/brewman/brewman/schemas/role.py @@ -1,8 +1,7 @@ import uuid from brewman.schemas import to_camel -from pydantic import ConfigDict, Field -from pydantic.main import BaseModel +from pydantic import BaseModel, ConfigDict, Field from .permission import PermissionItem diff --git a/brewman/brewman/schemas/stock_movement.py b/brewman/brewman/schemas/stock_movement.py index bc0c6aac..d54757d1 100644 --- a/brewman/brewman/schemas/stock_movement.py +++ b/brewman/brewman/schemas/stock_movement.py @@ -4,12 +4,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/trial_balance.py b/brewman/brewman/schemas/trial_balance.py index d8e26981..f96ee65b 100644 --- a/brewman/brewman/schemas/trial_balance.py +++ b/brewman/brewman/schemas/trial_balance.py @@ -2,12 +2,12 @@ from datetime import date, datetime from decimal import Decimal from pydantic import ( + BaseModel, ConfigDict, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel diff --git a/brewman/brewman/schemas/user.py b/brewman/brewman/schemas/user.py index 94888ef0..e0867021 100644 --- a/brewman/brewman/schemas/user.py +++ b/brewman/brewman/schemas/user.py @@ -3,13 +3,13 @@ import uuid from datetime import datetime from pydantic import ( + BaseModel, ConfigDict, Field, FieldSerializationInfo, field_serializer, field_validator, ) -from pydantic.main import BaseModel from . import to_camel from .role import RoleItem