fix: model

api/api/schemas/account/account.py

@@ -1,11 +1,12 @@
 import datetime
 from datetime import datetime
 from typing import Optional
-from pydantic import BaseModel, EmailStr, Field
+from pydantic import EmailStr, Field
 from api.db.tables.account import AccountRole,AccountStatus
 
+from api.schemas.base import Base
 
-class User(BaseModel):
+class User(Base):
     id: Optional[int] = None
     name: str = Field(..., max_length=100)
     login: str = Field(..., max_length=100)

api/api/schemas/account/account_keyring.py

@@ -1,11 +1,12 @@
 import datetime
 from typing import Optional
-from pydantic import BaseModel, Field
+from pydantic import Field
 from datetime import datetime
 from api.db.tables.account import KeyType,KeyStatus
 
+from api.schemas.base import Base
 
-class AccountKeyring(BaseModel):
+class AccountKeyring(Base):
     owner_id: int
     key_type: KeyType
     key_id: Optional[str] = Field(None, max_length=40)

api/api/schemas/endpoints/account.py

@@ -1,12 +1,13 @@
 from typing import Optional, List
 from datetime import datetime
-from pydantic import BaseModel, EmailStr, Field, TypeAdapter
+from pydantic import EmailStr, Field, TypeAdapter
 
 from api.db.tables.account import AccountRole,AccountStatus
 
+from api.schemas.base import Base
 
 
-class UserUpdate(BaseModel):
+class UserUpdate(Base):
     id: Optional[int] = None
     name: Optional[str] = Field(None, max_length=100)
     login: Optional[str] = Field(None, max_length=100)
@@ -18,7 +19,7 @@ class UserUpdate(BaseModel):
     created_at: Optional[datetime] = None
     status: Optional[AccountStatus] = None
 
-class AllUser(BaseModel):
+class AllUser(Base):
     id: int
     name: str
     login: str
@@ -29,7 +30,7 @@ class AllUser(BaseModel):
     status: AccountStatus
 
 
-class AllUserResponse(BaseModel):
+class AllUserResponse(Base):
     users: List[AllUser]
     amount_count: int
     amount_pages: int

api/api/schemas/endpoints/account_keyring.py

@@ -1,11 +1,12 @@
 import datetime
 from typing import Optional
-from pydantic import BaseModel, Field
+from pydantic import Field
 from datetime import datetime
 from api.db.tables.account import KeyType,KeyStatus
 
+from api.schemas.base import Base
 
-class AccountKeyringUpdate(BaseModel):
+class AccountKeyringUpdate(Base):
     owner_id: Optional[int] = None
     key_type: Optional[KeyType] = None
     key_id: Optional[str] = Field(None, max_length=40)

api/api/schemas/endpoints/auth.py

@@ -1,14 +1,14 @@
-from api.schemas.base import BaseModel
+from api.schemas.base import Base
 
 # Таблица для получения информации из запроса
 
 
-class Auth(BaseModel):
+class Auth(Base):
     login: str
     password: str
 
-class Refresh(BaseModel,):
+class Refresh(Base):
     refresh_token: str
 
-class Access(BaseModel):
+class Access(Base):
     access_token: str

api/api/schemas/events/list_events.py

@@ -3,7 +3,7 @@ from typing import Dict, Any
 from datetime import datetime
 from enum import Enum
 
-from api.schemas.base import BaseModel
+from api.schemas.base import Base
 
 
 class State(Enum):
@@ -17,7 +17,7 @@ class Status(Enum):
     DELETED = "Deleted"
 
 
-class ListEvent(BaseModel):
+class ListEvent(Base):
     id: int
     name: str = Field(..., max_length=40)
     title: str = Field(..., max_length=64)

api/api/schemas/process/node_link.py

@@ -1,4 +1,4 @@
-from pydantic import Field, conint
+from pydantic import Field
 from typing import Dict, Any
 from datetime import datetime
 from enum import Enum