|
| 1 | +from __future__ import annotations |
| 2 | + |
1 | 3 | import datetime |
2 | 4 | import uuid |
3 | | -from typing import TYPE_CHECKING, Optional |
| 5 | +from typing import TYPE_CHECKING |
4 | 6 |
|
5 | 7 | from flask_security.models.fsqla_v3 import ( |
6 | 8 | FsModels, |
@@ -50,8 +52,8 @@ class Role(Model, FsRoleMixin): |
50 | 52 | server_default=text("gen_random_uuid()"), |
51 | 53 | primary_key=True, |
52 | 54 | ) |
53 | | - name: Mapped[Optional[str]] = mapped_column(String(80), unique=True) |
54 | | - description: Mapped[Optional[str]] = mapped_column(String(255)) |
| 55 | + name: Mapped[str | None] = mapped_column(String(80), unique=True) |
| 56 | + description: Mapped[str | None] = mapped_column(String(255)) |
55 | 57 |
|
56 | 58 | def __str__(self): |
57 | 59 | return self.name |
@@ -117,7 +119,7 @@ class GitHubIdentity(Model): |
117 | 119 | ) |
118 | 120 | github_id: Mapped[int] = mapped_column(BigInteger, unique=True) |
119 | 121 | github_username: Mapped[str] = mapped_column(String(255)) |
120 | | - github_access_token: Mapped[Optional[str]] = mapped_column(String(255)) |
| 122 | + github_access_token: Mapped[str | None] = mapped_column(String(255)) |
121 | 123 | created_at: Mapped[datetime.datetime] = mapped_column( |
122 | 124 | DateTime, default=datetime.datetime.now |
123 | 125 | ) |
@@ -156,11 +158,11 @@ class TailscaleIntegration(Model): |
156 | 158 | index=True, |
157 | 159 | ) |
158 | 160 | client_id: Mapped[str] = mapped_column(String(255)) |
159 | | - client_secret_vault_path: Mapped[Optional[str]] = mapped_column(String(512)) |
160 | | - tailnet: Mapped[Optional[str]] = mapped_column(String(255)) |
161 | | - default_tags: Mapped[Optional[str]] = mapped_column(String(512)) |
| 161 | + client_secret_vault_path: Mapped[str | None] = mapped_column(String(512)) |
| 162 | + tailnet: Mapped[str | None] = mapped_column(String(255)) |
| 163 | + default_tags: Mapped[str | None] = mapped_column(String(512)) |
162 | 164 | operator_state: Mapped[str] = mapped_column(String(32), default="pending") |
163 | | - operator_version: Mapped[Optional[str]] = mapped_column(String(64)) |
| 165 | + operator_version: Mapped[str | None] = mapped_column(String(64)) |
164 | 166 | created_at: Mapped[datetime.datetime] = mapped_column( |
165 | 167 | DateTime, default=datetime.datetime.now |
166 | 168 | ) |
@@ -197,9 +199,7 @@ def __init__(self, *args, **kwargs): |
197 | 199 | name: Mapped[str] = mapped_column(Text()) |
198 | 200 | slug: Mapped[str] = mapped_column(postgresql.CITEXT(), unique=True) |
199 | 201 | k8s_identifier: Mapped[str] = mapped_column(String(64), unique=True) |
200 | | - deleted_at: Mapped[Optional[datetime.datetime]] = mapped_column( |
201 | | - DateTime, index=True |
202 | | - ) |
| 202 | + deleted_at: Mapped[datetime.datetime | None] = mapped_column(DateTime, index=True) |
203 | 203 |
|
204 | 204 | members: Mapped[list["OrganizationMember"]] = relationship( |
205 | 205 | back_populates="organization" |
|
0 commit comments