dcicutils 8.16.2.1b1__py3-none-any.whl → 8.16.2.1b3__py3-none-any.whl

dcicutils/portal_utils.py

@@ -210,7 +210,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):
@@ -220,14 +221,19 @@ class Portal:
                 url += f"?limit={limit}"
         if isinstance(offset, int) and (offset >= 0):
             if "?" in url:
-                url += "&from={offset}"
+                url += f"&from={offset}"
             else:
-                url += "?from={offset}"
+                url += f"?from={offset}"
         if isinstance(field, str) and field:
             if "?" in url:
-                url += "&field={field}"
+                url += f"&field={field}"
             else:
-                url += "?field={field}"
+                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,7 +276,8 @@ 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 isinstance(raw, bool) and raw:
             add_on = "frame=raw" + ("&datastore=database" if isinstance(database, bool) and database else "")
@@ -285,14 +292,19 @@ class Portal:
                 add_on += f"limit={limit}"
         if isinstance(offset, int) and (offset >= 0):
             if add_on:
-                add_on += "&from={offset}"
+                add_on += f"&from={offset}"
             else:
-                add_on += "from={offset}"
+                add_on += f"from={offset}"
         if isinstance(field, int) and field:
             if add_on:
-                add_on += "&field={field}"
+                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 += "field={field}"
+                add_on += "status=deleted"
         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.1b1.dist-info → dcicutils-8.16.2.1b3.dist-info}/METADATA

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

@@ -49,7 +49,7 @@ dcicutils/misc_utils.py,sha256=xNQtavXS6vw_x9rQNhZEryo9b19oWYg-A8TzjhVDuxg,11594
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=Az3n1aL-PQkN5gOFE6ZqC2XkYsqiwKlq7-tZggs1QN4,11062
-dcicutils/portal_utils.py,sha256=FQyxqAsiN-Hd44fpWRrCp8i6HCTRkMqAq9vXM41Jf_s,46719
+dcicutils/portal_utils.py,sha256=uMy3AJbs-pbjhR0sHXMZq74U6yZ4tTdWPqZJN871jmk,47117
 dcicutils/progress_bar.py,sha256=R3bWLMYM3Xq9PY7U0JadcFT1m7QmCbrbDp9qs9_Kf_c,19472
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=j0kzo_T5VduKTxgsMTp7xjneyNokumZzI_iz55Y0Jjs,20505
@@ -75,8 +75,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.16.2.1b1.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.16.2.1b1.dist-info/METADATA,sha256=KItc8pDz1MPVwNMNTxczJKODYWdkNxk5tl8kpSW3H9w,3493
-dcicutils-8.16.2.1b1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.16.2.1b1.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.16.2.1b1.dist-info/RECORD,,
+dcicutils-8.16.2.1b3.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.16.2.1b3.dist-info/METADATA,sha256=9p8krTHYyhbGEFTwpohYWGLh_UngjVUbTDx9LMTJEck,3493
+dcicutils-8.16.2.1b3.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.16.2.1b3.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.16.2.1b3.dist-info/RECORD,,