moving util files

LCOGT · Jan 8, 2025 · 2a89e24 · 2a89e24
1 parent 94026c3
commit 2a89e24
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 22 deletions.
diff --git a/datalab/datalab_session/analysis/get_tif.py b/datalab/datalab_session/analysis/get_tif.py
@@ -1,5 +1,5 @@
-from datalab.datalab_session.file_utils import create_tif
-from datalab.datalab_session.s3_utils import key_exists, add_file_to_bucket, get_s3_url, get_fits
+from datalab.datalab_session.utils.file_utils import create_tif
+from datalab.datalab_session.utils.s3_utils import key_exists, add_file_to_bucket, get_s3_url, get_fits
 
 def get_tif(input: dict):
   """

diff --git a/datalab/datalab_session/analysis/line_profile.py b/datalab/datalab_session/analysis/line_profile.py
@@ -3,8 +3,8 @@
 from astropy.wcs import WcsError
 from astropy import coordinates
 
-from datalab.datalab_session.file_utils import scale_points, get_hdu
-from datalab.datalab_session.s3_utils import get_fits
+from datalab.datalab_session.utils.file_utils import scale_points, get_hdu
+from datalab.datalab_session.utils.s3_utils import get_fits
 
 # For creating an array of brightness along a user drawn line
 def line_profile(input: dict):

diff --git a/datalab/datalab_session/analysis/raw_data.py b/datalab/datalab_session/analysis/raw_data.py
@@ -1,8 +1,8 @@
 import numpy as np
 import math
 from PIL import Image
-from datalab.datalab_session.s3_utils import get_fits
-from datalab.datalab_session.file_utils import get_hdu
+from datalab.datalab_session.utils.s3_utils import get_fits
+from datalab.datalab_session.utils.file_utils import get_hdu
 from fits2image.scaling import extract_samples, calc_zscale_min_max
 
 # TODO: This analysis endpoint assumes the image to be of 16 bitdepth. We should make this agnositc to bit depth in the future

diff --git a/datalab/datalab_session/analysis/source_catalog.py b/datalab/datalab_session/analysis/source_catalog.py
@@ -1,7 +1,7 @@
 import numpy as np
 
-from datalab.datalab_session.file_utils import get_hdu, scale_points
-from datalab.datalab_session.s3_utils import get_fits
+from datalab.datalab_session.utils.file_utils import get_hdu, scale_points
+from datalab.datalab_session.utils.s3_utils import get_fits
 
 # Source catalog Function Definition
 # ARGS: input (dict)

diff --git a/datalab/datalab_session/data_operations/data_operation.py b/datalab/datalab_session/data_operations/data_operation.py
@@ -5,9 +5,9 @@
 from django.core.cache import cache
 import numpy as np
 
-from datalab.datalab_session.s3_utils import get_fits
+from datalab.datalab_session.utils.s3_utils import get_fits
 from datalab.datalab_session.tasks import execute_data_operation
-from datalab.datalab_session.file_utils import get_hdu
+from datalab.datalab_session.utils.file_utils import get_hdu
 
 CACHE_DURATION = 60 * 60 * 24 * 30  # cache for 30 days
 

diff --git a/datalab/datalab_session/data_operations/fits_output_handler.py b/datalab/datalab_session/data_operations/fits_output_handler.py
@@ -2,8 +2,8 @@
 import numpy as np
 from astropy.io import fits
 
-from datalab.datalab_session.file_utils import create_jpgs
-from datalab.datalab_session.s3_utils import save_fits_and_thumbnails
+from datalab.datalab_session.utils.file_utils import create_jpgs
+from datalab.datalab_session.utils.s3_utils import save_fits_and_thumbnails
 
 
 class FITSOutputHandler():

diff --git a/datalab/datalab_session/data_operations/input_data_handler.py b/datalab/datalab_session/data_operations/input_data_handler.py
@@ -1,7 +1,7 @@
 from astropy.io import fits
 
-from datalab.datalab_session.s3_utils import get_fits
-from datalab.datalab_session.file_utils import get_hdu
+from datalab.datalab_session.utils.s3_utils import get_fits
+from datalab.datalab_session.utils.file_utils import get_hdu
 
 class InputDataHandler():
   """A class to read FITS files and provide access to the data.

diff --git a/datalab/datalab_session/data_operations/median.py b/datalab/datalab_session/data_operations/median.py
@@ -6,7 +6,7 @@
 from datalab.datalab_session.data_operations.fits_output_handler import FITSOutputHandler
 from datalab.datalab_session.data_operations.data_operation import BaseDataOperation
 from datalab.datalab_session.exceptions import ClientAlertException
-from datalab.datalab_session.file_utils import crop_arrays
+from datalab.datalab_session.utils.file_utils import crop_arrays
 
 log = logging.getLogger()
 log.setLevel(logging.INFO)

diff --git a/datalab/datalab_session/data_operations/rgb_stack.py b/datalab/datalab_session/data_operations/rgb_stack.py
@@ -1,13 +1,12 @@
 import logging
 
-from astropy.io import fits
 import numpy as np
 
 from datalab.datalab_session.data_operations.input_data_handler import InputDataHandler
 from datalab.datalab_session.data_operations.data_operation import BaseDataOperation
 from datalab.datalab_session.data_operations.fits_output_handler import FITSOutputHandler
 from datalab.datalab_session.exceptions import ClientAlertException
-from datalab.datalab_session.file_utils import crop_arrays, create_jpgs
+from datalab.datalab_session.utils.file_utils import crop_arrays, create_jpgs
 
 log = logging.getLogger()
 log.setLevel(logging.INFO)

diff --git a/datalab/datalab_session/data_operations/stacking.py b/datalab/datalab_session/data_operations/stacking.py
@@ -6,7 +6,7 @@
 from datalab.datalab_session.data_operations.fits_output_handler import FITSOutputHandler
 from datalab.datalab_session.data_operations.data_operation import BaseDataOperation
 from datalab.datalab_session.exceptions import ClientAlertException
-from datalab.datalab_session.file_utils import crop_arrays
+from datalab.datalab_session.utils.file_utils import crop_arrays
 
 log = logging.getLogger()
 log.setLevel(logging.INFO)

diff --git a/datalab/datalab_session/data_operations/subtraction.py b/datalab/datalab_session/data_operations/subtraction.py
@@ -6,7 +6,7 @@
 from datalab.datalab_session.data_operations.data_operation import BaseDataOperation
 from datalab.datalab_session.data_operations.fits_output_handler import FITSOutputHandler
 from datalab.datalab_session.exceptions import ClientAlertException
-from datalab.datalab_session.file_utils import crop_arrays
+from datalab.datalab_session.utils.file_utils import crop_arrays
 
 log = logging.getLogger()
 log.setLevel(logging.INFO)

diff --git a/datalab/datalab_session/tests/test_utils.py b/datalab/datalab_session/tests/test_utils.py
@@ -1,5 +1,5 @@
-from datalab.datalab_session.file_utils import *
-from datalab.datalab_session.s3_utils import *
+from datalab.datalab_session.utils.file_utils import *
+from datalab.datalab_session.utils.s3_utils import *
 from datalab.datalab_session.tests.test_files.file_extended_test_case import FileExtendedTestCase
 
 class FileUtilsTestClass(FileExtendedTestCase):

diff --git a/datalab/datalab_session/file_utils.py → datalab/datalab_session/utils/file_utils.py b/datalab/datalab_session/file_utils.py → datalab/datalab_session/utils/file_utils.py
@@ -6,7 +6,7 @@
 from fits2image.conversions import fits_to_jpg, fits_to_tif
 
 from datalab.datalab_session.exceptions import ClientAlertException
-from datalab.datalab_session.s3_utils import save_fits_and_thumbnails
+from datalab.datalab_session.utils.s3_utils import save_fits_and_thumbnails
 
 log = logging.getLogger()
 log.setLevel(logging.INFO)

diff --git a/datalab/datalab_session/s3_utils.py → datalab/datalab_session/utils/s3_utils.py b/datalab/datalab_session/s3_utils.py → datalab/datalab_session/utils/s3_utils.py