dcicutils 8.7.0.1b24__py3-none-any.whl → 8.7.0.1b26__py3-none-any.whl

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/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.dist-info → dcicutils-8.7.0.1b26.dist-info}/METADATA

@@ -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.dist-info → dcicutils-8.7.0.1b26.dist-info}/RECORD

@@ -43,7 +43,7 @@ dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
 dcicutils/misc_utils.py,sha256=bMRWWxdbhuF3PKdCZEH-H4U1ecgT3Nag3EL92D9XGoY,100973
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
-dcicutils/portal_utils.py,sha256=uqT_e3dhBFOKdKLEMCsJg7yIyURQ3Y68UJsglUbmY4o,25723
+dcicutils/portal_utils.py,sha256=sO5S8a2g-fIwC_Spdy7aBpmDjVbijCrtU-mpd8YrZog,25864
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
 dcicutils/qa_utils.py,sha256=TT0SiJWiuxYvbsIyhK9VO4uV_suxhB6CpuC4qPacCzQ,160208
@@ -57,15 +57,15 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=ymP7PXH6-yEiXAt75w0ldQFciGNqWBClNxC5gfX2FnY,22961
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
-dcicutils/structured_data.py,sha256=JIEriP5MI1UjanDwJkaZRyW1h2V1FGMwet0BOIvFMVU,32943
+dcicutils/structured_data.py,sha256=-QcaVVbta9t5hIXVO0yKMDs8jQyrpvuEET0WFFkNFSM,33582
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
 dcicutils/tmpfile_utils.py,sha256=n95XF8dZVbQRSXBZTGToXXfSs3JUVRyN6c3ZZ0nhAWI,1403
 dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
-dcicutils-8.7.0.1b24.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.7.0.1b24.dist-info/METADATA,sha256=6tmLbZ6YEomGqF46gxsNURe-92nPNIiFkurTxUhjnCg,3315
-dcicutils-8.7.0.1b24.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.7.0.1b24.dist-info/entry_points.txt,sha256=8wbw5csMIgBXhkwfgsgJeuFcoUc0WsucUxmOyml2aoA,209
-dcicutils-8.7.0.1b24.dist-info/RECORD,,
+dcicutils-8.7.0.1b26.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.7.0.1b26.dist-info/METADATA,sha256=Qq3W6hpTaEuDnAAZpv0NFpmBHPra6gzi9Uo6tCciBjw,3315
+dcicutils-8.7.0.1b26.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.7.0.1b26.dist-info/entry_points.txt,sha256=8wbw5csMIgBXhkwfgsgJeuFcoUc0WsucUxmOyml2aoA,209
+dcicutils-8.7.0.1b26.dist-info/RECORD,,