dcicutils 8.7.0.1b3__tar.gz → 8.7.0.1b5__tar.gz

{dcicutils-8.7.0.1b3 → dcicutils-8.7.0.1b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.7.0.1b3
+Version: 8.7.0.1b5
 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.7.0.1b3 → dcicutils-8.7.0.1b5}/dcicutils/portal_utils.py

@@ -202,28 +202,45 @@ class Portal:
     def vapp(self) -> Optional[TestApp]:
         return self._vapp
 
-    def get(self, url: str, follow: bool = True, **kwargs) -> OptionalResponse:
+    def get(self, url: str, follow: bool = True, raise_for_status: bool = False, **kwargs) -> OptionalResponse:
+        url = self.url(url)
         if not self._vapp:
-            return requests.get(self.url(url), allow_redirects=follow, **self._kwargs(**kwargs))
-        response = self._vapp.get(self.url(url), **self._kwargs(**kwargs))
-        if response and response.status_code in [301, 302, 303, 307, 308] and follow:
-            response = response.follow()
-        return self._response(response)
+            response = requests.get(url, allow_redirects=follow, **self._kwargs(**kwargs))
+        else:
+            response = self._vapp.get(url, **self._kwargs(**kwargs))
+            if response and response.status_code in [301, 302, 303, 307, 308] and follow:
+                response = response.follow()
+            response = self._response(response)
+        if raise_for_status:
+            response.raise_for_status()
+        return response
 
-    def patch(self, url: str, data: Optional[dict] = None, json: Optional[dict] = None, **kwargs) -> OptionalResponse:
+    def patch(self, url: str, data: Optional[dict] = None, json: Optional[dict] = None,
+              raise_for_status: bool = False, **kwargs) -> OptionalResponse:
+        url = self.url(url)
         if not self._vapp:
-            return requests.patch(self.url(url), data=data, json=json, **self._kwargs(**kwargs))
-        return self._response(self._vapp.patch_json(self.url(url), json or data, **self._kwargs(**kwargs)))
+            response = requests.patch(url, data=data, json=json, **self._kwargs(**kwargs))
+        else:
+            response = self._vapp.patch_json(url, json or data, **self._kwargs(**kwargs))
+            response = self._response(response)
+        if raise_for_status:
+            response.raise_for_status()
+        return response
 
-    def post(self, url: str, data: Optional[dict] = None, json: Optional[dict] = None,
-             files: Optional[dict] = None, **kwargs) -> OptionalResponse:
+    def post(self, url: str, data: Optional[dict] = None, json: Optional[dict] = None, files: Optional[dict] = None,
+             raise_for_status: bool = False, **kwargs) -> OptionalResponse:
+        url = self.url(url)
         if not self._vapp:
-            return requests.post(self.url(url), data=data, json=json, files=files, **self._kwargs(**kwargs))
-        if files:
-            response = self._vapp.post(self.url(url), json or data, upload_files=files, **self._kwargs(**kwargs))
+            response = requests.post(url, data=data, json=json, files=files, **self._kwargs(**kwargs))
         else:
-            response = self._vapp.post_json(self.url(url), json or data, upload_files=files, **self._kwargs(**kwargs))
-        return self._response(response)
+            if files:
+                response = self._vapp.post(url, json or data, upload_files=files, **self._kwargs(**kwargs))
+            else:
+                response = self._vapp.post_json(url, json or data, upload_files=files, **self._kwargs(**kwargs))
+            response = self._response(response)
+        if raise_for_status:
+            response.raise_for_status()
+        return response
 
     def get_metadata(self, object_id: str) -> Optional[dict]:
         return get_metadata(obj_id=object_id, vapp=self._vapp, key=self._key)
@@ -257,11 +274,28 @@ class Portal:
     def schema_name(name: str) -> str:
         return to_camel_case(name if not name.endswith(".json") else name[:-5]) if isinstance(name, str) else ""
 
+    def is_schema_type(self, value: dict, schema_type: str) -> bool:
+        """
+        Returns True iff the given object isa type of the given schema type.
+        """
+        if isinstance(value, dict) and (value_types := value.get("@type")):
+            if isinstance(value_types, str):
+                return self.is_specified_schema(value_types, schema_type)
+            elif isinstance(value_types, list):
+                for value_type in value_types:
+                    if self.is_specified_schema(value_type, schema_type):
+                        return True
+        return False
+
     def is_specified_schema(self, schema_name: str, schema_type: str) -> bool:
         """
         Returns True iff the given schema name isa type of the given schema type name,
         i.e. has an ancestor which is of type that given type.
         """
+        schema_name = self.schema_name(schema_name)
+        schema_type = self.schema_name(schema_type)
+        if schema_name == schema_type:
+            return True
         if super_type_map := self.get_schemas_super_type_map():
             if super_type := super_type_map.get(schema_type):
                 return self.schema_name(schema_name) in super_type

{dcicutils-8.7.0.1b3 → dcicutils-8.7.0.1b5}/pyproject.toml

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