Skip to content

Commit f800a3e

Browse files
TheTechmageTheTechmage
committed
chore: ruff formatting
Signed-off-by: Colton Wolkins (Laptop) <colton@indicio.tech>
1 parent ebefef9 commit f800a3e

File tree

14 files changed

+225
-140
lines changed

14 files changed

+225
-140
lines changed

‎acapy_agent/core/dispatcher.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@ async def handle_v2_message(
187187
)
188188
to_did = services[0].service_endpoint.uri
189189
found_forwardable_service = (
190-
await routing_service.is_forwardable_service(messaging.resolver, services[0])
190+
await routing_service.is_forwardable_service(
191+
messaging.resolver, services[0]
192+
)
191193
if services
192194
else False
193195
)
@@ -212,7 +214,7 @@ async def handle_v2_message(
212214
send_outbound,
213215
reply_session_id=inbound_message.session_id,
214216
reply_to_verkey=inbound_message.receipt.sender_verkey,
215-
target_list=reply_destination
217+
target_list=reply_destination,
216218
)
217219

218220
context.injector.bind_instance(BaseResponder, responder)
@@ -288,8 +290,8 @@ async def make_v2_message(self, profile: Profile, parsed_msg: dict) -> BaseMessa
288290

289291
registry: V2ProtocolRegistry = self.profile.inject(V2ProtocolRegistry)
290292
try:
291-
#message_cls = registry.resolve_message_class(message_type)
292-
#if isinstance(message_cls, DeferLoad):
293+
# message_cls = registry.resolve_message_class(message_type)
294+
# if isinstance(message_cls, DeferLoad):
293295
# message_cls = message_cls.resolved
294296
message_cls = registry.protocols_matching_query(message_type)
295297
except ProtocolMinorVersionNotSupported as e:
@@ -299,7 +301,7 @@ async def make_v2_message(self, profile: Profile, parsed_msg: dict) -> BaseMessa
299301
raise MessageParseError(f"Unrecognized message type {message_type}")
300302

301303
try:
302-
#instance = message_cls[0] #message_cls.deserialize(parsed_msg)
304+
# instance = message_cls[0] #message_cls.deserialize(parsed_msg)
303305
instance = registry.handlers[message_cls[0]]
304306
if isinstance(instance, DeferLoad):
305307
instance = instance.resolved
@@ -310,7 +312,6 @@ async def make_v2_message(self, profile: Profile, parsed_msg: dict) -> BaseMessa
310312

311313
return instance
312314

313-
314315
async def handle_v1_message(
315316
self,
316317
profile: Profile,

‎acapy_agent/core/plugin_registry.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,7 @@ async def load_protocol_version(
224224
goal_code_registry = context.inject(GoalCodeRegistry)
225225
if hasattr(mod, "HANDLERS"):
226226
for message_type, handler in mod.HANDLERS:
227-
v2_protocol_registry.register_handler(
228-
message_type, handler
229-
)
227+
v2_protocol_registry.register_handler(message_type, handler)
230228
if hasattr(mod, "MESSAGE_TYPES"):
231229
protocol_registry.register_message_types(
232230
mod.MESSAGE_TYPES, version_definition=version_definition

‎acapy_agent/didcomm_v2/protocol_registry.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ def protocols_matching_query(self, query: str) -> Sequence[str]:
3939
def register_handler(self, message_type: str, handler: Union[Coroutine, str]):
4040
"""Register a new message type to handler association."""
4141
if isinstance(handler, str):
42-
handler = DeferLoad(handler)
42+
handler = DeferLoad(handler)
4343
self._type_to_message_handler[message_type] = handler

‎acapy_agent/protocols_v2/basicmessage/v1_0/message_types.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
"""Message type identifiers for Trust Pings."""
22

3-
#from ...didcomm_prefix import DIDCommPrefix
3+
# from ...didcomm_prefix import DIDCommPrefix
44
import logging
55
from ....messaging.v2_agent_message import V2AgentMessage
66
from ....connections.models.connection_target import ConnectionTarget
77
from didcomm_messaging import DIDCommMessaging, RoutingService
88

9-
SPEC_URI = (
10-
"https://didcomm.org/basicmessage/2.0/message"
11-
)
9+
SPEC_URI = "https://didcomm.org/basicmessage/2.0/message"
1210

1311
# Message types
1412
BASIC_MESSAGE = "https://didcomm.org/basicmessage/2.0/message"
1513

1614
PROTOCOL_PACKAGE = "acapy_agent.protocols_v2.basicmessage.v1_0"
1715

16+
1817
class basic_message:
1918
async def __call__(self, *args, **kwargs):
2019
await self.handle(*args, **kwargs)
20+
2121
@staticmethod
2222
async def handle(context, responder, payload):
2323
logger = logging.getLogger(__name__)
24-
their_did = context.message_receipt.sender_verkey.split('#')[0]
25-
our_did = context.message_receipt.recipient_verkey.split('#')[0]
24+
their_did = context.message_receipt.sender_verkey.split("#")[0]
25+
our_did = context.message_receipt.recipient_verkey.split("#")[0]
2626
error_result = V2AgentMessage(
2727
message={
2828
"type": BASIC_MESSAGE,

‎acapy_agent/protocols_v2/basicmessage/v1_0/routes.py‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,25 @@ class PingConnIdMatchInfoSchema(OpenAPISchema):
5151
metadata={"description": "Connection identifier", "example": UUID4_EXAMPLE},
5252
)
5353

54+
5455
from ....wallet.base import BaseWallet
5556
from ....wallet.did_info import DIDInfo
56-
from ....wallet.did_method import KEY, PEER2, PEER4, SOV, DIDMethod, DIDMethods, HolderDefinedDid
57+
from ....wallet.did_method import (
58+
KEY,
59+
PEER2,
60+
PEER4,
61+
SOV,
62+
DIDMethod,
63+
DIDMethods,
64+
HolderDefinedDid,
65+
)
5766
from ....wallet.did_posture import DIDPosture
5867
from ....wallet.error import WalletError, WalletNotFoundError
5968
from ....messaging.v2_agent_message import V2AgentMessage
6069
from ....connections.models.connection_target import ConnectionTarget
6170
from didcomm_messaging import DIDCommMessaging, RoutingService
71+
72+
6273
def format_did_info(info: DIDInfo):
6374
"""Serialize a DIDInfo object."""
6475
if info:
@@ -71,19 +82,20 @@ def format_did_info(info: DIDInfo):
7182
"metadata": info.metadata,
7283
}
7384

85+
7486
async def get_mydid(request: web.BaseRequest):
7587
context: AdminRequestContext = request["context"]
76-
#filter_did = request.query.get("did")
77-
#filter_verkey = request.query.get("verkey")
88+
# filter_did = request.query.get("did")
89+
# filter_verkey = request.query.get("verkey")
7890
filter_posture = DIDPosture.get(request.query.get("posture"))
7991
results = []
8092
async with context.session() as session:
8193
did_methods: DIDMethods = session.inject(DIDMethods)
8294
filter_method: DIDMethod | None = did_methods.from_method(
8395
request.query.get("method") or "did:peer:2"
8496
)
85-
#key_types = session.inject(KeyTypes)
86-
#filter_key_type = key_types.from_key_type(request.query.get("key_type", ""))
97+
# key_types = session.inject(KeyTypes)
98+
# filter_key_type = key_types.from_key_type(request.query.get("key_type", ""))
8799
wallet: BaseWallet | None = session.inject_or(BaseWallet)
88100
if not wallet:
89101
raise web.HTTPForbidden(reason="No wallet available")
@@ -97,13 +109,14 @@ async def get_mydid(request: web.BaseRequest):
97109
or DIDPosture.get(info.metadata) is DIDPosture.WALLET_ONLY
98110
)
99111
and (not filter_method or info.method == filter_method)
100-
#and (not filter_key_type or info.key_type == filter_key_type)
112+
# and (not filter_key_type or info.key_type == filter_key_type)
101113
]
102114

103115
results.sort(key=lambda info: (DIDPosture.get(info["posture"]).ordinal, info["did"]))
104116
our_did = results[0]["did"]
105117
return our_did
106118

119+
107120
async def get_target(request: web.BaseRequest, to_did: str, from_did: str):
108121
context: AdminRequestContext = request["context"]
109122

@@ -133,7 +146,9 @@ async def get_target(request: web.BaseRequest, to_did: str, from_did: str):
133146
messaging.resolver, services[0]
134147
)
135148
while found_forwardable_service:
136-
services = await routing_service._resolve_services(messaging.resolver, to_target)
149+
services = await routing_service._resolve_services(
150+
messaging.resolver, to_target
151+
)
137152
if services:
138153
chain.append(
139154
{
@@ -143,7 +158,9 @@ async def get_target(request: web.BaseRequest, to_did: str, from_did: str):
143158
)
144159
to_target = services[0].service_endpoint.uri
145160
found_forwardable_service = (
146-
await routing_service.is_forwardable_service(messaging.resolver, services[0])
161+
await routing_service.is_forwardable_service(
162+
messaging.resolver, services[0]
163+
)
147164
if services
148165
else False
149166
)
@@ -192,9 +209,7 @@ async def basic_message_send(request: web.BaseRequest):
192209
msg = V2AgentMessage(
193210
message={
194211
"type": "https://didcomm.org/basicmessage/2.0/message",
195-
"body": {
196-
"content": message
197-
},
212+
"body": {"content": message},
198213
"lang": "en",
199214
"to": [their_did],
200215
"from": our_did,
@@ -227,6 +242,9 @@ def post_process_routes(app: web.Application):
227242
{
228243
"name": "didcommv2",
229244
"description": "DIDComm V2 based protocols for Interop-a-thon",
230-
"externalDocs": {"description": "Specification", "url": "https://didcomm.org"},
245+
"externalDocs": {
246+
"description": "Specification",
247+
"url": "https://didcomm.org",
248+
},
231249
}
232250
)

‎acapy_agent/protocols_v2/basicmessage/v1_0/tests/test_routes.py‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ async def test_connections_send_ping(self):
3232
self.request.json = mock.CoroutineMock(return_value={"comment": "some comment"})
3333
self.request.match_info = {"conn_id": "dummy"}
3434

35-
with mock.patch.object(
36-
test_module.ConnRecord, "retrieve_by_id", mock.CoroutineMock()
37-
) as mock_retrieve, mock.patch.object(
38-
test_module, "Ping", mock.MagicMock()
39-
) as mock_ping, mock.patch.object(
40-
test_module.web, "json_response", mock.MagicMock()
41-
) as json_response:
35+
with (
36+
mock.patch.object(
37+
test_module.ConnRecord, "retrieve_by_id", mock.CoroutineMock()
38+
) as mock_retrieve,
39+
mock.patch.object(test_module, "Ping", mock.MagicMock()) as mock_ping,
40+
mock.patch.object(
41+
test_module.web, "json_response", mock.MagicMock()
42+
) as json_response,
43+
):
4244
mock_ping.return_value = mock.MagicMock(_thread_id="dummy")
4345
mock_retrieve.return_value = mock.MagicMock(is_ready=True)
4446
result = await test_module.connections_send_ping(self.request)
@@ -49,11 +51,14 @@ async def test_connections_send_ping_no_conn(self):
4951
self.request.json = mock.CoroutineMock(return_value={"comment": "some comment"})
5052
self.request.match_info = {"conn_id": "dummy"}
5153

52-
with mock.patch.object(
53-
test_module.ConnRecord, "retrieve_by_id", mock.CoroutineMock()
54-
) as mock_retrieve, mock.patch.object(
55-
test_module.web, "json_response", mock.MagicMock()
56-
) as json_response:
54+
with (
55+
mock.patch.object(
56+
test_module.ConnRecord, "retrieve_by_id", mock.CoroutineMock()
57+
) as mock_retrieve,
58+
mock.patch.object(
59+
test_module.web, "json_response", mock.MagicMock()
60+
) as json_response,
61+
):
5762
mock_retrieve.side_effect = test_module.StorageNotFoundError()
5863
with self.assertRaises(test_module.web.HTTPNotFound):
5964
await test_module.connections_send_ping(self.request)
@@ -62,11 +67,14 @@ async def test_connections_send_ping_not_ready(self):
6267
self.request.json = mock.CoroutineMock(return_value={"comment": "some comment"})
6368
self.request.match_info = {"conn_id": "dummy"}
6469

65-
with mock.patch.object(
66-
test_module.ConnRecord, "retrieve_by_id", mock.CoroutineMock()
67-
) as mock_retrieve, mock.patch.object(
68-
test_module.web, "json_response", mock.MagicMock()
69-
) as json_response:
70+
with (
71+
mock.patch.object(
72+
test_module.ConnRecord, "retrieve_by_id", mock.CoroutineMock()
73+
) as mock_retrieve,
74+
mock.patch.object(
75+
test_module.web, "json_response", mock.MagicMock()
76+
) as json_response,
77+
):
7078
mock_retrieve.return_value = mock.MagicMock(is_ready=False)
7179
with self.assertRaises(test_module.web.HTTPBadRequest):
7280
await test_module.connections_send_ping(self.request)

‎acapy_agent/protocols_v2/discovery/v1_0/message_types.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
"""Message type identifiers for Trust Pings."""
22

3-
#from ...didcomm_prefix import DIDCommPrefix
3+
# from ...didcomm_prefix import DIDCommPrefix
44
import logging
55
from ....messaging.v2_agent_message import V2AgentMessage
66
from ....connections.models.connection_target import ConnectionTarget
77
from didcomm_messaging import DIDCommMessaging, RoutingService
88

9-
SPEC_URI = (
10-
"https://didcomm.org/discover-features/2.0/queries"
11-
)
9+
SPEC_URI = "https://didcomm.org/discover-features/2.0/queries"
1210

1311
# Message types
1412
QUERIES = "https://didcomm.org/discover-features/2.0/queries"
1513
DISCLOSE = "https://didcomm.org/discover-features/2.0/disclose"
1614

1715
PROTOCOL_PACKAGE = "acapy_agent.protocols_v2.discovery.v1_0"
1816

17+
1918
class discover_features:
2019
async def __call__(self, *args, **kwargs):
2120
await self.handle(*args, **kwargs)
21+
2222
@staticmethod
2323
async def handle(context, responder, payload):
2424
logger = logging.getLogger(__name__)
25-
their_did = context.message_receipt.sender_verkey.split('#')[0]
26-
our_did = context.message_receipt.recipient_verkey.split('#')[0]
25+
their_did = context.message_receipt.sender_verkey.split("#")[0]
26+
our_did = context.message_receipt.recipient_verkey.split("#")[0]
2727
error_result = V2AgentMessage(
2828
message={
2929
"type": DISCLOSE,
@@ -44,7 +44,6 @@ async def handle(context, responder, payload):
4444
await responder.send_reply(error_result)
4545

4646

47-
4847
HANDLERS = {
4948
QUERIES: f"{PROTOCOL_PACKAGE}.message_types.discover_features",
5049
}.items()

0 commit comments

Comments
 (0)