Sanity check in portal_utils.Portal constructor.

dcicutils/portal_utils.py

@@ -92,10 +92,11 @@ def init_from_key(key: dict, server: Optional[str], unspecified: Optional[list]
                 self._key_id = key_id
                 self._secret = secret
                 self._key_pair = (key_id, secret)
-                if ((isinstance(server, str) and server) or (isinstance(server := key.get("server"), str) and server)):
+                if (isinstance(server, str) and server) or (isinstance(server := key.get("server"), str) and server):
                     if server := normalize_server(server):
-                        if isinstance(key_server := key.get("server"), str) and key_server and key_server != server:
-                            raise Exception(f"Portal server inconsistency: {server} vs {key_server}")
+                        if isinstance(key_server := key.get("server"), str) and key_server:
+                            if normalize_server(key_server) != server:
+                                raise Exception(f"Portal server inconsistency: {server} vs {key_server}")
                         self._key["server"] = self._server = server
             if not self._key:
                 raise Exception("Portal init error; from key.")

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.7.0.1b6"  # TODO: To become 8.7.1
+version = "8.7.0.1b7"  # TODO: To become 8.7.1
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"