dcicutils 8.7.0.1b2__py3-none-any.whl → 8.7.0.1b4__py3-none-any.whl

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.dist-info → dcicutils-8.7.0.1b4.dist-info}/METADATA

@@ -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.dist-info → dcicutils-8.7.0.1b4.dist-info}/RECORD

@@ -43,7 +43,7 @@ dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
 dcicutils/misc_utils.py,sha256=bMRWWxdbhuF3PKdCZEH-H4U1ecgT3Nag3EL92D9XGoY,100973
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
-dcicutils/portal_utils.py,sha256=sNr2nlSFZ6TSXC8vOFr82fjUbvIFG9s4-m-VzxIn8pA,21224
+dcicutils/portal_utils.py,sha256=e7MnUbEXNOS-_NiCV4Xod3BT_K1Cy-crsRAqZdG_sXo,22528
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
 dcicutils/qa_utils.py,sha256=TT0SiJWiuxYvbsIyhK9VO4uV_suxhB6CpuC4qPacCzQ,160208
@@ -64,8 +64,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=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
-dcicutils-8.7.0.1b2.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.7.0.1b2.dist-info/METADATA,sha256=PwWPI_EXCGJ5BPcX7MBioNBQtfFm56Nenj1ORil3KH0,3314
-dcicutils-8.7.0.1b2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.7.0.1b2.dist-info/entry_points.txt,sha256=8wbw5csMIgBXhkwfgsgJeuFcoUc0WsucUxmOyml2aoA,209
-dcicutils-8.7.0.1b2.dist-info/RECORD,,
+dcicutils-8.7.0.1b4.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.7.0.1b4.dist-info/METADATA,sha256=Fc1lyyT3RwFRF93kxrHZ-j8zGImaJktcCUQno5PTXRs,3314
+dcicutils-8.7.0.1b4.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.7.0.1b4.dist-info/entry_points.txt,sha256=8wbw5csMIgBXhkwfgsgJeuFcoUc0WsucUxmOyml2aoA,209
+dcicutils-8.7.0.1b4.dist-info/RECORD,,