Skip to content

Commit 75683f4

Browse files
committed
chore: fmt
1 parent e055b37 commit 75683f4

27 files changed

+576
-258
lines changed

src/riskmatrix/layouts/steps.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ def steps(context: 'Organization', request: 'IRequest') -> 'RenderData':
4141
'#',
4242
disabled=True
4343
),
44-
Step(_("Finish Assessment"), request.route_url('finish_assessment'), disabled=False),
44+
Step(
45+
_("Finish Assessment"),
46+
request.route_url('finish_assessment'),
47+
disabled=False
48+
),
4549
]
4650
}
4751

src/riskmatrix/mail/mailer.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,12 @@ def create_or_update_template(
547547
name = f'[{self.stream}] {organization.name}: {template.name}'
548548
if len(name) > 100:
549549
name = name[:97] + '...'
550-
html_content: str = markdown_to_html(template.email_content)
551-
plain_content = markdown_to_plaintext(template.email_content)
550+
html_content: str = markdown_to_html( # noqa: F821
551+
template.email_content
552+
)
553+
plain_content = markdown_to_plaintext( # noqa: F821
554+
template.email_content
555+
)
552556

553557
# replace logos with appropriate placeholders.
554558
html_content = html_content.replace(

src/riskmatrix/mail/types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ class TemplateMailParams(
6464
RequiredTemplateMailParams,
6565
OptionalTemplateMailParams
6666
):
67-
pass
67+
pass

src/riskmatrix/models/asset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Asset(Base, SoftDeleteMixin, SerializerMixin):
5151
assessments: Mapped[list['RiskAssessment']] = relationship(
5252
back_populates='asset'
5353
)
54-
54+
5555
organization: Mapped['Organization'] = relationship(
5656
back_populates='assets'
5757
)

src/riskmatrix/models/organization.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Organization(Base):
3333
risks: Mapped[list['Risk']] = relationship(
3434
back_populates='organization',
3535
)
36-
risk_catalogs: Mapped[list['RiskCatalog']] = relationship(
36+
risk_catalogs: Mapped[list[RiskCatalog]] = relationship(
3737
back_populates='organization',
3838
)
3939
users: Mapped[list['User']] = relationship(

src/riskmatrix/models/password_change_token.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ def expired(self) -> bool:
9898
expiring_time = self.time_requested + timedelta(hours=48)
9999
if datetime.utcnow() > expiring_time:
100100
return True
101-
return False
101+
return False

src/riskmatrix/models/risk.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
from sqlalchemy_serializer import SerializerMixin
3030

31+
3132
class Risk(SoftDeleteMixin, Base, SerializerMixin):
3233

3334
__tablename__ = 'risk'

src/riskmatrix/models/risk_assessment.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from riskmatrix.orm.meta import UUIDStr
1919
from riskmatrix.orm.meta import UUIDStrPK
2020
from sqlalchemy.types import JSON
21-
from dataclasses import dataclass
2221
from sqlalchemy_serializer import SerializerMixin
2322

2423
from typing import Any, ClassVar
@@ -82,7 +81,7 @@ def __init__(
8281
self,
8382
asset: Asset,
8483
risk: Risk,
85-
info: 'RiskAssessmentInfo',
84+
info: RiskAssessmentInfo,
8685
**meta: Any
8786
):
8887
self.id = str(uuid4())

src/riskmatrix/models/risk_assessment_info.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from dataclasses import dataclass
21
from sedate import utcnow
32
from riskmatrix.orm.meta import Base
43
import enum
@@ -8,16 +7,13 @@
87
from sqlalchemy.orm import Mapped
98
from riskmatrix.orm.meta import UUIDStr
109
from riskmatrix.orm.meta import UUIDStrPK
11-
from sqlalchemy import UniqueConstraint
12-
from sqlalchemy import Column
10+
from sqlalchemy_serializer import SerializerMixin
1311
from datetime import datetime
1412

1513
from typing import TYPE_CHECKING
1614

1715
if TYPE_CHECKING:
1816
from riskmatrix.models import RiskAssessment
19-
20-
2117

2218

2319
class RiskAssessmentState(enum.Enum):
@@ -31,8 +27,6 @@ def __str__(self) -> str:
3127
}
3228
return names[self]
3329

34-
from sqlalchemy_serializer import SerializerMixin
35-
3630

3731
class RiskAssessmentInfo(Base, SerializerMixin):
3832

@@ -43,7 +37,7 @@ class RiskAssessmentInfo(Base, SerializerMixin):
4337
ForeignKey('organization.id', ondelete='CASCADE'),
4438
index=True,
4539
)
46-
40+
4741
name: Mapped[str] = mapped_column(nullable=True)
4842

4943
state: Mapped[RiskAssessmentState] = mapped_column(

src/riskmatrix/models/risk_catalog.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ class RiskCatalog(Base, SoftDeleteMixin, SerializerMixin):
5858
modified: Mapped[datetime | None] = mapped_column(onupdate=utcnow)
5959

6060
risks: Mapped[list['Risk']] = relationship(back_populates='catalog')
61-
organization: Mapped['Organization'] = relationship(back_populates='risk_catalogs')
61+
organization: Mapped['Organization'] = relationship(
62+
back_populates='risk_catalogs'
63+
)
6264

6365
def __init__(
6466
self,

0 commit comments

Comments
 (0)