dcicutils 8.7.2.1b5__tar.gz → 8.7.2.1b7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.7.2.1b5
+Version: 8.7.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.7.2.1b5 → dcicutils-8.7.2.1b7}/dcicutils/data_readers.py

@@ -170,7 +170,15 @@ class Excel:
         if self._workbook is None:
             self._workbook = openpyxl.load_workbook(self._file, data_only=True)
             self.sheet_names = [sheet_name for sheet_name in self._workbook.sheetnames
-                                if self._include_hidden_sheets or (self._workbook[sheet_name].sheet_state != "hidden")]
+                                if not self.is_hidden_sheet(self._workbook[sheet_name])]
+
+    def is_hidden_sheet(self, sheet: openpyxl.worksheet.worksheet.Worksheet) -> bool:
+        if not self._include_hidden_sheets:
+            if sheet.sheet_state == "hidden":
+                return True
+            if sheet.title.startswith("(") and sheet.title.endswith(")"):
+                return True
+        return False
 
     def __del__(self) -> None:
         if (workbook := self._workbook) is not None:

{dcicutils-8.7.2.1b5 → dcicutils-8.7.2.1b7}/dcicutils/portal_object_utils.py

@@ -13,9 +13,11 @@ class PortalObject:
 
     _PROPERTY_DELETION_SENTINEL = RowReader.CELL_DELETION_SENTINEL
 
-    def __init__(self, portal_object: dict, portal: Portal = None, type: Optional[str] = None) -> None:
-        self._data = portal_object
-        self._portal = portal
+    def __init__(self, data: dict, portal: Portal = None,
+                 schema: Optional[Union[dict, Schema]] = None, type: Optional[str] = None) -> None:
+        self._data = data if isinstance(data, dict) else {}
+        self._portal = portal if isinstance(portal, Portal) else None
+        self._schema = schema if isinstance(schema, dict) else (schema.data if isinstance(schema, Schema) else None)
         self._type = type if isinstance(type, str) and type else None
 
     @property
@@ -29,7 +31,7 @@ class PortalObject:
     @property
     @lru_cache(maxsize=1)
     def type(self) -> Optional[str]:
-        return self._type or Portal.get_schema_type(self._data)
+        return self._type or Portal.get_schema_type(self._data) or (Schema(self._schema).type if self._schema else None)
 
     @property
     @lru_cache(maxsize=1)
@@ -44,7 +46,7 @@ class PortalObject:
     @property
     @lru_cache(maxsize=1)
     def schema(self) -> Optional[dict]:
-        return self._portal.get_schema(self.type) if self._portal else None
+        return self._schema if self._schema else (self._portal.get_schema(self.type) if self._portal else None)
 
     def copy(self) -> PortalObject:
         return PortalObject(deepcopy(self.data), portal=self.portal, type=self.type)

{dcicutils-8.7.2.1b5 → dcicutils-8.7.2.1b7}/dcicutils/schema_utils.py

@@ -191,7 +191,9 @@ class Schema:
 
     def __init__(self, schema: dict, type: Optional[str] = None) -> None:
         self._data = schema if isinstance(schema, dict) else (schema.data if isinstance(schema, Schema) else {})
-        self._type = (type if isinstance(type, str) else "") or Schema.type_name(self._data.get("title", ""))
+        self._type = ((type if isinstance(type, str) else "") or
+                      Schema.type_name(self._data.get("title", "")) or
+                      Schema.type_name(self._data.get("$id", "")))
 
     @property
     def data(self) -> dict:

{dcicutils-8.7.2.1b5 → dcicutils-8.7.2.1b7}/dcicutils/scripts/view_portal_object.py

@@ -139,7 +139,7 @@ def _get_portal_object(portal: Portal, uuid: str,
         response = portal.get(path, raw=raw, database=database)
     except Exception as e:
         if "404" in str(e) and "not found" in str(e).lower():
-            _print("Portal object not found: {uuid}")
+            _print(f"Portal object not found: {uuid}")
             _exit_without_action()
         _exit_without_action(f"Exception getting Portal object: {uuid}\n{get_error_message(e)}")
     if not response:

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

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