Merge pull request openwallet-foundation#1802 from shaangill025/issue#1791

Fix: Inbound Transport is_external attribute

Author: swcurran

aries_cloudagent/config/logging.py

@@ -113,47 +113,53 @@ def print_banner(
 
         # Inbound transports
         banner.print_subtitle("Inbound Transports")
-        banner.print_spacer()
-        banner.print_list(
-            [
-                f"{transport.scheme}://{transport.host}:{transport.port}"
-                for transport in inbound_transports.values()
-            ]
-        )
-        banner.print_spacer()
-
-        external_in_transports = set().union(
-            *(
-                transport
-                for transport in inbound_transports.values()
-                if transport.is_external
-            )
-        )
+        internal_in_transports = [
+            f"{transport.scheme}://{transport.host}:{transport.port}"
+            for transport in inbound_transports.values()
+            if not transport.is_external
+        ]
+        if internal_in_transports:
+            banner.print_spacer()
+            banner.print_list(internal_in_transports)
+            banner.print_spacer()
+        external_in_transports = [
+            f"{transport.scheme}://{transport.host}:{transport.port}"
+            for transport in inbound_transports.values()
+            if transport.is_external
+        ]
         if external_in_transports:
             banner.print_spacer()
-            banner.print_list([f"{external_in_transports}"])
+            banner.print_subtitle("  External Plugin")
+            banner.print_spacer()
+            banner.print_list(external_in_transports)
             banner.print_spacer()
 
         # Outbound transports
-        schemes = set().union(
-            *(transport.schemes for transport in outbound_transports.values())
+        banner.print_subtitle("Outbound Transports")
+        internal_schemes = set().union(
+            *(
+                transport.schemes
+                for transport in outbound_transports.values()
+                if not transport.is_external
+            )
         )
-        if schemes:
-            banner.print_subtitle("Outbound Transports")
+        if internal_schemes:
             banner.print_spacer()
-            banner.print_list([f"{scheme}" for scheme in sorted(schemes)])
+            banner.print_list([f"{scheme}" for scheme in sorted(internal_schemes)])
             banner.print_spacer()
 
-        external_out_transports = set().union(
+        external_schemes = set().union(
             *(
-                transport
+                transport.schemes
                 for transport in outbound_transports.values()
                 if transport.is_external
             )
         )
-        if external_out_transports:
+        if external_schemes:
+            banner.print_spacer()
+            banner.print_subtitle("  External Plugin")
             banner.print_spacer()
-            banner.print_list([f"{external_out_transports}"])
+            banner.print_list([f"{scheme}" for scheme in sorted(external_schemes)])
             banner.print_spacer()
 
         # DID info

aries_cloudagent/transport/inbound/base.py

@@ -19,6 +19,7 @@ def __init__(
         create_session: Callable,
         *,
         max_message_size: int = 0,
+        is_external: bool = False,
         wire_format: BaseWireFormat = None,
         root_profile: Profile = None,
     ):
@@ -35,6 +36,7 @@ def __init__(
         self._scheme = scheme
         self.wire_format: BaseWireFormat = wire_format
         self.root_profile: Profile = root_profile
+        self._is_external = is_external
 
     @property
     def max_message_size(self):
@@ -46,6 +48,11 @@ def scheme(self):
         """Accessor for this transport's scheme."""
         return self._scheme
 
+    @property
+    def is_external(self):
+        """Accessor for this transport's is_external."""
+        return self._is_external
+
     def create_session(
         self,
         *,

aries_cloudagent/transport/inbound/http.py

@@ -15,8 +15,6 @@
 class HttpTransport(BaseInboundTransport):
     """Http Transport class."""
 
-    is_external = False
-
     def __init__(self, host: str, port: int, create_session, **kwargs) -> None:
         """
         Initialize an inbound HTTP transport instance.

aries_cloudagent/transport/inbound/ws.py

@@ -16,8 +16,6 @@
 class WsTransport(BaseInboundTransport):
     """Websockets Transport class."""
 
-    is_external = False
-
     def __init__(self, host: str, port: int, create_session, **kwargs) -> None:
         """
         Initialize an inbound WebSocket transport instance.