cryptodatapy 0.2.12__tar.gz → 0.2.13__tar.gz

{cryptodatapy-0.2.12 → cryptodatapy-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cryptodatapy
-Version: 0.2.12
+Version: 0.2.13
 Summary: Cryptoasset data library
 License: Apache-2.0
 Author: Systamental

{cryptodatapy-0.2.12 → cryptodatapy-0.2.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cryptodatapy"
-version = "0.2.12"
+version = "0.2.13"
 description = "Cryptoasset data library"
 authors = ["Systamental"]
 license = "Apache License 2.0"

{cryptodatapy-0.2.12 → cryptodatapy-0.2.13}/src/cryptodatapy/extract/data_vendors/tiingo_api.py

@@ -549,7 +549,7 @@ class Tiingo(DataVendor):
                     df = pd.concat([df, df0])
 
         else:
-            for ticker in self.data_req.tickers:
+            for ticker in self.data_req.source_tickers:
                 try:
                     df0 = self.get_tidy_data(self.data_req, data_type, ticker)
                 except Exception as e:
@@ -679,7 +679,7 @@ class Tiingo(DataVendor):
         """
         self.data_req = ConvertParams(data_req).to_tiingo()
 
-        # get metada
+        # get metadata
         self.get_assets_info(as_list=True)
         self.get_fields_info()
 
@@ -690,11 +690,16 @@ class Tiingo(DataVendor):
             )
 
         # check assets
-        if not any([ticker.upper() in self.assets[self.data_req.cat] for ticker in self.data_req.tickers]) and \
-                data_req.cat != 'fx':
-            raise ValueError(
-                f"Selected tickers are not available. Use assets attribute to see available tickers."
-            )
+        if self.data_req.cat == 'eqty':
+            if not any([ticker.upper() in self.assets[self.data_req.cat] for ticker in self.data_req.source_tickers]):
+                raise ValueError(
+                    f"Selected eqty tickers are not available. Use assets attribute to see available eqty tickers."
+                )
+        elif self.data_req.cat == 'crypto':
+            if not any([ticker in self.assets[self.data_req.cat] for ticker in self.data_req.source_markets]):
+                raise ValueError(
+                    f"Selected crypto tickers are not available. Use assets attribute to see available crypto tickers."
+                )
 
         # check fields
         if not any([field in self.fields[data_req.cat] for field in self.data_req.fields]):

{cryptodatapy-0.2.12 → cryptodatapy-0.2.13}/src/cryptodatapy/extract/libraries/ccxt_api.py

@@ -1483,6 +1483,8 @@ class CCXT(Library):
         df: pd.DataFrame - MultiIndex
             DataFrame with DatetimeIndex (level 0), ticker (level 1), and values for selected fields (cols).
         """
+        logging.info("Retrieving data request from CCXT...")
+
         # get OHLCV
         if any([field in ["open", "high", "low", "close", "volume"] for field in data_req.fields]):
             df = await self.fetch_tidy_ohlcv_async(data_req)
@@ -1523,6 +1525,8 @@ class CCXT(Library):
         df: pd.DataFrame - MultiIndex
             DataFrame with DatetimeIndex (level 0), ticker (level 1), and values for selected fields (cols).
         """
+        logging.info("Retrieving data request from CCXT...")
+
         # get OHLCV
         if any([field in ["open", "high", "low", "close", "volume"] for field in data_req.fields]):
             df = self.fetch_tidy_ohlcv(data_req)

{cryptodatapy-0.2.12 → cryptodatapy-0.2.13}/src/cryptodatapy/transform/convertparams.py

@@ -344,8 +344,20 @@ class ConvertParams:
         Convert tickers from CryptoDataPy to Tiingo format.
         """
         # tickers
-        if self.data_req.source_tickers is None:
-            self.data_req.source_tickers = [ticker.lower() for ticker in self.data_req.tickers]
+        with resources.path("cryptodatapy.conf", "tickers.csv") as f:
+            tickers_path = f
+        tickers_df = pd.read_csv(tickers_path, index_col=0, encoding="latin1")
+
+        if self.data_req.source_tickers is None and self.data_req.cat == 'eqty':
+            self.data_req.source_tickers = []
+            for ticker in self.data_req.tickers:
+                try:
+                    self.data_req.source_tickers.append(tickers_df.loc[ticker, "tiingo_id"])
+                except KeyError:
+                    logging.warning(
+                        f"{ticker} not found for Tiingo source. Check tickers in"
+                        f" data catalog and try again."
+                    )
 
         # freq
         if self.data_req.source_freq is None: