sovai 0.2.46__tar.gz → 0.2.48__tar.gz

{sovai-0.2.46 → sovai-0.2.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sovai
-Version: 0.2.46
+Version: 0.2.48
 Summary: python for asset management
 License: Proprietary License
 Author: Derek Snow

{sovai-0.2.46 → sovai-0.2.48}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sovai"
-version = "0.2.46"
+version = "0.2.48"
 description = "python for asset management"
 authors = ["Derek Snow <d.snow@outlook.com>"]
 license = "Proprietary License"

{sovai-0.2.46 → sovai-0.2.48}/sovai/get_data.py

@@ -29,6 +29,7 @@ from sovai.utils.datetime_formats import datetime_format
 from sovai.utils.client_side import client_side_frame
 from sovai.utils.client_side_s3 import load_frame_s3
 from sovai.utils.client_side_s3_part_high import load_frame_s3_partitioned_high
+from sovai.utils.verbose_utils import verbose_mode
 
 # Configure logging
 logger = logging.getLogger(__name__)
@@ -61,47 +62,6 @@ def is_full_installation() -> bool:
 _query_cache = {}
 
 
-class VerboseMode:
-   """
-   Utility class to handle verbose output throughout the application.
-   
-   This class provides a consistent interface for controlling debug output
-   without cluttering the main code with conditional print statements.
-   """
-   
-   def __init__(self, verbose: bool = False):
-       """
-       Initialize verbose mode settings.
-       
-       Args:
-           verbose: Whether to enable verbose output
-       """
-       self.verbose = verbose
-   
-   def log(self, *args, **kwargs) -> None:
-       """
-       Print information when verbose mode is enabled.
-       
-       Args:
-           *args: Arguments to print
-           **kwargs: Keyword arguments for print function
-       """
-       if self.verbose:
-           print(*args, **kwargs)
-   
-   def toggle_verbose(self, verbose: Optional[bool] = None) -> None:
-       """
-       Toggle or set verbose mode.
-       
-       Args:
-           verbose: If provided, set verbose mode to this value; otherwise toggle
-       """
-       if verbose is None:
-           self.verbose = not self.verbose
-       else:
-           self.verbose = verbose
-
-
 class ApiRequestHandler:
    """
    Centralized handler for API requests with robust error handling,
@@ -271,7 +231,7 @@ class ApiRequestHandler:
 
 
 # Initialize verbose mode handler
-verbose_mode = VerboseMode()
+# verbose_mode = VerboseMode()
 
 
 # Endpoint configurations
@@ -1191,7 +1151,7 @@ def data(
             )
         )
     except Exception as e:
-        logger.error(f"Parameter preparation error: {e}")
+        verbose_mode.log(f"Parameter preparation error: {e}")
         raise ValueError(f"Failed to prepare request parameters: {e}")
     
     # Prepare endpoint and parameters
@@ -1241,9 +1201,10 @@ def data(
                     )
                     _query_cache[cache_key] = handler_result
                     result_data = handler_result
+                    # print(handler_result)
                     break
                 except Exception as e:
-                    logger.error(f"Client-side handler error for {normalized_endpoint}: {e}")
+                    verbose_mode.log(f"Client-side handler error for {normalized_endpoint}: {e}")
                     # Fall through to API request if client-side handler fails
 
         # Only proceed with API request if no handler result
@@ -1315,7 +1276,7 @@ def data(
                     
                     if data_result is None:
                         error_msg = "Failed to download data from all provided URLs"
-                        logger.error(error_msg)
+                        verbose_mode.log(error_msg)
                         raise Exception(error_msg)
                     
                     filter_columns_arg = columns
@@ -1382,10 +1343,10 @@ def data(
                             fig = set_dark_mode(fig)
                             result_data = fig
                         except Exception as e:
-                            logger.error(f"Failed to process plot data: {e}")
+                            verbose_mode.log(f"Failed to process plot data: {e}")
                             result_data = None
                     else:
-                        logger.warning("Plotting is only available with the full installation. Please install 'sovai[full]' to use this feature.")
+                        verbose_mode.log("Plotting is only available with the full installation. Please install 'sovai[full]' to use this feature.")
                         result_data = None
                 
                 # Generate plot if requested
@@ -1394,19 +1355,19 @@ def data(
                     if HAS_FULL_INSTALL:
                         result_data = _draw_graphs(result_data)
                     else:
-                        logger.warning("Plotting is only available with the full installation. Please install 'sovai[full]' to use this feature.")
+                        verbose_mode.log("Plotting is only available with the full installation. Please install 'sovai[full]' to use this feature.")
                         result_data = None
                     
             except InvalidInputData as err:
-                logger.error(f"Invalid input data: {err}")
+                verbose_mode.log(f"Invalid input data: {err}")
                 raise
                 
             except (ConnectionError, TimeoutError) as err:
-                logger.error(f"Network error: {err}")
+                verbose_mode.log(f"Network error: {err}")
                 raise ConnectionError(f"Could not connect to API: {err}")
                 
             except Exception as err:
-                logger.error(f"API request error: {err}")
+                verbose_mode.log(f"API request error: {err}")
                 raise
 
 
@@ -1487,7 +1448,7 @@ async def fetch_multiple_tickers(
                 result = await future
                 results[ticker] = result
             except Exception as e:
-                logger.error(f"Error fetching data for ticker {ticker}: {e}")
+                verbose_mode.log(f"Error fetching data for ticker {ticker}: {e}")
                 results[ticker] = None
             
     return results