dcicutils 8.18.0__py3-none-any.whl → 8.18.1.1b1__py3-none-any.whl

dcicutils/portal_utils.py

@@ -471,6 +471,19 @@ class Portal:
             super_type_map_flattened[super_type_name] = list_breadth_first(super_type_map, super_type_name)
         return super_type_map_flattened
 
+    @lru_cache(maxsize=100)
+    def get_schema_super_type_names(self, schema_name: str, include_schema_name: bool = False) -> List[str]:
+        if isinstance(schema_name, str) and (schema_name := self.schema_name(schema_name)):
+            if isinstance(super_type_map := self.get_schemas_super_type_map(), dict):
+                super_types = set()
+                for super_type_name in super_type_map:
+                    if schema_name in super_type_map[super_type_name]:
+                        super_types.add(super_type_name)
+                if (include_schema_name is True) and super_types and self.get_schema(schema_name):
+                    super_types.add(schema_name)
+                return list(super_types)
+        return []
+
     @lru_cache(maxsize=100)
     def get_schema_subtype_names(self, type_name: str) -> List[str]:
         if not (schemas_super_type_map := self.get_schemas_super_type_map()):

dcicutils/submitr/custom_excel.py

@@ -76,7 +76,7 @@ from dcicutils.misc_utils import to_boolean, to_float, to_integer
 # the same (portal) type; see comments below near the ExcelSheetName class definition.
 
 CUSTOM_COLUMN_MAPPINGS_BASE_URL = "https://raw.githubusercontent.com/smaht-dac/submitr/refs/heads"
-CUSTOM_COLUMN_MAPPINGS_BRANCH = "dmichaels-custom-column-mappings-20250115"
+CUSTOM_COLUMN_MAPPINGS_BRANCH = "master"
 CUSTOM_COLUMN_MAPPINGS_PATH = "submitr/config/custom_column_mappings.json"
 CUSTOM_COLUMN_MAPPINGS_URL = f"{CUSTOM_COLUMN_MAPPINGS_BASE_URL}/{CUSTOM_COLUMN_MAPPINGS_BRANCH}/{CUSTOM_COLUMN_MAPPINGS_PATH}"  # noqa
 CUSTOM_COLUMN_MAPPINGS_LOCAL = False

{dcicutils-8.18.0.dist-info → dcicutils-8.18.1.1b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.18.0
+Version: 8.18.1.1b1
 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.0.dist-info → dcicutils-8.18.1.1b1.dist-info}/RECORD

@@ -49,7 +49,7 @@ dcicutils/misc_utils.py,sha256=U6dABhaswQA_QPJgkx535WZuZ_ECfc3KvamOEdIMUtc,11607
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=Az3n1aL-PQkN5gOFE6ZqC2XkYsqiwKlq7-tZggs1QN4,11062
-dcicutils/portal_utils.py,sha256=ttqcs6wNyfe8T_OcGl_AvGXoVD5KKbhwDop7PC8rOaE,47533
+dcicutils/portal_utils.py,sha256=n_Evc8bYBBkWh89ysFB0mmHJ9lUsH-Rio_dWUqrLkkQ,48275
 dcicutils/progress_bar.py,sha256=R3bWLMYM3Xq9PY7U0JadcFT1m7QmCbrbDp9qs9_Kf_c,19472
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=j0kzo_T5VduKTxgsMTp7xjneyNokumZzI_iz55Y0Jjs,20505
@@ -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=VqAjEAXEjY8nnS-fxCjLPAEhFWHyL5AkKDNGn-Czts0,16583
+dcicutils/submitr/custom_excel.py,sha256=foT-fvGQti4RbTYIj6JSE4lh0gLhQ8thcidoUH-hv4w,16548
 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.0.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
-dcicutils-8.18.0.dist-info/METADATA,sha256=hbPeg5MHZe6rNL1ndPdW78tXt7nEpJMIDy7iEGaMgu0,3489
-dcicutils-8.18.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.18.0.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.18.0.dist-info/RECORD,,
+dcicutils-8.18.1.1b1.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
+dcicutils-8.18.1.1b1.dist-info/METADATA,sha256=QTmT7uAXru-PL2DWvZiwiaYiMkF009Q65xXIAOyd6pQ,3493
+dcicutils-8.18.1.1b1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.18.1.1b1.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.18.1.1b1.dist-info/RECORD,,