diff --git a/skeletonservice/datasets/api.py b/skeletonservice/datasets/api.py index 72270be..3be7a78 100644 --- a/skeletonservice/datasets/api.py +++ b/skeletonservice/datasets/api.py @@ -509,10 +509,10 @@ def process(datastack_name: str, skvn: int, rid: int): c = MessagingClient() exchange = os.getenv("SKELETON_CACHE_HIGH_PRIORITY_EXCHANGE", "skeleton") - print(f"SkeletonService sending payload for rid {rid} to exchange {exchange}") + current_app.logger.info(f"SkeletonService sending payload for rid {rid} to exchange {exchange}") c.publish(exchange, payload, attributes) - print(f"Message has been dispatched to {exchange}: {datastack_name} {rid} skvn:{skvn} {current_app.config['SKELETON_CACHE_BUCKET']}") + current_app.logger.info(f"Message has been dispatched to {exchange}: {datastack_name} {rid} skvn:{skvn} {current_app.config['SKELETON_CACHE_BUCKET']}") return f"Message has been dispatched to {exchange}: {datastack_name} {rid} skvn:{skvn} {current_app.config['SKELETON_CACHE_BUCKET']}" # @auth_required diff --git a/skeletonservice/datasets/messaging.py b/skeletonservice/datasets/messaging.py index 7985cf1..48c2789 100644 --- a/skeletonservice/datasets/messaging.py +++ b/skeletonservice/datasets/messaging.py @@ -2,12 +2,14 @@ import traceback as tb from messagingclient import MessagingClient from .service import SkeletonService +import logging +logger = logging.getLogger(__name__) def callback(payload): s = "" for k in payload.attributes: s += f"\n__{k}: {payload.attributes[k]}" - print("Skeleton Cache message-processor received message: ", s) + logger.info("Skeleton Cache message-processor received message: ", s) try: # NOTE: Forrest indicates I am shooting for something like the following once fully implemented. # SkelClassVsn = current_app.config['SKELETON_VERSION_ENGINES'][int(payload.attributes["skeleton_version"])] @@ -24,9 +26,9 @@ def callback(payload): False, # via_requests int(payload.attributes["verbose_level"]), ) - print("Skeleton Cache message-processor returned from SkeletonService.get_skeleton_by_datastack_and_rid() with result: ", result) + logger.info("Skeleton Cache message-processor returned from SkeletonService.get_skeleton_by_datastack_and_rid() with result: ", result) except Exception as e: - print("Skeleton Cache message-processor received error from SkeletonService.get_skeleton_by_datastack_and_rid(): ", repr(e)) + logger.error("Skeleton Cache message-processor received error from SkeletonService.get_skeleton_by_datastack_and_rid(): ", repr(e)) print(tb.format_exc()) raise e diff --git a/skeletonservice/datasets/service.py b/skeletonservice/datasets/service.py index 7bb7809..7f1a895 100644 --- a/skeletonservice/datasets/service.py +++ b/skeletonservice/datasets/service.py @@ -20,6 +20,7 @@ import pcg_skel from cloudfiles import CloudFiles, compression import cloudvolume +import logging # from skeletonservice.datasets.models import ( # Skeleton, @@ -27,7 +28,7 @@ # from skeletonservice.datasets.schemas import ( # SkeletonSchema, # ) - +logger = logging.getLogger(__name__) __version__ = "0.14.3" CAVE_CLIENT_SERVER = os.environ.get("GLOBAL_SERVER_URL", "https://global.daf-apis.com") @@ -1248,18 +1249,15 @@ def get_skeleton_by_datastack_and_rid( ) if skel_confirmation: # Nothing else to do, so return - if verbose_level >= 1: - print(f"Skeleton is already in cache: {rid}") + logger.info(f"Skeleton is already in cache: {rid}") return # At this point, fall through with cached_skeleton set to None to trigger generating a new skeleton. else: cached_skeleton = SkeletonService._retrieve_skeleton_from_cache( params, output_format ) - if verbose_level >= 1: - print(f"Cache query result: {cached_skeleton is not None}") - if verbose_level >= 2: - print(f"Cache query result: {cached_skeleton}") + logger.debug(f"Cache query result: {cached_skeleton is not None}") + logger.info(f"Cache query result: {cached_skeleton}") # if os.path.exists(DEBUG_SKELETON_CACHE_LOC): # cached_skeleton = SkeletonService._retrieve_skeleton_from_local(params, output_format) @@ -1302,16 +1300,14 @@ def get_skeleton_by_datastack_and_rid( cached_skeleton ) ) - if verbose_level >= 1: - print(f"Length of cached skeleton: {len(cached_skeleton)} and corresponding json: {len(json.dumps(cached_skeleton))}") + logger.debug(f"Length of cached skeleton: {len(cached_skeleton)} and corresponding json: {len(json.dumps(cached_skeleton))}") if via_requests and has_request_context(): t0 = default_timer() response = jsonify(cached_skeleton) - if verbose_level >= 1: - t1 = default_timer() - et = t1 - t0 - print(f"Time to jsonify json dict: {et}s") + t1 = default_timer() + et = t1 - t0 + logger.info(f"Time to jsonify json dict: {et}s") response.headers.update(SkeletonService._response_headers()) response = SkeletonService._after_request(response) return response @@ -1378,8 +1374,7 @@ def get_skeleton_by_datastack_and_rid( or output_format == "precomputed" ): skeleton, lvl2_ids = SkeletonService._retrieve_skeleton_from_cache(params, "h5_mpsk") - if verbose_level >= 1: - print(f"H5 cache query result: {skeleton}") + logger.info(f"H5 cache query result: {skeleton}") # If no H5 skeleton was found, generate a new skeleton. # Note that the skeleton for any given set of parameters will only ever be generated once, regardless of the multiple formats offered. @@ -1393,13 +1388,12 @@ def get_skeleton_by_datastack_and_rid( params, "h5" ) except Exception as e: - print(f"Exception while retrieving local debugging skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while retrieving local debugging skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() try: if not skeleton: - if verbose_level >= 1: - print("No local (debugging) skeleton found. Proceeding to generate a new skeleton.") + logger.info("No local (debugging) skeleton found. Proceeding to generate a new skeleton.") skeletonization_start_time = default_timer() if skeleton_version == 1: skeleton = SkeletonService._generate_v1_skeleton(*params, cave_client) @@ -1411,19 +1405,17 @@ def get_skeleton_by_datastack_and_rid( nrn, skeleton, lvl2_ids = SkeletonService._generate_v4_skeleton(*params, cave_client) skeletonization_end_time = default_timer() skeletonization_elapsed_time = skeletonization_end_time - skeletonization_start_time - if verbose_level >= 1: - print(f"Skeleton successfully generated in {skeletonization_elapsed_time} seconds: {skeleton}") + logger.info(f"Skeleton successfully generated in {skeletonization_elapsed_time} seconds: {skeleton}") try: SkeletonService._archive_skeletonization_time(bucket, rid, skeleton_version, skeletonization_elapsed_time) except Exception as e: # This is a non-critical operation, so don't let it stop the process. - print(f"Exception while archiving skeletonization time: {str(e)}. Traceback:") + logger.error(f"Exception while archiving skeletonization time: {str(e)}. Traceback:") traceback.print_exc() else: - if verbose_level >= 1: - print("Local (debugging) skeleton was found.") + logger.info("Local (debugging) skeleton was found.") except Exception as e: - print(f"Exception while generating skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while generating skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() return f"Exception while generating skeleton for {rid}: {str(e)}" @@ -1448,7 +1440,7 @@ def get_skeleton_by_datastack_and_rid( skeleton, lvl2_ids, debug_skeleton_cache_loc + file_name ) except Exception as e: - print(f"Exception while saving local debugging skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while saving local debugging skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() try: @@ -1475,7 +1467,7 @@ def get_skeleton_by_datastack_and_rid( return response return sk_file_content except Exception as e: - print(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() if output_format == "swc" or output_format == "swccompressed": @@ -1515,7 +1507,7 @@ def get_skeleton_by_datastack_and_rid( return response return file_content except Exception as e: - print(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() return @@ -1523,13 +1515,12 @@ def get_skeleton_by_datastack_and_rid( try: if not skeleton_bytes: assert skeleton is not None - print("Generating flat dict with lvl2_ids of length: ", len(lvl2_ids) if lvl2_ids is not None else 0) + logger.info("Generating flat dict with lvl2_ids of length: ", len(lvl2_ids) if lvl2_ids is not None else 0) skeleton_json = SkeletonService._skeleton_to_flatdict(skeleton, lvl2_ids, skeleton_version) skeleton_bytes = SkeletonService.compressDictToBytes(skeleton_json) SkeletonService._cache_skeleton(params, skeleton_bytes, output_format) if via_requests and has_request_context(): - if verbose_level >= 1: - print(f"Compressed FLAT DICT size: {len(skeleton_bytes)}") + logger.info(f"Compressed FLAT DICT size: {len(skeleton_bytes)}") response = Response( skeleton_bytes, mimetype="application/octet-stream" ) @@ -1540,7 +1531,7 @@ def get_skeleton_by_datastack_and_rid( return response return skeleton_bytes except Exception as e: - print(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() if output_format == "json": @@ -1560,7 +1551,7 @@ def get_skeleton_by_datastack_and_rid( return response return skeleton_json except Exception as e: - print(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() if output_format == "jsoncompressed": @@ -1571,8 +1562,7 @@ def get_skeleton_by_datastack_and_rid( skeleton_bytes = SkeletonService.compressDictToBytes(skeleton_json) SkeletonService._cache_skeleton(params, skeleton_bytes, output_format) if via_requests and has_request_context(): - if verbose_level >= 1: - print(f"Compressed JSON size: {len(skeleton_bytes)}") + logger.info(f"Compressed JSON size: {len(skeleton_bytes)}") response = Response( skeleton_bytes, mimetype="application/octet-stream" ) @@ -1583,7 +1573,7 @@ def get_skeleton_by_datastack_and_rid( return response return skeleton_bytes except Exception as e: - print(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() if output_format == "arrays": @@ -1600,7 +1590,7 @@ def get_skeleton_by_datastack_and_rid( return response return skeleton_arrays except Exception as e: - print(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() if output_format == "arrayscompressed": @@ -1624,7 +1614,7 @@ def get_skeleton_by_datastack_and_rid( return response return skeleton_bytes except Exception as e: - print(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() if output_format == "precomputed": @@ -1650,7 +1640,7 @@ def get_skeleton_by_datastack_and_rid( params, skeleton_precomputed, output_format ) except Exception as e: - print(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") + logger.error(f"Exception while caching {output_format.upper()} skeleton for {rid}: {str(e)}. Traceback:") traceback.print_exc() if via_requests and has_request_context(): @@ -1685,8 +1675,7 @@ def get_skeletons_bulk_by_datastack_and_rids( if bucket[-1] != "/": bucket += "/" - if verbose_level >= 1: - print( + logger.info( f"get_skeletons_bulk_by_datastack_and_rids() datastack_name: {datastack_name}, rids: {rids}, bucket: {bucket}, skeleton_version: {skeleton_version}", f" root_resolution: {root_resolution}, collapse_soma: {collapse_soma}, collapse_radius: {collapse_radius}, output_format: {output_format}, generate_missing_skeletons: {generate_missing_skeletons}", ) @@ -1722,13 +1711,11 @@ def get_skeletons_bulk_by_datastack_and_rids( continue skeleton = SkeletonService._retrieve_skeleton_from_cache(params, output_format) - if verbose_level >= 1: - print(f"get_skeletons_bulk_by_datastack_and_rids() Cache query result for {output_format} rid {rid}: {skeleton is not None}") + logger.info(f"get_skeletons_bulk_by_datastack_and_rids() Cache query result for {output_format} rid {rid}: {skeleton is not None}") if skeleton is None: # No JSON or SWC skeleton was found (but the H5 status is unknown at this point) h5_available = SkeletonService._confirm_skeleton_in_cache(params, "h5") - if verbose_level >= 1: - print(f"H5 availability for rid {rid}: {h5_available}") + logger.info(f"H5 availability for rid {rid}: {h5_available}") if h5_available: skeleton = SkeletonService.get_skeleton_by_datastack_and_rid( datastack_name, @@ -1757,8 +1744,7 @@ def get_skeletons_bulk_by_datastack_and_rids( ) skeleton = "async" - if verbose_level >= 1: - print(f"get_skeletons_bulk_by_datastack_and_rids() Final skeleton for rid {rid}: {skeleton is not None if skeleton != 'async' else skeleton}") + logger.info(f"get_skeletons_bulk_by_datastack_and_rids() Final skeleton for rid {rid}: {skeleton is not None if skeleton != 'async' else skeleton}") # The BytesIO skeletons aren't JSON serializable and so won't fly back over the wire. Gotta convert 'em. # It's debatable whether an ascii encoding of this sort is necessarily smaller than the CSV representation, but presumably it is. @@ -1828,8 +1814,7 @@ def get_skeleton_by_datastack_and_rid_async( t2 = default_timer() - if verbose_level >= 1: - print(f"Polling for skeleton to be available for rid {rid}...") + logger.info(f"Polling for skeleton to be available for rid {rid}...") while not SkeletonService.skeletons_exist( bucket, skeleton_version, @@ -1837,12 +1822,10 @@ def get_skeleton_by_datastack_and_rid_async( verbose_level_ ): time.sleep(5) - if verbose_level >= 1: - print(f"Skeleton is now available for rid {rid}.") + logger.info(f"Skeleton is now available for rid {rid}.") else: t2 = t1 = default_timer() - if verbose_level >= 1: - print(f"No need to initiate asynchronous skeleton generation for rid {rid}. It already exists.") + logger.info(f"No need to initiate asynchronous skeleton generation for rid {rid}. It already exists.") t3 = default_timer() @@ -1861,14 +1844,14 @@ def get_skeleton_by_datastack_and_rid_async( t4 = default_timer() - if verbose_level >= 1: - et1 = t1 - t0 - et2 = t2 - t1 - et3 = t3 - t2 - et4 = t4 - t3 - print(f"get_skeleton_by_datastack_and_rid_async() Elapsed times: {et1:.3f}s {et2:.3f}s {et3:.3f}s {et4:.3f}s") - print(f"get_skeleton_by_datastack_and_rid_async() Final skeleton for rid {rid}: {skeleton is not None}") + et1 = t1 - t0 + et2 = t2 - t1 + et3 = t3 - t2 + et4 = t4 - t3 + logger.info(f"get_skeleton_by_datastack_and_rid_async() Elapsed times: {et1:.3f}s {et2:.3f}s {et3:.3f}s {et4:.3f}s") + logger.info(f"get_skeleton_by_datastack_and_rid_async() Final skeleton for rid {rid}: {skeleton is not None}") + return skeleton @@ -1915,9 +1898,8 @@ def generate_skeletons_bulk_by_datastack_and_rids_async( try: num_workers = current_app.config["SKELETONCACHE_MAX_REPLICAS"] # Number of skeleton worker (Kubernetes pods) available (# This should be read from the server somehow) except KeyError: - print("Flask config variable SKELETONCACHE_MAX_REPLICAS not found. Using default value of 15.") + logger.error("Flask config variable SKELETONCACHE_MAX_REPLICAS not found. Using default value of 15.") num_workers = 15 estimated_async_time_secs_upper_bound = math.ceil(num_valid_rids / num_workers) * skeleton_generation_time_estimate_secs - if verbose_level >= 1: - print(f"Estimated async time: ceiling({num_valid_rids} / {num_workers}) * {skeleton_generation_time_estimate_secs} = {estimated_async_time_secs_upper_bound}") + logger.info(f"Estimated async time: ceiling({num_valid_rids} / {num_workers}) * {skeleton_generation_time_estimate_secs} = {estimated_async_time_secs_upper_bound}") return estimated_async_time_secs_upper_bound diff --git a/skeletonservice/datasets/service_skvn1.py b/skeletonservice/datasets/service_skvn1.py index a327b81..4462ba1 100644 --- a/skeletonservice/datasets/service_skvn1.py +++ b/skeletonservice/datasets/service_skvn1.py @@ -1,11 +1,13 @@ from typing import List, Union from skeletonservice.datasets.service import SkeletonService +import logging +logger = logging.getLogger(__name__) class SkeletonService_skvn1(SkeletonService): def __init__(self): super().__init__() - print("SkeletonService_skvn1 initialized") + logger.info("SkeletonService_skvn1 initialized") @staticmethod def get_cache_contents( @@ -15,7 +17,7 @@ def get_cache_contents( limit: int = None, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn1.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}") + logger.info(f"SkeletonService_skvn1.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}") return SkeletonService.get_cache_contents( bucket, skeleton_version, @@ -31,7 +33,7 @@ def skeletons_exist( rids: Union[List, int] = None, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn1.skeletons_exist: {bucket} {skeleton_version} {rids}") + logger.info(f"SkeletonService_skvn1.skeletons_exist: {bucket} {skeleton_version} {rids}") return SkeletonService.skeletons_exist( bucket, skeleton_version, @@ -52,7 +54,7 @@ def get_skeleton_by_datastack_and_rid( via_requests: bool = True, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn1.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}") + logger.info(f"SkeletonService_skvn1.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}") return SkeletonService.get_skeleton_by_datastack_and_rid( datastack_name, rid, @@ -78,7 +80,7 @@ def get_skeleton_by_datastack_and_rid_async( skeleton_version: int = -1, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn1.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}") + logger.info(f"SkeletonService_skvn1.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}") return SkeletonService.get_skeleton_by_datastack_and_rid_async( datastack_name, rid, @@ -104,7 +106,7 @@ def get_skeletons_bulk_by_datastack_and_rids( generate_missing_skeletons: bool = False, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn1.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}") + logger.info(f"SkeletonService_skvn1.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}") return SkeletonService.get_skeletons_bulk_by_datastack_and_rids( datastack_name, rids, @@ -129,7 +131,7 @@ def generate_skeletons_bulk_by_datastack_and_rids_async( skeleton_version: int = -1, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn1.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}") + logger.info(f"SkeletonService_skvn1.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}") return SkeletonService.generate_skeletons_bulk_by_datastack_and_rids_async( datastack_name, rids, diff --git a/skeletonservice/datasets/service_skvn2.py b/skeletonservice/datasets/service_skvn2.py index ecf919e..7adcd54 100644 --- a/skeletonservice/datasets/service_skvn2.py +++ b/skeletonservice/datasets/service_skvn2.py @@ -1,11 +1,13 @@ from typing import List, Union from skeletonservice.datasets.service import SkeletonService +import logging +logger = logging.getLogger(__name__) class SkeletonService_skvn2(SkeletonService): def __init__(self): super().__init__() - print("SkeletonService_skvn2 initialized") + logger.info("SkeletonService_skvn2 initialized") @staticmethod def get_cache_contents( @@ -15,7 +17,7 @@ def get_cache_contents( limit: int = None, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn2.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}") + logger.info(f"SkeletonService_skvn2.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}") return SkeletonService.get_cache_contents( bucket, skeleton_version, @@ -31,7 +33,7 @@ def skeletons_exist( rids: Union[List, int] = None, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn2.skeletons_exist: {bucket} {skeleton_version} {rids}") + logger.info(f"SkeletonService_skvn2.skeletons_exist: {bucket} {skeleton_version} {rids}") return SkeletonService.skeletons_exist( bucket, skeleton_version, @@ -52,7 +54,7 @@ def get_skeleton_by_datastack_and_rid( via_requests: bool = True, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn2.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}") + logger.info(f"SkeletonService_skvn2.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}") return SkeletonService.get_skeleton_by_datastack_and_rid( datastack_name, rid, @@ -78,7 +80,7 @@ def get_skeleton_by_datastack_and_rid_async( skeleton_version: int = -1, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn2.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}") + logger.info(f"SkeletonService_skvn2.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}") return SkeletonService.get_skeleton_by_datastack_and_rid_async( datastack_name, rid, @@ -104,7 +106,7 @@ def get_skeletons_bulk_by_datastack_and_rids( generate_missing_skeletons: bool = False, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn2.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}") + logger.info(f"SkeletonService_skvn2.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}") return SkeletonService.get_skeletons_bulk_by_datastack_and_rids( datastack_name, rids, @@ -129,7 +131,7 @@ def generate_skeletons_bulk_by_datastack_and_rids_async( skeleton_version: int = -1, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn2.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}") + logger.info(f"SkeletonService_skvn2.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}") return SkeletonService.generate_skeletons_bulk_by_datastack_and_rids_async( datastack_name, rids, diff --git a/skeletonservice/datasets/service_skvn3.py b/skeletonservice/datasets/service_skvn3.py index f1c9e55..e4ac59a 100644 --- a/skeletonservice/datasets/service_skvn3.py +++ b/skeletonservice/datasets/service_skvn3.py @@ -1,11 +1,13 @@ from typing import List, Union from skeletonservice.datasets.service import SkeletonService +import logging +logger = logging.getLogger(__name__) class SkeletonService_skvn3(SkeletonService): def __init__(self): super().__init__() - print("SkeletonService_skvn3 initialized") + logger.info("SkeletonService_skvn3 initialized") @staticmethod def get_cache_contents( @@ -15,7 +17,7 @@ def get_cache_contents( limit: int = None, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn3.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}") + logger.info(f"SkeletonService_skvn3.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}") return SkeletonService.get_cache_contents( bucket, skeleton_version, @@ -31,7 +33,7 @@ def skeletons_exist( rids: Union[List, int] = None, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn3.skeletons_exist: {bucket} {skeleton_version} {rids}") + logger.info(f"SkeletonService_skvn3.skeletons_exist: {bucket} {skeleton_version} {rids}") return SkeletonService.skeletons_exist( bucket, skeleton_version, @@ -52,7 +54,7 @@ def get_skeleton_by_datastack_and_rid( via_requests: bool = True, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn3.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}") + logger.info(f"SkeletonService_skvn3.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}") return SkeletonService.get_skeleton_by_datastack_and_rid( datastack_name, rid, @@ -78,7 +80,7 @@ def get_skeleton_by_datastack_and_rid_async( skeleton_version: int = -1, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn3.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}") + logger.info(f"SkeletonService_skvn3.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}") return SkeletonService.get_skeleton_by_datastack_and_rid_async( datastack_name, rid, @@ -104,7 +106,7 @@ def get_skeletons_bulk_by_datastack_and_rids( generate_missing_skeletons: bool = False, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn3.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}") + logger.info(f"SkeletonService_skvn3.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}") return SkeletonService.get_skeletons_bulk_by_datastack_and_rids( datastack_name, rids, @@ -129,7 +131,7 @@ def generate_skeletons_bulk_by_datastack_and_rids_async( skeleton_version: int = -1, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn3.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}") + logger.info(f"SkeletonService_skvn3.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}") return SkeletonService.generate_skeletons_bulk_by_datastack_and_rids_async( datastack_name, rids, diff --git a/skeletonservice/datasets/service_skvn4.py b/skeletonservice/datasets/service_skvn4.py index b79ae25..a9e8cca 100644 --- a/skeletonservice/datasets/service_skvn4.py +++ b/skeletonservice/datasets/service_skvn4.py @@ -1,11 +1,13 @@ from typing import List, Union from skeletonservice.datasets.service import SkeletonService +import logging +logger = logging.getLogger(__name__) class SkeletonService_skvn4(SkeletonService): def __init__(self): super().__init__() - print("SkeletonService_skvn4 initialized") + logger.info("SkeletonService_skvn4 initialized") @staticmethod def get_cache_contents( @@ -15,7 +17,7 @@ def get_cache_contents( limit: int = None, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn4.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}") + logger.info(f"SkeletonService_skvn4.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}") return SkeletonService.get_cache_contents( bucket, skeleton_version, @@ -31,7 +33,7 @@ def skeletons_exist( rids: Union[List, int] = None, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn4.skeletons_exist: {bucket} {skeleton_version} {rids}") + logger.info(f"SkeletonService_skvn4.skeletons_exist: {bucket} {skeleton_version} {rids}") return SkeletonService.skeletons_exist( bucket, skeleton_version, @@ -52,7 +54,7 @@ def get_skeleton_by_datastack_and_rid( via_requests: bool = True, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}") + logger.info(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}") return SkeletonService.get_skeleton_by_datastack_and_rid( datastack_name, rid, @@ -78,7 +80,7 @@ def get_skeleton_by_datastack_and_rid_async( skeleton_version: int = -1, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}") + logger.info(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}") return SkeletonService.get_skeleton_by_datastack_and_rid_async( datastack_name, rid, @@ -104,7 +106,7 @@ def get_skeletons_bulk_by_datastack_and_rids( generate_missing_skeletons: bool = False, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid: {datastack_name} {rids} {bucket}") + logger.info(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid: {datastack_name} {rids} {bucket}") return SkeletonService.get_skeletons_bulk_by_datastack_and_rids( datastack_name, rids, @@ -129,7 +131,7 @@ def generate_skeletons_bulk_by_datastack_and_rids_async( skeleton_version: int = -1, verbose_level_: int = 0, ): - print(f"SkeletonService_skvn4.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}") + logger.info(f"SkeletonService_skvn4.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}") return SkeletonService.generate_skeletons_bulk_by_datastack_and_rids_async( datastack_name, rids,