dcicutils 8.7.0.1b2__tar.gz → 8.7.0.1b4__tar.gz

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

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

@@ -257,15 +257,39 @@ 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_file_schema(self, schema_name: str) -> bool:
+    def is_schema_type(self, value: dict, schema_type: str) -> bool:
         """
-        Returns True iff the given schema name isa File type, i.e. has an ancestor which is of type File.
+        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 file_super_type := super_type_map.get(Portal.FILE_SCHEMA_NAME):
-                return self.schema_name(schema_name) in file_super_type
+            if super_type := super_type_map.get(schema_type):
+                return self.schema_name(schema_name) in super_type
         return False
 
+    def is_file_schema(self, schema_name: str) -> bool:
+        """
+        Returns True iff the given schema name isa File type, i.e. has an ancestor which is of type File.
+        """
+        return self.is_specified_schema(schema_name, Portal.FILE_SCHEMA_NAME)
+
     def get_schemas_super_type_map(self) -> dict:
         """
         Returns the "super type map" for all of the known schemas (via /profiles).
@@ -335,6 +359,9 @@ class Portal:
                     return getattr(self._response, attr)
                 def json(self):  # noqa
                     return self._response.json
+                def raise_for_status(self):  # noqa
+                    if self.status_code < 200 or self.status_code > 399:
+                        raise requests.exceptions.HTTPError(f"HTTP Error: {self.status_code}", response=self)
             response = TestResponseWrapper(response)
         return response
 

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.7.0.1b2"  # TODO: To become 8.7.1
+version = "8.7.0.1b4"  # 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"