fix: Fix import statements in nbia.py and nbia_cli.py

jjjermiah · Feb 18, 2024 · 14816f1 · 14816f1
1 parent 6874a3d
commit 14816f1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/nbiatoolkit/dicomsort/__init__.py b/src/nbiatoolkit/dicomsort/__init__.py
@@ -7,12 +7,12 @@
 #     "validateMD5"
 # ]
 
-# from .dicomsort import DICOMSorter
+from .dicomsort import DICOMSorter
 from .helper_functions import parseDICOMKeysFromFormat, sanitizeFileName, _truncateUID
 
 __all__ = [
     "parseDICOMKeysFromFormat",
     "sanitizeFileName",
     "_truncateUID",
-    # "DICOMSorter",
+    "DICOMSorter",
 ]
diff --git a/src/nbiatoolkit/nbia.py b/src/nbiatoolkit/nbia.py
@@ -7,7 +7,7 @@
 import os
 import zipfile
 from tempfile import TemporaryDirectory
-from src.nbiatoolkit.dicomsort.dicomsort import DICOMSorter
+from .dicomsort import DICOMSorter
 
 import multiprocessing
 from .auth import OAuth2

diff --git a/src/nbiatoolkit/nbia_cli.py b/src/nbiatoolkit/nbia_cli.py
@@ -1,5 +1,6 @@
 import io
 from .nbia import NBIAClient, __version__
+from .dicomsort import DICOMSorter
 
 import argparse
 import sys
@@ -500,7 +501,7 @@ def downloadSingleSeries_cli() -> None:
     args = p.parse_args()
 
     return getResults_cli(
-        func=NBIAClient(args.username, args.password)._downloadSingleSeries,
+        func=NBIAClient(args.username, args.password).downloadSeries,
         SeriesInstanceUID=args.seriesUID,
         downloadDir=args.downloadDir,
         filePattern=args.filePattern,
@@ -589,5 +590,5 @@ def DICOMSorter_cli():
     )
 
     sorter.sortDICOMFiles(
-        option="copy", overwrite=args.overwrite, nParallel=int(args.nParallel)
+        shutil_option="copy", overwrite=args.overwrite, n_parallel=int(args.nParallel)
     )