dcicutils 8.16.2.1b2__tar.gz → 8.16.2.1b4__tar.gz

{dcicutils-8.16.2.1b2 → dcicutils-8.16.2.1b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.16.2.1b2
+Version: 8.16.2.1b4
 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.16.2.1b2 → dcicutils-8.16.2.1b4}/dcicutils/portal_utils.py

@@ -13,6 +13,7 @@ import requests
 from requests.models import Response
 from threading import Thread
 from typing import Callable, Dict, List, Optional, Tuple, Type, Union
+# from urllib.parse import parse_qs as parse_url_query_string
 from uuid import uuid4 as uuid
 from webtest.app import TestApp, TestResponse
 from wsgiref.simple_server import make_server as wsgi_make_server
@@ -210,7 +211,8 @@ class Portal:
 
     def get(self, url: str, follow: bool = True,
             raw: bool = False, database: bool = False,
-            limit: Optional[int] = None, offset: Optional[int] = None, field: Optional[str] = None,
+            limit: Optional[int] = None, offset: Optional[int] = None,
+            field: Optional[str] = None, deleted: bool = False,
             raise_for_status: bool = False, **kwargs) -> OptionalResponse:
         url = self.url(url, raw, database)
         if isinstance(limit, int) and (limit >= 0):
@@ -228,6 +230,11 @@ class Portal:
                 url += f"&field={field}"
             else:
                 url += f"?field={field}"
+        if deleted is True:
+            if "?" in url:
+                url += "&status=deleted"
+            else:
+                url += "?status=deleted"
         if not self.vapp:
             response = requests.get(url, allow_redirects=follow, **self._kwargs(**kwargs))
         else:
@@ -270,8 +277,11 @@ class Portal:
         return response
 
     def get_metadata(self, object_id: str, raw: bool = False, database: bool = False,
-                     limit: Optional[int] = None, offset: Optional[int] = None, field: Optional[str] = None,
+                     limit: Optional[int] = None, offset: Optional[int] = None,
+                     field: Optional[str] = None, deleted: bool = False,
                      raise_exception: bool = True) -> Optional[dict]:
+        if not isinstance(object_id, str):
+            return None
         if isinstance(raw, bool) and raw:
             add_on = "frame=raw" + ("&datastore=database" if isinstance(database, bool) and database else "")
         elif database:
@@ -293,6 +303,18 @@ class Portal:
                 add_on += f"&field={field}"
             else:
                 add_on += f"field={field}"
+        if deleted is True:
+            if add_on:
+                add_on += "&status=deleted"
+            else:
+                add_on += "status=deleted"
+        if (question_mark := object_id.find("?")) > 0:
+            query_string = object_id[question_mark + 1:]
+            object_id = object_id[:question_mark]
+            if add_on:
+                add_on += f"&{query_string}"
+            else:
+                add_on += query_string
         if raise_exception:
             return get_metadata(obj_id=object_id, vapp=self.vapp, key=self.key, add_on=add_on)
         else:

{dcicutils-8.16.2.1b2 → dcicutils-8.16.2.1b4}/pyproject.toml

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