dcicutils 8.8.2.1b5__tar.gz → 8.8.2.1b7__tar.gz

{dcicutils-8.8.2.1b5 → dcicutils-8.8.2.1b7}/PKG-INFO

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

@@ -45,6 +45,7 @@ class Portal:
     DEFAULT_APP = APP_SMAHT
     KEYS_FILE_DIRECTORY = "~"
     MIME_TYPE_JSON = "application/json"
+    FILE_TYPE_SCHEMA_NAME = "File"
 
     # Object lookup strategies; on a per-reference (type/value) basis, used currently ONLY by
     # structured_data.py; controlled by an optional ref_lookup_strategy callable; default is
@@ -342,6 +343,9 @@ class Portal:
                             return True
         return False
 
+    def is_schema_file_type(self, schema_name_or_portal_object: Union[str, dict]) -> bool:
+        return self.is_schema_type(schema_name_or_portal_object, self.FILE_TYPE_SCHEMA_NAME)
+
     def isinstance_schema(self, portal_object: dict, target_schema_name: str) -> bool:
         """
         Returns True iff the given object isa type of the given schema type.

{dcicutils-8.8.2.1b5 → dcicutils-8.8.2.1b7}/dcicutils/progress_bar.py

@@ -149,8 +149,7 @@ class ProgressBar:
         if self._done or self._bar is None:
             return
         self._ended = time.time()
-        self._done = True
-        self.set_progress(self.total)  # xyzzy
+        self.set_progress(self.total)
         self._bar.set_description(self._description)
         self._bar.refresh()
         # FYI: Do NOT do a bar.disable = True before a bar.close() or it messes up output
@@ -160,6 +159,7 @@ class ProgressBar:
             self._tidy_output_hack.restore()
         if self._interrupt_handler:
             self._interrupt_handler.restore()
+        self._done = True
 
     def disable(self, value: bool = True) -> None:
         self._disabled = (value is True)

{dcicutils-8.8.2.1b5 → dcicutils-8.8.2.1b7}/dcicutils/structured_data.py

@@ -40,7 +40,6 @@ DOTTED_NAME_DELIMITER_CHAR = "."
 
 
 # TODO: Should probably pass this knowledge in from callers.
-FILE_TYPE_NAME = "File"
 FILE_TYPE_PROPERTY_NAME = "filename"
 
 # Forward type references for type hints.
@@ -162,7 +161,7 @@ class StructuredDataSet:
         result = []
         if self._portal:
             for type_name in self.data:
-                if self._portal.is_file_schema(type_name):
+                if self._portal.is_schema_file_type(type_name):
                     for item in self.data[type_name]:
                         if (file_name := item.get(FILE_TYPE_PROPERTY_NAME)):
                             result.append({"type": type_name, "file": file_name})
@@ -872,12 +871,6 @@ class Portal(PortalBase):
                     schemas[user_specified_schema["title"]] = user_specified_schema
         return schemas
 
-    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_schema_type(schema_name, FILE_TYPE_NAME)
-
     def ref_exists(self, type_name: str, value: Optional[str] = None,
                    called_from_map_ref: bool = False) -> Optional[dict]:
         if not value:

{dcicutils-8.8.2.1b5 → dcicutils-8.8.2.1b7}/pyproject.toml

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