Merge pull request crowdcent#113 from crowdcent/dev

v0.3.11
imbikramsaha · May 26, 2022 · 6e1303d · 6e1303d
2 parents e014a30 + b6e1f2a
commit 6e1303d
Show file tree

Hide file tree

Showing 9 changed files with 14,786 additions and 4,132 deletions.
diff --git a/docs/download.html b/docs/download.html
diff --git a/docs/preprocessing.html b/docs/preprocessing.html
diff --git a/nbs/01_download.ipynb b/nbs/01_download.ipynb
diff --git a/nbs/03_preprocessing.ipynb b/nbs/03_preprocessing.ipynb
diff --git a/nbs/test_assets/eodhd-map.csv b/nbs/test_assets/eodhd-map.csv
diff --git a/numerblox/__init__.py b/numerblox/__init__.py
@@ -1 +1 @@
-__version__ = "0.3.10"
+__version__ = "0.3.11"
diff --git a/numerblox/download.py b/numerblox/download.py
@@ -566,6 +566,7 @@ def generate_stock_dataf(self, ticker: str, start: dt) -> pd.DataFrame:
         try:
             stock_df = pd.DataFrame(candles)
         except:
+            rich_print(f":warning: WARNING: No data found for ticker: [red]'{ticker}'[/red]. :warning:")
             return pd.DataFrame()
         stock_df['ticker'] = ticker
         stock_df['date'] = pd.to_datetime(stock_df['t'], unit='s', origin='unix')
@@ -652,6 +653,7 @@ def generate_stock_dataf(self, ticker: str, start: str) -> pd.DataFrame:
             stock_df = pd.DataFrame(resp).set_index('date')
             stock_df['ticker'] = ticker
         except:
+            rich_print(f":warning: WARNING: No data found for ticker: [red]'{ticker}'[/red]. :warning:")
             stock_df = pd.DataFrame()
         return stock_df
 

diff --git a/numerblox/preprocessing.py b/numerblox/preprocessing.py
@@ -778,17 +778,20 @@ class TickerMapper(BaseProcessor):
     Map ticker from one format to another. \n
     :param ticker_col: Column used for mapping. Must already be present in the input data. \n
     :param target_ticker_format: Format to map tickers to. Must be present in the ticker map. \n
-    Supported ticker formats are: ['ticker', 'bloomberg_ticker', 'yahoo']
+    For default mapper supported ticker formats are: ['ticker', 'bloomberg_ticker', 'yahoo'] \n
+    :param mapper_path: Path to CSV file containing at least ticker_col and target_ticker_format columns. \n
+    Can be either a web link of local path. Numerai Signals mapping by default.
     """
 
     def __init__(
-        self, ticker_col: str = "ticker", target_ticker_format: str = "bloomberg_ticker"
+        self, ticker_col: str = "ticker", target_ticker_format: str = "bloomberg_ticker",
+        mapper_path: str = "https://numerai-signals-public-data.s3-us-west-2.amazonaws.com/signals_ticker_map_w_bbg.csv"
     ):
         super().__init__()
         self.ticker_col = ticker_col
         self.target_ticker_format = target_ticker_format
 
-        self.signals_map_path = "https://numerai-signals-public-data.s3-us-west-2.amazonaws.com/signals_ticker_map_w_bbg.csv"
+        self.signals_map_path = mapper_path
         self.ticker_map = pd.read_csv(self.signals_map_path)
 
         assert (

diff --git a/settings.ini b/settings.ini
@@ -10,7 +10,7 @@ author = Jason Rosenfeld, Carlo Lepelaars and contributors
 author_email = [email protected]
 copyright = CrowdCent 2022
 branch = master
-version = 0.3.10
+version = 0.3.11
 min_python = 3.7
 audience = Developers
 language = English