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

dcicutils/portal_object_utils.py

@@ -145,15 +145,12 @@ class PortalObject:
         return diffs
 
     @lru_cache(maxsize=1)
-    def _get_identifying_paths(self, all: bool = True,
-                               ref_lookup_strategy: Optional[Callable] = None) -> Optional[List[str]]:
+    def _get_identifying_paths(self, ref_lookup_strategy: Optional[Callable] = None) -> Optional[List[str]]:
         if not self._portal and (uuid := self.uuid):
-            if all is True and (type := self.type):
-                return [f"/{type}/{uuid}", f"/{uuid}"]
             return [f"/{uuid}"]
         # Migrating to and unifying this in portal_utils.Portal.get_identifying_paths (2024-05-26).
         return self._portal.get_identifying_paths(self._data,
-                                                  portal_type=self.schema, all=all,
+                                                  portal_type=self.schema,
                                                   lookup_strategy=ref_lookup_strategy) if self._portal else None
 
     def _normalized_refs(self, refs: List[dict]) -> Tuple[PortalObject, int]:

dcicutils/portal_utils.py

@@ -407,7 +407,7 @@ class Portal:
 
     @function_cache(maxsize=100, serialize_key=True)
     def get_identifying_paths(self, portal_object: dict, portal_type: Optional[Union[str, dict]] = None,
-                              all: bool = True, lookup_strategy: Optional[Union[Callable, bool]] = None) -> List[str]:
+                              lookup_strategy: Optional[Union[Callable, bool]] = None) -> List[str]:
         """
         Returns the list of the identifying Portal (URL) paths for the given Portal object. Favors any uuid
         and identifier based paths and defavors aliases based paths (ala self.get_identifying_property_names);
@@ -467,15 +467,11 @@ class Portal:
                 # And note the disction of just using /{uuid} here rather than /{type}/{uuid} as in the else
                 # statement below is not really necessary; just here for emphasis that this is all that's needed.
                 #
-                if all is True:
-                    results.append(f"/{portal_type}/{identifying_value}")
                 results.append(f"/{identifying_value}")
             elif isinstance(identifying_value, list):
                 for identifying_value_item in identifying_value:
                     if identifying_value_item:
                         results.append(f"/{portal_type}/{identifying_value_item}")
-                        if all is True:
-                            results.append(f"/{identifying_value_item}")
             else:
                 lookup_options = Portal.LOOKUP_UNDEFINED
                 if schema := self.get_schema(portal_type):
@@ -542,7 +538,7 @@ class Portal:
     @staticmethod
     def _lookup_strategy(portal: Portal, type_name: str, schema: dict, value: str) -> (int, Optional[str]):
         #
-        # Note this slight odd situation WRT object lookups by submitted_id and accession:
+        # Note this slightly odd situation WRT object lookups by submitted_id and accession:
         # -----------------------------+-----------------------------------------------+---------------+
         # PATH                         | EXAMPLE                                       | LOOKUP RESULT |
         # -----------------------------+-----------------------------------------------+---------------+

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

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

@@ -47,8 +47,8 @@ dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
 dcicutils/misc_utils.py,sha256=zHwsxxEn24muLBP7mDvMa8I9VdMejwW8HMuCL5xbhhw,107690
 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=O3LhbnglWy6xfVt8-tBmCeCtTHYXE3ipfloasM_kKjE,44062
+dcicutils/portal_object_utils.py,sha256=Az3n1aL-PQkN5gOFE6ZqC2XkYsqiwKlq7-tZggs1QN4,11062
+dcicutils/portal_utils.py,sha256=lsS_Pvjr0ecUpyHu3R_QcnjrwUHApr2qo8Wmp9COwks,43827
 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.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,,
+dcicutils-8.8.6.1b8.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.6.1b8.dist-info/METADATA,sha256=f5e7Y4rOGWnLReByHQbOEKbpTPLMLTjzs9pzhHUM_jA,3439
+dcicutils-8.8.6.1b8.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.6.1b8.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.6.1b8.dist-info/RECORD,,