VORKOUT-7 : fix #10

Merged
ivan.dev merged 5 commits from VORKOUT-7fix into master 2025-06-09 13:06:38 +05:00
3 changed files with 31 additions and 25 deletions
Showing only changes of commit abd87b46b3 - Show all commits

View File

@ -1,3 +1,5 @@
import enum
from sqlalchemy import Table, Column, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index from sqlalchemy import Table, Column, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index
from sqlalchemy.sql import func from sqlalchemy.sql import func
@ -7,14 +9,14 @@ from api.db.sql_types import UnsignedInt
from api.db import metadata from api.db import metadata

Кстати, раз вы на Python 3.11, то вот в таких подобных случаях уже лучше наследоваться просто от enum.StrEnum

Кстати, раз вы на Python 3.11, то вот в таких подобных случаях уже лучше наследоваться просто от `enum.StrEnum`
class AccountRole(str, Enum): class AccountRole(enum.StrEnum):
OWNER = "OWNER" OWNER = "OWNER"
ADMIN = "ADMIN" ADMIN = "ADMIN"
EDITOR = "EDITOR" EDITOR = "EDITOR"
VIEWER = "VIEWER" VIEWER = "VIEWER"
class AccountStatus(str, Enum): class AccountStatus(enum.StrEnum):
ACTIVE = "ACTIVE" ACTIVE = "ACTIVE"
DISABLED = "DISABLED" DISABLED = "DISABLED"
BLOCKED = "BLOCKED" BLOCKED = "BLOCKED"
@ -39,14 +41,14 @@ account_table = Table(
) )
class KeyType(str, Enum): class KeyType(enum.StrEnum):
PASSWORD = "PASSWORD" PASSWORD = "PASSWORD"
ACCESS_TOKEN = "ACCESS_TOKEN" ACCESS_TOKEN = "ACCESS_TOKEN"
REFRESH_TOKEN = "REFRESH_TOKEN" REFRESH_TOKEN = "REFRESH_TOKEN"
API_KEY = "API_KEY" API_KEY = "API_KEY"
class KeyStatus(str, Enum): class KeyStatus(enum.StrEnum):
ACTIVE = "ACTIVE" ACTIVE = "ACTIVE"
EXPIRED = "EXPIRED" EXPIRED = "EXPIRED"
DELETED = "DELETED" DELETED = "DELETED"

View File

@ -1,3 +1,5 @@
import enum
from sqlalchemy import Table, Column, Integer, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index from sqlalchemy import Table, Column, Integer, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index
from sqlalchemy.sql import func from sqlalchemy.sql import func
from enum import Enum, auto from enum import Enum, auto
@ -7,15 +9,15 @@ from api.db.sql_types import UnsignedInt
from api.db import metadata from api.db import metadata
class EventState(str, Enum): class EventState(enum.StrEnum):
AUTO = auto() AUTO = "AUTO"
DESCRIPTED = auto() DESCRIPTED = "DESCRIPTED"
class EventStatus(str, Enum): class EventStatus(enum.StrEnum):
ACTIVE = auto() ACTIVE = "ACTIVE"
DISABLED = auto() DISABLED = "DISABLED"
DELETED = auto() DELETED = "DELETED"
list_events_table = Table( list_events_table = Table(

View File

@ -1,3 +1,5 @@
import enum
from sqlalchemy import ( from sqlalchemy import (
Table, Table,
Column, Column,
@ -19,11 +21,11 @@ from api.db.sql_types import UnsignedInt
from api.db import metadata from api.db import metadata
class ProcessStatus(str, Enum): class ProcessStatus(enum.StrEnum):
ACTIVE = auto() ACTIVE = "ACTIVE"
STOPPING = auto() STOPPING = "STOPPING"
STOPPED = auto() STOPPED = "STOPPED"
DELETED = auto() DELETED = "DELETED"
process_schema_table = Table( process_schema_table = Table(
@ -57,10 +59,10 @@ process_version_archive_table = Table(
) )
class NodeStatus(str, Enum): class NodeStatus(enum.StrEnum):
ACTIVE = auto() ACTIVE = "ACTIVE"
DISABLED = auto() DISABLED = "DISABLED"
DELETED = auto() DELETED = "DELETED"
class NodeType(Enum): class NodeType(Enum):
@ -83,11 +85,11 @@ ps_node_table = Table(
) )
class NodeLinkStatus(str, Enum): class NodeLinkStatus(enum.StrEnum):
ACTIVE = auto() ACTIVE = "ACTIVE"
STOPPING = auto() STOPPING = "STOPPING"
STOPPED = auto() STOPPED = "STOPPED"
DELETED = auto() DELETED = "DELETED"
node_link_table = Table( node_link_table = Table(