dcicutils 8.7.0.1b24__tar.gz → 8.7.0.1b26__tar.gz

{dcicutils-8.7.0.1b24 → dcicutils-8.7.0.1b26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.7.0.1b24
+Version: 8.7.0.1b26
 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.7.0.1b24 → dcicutils-8.7.0.1b26}/dcicutils/portal_utils.py

@@ -69,8 +69,8 @@ class Portal:
             self._keys_file = portal._keys_file
             self._env = portal._env
             self._server = portal._server
-            self._app = portal._app
             self._vapp = portal._vapp
+            self._app = portal._app
 
         def init_from_vapp(vapp: Union[TestApp, VirtualApp, PyramidRouter], unspecified: Optional[list] = []) -> None:
             init(unspecified=unspecified)
@@ -145,9 +145,9 @@ class Portal:
                     server = server[:-1]
                 return prefix + server if server else None
 
-        if app and not (app := Portal._valid_app(app)):
+        if (valid_app := app) and not (valid_app := Portal._valid_app(app)):
             raise Exception(f"Portal init error; invalid app: {app}")
-        self._app = app
+        self._app = valid_app
         if isinstance(arg, Portal):
             init_from_portal(arg, unspecified=[env, server, app])
         elif isinstance(arg, (TestApp, VirtualApp, PyramidRouter)):
@@ -298,6 +298,8 @@ class Portal:
         """
         if isinstance(schema_name_or_object, dict):
             return self.isinstance_schema(schema_name_or_object, target_schema_name)
+        elif not isinstance(schema_name_or_object, str) or not schema_name_or_object:
+            return False
         schema_name = self.schema_name(schema_name_or_object).lower()
         target_schema_name = self.schema_name(target_schema_name).lower()
         if schema_name == target_schema_name:
@@ -341,8 +343,8 @@ class Portal:
         """
         Returns the "super type map" for all of the known schemas (via /profiles).
         This is a dictionary with property names which are all known schema type names which
-        have (one or more) sub-types, and the value each such property name is an array of
-        all of those sub-types (direct and all descendents), in breadth first order.
+        have (one or more) sub-types, and the value of each such property name is an array
+        of all of those sub-types (direct and all descendents), in breadth first order.
         """
         def list_breadth_first(super_type_map: dict, super_type_name: str) -> dict:
             result = []

{dcicutils-8.7.0.1b24 → dcicutils-8.7.0.1b26}/dcicutils/structured_data.py

@@ -602,12 +602,22 @@ class Portal(PortalBase):
         resolved = []
         if self._ref_exists_single(type_name, value):
             resolved.append(type_name)
+            # TODO: Added this return on 2024-01-14 (dmichaels).
+            # Why did I orginally check for multiple existing values?
+            # Why not just return right away if I find that the ref exists?
+            # Getting multiple values because, for example, we find
+            # both this /Sample/UW_CELL-CULTURE-SAMPLE_COLO-829BL_HI-C_1
+            # and /CellSample/UW_CELL-CULTURE-SAMPLE_COLO-829BL_HI-C_1
+            # Why does that matter at all? Same thing.
+            return resolved
         # Check for the given ref in all sub-types of the given type.
         if (schemas_super_type_map := self.get_schemas_super_type_map()):
             if (sub_type_names := schemas_super_type_map.get(type_name)):
                 for sub_type_name in sub_type_names:
                     if self._ref_exists_single(sub_type_name, value):
                         resolved.append(type_name)
+                        # TODO: Added this return on 2024-01-14 (dmichaels). See above TODO.
+                        return resolved
         return resolved
 
     def _ref_exists_single(self, type_name: str, value: str) -> bool:

{dcicutils-8.7.0.1b24 → dcicutils-8.7.0.1b26}/pyproject.toml

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