rebase pubsub fixes

src/volttron/client/logs.py

@@ -1,5 +1,7 @@
 import logging
 from logging import Logger
+import sys
+import os
 
 
 def get_logger() -> Logger:
@@ -43,6 +45,18 @@ def get_default_client_log_config(level=logging.DEBUG) -> dict:
     }
 
 
+class JsonFormatter(logging.Formatter):
+
+    def format(self, record):
+        dct = record.__dict__.copy()
+        dct["msg"] = record.getMessage()
+        dct.pop("args")
+        exc_info = dct.pop("exc_info", None)
+        if exc_info:
+            dct["exc_text"] = "".join(traceback.format_exception(*exc_info))
+        return jsonapi.dumps(dct)
+
+
 class AgentFormatter(logging.Formatter):
 
     def __init__(self, fmt=None, datefmt=None):
@@ -66,6 +80,8 @@ def format(self, record):
 
 
 def setup_logging(level=logging.DEBUG, console=False):
+    from volttron.utils.commands import isapipe
+
     root = logging.getLogger()
     if not root.handlers:
         handler = logging.StreamHandler()

src/volttron/client/vip/agent/subsystems/rpc.py

@@ -35,7 +35,7 @@
 from zmq import ZMQError
 from zmq.green import ENOTSOCK
 
-from volttron.auth.auth_exception import AuthException
+#from volttron.auth.auth_exception import AuthException
 from volttron.utils import jsonapi, jsonrpc
 from volttron.client.known_identities import AUTH
 
@@ -265,8 +265,10 @@ def checked_method(*args, **kwargs):
             method_name = method.__name__
             args_dict = inspect.getcallargs(method, *args, **kwargs)
             try:
-                self.call(AUTH, "check_authorization",
-                          identity=calling_user, method_name=f"{self.core.identity}.{method_name}",
+                self.call(AUTH,
+                          "check_authorization",
+                          identity=calling_user,
+                          method_name=f"{self.core.identity}.{method_name}",
                           method_args=args_dict).get(timeout=10)
             except AuthException as e:
                 # msg = ("method '{}' requires capabilities {}, but capability {} "

src/volttron/server/logs.py

@@ -26,8 +26,6 @@
 import logging
 import os
 
-from volttron.client.logs import AgentFormatter
-
 # -*- coding: utf-8 -*- {{{
 # ===----------------------------------------------------------------------===
 #
@@ -62,6 +60,7 @@
 import warnings
 
 from volttron.utils import jsonapi
+from volttron.client.logs import AgentFormatter
 
 try:
     HAS_SYSLOG = True

src/volttron/types/auth/authz_types.py

@@ -607,9 +607,8 @@ def create_or_merge_role(self,
                              rpc_capabilities: RPCCapabilities = None,
                              pubsub_capabilities: PubsubCapabilities = None) -> bool:
         if not rpc_capabilities and not pubsub_capabilities:
-            raise ValueError(
-                f"Role {name} should have non empty capabilities - __rpc__ capabilities, "
-                "pubsub capabilities or both")
+            raise ValueError(f"Role {name} should have non empty capabilities - rpc capabilities, "
+                             "pubsub capabilities or both")
         if not self.compact_dict.get(ROLES):
             self.compact_dict[ROLES] = dict()
         if name not in self.compact_dict.get(ROLES):

src/volttron/utils/__init__.py

@@ -51,8 +51,6 @@
 from volttron.utils.version import get_version
 from volttron.types import Identity
 
-from volttron.client.logs import setup_logging
-
 _log = logging.getLogger(__name__)
 
 
@@ -92,7 +90,7 @@ def load_config(default_configuration: str | Path | dict | None) -> dict:
     :rtype: dict
     """
 
-    if default_configuration is None:
+    if default_configuration is None or default_configuration == "":
         return {}
 
     if isinstance(default_configuration, dict):