dcicutils 8.7.2.1b5__py3-none-any.whl → 8.7.2.1b7__py3-none-any.whl

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

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

@@ -10,7 +10,7 @@ dcicutils/common.py,sha256=YE8Mt5-vaZWWz4uaChSVhqGFbFtW5QKtnIyOr4zG4vM,3955
 dcicutils/contribution_scripts.py,sha256=0k5Gw1TumcD5SAcXVkDd6-yvuMEw-jUp5Kfb7FJH6XQ,2015
 dcicutils/contribution_utils.py,sha256=vYLS1JUB3sKd24BUxZ29qUBqYeQBLK9cwo8x3k64uPg,25653
 dcicutils/creds_utils.py,sha256=xrLekD49Ex0GOpL9n7LlJA4gvNcY7txTVFOSYD7LvEU,11113
-dcicutils/data_readers.py,sha256=6k2Pgcw62JbKcAYFUkMUUxoqAw2OTQTYyTW0qAYhSNA,6369
+dcicutils/data_readers.py,sha256=A48f7H7upkePpRKfq8bEv1EGM5Jjdes1pyjnreatjh0,6666
 dcicutils/data_utils.py,sha256=k2OxOlsx7AJ6jF-YNlMyGus_JqSUBe4_n1s65Mv1gQQ,3098
 dcicutils/datetime_utils.py,sha256=EODDGAngp1yh2ZlDIuI7tB74JBJucw2DljqfPknzK0Y,4666
 dcicutils/deployment_utils.py,sha256=rcNUFMe_tsrG4CHEtgBe41cZx4Pk4JqISPsjrJRMoEs,68891
@@ -46,7 +46,7 @@ dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
 dcicutils/misc_utils.py,sha256=zVc4urdVGgnWjQ4UQlrGH-URAzr2l_PwZWI3u_GJdFE,102210
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
-dcicutils/portal_object_utils.py,sha256=cez8sLu9dyk5f4TrR2QoOPPjCK0m_Sns1FeW5gbdbVw,12686
+dcicutils/portal_object_utils.py,sha256=6QYVsmIVH-GUgZnws0Ob2d-THtiHERETx_OrLKNn0vA,13015
 dcicutils/portal_utils.py,sha256=WA0KfBYYLXJmG-TVUPbBiwSfI-3phU07F5Fy79cJEWs,27684
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
@@ -54,10 +54,10 @@ dcicutils/qa_utils.py,sha256=TT0SiJWiuxYvbsIyhK9VO4uV_suxhB6CpuC4qPacCzQ,160208
 dcicutils/redis_tools.py,sha256=qkcSNMtvqkpvts-Cm9gWhneK523Q_oHwhNUud1be1qk,7055
 dcicutils/redis_utils.py,sha256=VJ-7g8pOZqR1ZCtdcjKz3-6as2DMUcs1b1zG6wSprH4,6462
 dcicutils/s3_utils.py,sha256=LauLFQGvZLfpBJ81tYMikjLd3SJRz2R_FrL1n4xSlyI,28868
-dcicutils/schema_utils.py,sha256=Ky1KCrHYbDR4qd1prHBKJvO8Z_1x1xVUup1SsQsVP24,10002
+dcicutils/schema_utils.py,sha256=IhtozG2jQ7bFyn54iPEdmDrHoCf3ryJXeXvPJRBXNn0,10095
 dcicutils/scripts/publish_to_pypi.py,sha256=LFzNHIQK2EXFr88YcfctyA_WKEBFc1ElnSjWrCXedPM,13889
 dcicutils/scripts/run_license_checker.py,sha256=z2keYnRDZsHQbTeo1XORAXSXNJK5axVzL5LjiNqZ7jE,4184
-dcicutils/scripts/view_portal_object.py,sha256=ouH1lCz3RYl_FyLmCsg2yHHSQ-dQ2QfN7j8IheqjxxE,8244
+dcicutils/scripts/view_portal_object.py,sha256=QZqNtXIDmgyVZEAYRNSpjCRLPwP-TUyFqcBx2La-nUo,8245
 dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19745
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=ymP7PXH6-yEiXAt75w0ldQFciGNqWBClNxC5gfX2FnY,22961
@@ -69,8 +69,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.2.1b5.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.7.2.1b5.dist-info/METADATA,sha256=ll_LWXvj31u5gWf3GJ0k9yrsdnmo0eaQ8KTA8haQT1o,3356
-dcicutils-8.7.2.1b5.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.7.2.1b5.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.7.2.1b5.dist-info/RECORD,,
+dcicutils-8.7.2.1b7.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.7.2.1b7.dist-info/METADATA,sha256=QPMBO-ACtYso8RGVZNhcN3t5o2mDUFvlBviU6Q6bIXk,3356
+dcicutils-8.7.2.1b7.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.7.2.1b7.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.7.2.1b7.dist-info/RECORD,,