dcicutils 8.4.0.1b10__tar.gz → 8.4.0.1b11__tar.gz

{dcicutils-8.4.0.1b10 → dcicutils-8.4.0.1b11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.4.0.1b10
+Version: 8.4.0.1b11
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.4.0.1b10 → dcicutils-8.4.0.1b11}/dcicutils/structured_data.py

@@ -543,11 +543,11 @@ class Schema:
 class PortalBase:
 
     def __init__(self,
-                 arg: Optional[Union[VirtualApp, TestApp, Router, Portal, dict, tuple, str]] = None,
+                 arg: Optional[Union[VirtualApp, TestApp, Router, PortalBase, dict, tuple, str]] = None,
                  env: Optional[str] = None, app: OrchestratedApp = APP_SMAHT, server: Optional[str] = None,
                  key: Optional[Union[dict, tuple]] = None,
-                 portal: Optional[Union[VirtualApp, TestApp, Router, Portal, str]] = None) -> PortalBase:
-        if ((isinstance(arg, (VirtualApp, TestApp, Router, Portal)) or
+                 portal: Optional[Union[VirtualApp, TestApp, Router, PortalBase, str]] = None) -> PortalBase:
+        if ((isinstance(arg, (VirtualApp, TestApp, Router, PortalBase)) or
              isinstance(arg, str) and arg.endswith(".ini")) and not portal):
             portal = arg
         elif isinstance(arg, str) and not env:
@@ -557,8 +557,11 @@ class PortalBase:
         self._vapp = None
         self._key = None
         self._key_pair = None
+        self._key_file = None
+        self._env = env
+        self._app = app
         self._server = None
-        if isinstance(portal, Portal):
+        if isinstance(portal, PortalBase):
             self._vapp = portal._vapp
             self._key = portal._key
             self._key_pair = portal._key_pair
@@ -585,6 +588,35 @@ class PortalBase:
                 self._key = key_manager.get_keydict_for_server(server)
                 self._server = server
             self._key_pair = key_manager.keydict_to_keypair(self._key) if self._key else None
+            self._key_file = key_manager.keys_file
+
+    @property
+    def env(self):
+        return self._env
+
+    @property
+    def app(self):
+        return self._app
+
+    @property
+    def key(self):
+        return self._key
+
+    @property
+    def key_pair(self):
+        return self._key_pair
+
+    @property
+    def key_file(self):
+        return self._key_file
+
+    @property
+    def server(self):
+        return self._server
+
+    @property
+    def vapp(self):
+        return self._vapp
 
     def get_metadata(self, object_id: str) -> Optional[dict]:
         return get_metadata(obj_id=object_id, vapp=self._vapp, key=self._key)
@@ -661,15 +693,15 @@ class PortalBase:
     @staticmethod
     def create_for_testing(ini_file: Optional[str] = None) -> PortalBase:
         if isinstance(ini_file, str):
-            return Portal(Portal._create_testapp(ini_file))
+            return PortalBase(PortalBase._create_testapp(ini_file))
         minimal_ini_for_unit_testing = "[app:app]\nuse = egg:encoded\nsqlalchemy.url = postgresql://dummy\n"
         with temporary_file(content=minimal_ini_for_unit_testing, suffix=".ini") as ini_file:
-            return Portal(Portal._create_testapp(ini_file))
+            return PortalBase(PortalBase._create_testapp(ini_file))
 
     @staticmethod
-    def create_for_testing_local(ini_file: Optional[str] = None) -> Portal:
+    def create_for_testing_local(ini_file: Optional[str] = None) -> PortalBase:
         if isinstance(ini_file, str) and ini_file:
-            return Portal(Portal._create_testapp(ini_file))
+            return PortalBase(PortalBase._create_testapp(ini_file))
         minimal_ini_for_testing_local = "\n".join([
             "[app:app]\nuse = egg:encoded\nfile_upload_bucket = dummy",
             "sqlalchemy.url = postgresql://postgres@localhost:5441/postgres?host=/tmp/snovault/pgdata",
@@ -690,7 +722,7 @@ class PortalBase:
             "multiauth.policy.auth0.base = encoded.authentication.Auth0AuthenticationPolicy"
         ])
         with temporary_file(content=minimal_ini_for_testing_local, suffix=".ini") as minimal_ini_file:
-            return Portal(Portal._create_testapp(minimal_ini_file))
+            return PortalBase(PortalBase._create_testapp(minimal_ini_file))
 
     @staticmethod
     def _create_testapp(value: Union[str, Router, TestApp] = "development.ini") -> TestApp:

{dcicutils-8.4.0.1b10 → dcicutils-8.4.0.1b11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.4.0.1b10"  # TODO: To become 8.4.1
+version = "8.4.0.1b11"  # TODO: To become 8.4.1
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"