bullishpy 0.28.0__py3-none-any.whl → 0.29.0__py3-none-any.whl

bullish/analysis/analysis.py

@@ -1,5 +1,6 @@
 import logging
 import time
+from datetime import date
 from itertools import batched, chain
 from pathlib import Path
 from typing import (
@@ -15,7 +16,6 @@ from typing import (
 )
 
 import pandas as pd
-from bearish.interface.interface import BearishDbBase  # type: ignore
 from bearish.models.assets.equity import BaseEquity  # type: ignore
 from bearish.models.base import (  # type: ignore
     DataSourceBase,
@@ -87,10 +87,10 @@ def _compute_growth(series: pd.Series) -> bool:
     return all(series.pct_change(fill_method=None).dropna() > 0)
 
 
-def _all_positive(series: pd.Series) -> bool:
+def _all_positive(series: pd.Series, threshold: int = 0) -> bool:
     if series.empty:
         return False
-    return all(series.dropna() > 0)
+    return all(series.dropna() > threshold)
 
 
 def _get_last(data: pd.Series) -> Optional[float]:
@@ -274,7 +274,7 @@ class BaseFundamentalAnalysis(BaseModel):
             debt_to_equity = (
                 balance_sheet.total_liabilities / balance_sheet.total_shareholder_equity
             ).dropna()
-            positive_debt_to_equity = _all_positive(debt_to_equity)
+            positive_debt_to_equity = _all_positive(debt_to_equity, threshold=1)
 
             # Add relevant balance sheet data to financials
             financial["total_shareholder_equity"] = balance_sheet[
@@ -433,6 +433,10 @@ class FundamentalAnalysis(YearlyFundamentalAnalysis, QuarterlyFundamentalAnalysi
         ]
 
 
+class AnalysisEarningsDate(BaseModel):
+    next_earnings_date: Optional[date] = None
+
+
 class AnalysisView(BaseModel):
     sector: Annotated[
         Optional[str],
@@ -484,15 +488,15 @@ class AnalysisView(BaseModel):
             default=None,
         ),
     ]
-    median_yearly_growth: Optional[float] = None
-    median_weekly_growth: Optional[float] = None
-    median_monthly_growth: Optional[float] = None
+    yearly_growth: Optional[float] = None
+    weekly_growth: Optional[float] = None
+    monthly_growth: Optional[float] = None
 
 
-class Analysis(AnalysisView, BaseEquity, TechnicalAnalysis, FundamentalAnalysis):  # type: ignore
+class Analysis(AnalysisEarningsDate, AnalysisView, BaseEquity, TechnicalAnalysis, FundamentalAnalysis):  # type: ignore
 
     @classmethod
-    def from_ticker(cls, bearish_db: BearishDbBase, ticker: Ticker) -> "Analysis":
+    def from_ticker(cls, bearish_db: "BullishDb", ticker: Ticker) -> "Analysis":
         asset = bearish_db.read_assets(
             AssetQuery(
                 symbols=Symbols(equities=[ticker]),
@@ -504,11 +508,13 @@ class Analysis(AnalysisView, BaseEquity, TechnicalAnalysis, FundamentalAnalysis)
         fundamental_analysis = FundamentalAnalysis.from_financials(financials, ticker)
         prices = Prices.from_ticker(bearish_db, ticker)
         technical_analysis = TechnicalAnalysis.from_data(prices.to_dataframe(), ticker)
+        next_earnings_date = bearish_db.read_next_earnings_date(ticker.symbol)
         return cls.model_validate(
             equity.model_dump()
             | fundamental_analysis.model_dump()
             | technical_analysis.model_dump()
             | {
+                "next_earnings_date": next_earnings_date,
                 "price_per_earning_ratio": (
                     (
                         technical_analysis.last_price
@@ -518,7 +524,7 @@ class Analysis(AnalysisView, BaseEquity, TechnicalAnalysis, FundamentalAnalysis)
                     and fundamental_analysis.earning_per_share != 0
                     and fundamental_analysis.earning_per_share is not None
                     else None
-                )
+                ),
             }
         )
 

bullish/analysis/constants.py

@@ -308,23 +308,20 @@ Sector = Literal[
     "Financial Services",
     "Conglomerates",
 ]
-
-SubCountry = Literal["United kingdom", "United states", "Germany", "Belgium", "France"]
+Europe = Literal["Germany", "Belgium", "France"]
+Us = Literal["United states"]
+WesternCountries = Literal["United kingdom", Europe, Us]
 Country = Literal[
+    WesternCountries,
     "Australia",
     "China",
     "Japan",
-    "United kingdom",
-    "United states",
     "Poland",
     "Switzerland",
     "Canada",
     "Greece",
     "Spain",
-    "Germany",
     "Indonesia",
-    "Belgium",
-    "France",
     "Netherlands",
     "British virgin islands",
     "Italy",

bullish/analysis/filter.py

@@ -172,6 +172,10 @@ class GeneralFilter(BaseModel):
     industry_group: Optional[List[str]] = None
     sector: Optional[List[str]] = None
     symbol: Optional[List[str]] = None
+    limit: Optional[str] = None
+    next_earnings_date: List[date] = Field(
+        default=[date.today(), date.today() + datetime.timedelta(days=30 * 12)],
+    )
     market_capitalization: Optional[List[float]] = Field(default=[5e8, 1e12])
     price_per_earning_ratio: Optional[List[float]] = Field(default=[0.0, 1000.0])
 
@@ -186,11 +190,12 @@ class FilterQuery(GeneralFilter, *TechnicalAnalysisFilters, *FundamentalAnalysis
             ).items()
         )
 
-    def to_query(self) -> str:
+    def to_query(self) -> str:  # noqa: C901
         parameters = self.model_dump(exclude_defaults=True, exclude_unset=True)
         query = []
         order_by_desc = ""
         order_by_asc = ""
+        limit = None
         for parameter, value in parameters.items():
             if not value:
                 continue
@@ -207,10 +212,20 @@ class FilterQuery(GeneralFilter, *TechnicalAnalysisFilters, *FundamentalAnalysis
                 order_by_desc = f"ORDER BY {value} DESC"
             elif isinstance(value, str) and bool(value) and parameter == "order_by_asc":
                 order_by_asc = f"ORDER BY {value} ASC"
+            elif isinstance(value, str) and bool(value) and parameter == "limit":
+                limit = f" LIMIT {int(value)}"
             elif (
-                isinstance(value, list)
-                and len(value) == SIZE_RANGE
-                and all(isinstance(item, (int, float)) for item in value)
+                (
+                    isinstance(value, list)
+                    and len(value) == SIZE_RANGE
+                    and all(isinstance(item, date) for item in value)
+                )
+                and parameter == "next_earnings_date"
+                or (
+                    isinstance(value, list)
+                    and len(value) == SIZE_RANGE
+                    and all(isinstance(item, (int, float)) for item in value)
+                )
             ):
                 query.append(f"{parameter} BETWEEN {value[0]} AND {value[1]}")
             elif (
@@ -229,7 +244,12 @@ class FilterQuery(GeneralFilter, *TechnicalAnalysisFilters, *FundamentalAnalysis
             else:
                 raise NotImplementedError
         query_ = " AND ".join(query)
-        return f"{query_} {order_by_desc.strip()} {order_by_asc.strip()}".strip()
+        query__ = f"{query_} {order_by_desc.strip()} {order_by_asc.strip()}".strip()
+        if limit is not None:
+            query__ += limit
+        else:
+            query__ += " LIMIT 1000"
+        return query__
 
 
 class FilterQueryStored(FilterQuery): ...

bullish/analysis/functions.py

@@ -288,6 +288,14 @@ def compute_price(data: pd.DataFrame) -> pd.DataFrame:
     return results
 
 
+def compute_volume(data: pd.DataFrame) -> pd.DataFrame:
+    results = pd.DataFrame(index=data.index)
+    results["AVERAGE_VOLUME_10"] = data.volume.rolling(window=10).mean()
+    results["AVERAGE_VOLUME_30"] = data.volume.rolling(window=30).mean()
+    results["VOLUME"] = data.volume
+    return results
+
+
 def find_last_true_run_start(series: pd.Series) -> Optional[date]:
     if not series.iloc[-1]:
         return None
@@ -397,6 +405,10 @@ TRANGE = IndicatorFunction(
     expected_columns=["TRANGE"],
     functions=[compute_trange, compute_pandas_ta_trange],
 )
+VOLUME = IndicatorFunction(
+    expected_columns=["AVERAGE_VOLUME_10", "AVERAGE_VOLUME_30", "VOLUME"],
+    functions=[compute_volume],
+)
 PRICE = IndicatorFunction(
     expected_columns=[
         "200_DAY_HIGH",

bullish/analysis/indicators.py

@@ -20,6 +20,7 @@ from bullish.analysis.functions import (
     cross_simple,
     cross_value_series,
     find_last_true_run_start,
+    VOLUME,
 )
 
 logger = logging.getLogger(__name__)
@@ -389,6 +390,27 @@ def indicators_factory() -> List[Indicator]:
                     type=Optional[date],
                     function=lambda d: 0.6 * d["20_DAY_HIGH"] > d.LAST_PRICE,
                 ),
+                Signal(
+                    name="WEEKLY_GROWTH",
+                    description="weekly growth",
+                    type_info="Oversold",
+                    type=Optional[float],
+                    function=lambda d: d.WEEKLY_GROWTH,
+                ),
+                Signal(
+                    name="MONTHLY_GROWTH",
+                    description="Median monthly growth",
+                    type_info="Oversold",
+                    type=Optional[float],
+                    function=lambda d: d.MONTHLY_GROWTH,
+                ),
+                Signal(
+                    name="YEARLY_GROWTH",
+                    description="Median yearly growth",
+                    type_info="Oversold",
+                    type=Optional[float],
+                    function=lambda d: d.YEARLY_GROWTH,
+                ),
                 Signal(
                     name="MEDIAN_WEEKLY_GROWTH",
                     description="Median weekly growth",
@@ -419,6 +441,42 @@ def indicators_factory() -> List[Indicator]:
                         number=lambda v: np.median(v.unique())
                     ),
                 ),
+                Signal(
+                    name="LOWER_THAN_20_DAY_HIGH",
+                    description="Current price is lower than the 20-day high",
+                    type_info="Oversold",
+                    type=Optional[date],
+                    function=lambda d: 0.6 * d["20_DAY_HIGH"] > d.LAST_PRICE,
+                ),
+            ],
+        ),
+        Indicator(
+            name="VOLUME",
+            description="Volume based indicators",
+            expected_columns=VOLUME.expected_columns,
+            function=VOLUME.call,
+            signals=[
+                Signal(
+                    name="AVERAGE_VOLUME_10",
+                    type_info="Value",
+                    description="Average volume over the last 10 days",
+                    type=Optional[float],
+                    function=lambda d: d.AVERAGE_VOLUME_10,
+                ),
+                Signal(
+                    name="AVERAGE_VOLUME_30",
+                    type_info="Value",
+                    description="Average volume over the last 30 days",
+                    type=Optional[float],
+                    function=lambda d: d.AVERAGE_VOLUME_30,
+                ),
+                Signal(
+                    name="VOLUME_ABOVE_AVERAGE",
+                    type_info="Value",
+                    description="Volume above average volume over the last 30 days",
+                    type=Optional[date],
+                    function=lambda d: d.AVERAGE_VOLUME_30 < d.VOLUME,
+                ),
             ],
         ),
         Indicator(

bullish/analysis/industry_views.py

@@ -23,7 +23,7 @@ from bullish.analysis.constants import (
     IndustryGroup,
     Sector,
     Country,
-    SubCountry,
+    WesternCountries,
 )
 
 if TYPE_CHECKING:
@@ -61,7 +61,7 @@ def get_industry_comparison_data(
         normalized_symbol = compute_normalized_close(symbol_data.close).rename("symbol")
         normalized_industry = industry_data.normalized_close.rename(industry)
         data = [normalized_symbol, normalized_industry]
-        for country in get_args(SubCountry):
+        for country in get_args(WesternCountries):
             views = bullish_db.read_returns(type, industry, country)
             if views:
                 industry_data = IndustryViews.from_views(views).to_dataframe()

bullish/analysis/predefined_filters.py

@@ -1,6 +1,6 @@
 import datetime
 from datetime import timedelta
-from typing import Dict, Any, Optional, List, Union
+from typing import Dict, Any, Optional, List, Union, get_args
 
 from bullish.analysis.analysis import AnalysisView
 from bullish.analysis.backtest import (
@@ -9,6 +9,7 @@ from bullish.analysis.backtest import (
     BacktestQueryRange,
     BacktestQuerySelection,
 )
+from bullish.analysis.constants import Europe, Us
 from bullish.analysis.filter import FilterQuery, BOOLEAN_GROUP_MAPPING
 from pydantic import BaseModel, Field
 
@@ -101,280 +102,84 @@ class NamedFilterQuery(FilterQuery):
 
         return bullish_db.read_query(queries.to_query())["symbol"].tolist()  # type: ignore
 
+    def country_variant(self, suffix: str, countries: List[str]) -> "NamedFilterQuery":
+        return NamedFilterQuery.model_validate(
+            self.model_dump()
+            | {"name": f"{self.name} ({suffix})", "country": countries}
+        )
 
-STRONG_FUNDAMENTALS = NamedFilterQuery(
-    name="Strong Fundamentals",
-    income=[
-        "positive_operating_income",
-        "growing_operating_income",
-        "positive_net_income",
-        "growing_net_income",
-    ],
-    cash_flow=["positive_free_cash_flow", "growing_operating_cash_flow"],
-    eps=["positive_diluted_eps", "growing_diluted_eps"],
-    properties=[
-        "operating_cash_flow_is_higher_than_net_income",
-        "positive_return_on_equity",
-        "positive_return_on_assets",
-        "positive_debt_to_equity",
-    ],
-    market_capitalization=[1e10, 1e12],  # 1 billion to 1 trillion
-    rsi_bullish_crossover_30=DATE_THRESHOLD,
-)
+    def variants(self) -> List["NamedFilterQuery"]:
+        return [
+            self.country_variant("Europe", list(get_args(Europe))),
+            self.country_variant("Us", list(get_args(Us))),
+        ]
 
-GOOD_FUNDAMENTALS = NamedFilterQuery(
-    name="Good Fundamentals",
-    income=[
-        "positive_operating_income",
-        "positive_net_income",
-    ],
-    cash_flow=["positive_free_cash_flow"],
-    eps=["positive_diluted_eps"],
-    properties=[
-        "positive_return_on_equity",
-        "positive_return_on_assets",
-        "positive_debt_to_equity",
-    ],
-    market_capitalization=[1e10, 1e12],  # 1 billion to 1 trillion
-    rsi_bullish_crossover_30=DATE_THRESHOLD,
-)
 
-RSI_CROSSOVER_30_GROWTH_STOCK_STRONG_FUNDAMENTAL = NamedFilterQuery(
-    name="RSI cross-over 30 growth stock strong fundamental",
-    income=[
-        "positive_operating_income",
-        "growing_operating_income",
-        "positive_net_income",
-        "growing_net_income",
-    ],
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[10, 100],
-    rsi_bullish_crossover_30=DATE_THRESHOLD,
-    market_capitalization=[5e8, 1e12],
+SMALL_CAP = NamedFilterQuery(
+    name="Small Cap",
+    last_price=[1, 20],
+    market_capitalization=[5e7, 5e8],
+    properties=["positive_debt_to_equity"],
+    average_volume_30=[50000, 5e9],
     order_by_desc="market_capitalization",
-    country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
-)
-RSI_CROSSOVER_40_GROWTH_STOCK_STRONG_FUNDAMENTAL = NamedFilterQuery(
-    name="RSI cross-over 40 growth stock strong fundamental",
-    income=[
-        "positive_operating_income",
-        "growing_operating_income",
-        "positive_net_income",
-        "growing_net_income",
-    ],
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[10, 500],
-    rsi_bullish_crossover_40=DATE_THRESHOLD,
-    market_capitalization=[5e8, 1e12],
-    order_by_desc="market_capitalization",
-    country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
-)
+).variants()
 
-RSI_CROSSOVER_30_GROWTH_STOCK = NamedFilterQuery(
-    name="RSI cross-over 30 growth stock",
-    price_per_earning_ratio=[10, 500],
-    rsi_bullish_crossover_30=DATE_THRESHOLD,
-    market_capitalization=[1e10, 1e13],
-    order_by_desc="market_capitalization",
-    country=[
-        "Germany",
-        "United states",
-        "France",
-        "United kingdom",
-        "Canada",
-        "Japan",
-        "Belgium",
-    ],
-)
-
-MEDIAN_YEARLY_GROWTH = NamedFilterQuery(
-    name="Median yearly growth",
-    market_capitalization=[1e6, 1e13],
-    median_yearly_growth=[40, 1000],
-    last_price=[1, 100],
-    order_by_asc="last_price",
-    country=[
-        "Germany",
-        "United states",
-        "France",
-        "Belgium",
-    ],
-)
-RSI_CROSSOVER_40_GROWTH_STOCK = NamedFilterQuery(
-    name="RSI cross-over 40 growth stock",
-    price_per_earning_ratio=[10, 500],
-    rsi_bullish_crossover_40=DATE_THRESHOLD,
-    market_capitalization=[1e10, 1e13],
-    order_by_desc="market_capitalization",
-    country=[
-        "Germany",
-        "United states",
-        "France",
-        "United kingdom",
-        "Canada",
-        "Japan",
-        "Belgium",
-    ],
-)
-
-
-MOMENTUM_GROWTH_GOOD_FUNDAMENTALS = NamedFilterQuery(
-    name="Momentum Growth Good Fundamentals (RSI 30)",
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[10, 500],
-    rsi_bullish_crossover_30=[
-        datetime.date.today() - datetime.timedelta(days=7),
-        datetime.date.today(),
-    ],
-    macd_12_26_9_bullish_crossover=[
-        datetime.date.today() - datetime.timedelta(days=7),
-        datetime.date.today(),
-    ],
+TOP_PERFORMERS = NamedFilterQuery(
+    name="Top Performers",
     sma_50_above_sma_200=[
         datetime.date.today() - datetime.timedelta(days=5000),
         datetime.date.today() - datetime.timedelta(days=10),
     ],
-    market_capitalization=[5e8, 1e12],
-    order_by_desc="momentum",
-    country=[
-        "Germany",
-        "United states",
-        "France",
-        "United kingdom",
-        "Canada",
-        "Japan",
-        "Belgium",
-    ],
-)
-
-MOMENTUM_GROWTH_STRONG_FUNDAMENTALS = NamedFilterQuery(
-    name="Momentum Growth Strong Fundamentals (RSI 30)",
-    income=[
-        "positive_operating_income",
-        "growing_operating_income",
-        "positive_net_income",
-        "growing_net_income",
-    ],
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[10, 500],
-    rsi_bullish_crossover_30=[
-        datetime.date.today() - datetime.timedelta(days=7),
-        datetime.date.today(),
-    ],
-    macd_12_26_9_bullish_crossover=[
-        datetime.date.today() - datetime.timedelta(days=7),
-        datetime.date.today(),
-    ],
-    sma_50_above_sma_200=[
+    price_above_sma_50=[
         datetime.date.today() - datetime.timedelta(days=5000),
         datetime.date.today() - datetime.timedelta(days=10),
     ],
-    market_capitalization=[5e8, 1e12],
-    order_by_desc="momentum",
-    country=[
-        "Germany",
-        "United states",
-        "France",
-        "United kingdom",
-        "Canada",
-        "Japan",
-        "Belgium",
-    ],
-)
-MOMENTUM_GROWTH_RSI_30 = NamedFilterQuery(
-    name="Momentum Growth Screener (RSI 30)",
-    price_per_earning_ratio=[10, 500],
-    rsi_bullish_crossover_30=[
-        datetime.date.today() - datetime.timedelta(days=7),
-        datetime.date.today(),
-    ],
-    macd_12_26_9_bullish_crossover=[
-        datetime.date.today() - datetime.timedelta(days=7),
-        datetime.date.today(),
-    ],
-    sma_50_above_sma_200=[
-        datetime.date.today() - datetime.timedelta(days=5000),
-        datetime.date.today() - datetime.timedelta(days=10),
-    ],
-    market_capitalization=[5e8, 1e12],
-    order_by_desc="momentum",
-    country=[
-        "Germany",
-        "United states",
-        "France",
-        "United kingdom",
-        "Canada",
-        "Japan",
-        "Belgium",
-    ],
-)
-MOMENTUM_GROWTH_RSI_40 = NamedFilterQuery(
-    name="Momentum Growth Screener (RSI 40)",
-    price_per_earning_ratio=[10, 500],
-    rsi_bullish_crossover_40=[
-        datetime.date.today() - datetime.timedelta(days=7),
-        datetime.date.today(),
-    ],
-    macd_12_26_9_bullish_crossover=[
-        datetime.date.today() - datetime.timedelta(days=7),
+    volume_above_average=DATE_THRESHOLD,
+    weekly_growth=[1, 100],
+    monthly_growth=[8, 100],
+    order_by_desc="market_capitalization",
+).variants()
+
+LARGE_CAPS = NamedFilterQuery(
+    name="Large caps",
+    order_by_desc="market_capitalization",
+    limit="50",
+).variants()
+
+NEXT_EARNINGS_DATE = NamedFilterQuery(
+    name="Next Earnings date",
+    order_by_desc="market_capitalization",
+    next_earnings_date=[
         datetime.date.today(),
+        datetime.date.today() + timedelta(days=10),
     ],
-    sma_50_above_sma_200=[
-        datetime.date.today() - datetime.timedelta(days=5000),
-        datetime.date.today() - datetime.timedelta(days=10),
-    ],
-    market_capitalization=[5e8, 1e12],
-    order_by_desc="momentum",
-    country=[
-        "Germany",
-        "United states",
-        "France",
-        "United kingdom",
-        "Canada",
-        "Japan",
-        "Belgium",
-    ],
-)
+).variants()
+
+RSI_CROSSOVER_40 = NamedFilterQuery(
+    name="RSI cross-over 40",
+    rsi_bullish_crossover_40=DATE_THRESHOLD,
+    market_capitalization=[5e8, 1e13],
+    order_by_desc="market_capitalization",
+    country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
+).variants()
 
-GOLDEN_CROSS_LAST_SEVEN_DAYS = NamedFilterQuery(
-    name="Golden cross in the last five days",
+RSI_CROSSOVER_30 = NamedFilterQuery(
+    name="RSI cross-over 30",
     price_per_earning_ratio=[10, 500],
-    last_price=[1, 10000],
-    golden_cross=[
-        datetime.date.today() - datetime.timedelta(days=7),
-        datetime.date.today(),
-    ],
+    rsi_bullish_crossover_30=DATE_THRESHOLD,
+    market_capitalization=[5e8, 1e13],
     order_by_desc="market_capitalization",
-    country=[
-        "Germany",
-        "United states",
-        "France",
-        "United kingdom",
-        "Canada",
-        "Japan",
-        "Belgium",
-    ],
-)
+).variants()
 
 
 def predefined_filters() -> list[NamedFilterQuery]:
     return [
-        STRONG_FUNDAMENTALS,
-        GOOD_FUNDAMENTALS,
-        RSI_CROSSOVER_30_GROWTH_STOCK_STRONG_FUNDAMENTAL,
-        RSI_CROSSOVER_40_GROWTH_STOCK_STRONG_FUNDAMENTAL,
-        RSI_CROSSOVER_30_GROWTH_STOCK,
-        RSI_CROSSOVER_40_GROWTH_STOCK,
-        MOMENTUM_GROWTH_GOOD_FUNDAMENTALS,
-        MOMENTUM_GROWTH_STRONG_FUNDAMENTALS,
-        MOMENTUM_GROWTH_RSI_30,
-        MOMENTUM_GROWTH_RSI_40,
-        GOLDEN_CROSS_LAST_SEVEN_DAYS,
-        MEDIAN_YEARLY_GROWTH,
+        *SMALL_CAP,
+        *TOP_PERFORMERS,
+        *LARGE_CAPS,
+        *NEXT_EARNINGS_DATE,
+        *RSI_CROSSOVER_40,
+        *RSI_CROSSOVER_30,
     ]
 
 

bullish/app/app.py

@@ -146,14 +146,20 @@ def build_filter(model: Type[BaseModel], data: Dict[str, Any]) -> Dict[str, Any]
         if data.get(field) and data[field] != info.default:
             default = data[field]
         if info.annotation == Optional[List[str]]:  # type: ignore
+            mapping = groups_mapping().get(field)
+            if not mapping:
+                continue
             data[field] = st.multiselect(
                 name,
-                groups_mapping()[field],
+                mapping,
                 default=default,
                 key=hash((model.__name__, field)),
             )
         elif info.annotation == Optional[str]:  # type: ignore
-            options = ["", *groups_mapping()[field]]
+            mapping = groups_mapping().get(field)
+            if not mapping:
+                continue
+            options = ["", *mapping]
             data[field] = st.selectbox(
                 name,
                 options,
@@ -183,7 +189,7 @@ def build_filter(model: Type[BaseModel], data: Dict[str, Any]) -> Dict[str, Any]
             except Exception as e:
                 logger.error(
                     f"Error building filter for {model.__name__}.{field} "
-                    f"with the parameters {(info.annotation, name, ge, le, tuple(default))}: {e}"
+                    f"with the parameters {(info.annotation, name, ge, le)}: {e}"
                 )
                 raise e
     return data

bullish/database/alembic/versions/d0e58e050845_.py

@@ -0,0 +1,39 @@
+"""
+
+Revision ID: d0e58e050845
+Revises: ff0cc4ba40ec
+Create Date: 2025-08-05 14:02:54.407561
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import sqlite
+
+# revision identifiers, used by Alembic.
+revision: str = "d0e58e050845"
+down_revision: Union[str, None] = "ff0cc4ba40ec"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("analysis", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("next_earnings_date", sa.Date(), nullable=True))
+        batch_op.create_index(
+            "ix_analysis_next_earnings_date", ["next_earnings_date"], unique=False
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("analysis", schema=None) as batch_op:
+        batch_op.drop_index("ix_analysis_next_earnings_date")
+        batch_op.drop_column("next_earnings_date")
+
+    # ### end Alembic commands ###

bullish/database/alembic/versions/ff0cc4ba40ec_.py

@@ -0,0 +1,69 @@
+"""
+
+Revision ID: ff0cc4ba40ec
+Revises: 79bc71ec6f9e
+Create Date: 2025-08-05 12:09:12.108606
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import sqlite
+
+# revision identifiers, used by Alembic.
+revision: str = "ff0cc4ba40ec"
+down_revision: Union[str, None] = "79bc71ec6f9e"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("analysis", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("average_volume_10", sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column("average_volume_30", sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column("volume_above_average", sa.Date(), nullable=True))
+        batch_op.add_column(sa.Column("weekly_growth", sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column("monthly_growth", sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column("yearly_growth", sa.Float(), nullable=True))
+        batch_op.create_index(
+            "ix_analysis_average_volume_10", ["average_volume_10"], unique=False
+        )
+        batch_op.create_index(
+            "ix_analysis_average_volume_30", ["average_volume_30"], unique=False
+        )
+        batch_op.create_index(
+            "ix_analysis_monthly_growth", ["monthly_growth"], unique=False
+        )
+        batch_op.create_index(
+            "ix_analysis_volume_above_average", ["volume_above_average"], unique=False
+        )
+        batch_op.create_index(
+            "ix_analysis_weekly_growth", ["weekly_growth"], unique=False
+        )
+        batch_op.create_index(
+            "ix_analysis_yearly_growth", ["yearly_growth"], unique=False
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("analysis", schema=None) as batch_op:
+        batch_op.drop_index("ix_analysis_yearly_growth")
+        batch_op.drop_index("ix_analysis_weekly_growth")
+        batch_op.drop_index("ix_analysis_volume_above_average")
+        batch_op.drop_index("ix_analysis_monthly_growth")
+        batch_op.drop_index("ix_analysis_average_volume_30")
+        batch_op.drop_index("ix_analysis_average_volume_10")
+        batch_op.drop_column("yearly_growth")
+        batch_op.drop_column("monthly_growth")
+        batch_op.drop_column("weekly_growth")
+        batch_op.drop_column("volume_above_average")
+        batch_op.drop_column("average_volume_30")
+        batch_op.drop_column("average_volume_10")
+
+    # ### end Alembic commands ###

bullish/database/crud.py

@@ -331,3 +331,13 @@ class BullishDb(BearishDb, BullishDbBase):  # type: ignore
                 return [BacktestResult.model_validate(r) for r in results]
             else:
                 return []
+
+    def read_next_earnings_date(self, symbol: str) -> Optional[date]:
+        with Session(self._engine) as session:
+            stmt = select(EarningsDateORM.date).where(
+                EarningsDateORM.symbol == symbol, EarningsDateORM.date > date.today()
+            )
+            result = session.exec(stmt).first()
+            if result:
+                return result.date()  # type: ignore
+            return None

bullish/interface/interface.py

@@ -35,7 +35,7 @@ class BullishDbBase(BearishDbBase):  # type: ignore
         query_ = query.to_query()
         fields = ",".join(list(AnalysisView.model_fields))
         query_str: str = f""" 
-        SELECT {fields} FROM analysis WHERE {query_} LIMIT 1000
+        SELECT {fields} FROM analysis WHERE {query_}
         """  # noqa: S608
         return self._read_filter_query(query_str)
 
@@ -149,3 +149,6 @@ class BullishDbBase(BearishDbBase):  # type: ignore
     def read_many_backtest_results(
         self, query: Optional[BacktestResultQuery] = None
     ) -> List[BacktestResult]: ...
+
+    @abc.abstractmethod
+    def read_next_earnings_date(self, symbol: str) -> Optional[date]: ...

bullish/jobs/tasks.py

@@ -111,4 +111,4 @@ def news(
     task: Optional[Task] = None,
 ) -> None:
     database_config = DatabaseConfig(database_path=database_path, no_migration=True)
-    get_news(symbols, database_config, headless=headless, model_name = "gpt-4o-mini")
+    get_news(symbols, database_config, headless=headless, model_name="gpt-4o-mini")

{bullishpy-0.28.0.dist-info → bullishpy-0.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bullishpy
-Version: 0.28.0
+Version: 0.29.0
 Summary: 
 Author: aan
 Author-email: andoludovic.andriamamonjy@gmail.com

{bullishpy-0.28.0.dist-info → bullishpy-0.29.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 bullish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/analysis/analysis.py,sha256=9a1j1-Fe0XW5_fiNXtgs7XM_0Rl0mQOWvXQv9nUirdg,22124
+bullish/analysis/analysis.py,sha256=nCb___Tb2aOFIu1wWtPwS1VVZfXOSCp5zUWaIOCdvl4,22345
 bullish/analysis/backtest.py,sha256=x91ek5kOzJHvYq0TmJh1Q8wBDDduIaieE0zDaoZFXew,14325
-bullish/analysis/constants.py,sha256=OpjmrMWHKstoqi314GdJU0vg23IgWqa_rrFU_Lsms0Q,9940
-bullish/analysis/filter.py,sha256=wBVkHhQPfG8wJ0TR3KLo_Bb7cRZFPyHlF4UK2mpG6S0,8495
-bullish/analysis/functions.py,sha256=JSxYCuua_sMGLosN83j0GcY0Ls_gsE4OZLLGInxG9RA,14354
-bullish/analysis/indicators.py,sha256=Dpps-v4bfQ3KF-C8zjMlArw1DJgZo-_EedYwihIiFJ0,24462
-bullish/analysis/industry_views.py,sha256=3TwruMdRYtmBC5bRYFptLt18AN9PQSY9d-uWnTiJKgY,6787
-bullish/analysis/predefined_filters.py,sha256=FnEyWcVKlCSlDhE8LHGXGY3tFZmFTnExQmg78BW9ICs,12417
+bullish/analysis/constants.py,sha256=X3oCyYNA6B-jsZSYJLeGQ94S453Z7jIVNPmv3lMPp8Q,9922
+bullish/analysis/filter.py,sha256=0h4wfAuZ-ohhACPhOjZrNEV17gbZ7FopNv0k0HBtIWE,9262
+bullish/analysis/functions.py,sha256=PgjyzbBFwxCBN_n1PWWI7HC1FBb2Q685PBF4nSOj95g,14795
+bullish/analysis/indicators.py,sha256=XsMHc4-hEZwxFpI3JI-s4C2hcg0eCQLWcAQ8P46dtL8,26812
+bullish/analysis/industry_views.py,sha256=-B4CCAYz2arGQtWTXLLMpox0loO_MGdVQd2ycCRMOQQ,6799
+bullish/analysis/predefined_filters.py,sha256=RZe3lk1pLnQ7lZkTK7hC5Hh8GhaZ1-9fqy-D1A_3aR8,6657
 bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/app/app.py,sha256=rIvz4A0aJu7wGXBSCqO3EBA4QGhV8GPYVOYLOd9WjnY,14253
+bullish/app/app.py,sha256=9zxskm5gHt2uDGn59vL4ltI2zgrIBGhavp7jogt1us0,14411
 bullish/cli.py,sha256=azhVLwOUrmwrtFAJSgva8-UFgNgkepXhjp7DxQNc-yw,2427
 bullish/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/database/alembic/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
@@ -30,11 +30,13 @@ bullish/database/alembic/versions/73564b60fe24_.py,sha256=MTlDRDNHj3E9gK7IMeAzv2
 bullish/database/alembic/versions/79bc71ec6f9e_.py,sha256=4nShut2NEd1F3piSckIIBtke0GEsFAxYw5TZl5YYRzc,1140
 bullish/database/alembic/versions/b76079e9845f_.py,sha256=W8eeTABjI9tT1dp3hlK7g7tiKqDhmA8AoUX9Sw-ykLI,1165
 bullish/database/alembic/versions/bf6b86dd5463_.py,sha256=fKB8knCprGmiL6AEyFdhybVmB7QX_W4MPFF9sPzUrSM,1094
+bullish/database/alembic/versions/d0e58e050845_.py,sha256=x_LS3J27FNyy_WD99uvZzNehly-jpgn9abOYN-VjjZc,1164
 bullish/database/alembic/versions/d663166c531d_.py,sha256=U92l6QXqPniAYrPeu2Bt77ReDbXveLj4aGXtgd806JY,1915
 bullish/database/alembic/versions/ec25c8fa449f_.py,sha256=8Yts74KEjK4jg20zIo90_0atw-sOBuE3hgCKl-rfS5E,2271
 bullish/database/alembic/versions/ee5baabb35f8_.py,sha256=nBMEY-_C8AsSXVPyaDdUkwrFFo2gxShzJhmrjejDwtc,1632
 bullish/database/alembic/versions/fc191121f522_.py,sha256=0sstF6TpAJ09-Mt-Vek9SdSWksvi4C58a5D92rBtuY8,1894
-bullish/database/crud.py,sha256=mu4Ddvg94gLNUENGTw1dbT6dgW5AiS7O3JpehB5vOWo,12701
+bullish/database/alembic/versions/ff0cc4ba40ec_.py,sha256=74lxga54ig_LoNZYK9toJL9iRwGbNRezh1zvO1YI40U,2719
+bullish/database/crud.py,sha256=TvA3TGjr6RNYdNP0u-7RmVU1i9mqNbsv8lOcRbaXbn8,13122
 bullish/database/schemas.py,sha256=3uRcNKuobqWC3mCfInzo-4KhrZp3DH6yx_0TEbLoHME,3428
 bullish/database/scripts/create_revision.py,sha256=rggIf-3koPqJNth8FIg89EOfnIM7a9QrvL8X7UJsP0g,628
 bullish/database/scripts/stamp.py,sha256=PWgVUEBumjNUMjTnGw46qmU3p221LeN-KspnW_gFuu4,839
@@ -44,14 +46,14 @@ bullish/exceptions.py,sha256=4z_i-dD-CDz1bkGmZH9DOf1L_awlCPCgdUDPF7dhWAI,106
 bullish/figures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/figures/figures.py,sha256=EpJQOiSqSp7cHvZoGlZrF6UVpyv-fFyDApAfskqdUkU,4562
 bullish/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/interface/interface.py,sha256=9bhXOKlYtoCbbbDBzmwlVK2HuAzfO-1kE8mk_MMG0MM,5046
+bullish/interface/interface.py,sha256=dFQW0tMYbFL-gWrlWTWP1qKKSzqlrhz6-T_lLqhILyw,5134
 bullish/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/jobs/app.py,sha256=5MJ5KXUo7JSNAvOPgkpIMasD11VTrjQvGzM7vmCY65E,77
 bullish/jobs/models.py,sha256=S2yvBf69lmt4U-5OU5CjXCMSw0s9Ubh9xkrB3k2qOZo,764
-bullish/jobs/tasks.py,sha256=W699Lt6FP1zo7QzGcvVo7x2aowAcEjQBq5PFVjnCKvY,3719
+bullish/jobs/tasks.py,sha256=5dGWT7uZlirlQsqvI2BR9V3ywbt8yD0s-jaNiTFaIAg,3717
 bullish/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/utils/checks.py,sha256=Va10_xDVVnxYkOD2hafvyQ-TFV8FQpOkr4huJ7XgpDM,2188
-bullishpy-0.28.0.dist-info/METADATA,sha256=Asyi1bAYTjIESyT8xdzPp4DzP2p2ASKoTmJKPA--9zc,830
-bullishpy-0.28.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.28.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.28.0.dist-info/RECORD,,
+bullishpy-0.29.0.dist-info/METADATA,sha256=ROYPl5D2qTigixZ1Xok4cfnwuVYUarBgrz22cKFUs7o,830
+bullishpy-0.29.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.29.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.29.0.dist-info/RECORD,,