Skip to content

Commit 92bebb2

Browse files
ewdurbinewdurbin
committed
forward refs
1 parent c6b8532 commit 92bebb2

3 files changed

Lines changed: 55 additions & 59 deletions

File tree

‎cabotage/server/models/auth.py‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ class User(Model, FsUserMixin):
8181
DateTime, default=datetime.datetime.now
8282
)
8383

84-
roles: Mapped[list["Role"]] = relationship( # type: ignore[assignment]
84+
roles: Mapped[list[Role]] = relationship( # type: ignore[assignment]
8585
"Role", secondary=roles_users, backref=backref("users", lazy="dynamic")
8686
)
8787

88-
organizations: Mapped[list["OrganizationMember"]] = relationship(
88+
organizations: Mapped[list[OrganizationMember]] = relationship(
8989
back_populates="user"
9090
)
91-
teams: Mapped[list["TeamMember"]] = relationship(back_populates="user")
91+
teams: Mapped[list[TeamMember]] = relationship(back_populates="user")
9292

9393
def __repr__(self):
9494
return "<User {0}>".format(self.username)
@@ -124,9 +124,7 @@ class GitHubIdentity(Model):
124124
DateTime, default=datetime.datetime.now
125125
)
126126

127-
user: Mapped["User"] = relationship(
128-
backref=backref("github_identity", uselist=False)
129-
)
127+
user: Mapped[User] = relationship(backref=backref("github_identity", uselist=False))
130128

131129

132130
class WebAuthn(Model, FsWebAuthnMixin):
@@ -172,7 +170,7 @@ class TailscaleIntegration(Model):
172170
onupdate=datetime.datetime.now,
173171
)
174172

175-
organization: Mapped["Organization"] = relationship(
173+
organization: Mapped[Organization] = relationship(
176174
backref=backref("tailscale_integration", uselist=False),
177175
)
178176

@@ -201,14 +199,12 @@ def __init__(self, *args, **kwargs):
201199
k8s_identifier: Mapped[str] = mapped_column(String(64), unique=True)
202200
deleted_at: Mapped[datetime.datetime | None] = mapped_column(DateTime, index=True)
203201

204-
members: Mapped[list["OrganizationMember"]] = relationship(
205-
back_populates="organization"
206-
)
207-
teams: Mapped[list["OrganizationTeam"]] = relationship(
202+
members: Mapped[list[OrganizationMember]] = relationship(
208203
back_populates="organization"
209204
)
205+
teams: Mapped[list[OrganizationTeam]] = relationship(back_populates="organization")
210206

211-
projects: Mapped[list["Project"]] = relationship(back_populates="organization")
207+
projects: Mapped[list[Project]] = relationship(back_populates="organization")
212208

213209
@property
214210
def active_projects(self):
@@ -252,10 +248,8 @@ def __init__(self, *args, **kwargs):
252248
name: Mapped[str] = mapped_column(String(64))
253249
slug: Mapped[str] = mapped_column(String(64))
254250

255-
organizations: Mapped[list["OrganizationTeam"]] = relationship(
256-
back_populates="team"
257-
)
258-
members: Mapped[list["TeamMember"]] = relationship(back_populates="team")
251+
organizations: Mapped[list[OrganizationTeam]] = relationship(back_populates="team")
252+
members: Mapped[list[TeamMember]] = relationship(back_populates="team")
259253

260254
def add_user(self, user, admin=False):
261255
association = TeamMember(admin=admin)

‎cabotage/server/models/auth_associations.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
import uuid
24
from typing import TYPE_CHECKING
35

@@ -24,8 +26,8 @@ class OrganizationMember(Model):
2426
)
2527
admin: Mapped[bool] = mapped_column(Boolean, default=False)
2628

27-
user: Mapped["User"] = relationship(back_populates="organizations")
28-
organization: Mapped["Organization"] = relationship(back_populates="members")
29+
user: Mapped[User] = relationship(back_populates="organizations")
30+
organization: Mapped[Organization] = relationship(back_populates="members")
2931

3032

3133
class OrganizationTeam(Model):
@@ -40,8 +42,8 @@ class OrganizationTeam(Model):
4042
postgresql.UUID(as_uuid=True), ForeignKey("teams.id"), primary_key=True
4143
)
4244

43-
organization: Mapped["Organization"] = relationship(back_populates="teams")
44-
team: Mapped["Team"] = relationship(back_populates="organizations")
45+
organization: Mapped[Organization] = relationship(back_populates="teams")
46+
team: Mapped[Team] = relationship(back_populates="organizations")
4547

4648

4749
class TeamMember(Model):
@@ -55,5 +57,5 @@ class TeamMember(Model):
5557
)
5658
admin: Mapped[bool] = mapped_column(Boolean, default=False)
5759

58-
user: Mapped["User"] = relationship(back_populates="teams")
59-
team: Mapped["Team"] = relationship(back_populates="members")
60+
user: Mapped[User] = relationship(back_populates="teams")
61+
team: Mapped[Team] = relationship(back_populates="members")

‎cabotage/server/models/projects.py‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,18 @@ def __init__(self, *args, **kwargs):
145145
)
146146
deleted_at: Mapped[datetime.datetime | None] = mapped_column(DateTime, index=True)
147147

148-
organization: Mapped["Organization"] = relationship(
148+
organization: Mapped[Organization] = relationship(
149149
"Organization", back_populates="projects"
150150
)
151151

152152
branch_deploy_base_environment: Mapped[Environment | None] = relationship(
153153
"Environment", foreign_keys=[branch_deploy_base_environment_id]
154154
)
155-
project_applications: Mapped[list["Application"]] = relationship(
155+
project_applications: Mapped[list[Application]] = relationship(
156156
back_populates="project",
157157
cascade="all, delete-orphan",
158158
)
159-
project_environments: Mapped[list["Environment"]] = relationship(
159+
project_environments: Mapped[list[Environment]] = relationship(
160160
back_populates="project",
161161
cascade="all, delete-orphan",
162162
order_by="Environment.sort_order",
@@ -214,19 +214,19 @@ def __init__(self, *args, **kwargs):
214214
)
215215
version_id: Mapped[int] = mapped_column(Integer)
216216

217-
project: Mapped["Project"] = relationship(
217+
project: Mapped[Project] = relationship(
218218
back_populates="project_environments", foreign_keys=[project_id]
219219
)
220220
forked_from_environment: Mapped[Environment | None] = relationship(
221221
"Environment",
222222
remote_side="Environment.id",
223223
foreign_keys=[forked_from_environment_id],
224224
)
225-
application_environments: Mapped[list["ApplicationEnvironment"]] = relationship(
225+
application_environments: Mapped[list[ApplicationEnvironment]] = relationship(
226226
back_populates="environment",
227227
cascade="all, delete-orphan",
228228
)
229-
environment_configurations: Mapped[list["EnvironmentConfiguration"]] = relationship(
229+
environment_configurations: Mapped[list[EnvironmentConfiguration]] = relationship(
230230
back_populates="environment",
231231
cascade="all, delete-orphan",
232232
order_by="EnvironmentConfiguration.name",
@@ -291,39 +291,39 @@ class ApplicationEnvironment(Model, Timestamp):
291291
deleted_at: Mapped[datetime.datetime | None] = mapped_column(DateTime, index=True)
292292
version_id: Mapped[int] = mapped_column(Integer)
293293

294-
application: Mapped["Application"] = relationship(
294+
application: Mapped[Application] = relationship(
295295
back_populates="application_environments"
296296
)
297-
environment: Mapped["Environment"] = relationship(
297+
environment: Mapped[Environment] = relationship(
298298
back_populates="application_environments"
299299
)
300-
configurations: Mapped[list["Configuration"]] = relationship(
300+
configurations: Mapped[list[Configuration]] = relationship(
301301
back_populates="application_environment",
302302
foreign_keys="Configuration.application_environment_id",
303303
order_by="Configuration.name",
304304
)
305-
environment_config_subscriptions: Mapped[list["EnvironmentConfigSubscription"]] = (
305+
environment_config_subscriptions: Mapped[list[EnvironmentConfigSubscription]] = (
306306
relationship(
307307
back_populates="application_environment",
308308
cascade="all, delete-orphan",
309309
)
310310
)
311-
images: DynamicMapped["Image"] = relationship(
311+
images: DynamicMapped[Image] = relationship(
312312
back_populates="application_environment",
313313
foreign_keys="Image.application_environment_id",
314314
lazy="dynamic",
315315
)
316-
releases: DynamicMapped["Release"] = relationship(
316+
releases: DynamicMapped[Release] = relationship(
317317
back_populates="application_environment",
318318
foreign_keys="Release.application_environment_id",
319319
lazy="dynamic",
320320
)
321-
deployments: DynamicMapped["Deployment"] = relationship(
321+
deployments: DynamicMapped[Deployment] = relationship(
322322
back_populates="application_environment",
323323
foreign_keys="Deployment.application_environment_id",
324324
lazy="dynamic",
325325
)
326-
ingresses: Mapped[list["Ingress"]] = relationship(
326+
ingresses: Mapped[list[Ingress]] = relationship(
327327
back_populates="application_environment",
328328
foreign_keys="Ingress.application_environment_id",
329329
cascade="all, delete-orphan",
@@ -475,28 +475,28 @@ def __init__(self, *args, **kwargs):
475475
)
476476
deleted_at: Mapped[datetime.datetime | None] = mapped_column(DateTime, index=True)
477477

478-
project: Mapped["Project"] = relationship(back_populates="project_applications")
479-
images: DynamicMapped["Image"] = relationship(
478+
project: Mapped[Project] = relationship(back_populates="project_applications")
479+
images: DynamicMapped[Image] = relationship(
480480
back_populates="application",
481481
cascade="all, delete-orphan",
482482
lazy="dynamic",
483483
)
484-
configurations: Mapped[list["Configuration"]] = relationship(
484+
configurations: Mapped[list[Configuration]] = relationship(
485485
back_populates="application",
486486
cascade="all, delete-orphan",
487487
order_by="Configuration.name",
488488
)
489-
releases: DynamicMapped["Release"] = relationship(
489+
releases: DynamicMapped[Release] = relationship(
490490
back_populates="application",
491491
cascade="all, delete-orphan",
492492
lazy="dynamic",
493493
)
494-
deployments: DynamicMapped["Deployment"] = relationship(
494+
deployments: DynamicMapped[Deployment] = relationship(
495495
back_populates="application",
496496
cascade="all, delete-orphan",
497497
lazy="dynamic",
498498
)
499-
application_environments: Mapped[list["ApplicationEnvironment"]] = relationship(
499+
application_environments: Mapped[list[ApplicationEnvironment]] = relationship(
500500
back_populates="application",
501501
cascade="all, delete-orphan",
502502
)
@@ -710,8 +710,8 @@ class Deployment(Model, Timestamp):
710710
deploy_log: Mapped[str | None] = mapped_column(Text())
711711
job_id: Mapped[str | None] = mapped_column(String(64))
712712

713-
application: Mapped["Application"] = relationship(back_populates="deployments")
714-
application_environment: Mapped["ApplicationEnvironment"] = relationship(
713+
application: Mapped[Application] = relationship(back_populates="deployments")
714+
application_environment: Mapped[ApplicationEnvironment] = relationship(
715715
back_populates="deployments", foreign_keys=[application_environment_id]
716716
)
717717

@@ -775,10 +775,10 @@ class JobLog(Model, Timestamp):
775775
),
776776
)
777777

778-
application: Mapped["Application"] = relationship(
778+
application: Mapped[Application] = relationship(
779779
backref=backref("job_logs", lazy="dynamic"),
780780
)
781-
application_environment: Mapped["ApplicationEnvironment"] = relationship(
781+
application_environment: Mapped[ApplicationEnvironment] = relationship(
782782
backref=backref("job_logs", lazy="dynamic"),
783783
)
784784

@@ -841,8 +841,8 @@ class Release(Model, Timestamp):
841841
server_default=None,
842842
)
843843

844-
application: Mapped["Application"] = relationship(back_populates="releases")
845-
application_environment: Mapped["ApplicationEnvironment"] = relationship(
844+
application: Mapped[Application] = relationship(back_populates="releases")
845+
application_environment: Mapped[ApplicationEnvironment] = relationship(
846846
back_populates="releases", foreign_keys=[application_environment_id]
847847
)
848848

@@ -1130,8 +1130,8 @@ class Configuration(Model, Timestamp):
11301130
secret: Mapped[bool] = mapped_column(Boolean, default=False)
11311131
buildtime: Mapped[bool] = mapped_column(Boolean, default=False)
11321132

1133-
application: Mapped["Application"] = relationship(back_populates="configurations")
1134-
application_environment: Mapped["ApplicationEnvironment"] = relationship(
1133+
application: Mapped[Application] = relationship(back_populates="configurations")
1134+
application_environment: Mapped[ApplicationEnvironment] = relationship(
11351135
back_populates="configurations", foreign_keys=[application_environment_id]
11361136
)
11371137

@@ -1227,10 +1227,10 @@ class EnvironmentConfiguration(Model, Timestamp):
12271227
secret: Mapped[bool] = mapped_column(Boolean, default=False)
12281228
buildtime: Mapped[bool] = mapped_column(Boolean, default=False)
12291229

1230-
environment: Mapped["Environment"] = relationship(
1230+
environment: Mapped[Environment] = relationship(
12311231
back_populates="environment_configurations"
12321232
)
1233-
subscriptions: Mapped[list["EnvironmentConfigSubscription"]] = relationship(
1233+
subscriptions: Mapped[list[EnvironmentConfigSubscription]] = relationship(
12341234
back_populates="environment_configuration",
12351235
cascade="all, delete-orphan",
12361236
)
@@ -1303,10 +1303,10 @@ class EnvironmentConfigSubscription(Model, Timestamp):
13031303
index=True,
13041304
)
13051305

1306-
application_environment: Mapped["ApplicationEnvironment"] = relationship(
1306+
application_environment: Mapped[ApplicationEnvironment] = relationship(
13071307
back_populates="environment_config_subscriptions"
13081308
)
1309-
environment_configuration: Mapped["EnvironmentConfiguration"] = relationship(
1309+
environment_configuration: Mapped[EnvironmentConfiguration] = relationship(
13101310
back_populates="subscriptions"
13111311
)
13121312

@@ -1361,8 +1361,8 @@ class Image(Model, Timestamp):
13611361
index=True,
13621362
)
13631363

1364-
application: Mapped["Application"] = relationship(back_populates="images")
1365-
application_environment: Mapped["ApplicationEnvironment"] = relationship(
1364+
application: Mapped[Application] = relationship(back_populates="images")
1365+
application_environment: Mapped[ApplicationEnvironment] = relationship(
13661366
back_populates="images", foreign_keys=[application_environment_id]
13671367
)
13681368

@@ -1530,15 +1530,15 @@ class Ingress(Model, Timestamp):
15301530
tailscale_tags: Mapped[str | None] = mapped_column(String(512))
15311531
version_id: Mapped[int] = mapped_column(Integer)
15321532

1533-
application_environment: Mapped["ApplicationEnvironment"] = relationship(
1533+
application_environment: Mapped[ApplicationEnvironment] = relationship(
15341534
back_populates="ingresses", foreign_keys=[application_environment_id]
15351535
)
1536-
hosts: Mapped[list["IngressHost"]] = relationship(
1536+
hosts: Mapped[list[IngressHost]] = relationship(
15371537
backref="ingress",
15381538
cascade="all, delete-orphan",
15391539
order_by="IngressHost.hostname",
15401540
)
1541-
paths: Mapped[list["IngressPath"]] = relationship(
1541+
paths: Mapped[list[IngressPath]] = relationship(
15421542
backref="ingress",
15431543
cascade="all, delete-orphan",
15441544
order_by="IngressPath.path",

0 commit comments

Comments
 (0)