bbstrader 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

bbstrader/compat.py

@@ -1,16 +1,17 @@
 import platform
 import sys
+from typing import Any
 
 
-def setup_mock_modules():
+def setup_mock_modules() -> None:
     """Mock some modules not available on some OS to prevent import errors."""
     from unittest.mock import MagicMock
 
     class Mock(MagicMock):
         @classmethod
-        def __getattr__(cls, name):
+        def __getattr__(cls, name: str) -> Any:
             return MagicMock()
-        
+
     MOCK_MODULES = []
 
     # Mock Metatrader5 on Linux and MacOS

bbstrader/config.py

@@ -1,6 +1,7 @@
 import logging
+from datetime import datetime
 from pathlib import Path
-from typing import List
+from typing import Any, List, Optional
 
 
 def get_config_dir(name: str = ".bbstrader") -> Path:
@@ -23,7 +24,7 @@ BBSTRADER_DIR = get_config_dir()
 
 
 class LogLevelFilter(logging.Filter):
-    def __init__(self, levels: List[int]):
+    def __init__(self, levels: List[int]) -> None:
         """
         Initializes the filter with specific logging levels.
 
@@ -47,52 +48,35 @@ class LogLevelFilter(logging.Filter):
 
 
 class CustomFormatter(logging.Formatter):
-    def formatTime(self, record, datefmt=None):
+    def formatTime(
+        self, record: logging.LogRecord, datefmt: Optional[str] = None
+    ) -> str:
         if hasattr(record, "custom_time"):
             # Use the custom time if provided
-            record.created = record.custom_time.timestamp()
+            record.created = record.custom_time.timestamp() # type: ignore
         return super().formatTime(record, datefmt)
 
 
 class CustomLogger(logging.Logger):
-    def __init__(self, name, level=logging.NOTSET):
+    def __init__(self, name: str, level: int = logging.NOTSET) -> None:
         super().__init__(name, level)
 
-    def _log(
+    def log(
         self,
-        level,
-        msg,
-        args,
-        exc_info=None,
-        extra=None,
-        stack_info=False,
-        stacklevel=1,
-        custom_time=None,
-    ):
-        if extra is None:
-            extra = {}
-        # Add custom_time to the extra dictionary if provided
+        level: int,
+        msg: object,
+        *args: object,
+        custom_time: Optional[datetime] = None,
+        **kwargs: Any,
+    ) -> None:
         if custom_time:
-            extra["custom_time"] = custom_time
-        super()._log(level, msg, args, exc_info, extra, stack_info, stacklevel)
+            if "extra" not in kwargs or kwargs["extra"] is None:
+                kwargs["extra"] = {}
+            kwargs["extra"]["custom_time"] = custom_time
+        super().log(level, msg, *args, **kwargs)
 
-    def info(self, msg, *args, custom_time=None, **kwargs):
-        self._log(logging.INFO, msg, args, custom_time=custom_time, **kwargs)
 
-    def debug(self, msg, *args, custom_time=None, **kwargs):
-        self._log(logging.DEBUG, msg, args, custom_time=custom_time, **kwargs)
-
-    def warning(self, msg, *args, custom_time=None, **kwargs):
-        self._log(logging.WARNING, msg, args, custom_time=custom_time, **kwargs)
-
-    def error(self, msg, *args, custom_time=None, **kwargs):
-        self._log(logging.ERROR, msg, args, custom_time=custom_time, **kwargs)
-
-    def critical(self, msg, *args, custom_time=None, **kwargs):
-        self._log(logging.CRITICAL, msg, args, custom_time=custom_time, **kwargs)
-
-
-def config_logger(log_file: str, console_log=True):
+def config_logger(log_file: str, console_log: bool = True) -> logging.Logger:
     # Use the CustomLogger
     logging.setLoggerClass(CustomLogger)
     logger = logging.getLogger(__name__)

bbstrader/core/data.py

@@ -2,7 +2,7 @@ import json
 import re
 import ssl
 from datetime import datetime
-from typing import List, Literal
+from typing import Any, Dict, List, Literal, Optional, Union
 from urllib.request import urlopen
 
 import certifi
@@ -27,7 +27,7 @@ def _get_search_query(query: str) -> str:
         return query
 
 
-def _find_news(query: str | List[str], text):
+def _find_news(query: Union[str, List[str]], text: str) -> bool:
     if isinstance(query, str):
         query = query.split(" ")
     pattern = r"\b(?:" + "|".join(map(re.escape, query)) + r")\b"
@@ -36,7 +36,7 @@ def _find_news(query: str | List[str], text):
     return False
 
 
-def _filter_news(news: List[str], query: str | List[str]) -> List[str]:
+def _filter_news(news: List[str], query: Union[str, List[str]]) -> List[str]:
     return [text for text in news if _find_news(query, text)]
 
 
@@ -48,7 +48,7 @@ class FmpNews(object):
     as well as financial articles and press releases.
     """
 
-    def __init__(self, api: str):
+    def __init__(self, api: str) -> None:
         """
         Args:
             api (str): The API key for accessing FMP's news data.
@@ -60,13 +60,15 @@ class FmpNews(object):
             raise ValueError("API key is required For FmpNews")
         self.__api = api
 
-    def _jsonparsed_data(self, url):
+    def _jsonparsed_data(self, url: str) -> Any:
         context = ssl.create_default_context(cafile=certifi.where())
         with urlopen(url, context=context) as response:
             data = response.read().decode("utf-8")
             return json.loads(data)
 
-    def _load_news(self, news_type, symbol=None, **kwargs) -> List[dict]:
+    def _load_news(
+        self, news_type: str, symbol: Optional[str] = None, **kwargs: Any
+    ) -> List[Dict[str, Any]]:
         params = {"start": "from", "end": "to", "page": "page", "limit": "limit"}
         base_url = f"https://financialmodelingprep.com/stable/news/{news_type}-latest?apikey={self.__api}"
         if news_type == "articles":
@@ -81,8 +83,8 @@ class FmpNews(object):
 
         return self._jsonparsed_data(base_url)
 
-    def get_articles(self, **kwargs) -> List[dict]:
-        def html_parser(content):
+    def get_articles(self, **kwargs: Any) -> List[Dict[str, Any]]:
+        def html_parser(content: str) -> str:
             soup = BeautifulSoup(content, "html.parser")
             text = soup.get_text(separator="\n")
             return text.replace("\n", "")
@@ -91,29 +93,39 @@ class FmpNews(object):
         df = pd.DataFrame(articles)
         df = df[["title", "date", "content", "tickers"]]
         df["content"] = df["content"].apply(html_parser)
-        return df.to_dict(orient="records")
+        return df.to_dict(orient="records") # type: ignore
 
-    def get_releases(self, symbol=None, **kwargs):
+    def get_releases(
+        self, symbol: Optional[str] = None, **kwargs: Any
+    ) -> List[Dict[str, Any]]:
         return self._load_news("press-releases", symbol, **kwargs)
 
-    def get_stock_news(self, symbol=None, **kwargs):
+    def get_stock_news(
+        self, symbol: Optional[str] = None, **kwargs: Any
+    ) -> List[Dict[str, Any]]:
         return self._load_news("stock", symbol, **kwargs)
 
-    def get_crypto_news(self, symbol=None, **kwargs):
+    def get_crypto_news(
+        self, symbol: Optional[str] = None, **kwargs: Any
+    ) -> List[Dict[str, Any]]:
         return self._load_news("crypto", symbol, **kwargs)
 
-    def get_forex_news(self, symbol=None, **kwargs):
+    def get_forex_news(
+        self, symbol: Optional[str] = None, **kwargs: Any
+    ) -> List[Dict[str, Any]]:
         return self._load_news("forex", symbol, **kwargs)
 
-    def _last_date(self, date):
+    def _last_date(self, date: str) -> datetime:
         return datetime.strptime(date, "%Y-%m-%d %H:%M:%S")
 
-    def parse_news(self, news: List[dict], symbol=None, **kwargs) -> List[str]:
+    def parse_news(
+        self, news: List[Dict[str, Any]], symbol: Optional[str] = None, **kwargs: Any
+    ) -> List[str]:
         start = kwargs.get("start")
         end = kwargs.get("end")
         end_date = self._last_date(end) if end is not None else datetime.now().date()
 
-        def parse_record(record):
+        def parse_record(record: Dict[str, Any]) -> str:
             return " ".join(
                 [
                     record.pop("symbol", ""),
@@ -127,7 +139,7 @@ class FmpNews(object):
         parsed_news = []
         for record in news:
             date = record.get("publishedDate")
-            published_date = self._last_date(record.get("date", date)).date()
+            published_date = self._last_date(record.get("date", date)).date() # type: ignore
             start_date = (
                 self._last_date(start).date() if start is not None else published_date
             )
@@ -141,18 +153,23 @@ class FmpNews(object):
                     parsed_news.append(parse_record(record))
         return parsed_news
 
-    def get_latest_articles(self, articles=None, save=False, **kwargs) -> List[dict]:
+    def get_latest_articles(
+        self,
+        articles: Optional[List[Dict[str, Any]]] = None,
+        save: bool = False,
+        **kwargs: Any,
+    ) -> List[Dict[str, Any]]:
         end = kwargs.get("end")
         now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         end_date = self._last_date(end) if end is not None else self._last_date(now)
         if articles is None:
             try:
-                articles = pd.read_csv("latest_fmp_articles.csv")
-                articles = articles.to_dict(orient="records")
-                if self._last_date(articles[0]["date"]).hour < end_date.hour:
+                articles = pd.read_csv("latest_fmp_articles.csv") # type: ignore
+                articles = articles.to_dict(orient="records") # type: ignore
+                if self._last_date(articles[0]["date"]).hour < end_date.hour: # type: ignore
                     articles = self.get_articles(**kwargs)
                 else:
-                    return articles
+                    return articles # type: ignore
             except FileNotFoundError:
                 articles = self.get_articles(**kwargs)
 
@@ -162,8 +179,13 @@ class FmpNews(object):
         return articles
 
     def get_news(
-        self, query, source="articles", articles=None, symbol: str = None, **kwargs
-    ):
+        self,
+        query: str,
+        source: str = "articles",
+        articles: Optional[List[Dict[str, Any]]] = None,
+        symbol: Optional[str] = None,
+        **kwargs: Any,
+    ) -> List[str]:
         """
         Retrieves relevant financial news based on the specified source.
 
@@ -201,7 +223,7 @@ class FmpNews(object):
         news_source = source_methods.get(source, lambda: [])()
         if source == "articles":
             symbol = None  # Articles do not require a symbol filter
-        news = self.parse_news(news_source, symbol=symbol)
+        news = self.parse_news(news_source, symbol=symbol, **kwargs)
         return _filter_news(news, query)
 
 
@@ -213,7 +235,9 @@ class FinancialNews(object):
 
     """
 
-    def _fetch_news(self, url, query, n_news, headline_tag) -> List[str]:
+    def _fetch_news(
+        self, url: str, query: str, n_news: int, headline_tag: str
+    ) -> List[str]:
         headers = {"User-Agent": "Mozilla/5.0"}
         try:
             response = requests.get(url, headers=headers)
@@ -234,7 +258,9 @@ class FinancialNews(object):
         ]
         return headlines[:n_news]
 
-    def get_yahoo_finance_news(self, query: str, asset_type="stock", n_news=10):
+    def get_yahoo_finance_news(
+        self, query: str, asset_type: str = "stock", n_news: int = 10
+    ) -> List[str]:
         """
         Fetches recent Yahoo Finance news headlines for a given financial asset.
 
@@ -257,17 +283,17 @@ class FinancialNews(object):
             list[str]: A list of Yahoo Finance news headlines relevant to the query.
         """
         if asset_type == "forex" or asset_type == "future":
-            assert (
-                "=" in query
-            ), "Forex query must contain '=' for currency pairs (e.g., EURUSD=X, CL=F)"
+            assert "=" in query, (
+                "Forex query must contain '=' for currency pairs (e.g., EURUSD=X, CL=F)"
+            )
         if asset_type == "crypto":
-            assert (
-                "-" in query
-            ), "Crypto query must contain '-' for crypto pairs (e.g., BTC-USD, ETH-USD)"
+            assert "-" in query, (
+                "Crypto query must contain '-' for crypto pairs (e.g., BTC-USD, ETH-USD)"
+            )
         if asset_type == "index":
-            assert query.startswith(
-                "^"
-            ), "Index query must start with '^' (e.g., ^GSPC for S&P 500)"
+            assert query.startswith("^"), (
+                "Index query must start with '^' (e.g., ^GSPC for S&P 500)"
+            )
         url = (
             f"https://finance.yahoo.com/quote/{query}/news"
             if asset_type in ["stock", "etf", "index", "future", "forex"]
@@ -275,7 +301,9 @@ class FinancialNews(object):
         )
         return self._fetch_news(url, query, n_news, "h3")
 
-    def get_google_finance_news(self, query: str, asset_type="stock", n_news=10):
+    def get_google_finance_news(
+        self, query: str, asset_type: str = "stock", n_news: int = 10
+    ) -> List[str]:
         """
         Fetches recent Google Finance news headlines for a given financial asset.
 
@@ -403,14 +431,14 @@ class FinancialNews(object):
 
     def get_twitter_posts(
         self,
-        query,
-        asset_type="stock",
-        bearer=None,
-        api_key=None,
-        api_secret=None,
-        access_token=None,
-        access_secret=None,
-        n_posts=10,
+        query: str,
+        asset_type: str = "stock",
+        bearer: Optional[str] = None,
+        api_key: Optional[str] = None,
+        api_secret: Optional[str] = None,
+        access_token: Optional[str] = None,
+        access_secret: Optional[str] = None,
+        n_posts: int = 10,
     ) -> List[str]:
         """
         Fetches recent tweets related to a financial asset.
@@ -471,13 +499,13 @@ class FinancialNews(object):
                 query=search, max_results=100, tweet_fields=["text"]
             )
             query = _get_search_query(query)
-            news = [tweet.text for tweet in tweets.data] if tweets.data else []
+            news = [tweet.text for tweet in tweets.data] if tweets.data else [] # type: ignore
             return _filter_news(news, query)[:n_posts]
         except tweepy.TweepyException:
             return []
 
-    def get_fmp_news(self, api=None) -> FmpNews:
-        return FmpNews(api=api)
+    def get_fmp_news(self, api:str |None =None) -> FmpNews:
+        return FmpNews(api=api) # type: ignore
 
     def get_coindesk_news(
         self,

bbstrader/core/scripts.py

@@ -4,7 +4,7 @@ import sys
 import textwrap
 import time
 from datetime import datetime, timedelta
-from typing import List, Literal
+from typing import Any, Coroutine, Dict, List, Literal
 
 import nltk
 from loguru import logger
@@ -16,7 +16,7 @@ from bbstrader.core.data import FinancialNews
 from bbstrader.trading.utils import send_telegram_message
 
 
-def summarize_text(text, sentences_count=5):
+def summarize_text(text: str, sentences_count: int = 5) -> str:
     """
     Generate a summary using TextRank algorithm.
     """
@@ -26,7 +26,7 @@ def summarize_text(text, sentences_count=5):
     return " ".join(str(sentence) for sentence in summary)
 
 
-def format_coindesk_article(article: dict) -> str:
+def format_coindesk_article(article: Dict[str, Any]) -> str:
     if not all(
         k in article
         for k in (
@@ -35,7 +35,7 @@ def format_coindesk_article(article: dict) -> str:
             "published_on",
             "sentiment",
             "keywords",
-            "keywords",
+            "status",
             "url",
         )
     ):
@@ -54,7 +54,7 @@ def format_coindesk_article(article: dict) -> str:
     return text
 
 
-def format_fmp_article(article: dict) -> str:
+def format_fmp_article(article: Dict[str, Any]) -> str:
     if not all(k in article for k in ("title", "date", "content", "tickers")):
         return ""
     summary = summarize_text(article["content"])
@@ -69,28 +69,29 @@ def format_fmp_article(article: dict) -> str:
 
 
 async def send_articles(
-    articles: List[dict],
+    articles: List[Dict[str, Any]],
     token: str,
     id: str,
     source: Literal["coindesk", "fmp"],
-    interval=15,
-):
+    interval: int = 15,
+) -> None:
     for article in articles:
         message = ""
         if source == "coindesk":
-            if article["published_on"] >= datetime.now() - timedelta(minutes=interval):
-                article["published_on"] = article.get("published_on").strftime(
-                    "%Y-%m-%d %H:%M:%S"
-                )
-            message = format_coindesk_article(article)
+            published_on = article.get("published_on")
+            if isinstance(
+                published_on, datetime
+            ) and published_on >= datetime.now() - timedelta(minutes=interval):
+                article["published_on"] = published_on.strftime("%Y-%m-%d %H:%M:%S")
+                message = format_coindesk_article(article)
         else:
             message = format_fmp_article(article)
         if message == "":
-            return
+            continue
         await send_telegram_message(token, id, text=message)
 
 
-def send_news_feed(unknown):
+def send_news_feed(unknown: List[str]) -> None:
     HELP_MSG = """
     Send news feed from Coindesk to Telegram channel.
     This script fetches the latest news articles from Coindesk, summarizes them,
@@ -145,19 +146,19 @@ def send_news_feed(unknown):
     logger.info(f"Starting the News Feed on {args.interval} minutes")
     while True:
         try:
-            fmp_articles = []
+            fmp_articles: List[Dict[str, Any]] = []
             if fmp_news is not None:
                 start = datetime.now() - timedelta(minutes=args.interval)
-                start = start.strftime("%Y-%m-%d %H:%M:%S")
-                end = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                start_str = start.strftime("%Y-%m-%d %H:%M:%S")
+                end_str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
                 fmp_articles = fmp_news.get_latest_articles(
-                    save=True, start=start, end=end
+                    save=True, start=start_str, end=end_str
                 )
             coindesk_articles = news.get_coindesk_news(query=args.query)
-            if len(coindesk_articles) != 0:
+            if coindesk_articles and isinstance(coindesk_articles, list):
                 asyncio.run(
                     send_articles(
-                        coindesk_articles,
+                        coindesk_articles,  # type: ignore
                         args.token,
                         args.id,
                         "coindesk",

bbstrader/core/utils.py

@@ -2,17 +2,16 @@ import configparser
 import importlib
 import importlib.util
 import os
-from typing import Any, Dict, List
+from types import ModuleType
+from typing import Any, Dict, List, Optional, Type, Union
 
 __all__ = ["load_module", "load_class"]
 
 
-def load_module(file_path):
+def load_module(file_path: str) -> ModuleType:
     """Load a module from a file path.
-
     Args:
         file_path: Path to the file to load.
-
     Returns:
         The loaded module.
     """
@@ -21,14 +20,15 @@ def load_module(file_path):
             f"Strategy file {file_path} not found. Please create it."
         )
     spec = importlib.util.spec_from_file_location("bbstrader.cli", file_path)
+    if spec is None or spec.loader is None:
+        raise ImportError(f"Could not load spec for module at {file_path}")
     module = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(module)
     return module
 
 
-def load_class(module, class_name, base_class):
+def load_class(module: ModuleType, class_name: str, base_class: Type) -> Type:
     """Load a class from a module.
-
     Args:
         module: The module to load the class from.
         class_name: The name of the class to load.
@@ -42,7 +42,7 @@ def load_class(module, class_name, base_class):
     return class_
 
 
-def auto_convert(value):
+def auto_convert(value: str) -> Union[bool, None, int, float, str]:
     """Convert string values to appropriate data types"""
     if value.lower() in {"true", "false"}:  # Boolean
         return value.lower() == "true"
@@ -56,13 +56,13 @@ def auto_convert(value):
         return value
 
 
-def dict_from_ini(file_path, sections: str | List[str] = None) -> Dict[str, Any]:
+def dict_from_ini(
+    file_path: str, sections: Optional[Union[str, List[str]]] = None
+) -> Dict[str, Any]:
     """Reads an INI file and converts it to a dictionary with proper data types.
-
     Args:
         file_path: Path to the INI file to read.
         sections: Optional list of sections to read from the INI file.
-
     Returns:
         A dictionary containing the INI file contents with proper data types.
     """
@@ -71,7 +71,7 @@ def dict_from_ini(file_path, sections: str | List[str] = None) -> Dict[str, Any]
         config.read(file_path)
     except Exception:
         raise
-    ini_dict = {}
+    ini_dict: Dict[str, Any] = {}
     for section in config.sections():
         ini_dict[section] = {
             key: auto_convert(value) for key, value in config.items(section)
@@ -83,10 +83,11 @@ def dict_from_ini(file_path, sections: str | List[str] = None) -> Dict[str, Any]
         except KeyError:
             raise KeyError(f"{sections} not found in the {file_path} file")
     if isinstance(sections, list):
-        sect_dict = {}
+        sect_dict: Dict[str, Any] = {}
         for section in sections:
             try:
                 sect_dict[section] = ini_dict[section]
             except KeyError:
                 raise KeyError(f"{section} not found in the {file_path} file")
+        return sect_dict
     return ini_dict

bbstrader/trading/execution.py

@@ -971,11 +971,17 @@ class Mt5ExecutionEngine:
             msg = f"Handling period end actions, STRATEGY={self.STRATEGY} , ACCOUNT={self.ACCOUNT}"
             self._print_exc(msg, e)
             pass
+    
+    def select_symbols(self):
+        for symbol in self.symbols:
+            if not MT5.symbol_select(symbol, True):
+                logger.error(f"Failed to select symbol {symbol} error = {MT5.last_error()}")
 
     def run(self):
         while self._running and not self.shutdown_event.is_set():
             try:
                 check_mt5_connection(**self.kwargs)
+                self.select_symbols()
                 positions_orders = self._check_positions_orders()
                 if self.show_positions_orders:
                     self._display_positions_orders(positions_orders)