Sort mautrix-python as a first-party import

mausignald/types.py

@@ -8,6 +8,7 @@ from datetime import datetime, timedelta
 from uuid import UUID
 
 from attr import dataclass
+
 from mautrix.types import ExtensibleEnum, SerializableAttrs, SerializableEnum, field
 
 GroupID = NewType("GroupID", str)

mautrix_signal/commands/auth.py

@@ -16,12 +16,11 @@
 from typing import Union
 import io
 
+from mausignald.errors import AuthorizationFailedException, TimeoutException, UnexpectedResponse
 from mautrix.appservice import IntentAPI
 from mautrix.bridge.commands import HelpSection, command_handler
 from mautrix.types import EventID, ImageInfo, MediaMessageEventContent, MessageType
 
-from mausignald.errors import AuthorizationFailedException, TimeoutException, UnexpectedResponse
-
 from .. import puppet as pu
 from .typehint import CommandEvent
 

mautrix_signal/commands/signal.py

@@ -17,11 +17,10 @@ from typing import Optional
 import base64
 import json
 
-from mautrix.bridge.commands import SECTION_ADMIN, HelpSection, command_handler
-from mautrix.types import EventID
-
 from mausignald.errors import UnknownIdentityKey
 from mausignald.types import Address
+from mautrix.bridge.commands import SECTION_ADMIN, HelpSection, command_handler
+from mautrix.types import EventID
 
 from .. import portal as po, puppet as pu
 from .auth import make_qr, remove_extra_chars

mautrix_signal/db/disappearing_message.py

@@ -18,9 +18,10 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, ClassVar, List, Optional
 
 from attr import dataclass
+import asyncpg
+
 from mautrix.types import EventID, RoomID
 from mautrix.util.async_db import Database
-import asyncpg
 
 fake_db = Database.create("") if TYPE_CHECKING else None
 

mautrix_signal/db/message.py

@@ -18,11 +18,11 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, ClassVar
 
 from attr import dataclass
-from mautrix.types import EventID, RoomID
-from mautrix.util.async_db import Database
 import asyncpg
 
 from mausignald.types import Address, GroupID
+from mautrix.types import EventID, RoomID
+from mautrix.util.async_db import Database
 
 from ..util import id_to_str
 

mautrix_signal/db/portal.py

@@ -18,11 +18,11 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, ClassVar
 
 from attr import dataclass
-from mautrix.types import ContentURI, RoomID, UserID
-from mautrix.util.async_db import Database
 import asyncpg
 
 from mausignald.types import Address, GroupID
+from mautrix.types import ContentURI, RoomID, UserID
+from mautrix.util.async_db import Database
 
 from ..util import id_to_str
 

mautrix_signal/db/puppet.py

@@ -19,12 +19,12 @@ from typing import TYPE_CHECKING, ClassVar
 from uuid import UUID
 
 from attr import dataclass
-from mautrix.types import ContentURI, SyncToken, UserID
-from mautrix.util.async_db import Database
 from yarl import URL
 import asyncpg
 
 from mausignald.types import Address
+from mautrix.types import ContentURI, SyncToken, UserID
+from mautrix.util.async_db import Database
 
 fake_db = Database.create("") if TYPE_CHECKING else None
 

mautrix_signal/db/reaction.py

@@ -18,11 +18,11 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, ClassVar
 
 from attr import dataclass
-from mautrix.types import EventID, RoomID
-from mautrix.util.async_db import Database
 import asyncpg
 
 from mausignald.types import Address, GroupID
+from mautrix.types import EventID, RoomID
+from mautrix.util.async_db import Database
 
 from ..util import id_to_str
 

mautrix_signal/db/upgrade.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 from asyncpg import Connection
+
 from mautrix.util.async_db import UpgradeTable
 
 upgrade_table = UpgradeTable()

mautrix_signal/db/user.py

@@ -19,6 +19,7 @@ from typing import TYPE_CHECKING, ClassVar
 from uuid import UUID
 
 from attr import dataclass
+
 from mautrix.types import RoomID, UserID
 from mautrix.util.async_db import Database
 

mautrix_signal/formatter.py

@@ -19,6 +19,7 @@ from typing import cast
 import html
 import struct
 
+from mausignald.types import Address, Mention, MessageData
 from mautrix.types import Format, MessageType, TextMessageEventContent, UserID
 from mautrix.util.formatter import (
     EntityString,
@@ -28,8 +29,6 @@ from mautrix.util.formatter import (
     SemiAbstractEntity,
 )
 
-from mausignald.types import Address, Mention, MessageData
-
 from . import puppet as pu, user as u
 
 

mautrix_signal/matrix.py

@@ -32,7 +32,6 @@ from mautrix.types import (
     TypingEvent,
     UserID,
 )
-
 from mautrix_signal.db.disappearing_message import DisappearingMessage
 
 from . import portal as po, signal as s, user as u

mautrix_signal/portal.py

@@ -26,6 +26,25 @@ import os.path
 import pathlib
 import time
 
+from mausignald.errors import ResponseError, RPCError
+from mausignald.types import (
+    AccessControlMode,
+    Address,
+    Attachment,
+    Contact,
+    Group,
+    GroupAccessControl,
+    GroupID,
+    GroupMemberRole,
+    GroupV2,
+    GroupV2ID,
+    Mention,
+    MessageData,
+    Profile,
+    Quote,
+    Reaction,
+    Sticker,
+)
 from mautrix.appservice import AppService, IntentAPI
 from mautrix.bridge import BasePortal, async_getter_lock
 from mautrix.errors import IntentError, MatrixError, MForbidden
@@ -52,26 +71,6 @@ from mautrix.util.bridge_state import BridgeStateEvent
 from mautrix.util.format_duration import format_duration
 from mautrix.util.message_send_checkpoint import MessageSendCheckpointStatus
 
-from mausignald.errors import ResponseError, RPCError
-from mausignald.types import (
-    AccessControlMode,
-    Address,
-    Attachment,
-    Contact,
-    Group,
-    GroupAccessControl,
-    GroupID,
-    GroupMemberRole,
-    GroupV2,
-    GroupV2ID,
-    Mention,
-    MessageData,
-    Profile,
-    Quote,
-    Reaction,
-    Sticker,
-)
-
 from . import matrix as m, puppet as p, signal as s, user as u
 from .config import Config
 from .db import (

mautrix_signal/puppet.py

@@ -21,6 +21,9 @@ import asyncio
 import hashlib
 import os.path
 
+from yarl import URL
+
+from mausignald.types import Address, Contact, Profile
 from mautrix.appservice import IntentAPI
 from mautrix.bridge import BasePuppet, async_getter_lock
 from mautrix.errors import MForbidden
@@ -33,9 +36,6 @@ from mautrix.types import (
     UserID,
 )
 from mautrix.util.simple_template import SimpleTemplate
-from yarl import URL
-
-from mausignald.types import Address, Contact, Profile
 
 from . import portal as p, user as u
 from .config import Config

mautrix_signal/signal.py

@@ -19,9 +19,6 @@ from typing import TYPE_CHECKING
 import asyncio
 import logging
 
-from mautrix.types import MessageType
-from mautrix.util.logging import TraceLogger
-
 from mausignald import SignaldClient
 from mausignald.types import (
     Address,
@@ -35,6 +32,8 @@ from mausignald.types import (
     TypingNotification,
     WebsocketConnectionStateChangeEvent,
 )
+from mautrix.types import MessageType
+from mautrix.util.logging import TraceLogger
 
 from . import portal as po, puppet as pu, user as u
 from .db import Message as DBMessage

mautrix_signal/user.py

@@ -21,12 +21,6 @@ from datetime import datetime
 from uuid import UUID
 import asyncio
 
-from mautrix.appservice import AppService
-from mautrix.bridge import AutologinError, BaseUser, async_getter_lock
-from mautrix.types import RoomID, UserID
-from mautrix.util.bridge_state import BridgeState, BridgeStateEvent
-from mautrix.util.opt_prometheus import Gauge
-
 from mausignald.types import (
     Account,
     Address,
@@ -36,6 +30,11 @@ from mausignald.types import (
     WebsocketConnectionState,
     WebsocketConnectionStateChangeEvent,
 )
+from mautrix.appservice import AppService
+from mautrix.bridge import AutologinError, BaseUser, async_getter_lock
+from mautrix.types import RoomID, UserID
+from mautrix.util.bridge_state import BridgeState, BridgeStateEvent
+from mautrix.util.opt_prometheus import Gauge
 
 from . import portal as po, puppet as pu
 from .config import Config

mautrix_signal/web/provisioning_api.py

@@ -21,11 +21,11 @@ import json
 import logging
 
 from aiohttp import web
-from mautrix.types import UserID
-from mautrix.util.logging import TraceLogger
 
 from mausignald.errors import InternalError, TimeoutException
 from mausignald.types import Account, Address
+from mautrix.types import UserID
+from mautrix.util.logging import TraceLogger
 
 from .. import user as u
 

pyproject.toml

@@ -3,6 +3,7 @@ profile = "black"
 force_to_top = "typing"
 from_first = true
 combine_as_imports = true
+known_first_party = "mautrix"
 line_length = 99
 
 [tool.black]