dcicutils 8.8.6.1b7__tar.gz → 8.8.6.1b9__tar.gz

{dcicutils-8.8.6.1b7 → dcicutils-8.8.6.1b9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.6.1b7
+Version: 8.8.6.1b9
 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 → dcicutils-8.8.6.1b9}/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-8.8.6.1b7 → dcicutils-8.8.6.1b9}/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):
@@ -503,6 +499,13 @@ class Portal:
                         results.append(f"/{subtype_name}/{identifying_value}")
         return results
 
+    @function_cache(maxsize=100, serialize_key=True)
+    def get_identifying_path(self, portal_object: dict, portal_type: Optional[Union[str, dict]] = None,
+                             lookup_strategy: Optional[Union[Callable, bool]] = None) -> Optional[str]:
+        if identifying_paths := self.get_identifying_path(portal_object, portal_type, lookup_strategy):
+            return identifying_paths[0]
+        return None
+
     @function_cache(maxsize=100, serialize_key=True)
     def get_identifying_property_names(self, schema: Union[str, dict],
                                        portal_object: Optional[dict] = None) -> List[str]:
@@ -542,7 +545,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 → dcicutils-8.8.6.1b9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.8.6.1b7"
+version = "8.8.6.1b9"
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"