dcicutils 8.14.0.1b11__py3-none-any.whl → 8.14.0.1b12__py3-none-any.whl

dcicutils/scripts/update_portal_object.py

@@ -401,7 +401,8 @@ def _upsert_data(portal: Portal, data: dict, schema_name: str,
 
 
 def _load_data(load: str, ini_file: str, explicit_schema_name: Optional[str] = None,
-               verbose: bool = False, debug: bool = False, noprogress: bool = False) -> bool:
+               verbose: bool = False, debug: bool = False, noprogress: bool = False,
+               _portal: Optional[Portal] = None, _single_insert_file: Optional[str] = None) -> bool:
 
     from snovault.loadxl import load_all_gen, LoadGenWrapper
     from dcicutils.captured_output import captured_output
@@ -411,7 +412,7 @@ def _load_data(load: str, ini_file: str, explicit_schema_name: Optional[str] = N
 
         nonlocal LoadGenWrapper, load_all_gen, verbose, debug
         progress_total = sum(schema_names_to_load.values()) * 2  # loadxl does two passes
-        progress_bar = ProgressBar(progress_total) if not noprogress else None
+        progress_bar = ProgressBar(progress_total, interrupt_exit=True) if not noprogress else None
 
         def decode_bytes(str_or_bytes: Union[str, bytes], *, encoding: str = "utf-8") -> str:
             if not isinstance(encoding, str):
@@ -477,9 +478,9 @@ def _load_data(load: str, ini_file: str, explicit_schema_name: Optional[str] = N
         inserts_directory = None
         inserts_file = load
 
-    portal = None
-    with captured_output(not debug):
-        portal = Portal(ini_file)
+    if not (portal := _portal):
+        with captured_output(not debug):
+            portal = Portal(ini_file)
 
     if inserts_file:
         with io.open(inserts_file, "r") as f:
@@ -498,7 +499,8 @@ def _load_data(load: str, ini_file: str, explicit_schema_name: Optional[str] = N
                     with io.open(file_name, "w") as f:
                         json.dump(data, f)
                     return _load_data(load=tmpdir, ini_file=ini_file, explicit_schema_name=explicit_schema_name,
-                                      verbose=verbose, debug=debug, noprogress=noprogress)
+                                      verbose=verbose, debug=debug, noprogress=noprogress,
+                                      _portal=portal, _single_insert_file=inserts_file)
             elif isinstance(data, dict):
                 _print("DICT IN FILE FOR LOAD NOT YET SUPPPORTED")
                 if not _is_schema_name_list(portal, schema_names := list(data.keys())):
@@ -517,7 +519,8 @@ def _load_data(load: str, ini_file: str, explicit_schema_name: Optional[str] = N
                         nfiles += 1
                     if nfiles > 0:
                         return _load_data(load=tmpdir, ini_file=ini_file,
-                                          verbose=verbose, debug=debug, noprogress=noprogress)
+                                          verbose=verbose, debug=debug, noprogress=noprogress,
+                                          _portal=portal, _single_insert_file=inserts_file)
                 # TODO
                 return True
             else:
@@ -525,7 +528,10 @@ def _load_data(load: str, ini_file: str, explicit_schema_name: Optional[str] = N
                 return False
         return True
     if verbose:
-        _print(f"Loading data files into Portal (via snovault.loadxl) from: {inserts_directory}")
+        if _single_insert_file:
+            _print(f"Loading data file into Portal (via snovault.loadxl) from: {_single_insert_file}")
+        else:
+            _print(f"Loading data files into Portal (via snovault.loadxl) from: {inserts_directory}")
         _print(f"Portal INI file for load is: {ini_file}")
 
     schema_names = list(_get_schemas(portal).keys())

{dcicutils-8.14.0.1b11.dist-info → dcicutils-8.14.0.1b12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.14.0.1b11
+Version: 8.14.0.1b12
 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.14.0.1b11.dist-info → dcicutils-8.14.0.1b12.dist-info}/RECORD

@@ -60,7 +60,7 @@ dcicutils/s3_utils.py,sha256=h2B9ftOo-kxqfiKth5ZDC_cAUFy1Pbu7BrVanFnE5Iw,28839
 dcicutils/schema_utils.py,sha256=GmRm-XqZKJ6qine16SQF1txcby9WougDav_sYmKNs9E,12400
 dcicutils/scripts/publish_to_pypi.py,sha256=sMd4WASQGlxlh7uLrt2eGkFRXYgONVmvIg8mClMS5RQ,13903
 dcicutils/scripts/run_license_checker.py,sha256=z2keYnRDZsHQbTeo1XORAXSXNJK5axVzL5LjiNqZ7jE,4184
-dcicutils/scripts/update_portal_object.py,sha256=fLgsPgnugKLS18A8JwP8O_UdmeFqNIjUIhrEFlIhfgE,32589
+dcicutils/scripts/update_portal_object.py,sha256=KSsbHVOaS7zGOSVYbB2Lf7FT_gYFAGk4ot8e-us2HkE,33057
 dcicutils/scripts/view_portal_object.py,sha256=lcgXWH9ooVf7tJDIRnoFGOgT0wYLGhiJlJW3a9w6A_c,36983
 dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19745
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
@@ -75,8 +75,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.14.0.1b11.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.14.0.1b11.dist-info/METADATA,sha256=HFNj87yKbAwTA98cVDJm_0r9aVJssg7zo5dIsqngVrg,3440
-dcicutils-8.14.0.1b11.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.14.0.1b11.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.14.0.1b11.dist-info/RECORD,,
+dcicutils-8.14.0.1b12.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.14.0.1b12.dist-info/METADATA,sha256=iUlj60aXP1C2TpYySyc6ieQWkM3a11PKfLLFXEOFH9s,3440
+dcicutils-8.14.0.1b12.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.14.0.1b12.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.14.0.1b12.dist-info/RECORD,,