dcicutils 8.8.6.1b6__py3-none-any.whl → 8.8.6.1b7__py3-none-any.whl

dcicutils/portal_utils.py

@@ -480,7 +480,7 @@ class Portal:
                 lookup_options = Portal.LOOKUP_UNDEFINED
                 if schema := self.get_schema(portal_type):
                     if callable(lookup_strategy):
-                        lookup_options, validator = lookup_strategy(self, self.type, schema, identifying_value)
+                        lookup_options, validator = lookup_strategy(self, portal_type, schema, identifying_value)
                         if callable(validator):
                             if validator(schema, identifying_property, identifying_value) is False:
                                 continue
@@ -494,12 +494,12 @@ class Portal:
                     lookup_options = Portal.LOOKUP_DEFAULT
                 if is_lookup_root_first(lookup_options):
                     results.append(f"/{identifying_value}")
-                if is_lookup_specified_type(lookup_options) and self.type:
-                    results.append(f"/{self.type}/{identifying_value}")
+                if is_lookup_specified_type(lookup_options) and portal_type:
+                    results.append(f"/{portal_type}/{identifying_value}")
                 if is_lookup_root(lookup_options) and not is_lookup_root_first(lookup_options):
                     results.append(f"/{identifying_value}")
                 if is_lookup_subtypes(lookup_options):
-                    for subtype_name in self.get_schema_subtype_names(self.type):
+                    for subtype_name in self.get_schema_subtype_names(portal_type):
                         results.append(f"/{subtype_name}/{identifying_value}")
         return results
 

{dcicutils-8.8.6.1b6.dist-info → dcicutils-8.8.6.1b7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.6.1b6
+Version: 8.8.6.1b7
 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.8.6.1b6.dist-info → dcicutils-8.8.6.1b7.dist-info}/RECORD

@@ -48,7 +48,7 @@ dcicutils/misc_utils.py,sha256=zHwsxxEn24muLBP7mDvMa8I9VdMejwW8HMuCL5xbhhw,10769
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=ryNoSFKEdaj4Y5MPryVanK2Hg32-Kg6r0BwvOPf2Ov0,11227
-dcicutils/portal_utils.py,sha256=J1Ir-DeBu8JzueLZ3NjnP3lQeUzQMlbx99hoiKaWsVY,44054
+dcicutils/portal_utils.py,sha256=O3LhbnglWy6xfVt8-tBmCeCtTHYXE3ipfloasM_kKjE,44062
 dcicutils/progress_bar.py,sha256=UT7lxb-rVF_gp4yjY2Tg4eun1naaH__hB4_v3O85bcE,19468
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
@@ -73,8 +73,8 @@ 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=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.8.6.1b6.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.8.6.1b6.dist-info/METADATA,sha256=g3y6skHiac16VTTk89IWTnrZYIyp55vpG0l0xT7Z6tw,3439
-dcicutils-8.8.6.1b6.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.8.6.1b6.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.8.6.1b6.dist-info/RECORD,,
+dcicutils-8.8.6.1b7.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.6.1b7.dist-info/METADATA,sha256=ZexH-W6xIZwYEsZn6SxwMhwOaViVmTw4kNWr4K-nqR4,3439
+dcicutils-8.8.6.1b7.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.6.1b7.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.6.1b7.dist-info/RECORD,,