dcicutils 8.18.2__py3-none-any.whl → 8.18.3__py3-none-any.whl

dcicutils/submitr/custom_excel.py

@@ -95,7 +95,8 @@ class CustomExcel(Excel):
         return CustomExcelSheetReader(self, sheet_name=sheet_name, workbook=self._workbook,
                                       custom_column_mappings=self._custom_column_mappings)
 
-    def effective_sheet_name(self, sheet_name: str) -> str:
+    @staticmethod
+    def effective_sheet_name(sheet_name: str) -> str:
         if (underscore := sheet_name.find("_")) > 1:
             return sheet_name[underscore + 1:]
         return sheet_name
@@ -151,11 +152,21 @@ class CustomExcelSheetReader(ExcelSheetReader):
         ARGUMENT_NAME_CUSTOM_COLUMN_MAPPINGS = "custom_column_mappings"
         self._custom_column_mappings = None
         if ARGUMENT_NAME_CUSTOM_COLUMN_MAPPINGS in kwargs:
+            def lookup_custom_column_mappings(custom_column_mappings: dict, sheet_name: str) -> Optional[dict]:
+                if isinstance(custom_column_mappings, dict) and isinstance(sheet_name, str):
+                    if isinstance(found_custom_column_mappings := custom_column_mappings.get(sheet_name), dict):
+                        return found_custom_column_mappings
+                    if (effective_sheet_name := CustomExcel.effective_sheet_name(sheet_name)) != sheet_name:
+                        if isinstance(found_custom_column_mappings :=
+                                      custom_column_mappings.get(effective_sheet_name), dict):
+                            return found_custom_column_mappings
+                return None
             custom_column_mappings = kwargs[ARGUMENT_NAME_CUSTOM_COLUMN_MAPPINGS]
             del kwargs[ARGUMENT_NAME_CUSTOM_COLUMN_MAPPINGS]
             if not (isinstance(custom_column_mappings, dict) and
                     isinstance(sheet_name := kwargs.get(ARGUMENT_NAME_SHEET_NAME, None), str) and
-                    isinstance(custom_column_mappings := custom_column_mappings.get(sheet_name), dict)):
+                    isinstance(custom_column_mappings :=
+                               lookup_custom_column_mappings(custom_column_mappings, sheet_name), dict)):
                 custom_column_mappings = None
             self._custom_column_mappings = custom_column_mappings
         super().__init__(*args, **kwargs)

{dcicutils-8.18.2.dist-info → dcicutils-8.18.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.18.2
+Version: 8.18.3
 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.18.2.dist-info → dcicutils-8.18.3.dist-info}/RECORD

@@ -68,7 +68,7 @@ dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,2
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
 dcicutils/structured_data.py,sha256=9Uleh8AhRWW6qj4fDCUnpRBsLgxWHZVh8nJdMDSHmD0,67510
 dcicutils/submitr/config/custom_column_mappings.json,sha256=GS6umTpNZszTao8zTbGiNbR8qFnL4kudMt3nBZXaom0,3881
-dcicutils/submitr/custom_excel.py,sha256=foT-fvGQti4RbTYIj6JSE4lh0gLhQ8thcidoUH-hv4w,16548
+dcicutils/submitr/custom_excel.py,sha256=BHDIe8EPPeDTopPG8BIefELqhnxKm62nN3YGRsApkWw,17362
 dcicutils/submitr/progress_constants.py,sha256=5bxyX77ql8qEJearfHEvsvXl7D0GuUODW0T65mbRmnE,2895
 dcicutils/submitr/ref_lookup_strategy.py,sha256=VJN-Oo0LLna6Vo2cu47eC-eU-yUC9NFlQP29xajejVU,4741
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
@@ -77,8 +77,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=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.18.2.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
-dcicutils-8.18.2.dist-info/METADATA,sha256=3kuB4nZC-IyeEb1GNDblCIqcH1gD52idy4Tj9j39is4,3489
-dcicutils-8.18.2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.18.2.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.18.2.dist-info/RECORD,,
+dcicutils-8.18.3.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
+dcicutils-8.18.3.dist-info/METADATA,sha256=Nbx6ehOG34J3DpBsM75s98Qb9gnLjjP9MsjhbyprrH4,3489
+dcicutils-8.18.3.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.18.3.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.18.3.dist-info/RECORD,,