bullishpy 0.13.0__py3-none-any.whl → 0.15.0__py3-none-any.whl

bullish/analysis/industry_views.py

@@ -0,0 +1,201 @@
+import datetime
+from typing import (
+    Optional,
+    Any,
+    Annotated,
+    Literal,
+    Dict,
+    List,
+    TYPE_CHECKING,
+    get_args,
+)
+
+import numpy as np
+import pandas as pd
+from bearish.models.base import Ticker  # type: ignore
+from bearish.models.price.prices import Prices  # type: ignore
+from bearish.models.query.query import AssetQuery, Symbols  # type: ignore
+from pydantic import BaseModel, BeforeValidator, Field, model_validator
+
+from bullish.analysis.constants import Industry, IndustryGroup, Sector, Country
+
+if TYPE_CHECKING:
+    from bullish.database.crud import BullishDb
+
+Type = Literal["Mean"]
+
+FUNCTIONS = {"Mean": np.mean}
+BASELINE_DATE = datetime.date.today() - datetime.timedelta(days=60)
+
+
+def compute_normalized_close(close_: pd.Series) -> pd.Series:
+    close = close_.copy()
+    close.index = close.index.tz_localize(None)  # type: ignore
+    closest_ts = close.index[
+        close.index.get_indexer([BASELINE_DATE], method="nearest")[0]
+    ]
+    normalized_close = (close / close.loc[closest_ts]).rename("normalized_close")
+    normalized_close.index = close_.index
+    return normalized_close  # type: ignore
+
+
+def get_industry_comparison_data(
+    bullish_db: "BullishDb",
+    symbol_data: pd.DataFrame,
+    type: Type,
+    industry: Industry,
+    country: Country,
+) -> pd.DataFrame:
+    try:
+        views = bullish_db.read_returns(type, industry, country)
+        industry_data = IndustryViews.from_views(views).to_dataframe()
+        normalized_symbol = compute_normalized_close(symbol_data.close).rename("symbol")
+        normalized_industry = industry_data.normalized_close.rename("industry")
+        return pd.concat([normalized_symbol, normalized_industry], axis=1)
+    except Exception:
+        return pd.DataFrame()
+
+
+class PricesReturns(Prices):  # type: ignore
+
+    def returns(self) -> pd.DataFrame:
+        try:
+            data = self.to_dataframe()
+            data["simple_return"] = data.close.pct_change() * 100
+            data["log_return"] = (data.close / data.close.shift(1)).apply(np.log) * 100
+            data["normalized_close"] = compute_normalized_close(data.close)
+            return data[["simple_return", "log_return", "normalized_close"]]  # type: ignore
+        except Exception:
+            return pd.DataFrame(
+                columns=["simple_return", "log_return", "normalized_close"]
+            )
+
+
+def to_float(value: Any) -> Optional[float]:
+    if value == "None":
+        return None
+    if value is None:
+        return None
+    if isinstance(value, str):
+        try:
+            return float(value)
+        except ValueError:
+            return None
+    return float(value)
+
+
+class Basedate(BaseModel):
+    date: datetime.date
+
+
+class KPI(BaseModel):
+    simple_return: Annotated[float, BeforeValidator(to_float), Field(None)]
+    log_return: Annotated[float, BeforeValidator(to_float), Field(None)]
+    normalized_close: Annotated[float, BeforeValidator(to_float), Field(None)]
+
+
+class BaseIndustryView(Basedate, KPI): ...
+
+
+class IndustryView(BaseIndustryView):
+    created_at: datetime.date
+    country: Country
+    industry: Industry
+    industry_group: Optional[IndustryGroup] = None
+    sector: Optional[Sector] = None
+    type: Type
+
+    @model_validator(mode="before")
+    def _validate(cls, values: Dict[str, Any]) -> Dict[str, Any]:  # noqa: N805
+        created_at = datetime.date.today()
+        current_date = values.get("date", created_at)
+        return (
+            {"date": current_date}
+            | values
+            | {
+                "created_at": created_at,
+            }
+        )
+
+    @classmethod
+    def from_data(
+        cls,
+        data: pd.DataFrame,
+        function_name: Type,
+        industry: Industry,
+        country: Country,
+    ) -> List["IndustryView"]:
+        function = FUNCTIONS[function_name]
+        data_ = []
+        for field in KPI.model_fields:
+
+            data__ = (
+                data[field].apply(function, axis=1).rename(field)
+                if data[[field]].shape[1] > 1
+                else data[field]
+            )
+
+            data_.append(data__)
+
+        data_final = pd.concat(data_, axis=1)
+        data_final["date"] = data_final.index
+        return [
+            cls.model_validate(
+                r | {"industry": industry, "type": function_name, "country": country}
+            )
+            for r in data_final.to_dict(orient="records")
+        ]
+
+    @classmethod
+    def from_db(
+        cls, bullish: "BullishDb", industry: Industry, country: Country
+    ) -> List["IndustryView"]:
+        returns = []
+        symbols = bullish.read_industry_symbols(industries=[industry], country=country)
+        query = AssetQuery(
+            symbols=Symbols(equities=[Ticker(symbol=s) for s in symbols])
+        )
+        data = bullish.read_series(query, months=6)
+        raw_data = [
+            PricesReturns(prices=[d for d in data if d.symbol == s]).returns()
+            for s in symbols
+        ]
+        raw_data = [r for r in raw_data if not r.empty]
+
+        if raw_data:
+            data_ = pd.concat(raw_data, axis=1)
+            for function_name in FUNCTIONS:
+                returns.extend(cls.from_data(data_, function_name, industry, country))  # type: ignore
+        return returns
+
+
+class IndustryViews(BaseModel):
+    views: List[IndustryView]
+
+    def to_dataframe(self) -> pd.DataFrame:
+        data = pd.DataFrame.from_records(
+            [
+                p.model_dump(include=set(BaseIndustryView.model_fields))
+                for p in self.views
+            ]
+        )
+        if data.empty:
+            return data
+        data = data.set_index("date", inplace=False)
+        data = data.sort_index(inplace=False)
+
+        data.index = pd.to_datetime(data.index, utc=True)
+        data = data[~data.index.duplicated(keep="first")]
+        return data
+
+    @classmethod
+    def from_views(cls, views: List[IndustryView]) -> "IndustryViews":
+        return cls(views=views)
+
+
+def compute_industry_view(bullish: "BullishDb") -> None:
+    for country in get_args(Country):
+        for industry in get_args(Industry):
+            returns = IndustryView.from_db(bullish, industry, country)
+            if returns:
+                bullish.write_returns(returns)

bullish/analysis/predefined_filters.py

@@ -4,8 +4,9 @@ from typing import Dict, Any, Optional
 from bullish.analysis.filter import FilterQuery
 from pydantic import BaseModel, Field
 
+
 DATE_THRESHOLD = [
-    datetime.date.today() - datetime.timedelta(days=10),
+    datetime.date.today() - datetime.timedelta(days=7),
     datetime.date.today(),
 ]
 
@@ -60,177 +61,6 @@ GOOD_FUNDAMENTALS = NamedFilterQuery(
     rsi_bullish_crossover_30=DATE_THRESHOLD,
 )
 
-
-SHOOTING_STARS = NamedFilterQuery(
-    name="Shooting stars",
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    market_capitalization=[1e9, 1e12],  # 1 billion to 1 trillion
-    order_by_desc="median_yearly_growth",
-    order_by_asc="last_price",
-)
-
-RSI_CROSSOVER_TECH = NamedFilterQuery(
-    name="RSI cross-over",
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    return_after_rsi_crossover_45_period_90=[0.0, 100],
-    rsi_bullish_crossover_45=DATE_THRESHOLD,
-    market_capitalization=[5e8, 1e11],  # 1 billion to 1 trillion
-    order_by_desc="market_capitalization",
-    country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
-    industry=[
-        "Semiconductors",
-        "Software - Application",
-        "Software - Infrastructure",
-        "Biotechnology",
-        "Diagnostics & Research",
-        "Medical Devices",
-        "Health Information Services",
-        "Internet Retail",
-        "Electronic Gaming & Multimedia",
-        "Internet Content & Information",
-        "Solar",
-        "Information Technology Services",
-        "Scientific & Technical Instruments",
-        "Semiconductor Equipment & Materials",
-        "Diagnostics & Research",
-    ],
-)
-RSI_CROSSOVER_TECH_PE = NamedFilterQuery(
-    name="RSI cross-over P/E",
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[5, 30],  # P/E ratio between 10 and 100
-    rsi_bullish_crossover_45=DATE_THRESHOLD,
-    market_capitalization=[5e8, 1e12],  # 1 billion to 1 trillion
-    order_by_desc="market_capitalization",
-    country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
-    industry=[
-        "Semiconductors",
-        "Software - Application",
-        "Software - Infrastructure",
-        "Biotechnology",
-        "Diagnostics & Research",
-        "Medical Devices",
-        "Health Information Services",
-        "Internet Retail",
-        "Electronic Gaming & Multimedia",
-        "Internet Content & Information",
-        "Solar",
-        "Information Technology Services",
-        "Scientific & Technical Instruments",
-        "Semiconductor Equipment & Materials",
-        "Diagnostics & Research",
-    ],
-)
-
-MICRO_CAP_EVENT_SPECULATION = NamedFilterQuery(
-    name="Micro-Cap Event Speculation",
-    description="seeks tiny names where unusual volume and price gaps hint at "
-    "pending corporate events (patent win, FDA news, buy-out rumors).",
-    positive_adosc_20_day_breakout=DATE_THRESHOLD,
-    rate_of_change_30=[20, 100],  # 10% to 50% in the last 30 days
-    market_capitalization=[0, 5e8],
-)
-
-MOMENTUM_BREAKOUT_HUNTER = NamedFilterQuery(
-    name="Momentum Breakout Hunter",
-    description="A confluence of medium-term (50/200 MA) and "
-    "shorter oscillators suggests fresh upside momentum with fuel left.",
-    income=[
-        "positive_operating_income",
-        "positive_net_income",
-    ],
-    cash_flow=["positive_free_cash_flow"],
-    golden_cross=DATE_THRESHOLD,
-    adx_14_long=DATE_THRESHOLD,
-    rate_of_change_30=[0, 100],
-    rsi_neutral=DATE_THRESHOLD,
-)
-
-DEEP_VALUE_PLUS_CATALYST = NamedFilterQuery(
-    name="Deep-Value Plus Catalyst",
-    description="Seeks beaten-down names that just printed a bullish "
-    "candle and early accumulation signals—often the first leg of a bottom.",
-    income=[
-        "positive_operating_income",
-        "positive_net_income",
-    ],
-    lower_than_200_day_high=DATE_THRESHOLD,
-    rate_of_change_30=[3, 100],
-    rsi_bullish_crossover_30=DATE_THRESHOLD,
-)
-END_OF_TREND_REVERSAL = NamedFilterQuery(
-    name="End of trend reversal",
-    description="Layers long-term MA breach with momentum exhaustion and a "
-    "bullish candle—classic setup for mean-reversion traders.",
-    death_cross=DATE_THRESHOLD,
-    rsi_oversold=DATE_THRESHOLD,
-    candlesticks=["cdlmorningstart", "cdlabandonedbaby", "cdl3whitesoldiers"],
-)
-
-HIGH_QUALITY_CASH_GENERATOR = NamedFilterQuery(
-    name="High Quality Cash Generator",
-    description="This quartet isolates companies that are profitable, cash-rich, and disciplined with leverage. "
-    "Ideal first pass for “quality” or “compounder” "
-    "portfolios where downside protection matters as much as upside.",
-    income=[
-        "positive_net_income",
-    ],
-    cash_flow=["positive_free_cash_flow"],
-    properties=[
-        "operating_cash_flow_is_higher_than_net_income",
-        "positive_return_on_equity",
-        "positive_return_on_assets",
-        "positive_debt_to_equity",
-    ],
-)
-
-EARNINGS_ACCELERATION_TREND_CONFIRMATION = NamedFilterQuery(
-    name="Earnings Acceleration Trend Confirmation",
-    description="Pairs fundamental acceleration with momentum confirmation. Research shows this “double positive” "
-    "outperforms simple momentum because it filters out purely sentiment-driven rallies.",
-    income=[
-        "growing_operating_income",
-        "positive_net_income",
-    ],
-    eps=["growing_basic_eps"],
-    golden_cross=DATE_THRESHOLD,
-    macd_12_26_9_bullish_crossover=DATE_THRESHOLD,
-    adx_14_long=DATE_THRESHOLD,
-)
-DIVIDEND_GROWTH_COMPOUNDER = NamedFilterQuery(
-    name="Dividend-Growth Compounders",
-    description="Separates true dividend growers from high-yield traps. "
-    "Critical for income portfolios that need both yield and growth to beat inflation.",
-    mean_dividend_payout_ratio=[0, 0.6],  # 0% to 60% payout ratio
-    cash_flow=[
-        "positive_free_cash_flow",
-        "quarterly_positive_free_cash_flow",
-        "growing_operating_cash_flow",
-    ],
-    properties=["quarterly_positive_return_on_equity"],
-)
-
-BREAK_OUT_MOMENTUM = NamedFilterQuery(
-    name="Break-out Momentum",
-    description="Combines price, volume, and pattern confirmation. Great for tactical traders seeking "
-    "quick continuation moves with statistically higher follow-through.",
-    adosc_crosses_above_0=DATE_THRESHOLD,
-    positive_adosc_20_day_breakout=DATE_THRESHOLD,
-    rsi_bullish_crossover_30=DATE_THRESHOLD,
-)
-
-OVERSOLD_MEAN_REVERSION = NamedFilterQuery(
-    name="Oversold Mean Reversion",
-    description="Gives contrarian traders a high-probability bounce setup by "
-    "stacking three different oversold measures plus a reversal pattern.",
-    rsi_oversold=DATE_THRESHOLD,
-    stoch_oversold=DATE_THRESHOLD,
-    mfi_oversold=DATE_THRESHOLD,
-    lower_than_200_day_high=DATE_THRESHOLD,
-)
 RSI_CROSSOVER_30_GROWTH_STOCK_STRONG_FUNDAMENTAL = NamedFilterQuery(
     name="RSI cross-over 30 growth stock strong fundamental",
     income=[
@@ -241,7 +71,7 @@ RSI_CROSSOVER_30_GROWTH_STOCK_STRONG_FUNDAMENTAL = NamedFilterQuery(
     ],
     cash_flow=["positive_free_cash_flow"],
     properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[20, 40],
+    price_per_earning_ratio=[10, 100],
     rsi_bullish_crossover_30=DATE_THRESHOLD,
     market_capitalization=[5e8, 1e12],
     order_by_desc="market_capitalization",
@@ -257,33 +87,16 @@ RSI_CROSSOVER_40_GROWTH_STOCK_STRONG_FUNDAMENTAL = NamedFilterQuery(
     ],
     cash_flow=["positive_free_cash_flow"],
     properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[20, 40],
+    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"],
 )
-RSI_CROSSOVER_45_GROWTH_STOCK_STRONG_FUNDAMENTAL = NamedFilterQuery(
-    name="RSI cross-over 45 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=[20, 40],
-    rsi_bullish_crossover_45=DATE_THRESHOLD,
-    market_capitalization=[5e8, 1e12],
-    order_by_desc="market_capitalization",
-    country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
-)
+
 RSI_CROSSOVER_30_GROWTH_STOCK = NamedFilterQuery(
     name="RSI cross-over 30 growth stock",
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[20, 40],
+    price_per_earning_ratio=[10, 500],
     rsi_bullish_crossover_30=DATE_THRESHOLD,
     market_capitalization=[5e8, 1e12],
     order_by_desc="market_capitalization",
@@ -291,26 +104,38 @@ RSI_CROSSOVER_30_GROWTH_STOCK = NamedFilterQuery(
 )
 RSI_CROSSOVER_40_GROWTH_STOCK = NamedFilterQuery(
     name="RSI cross-over 40 growth stock",
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[20, 40],
+    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"],
 )
-RSI_CROSSOVER_45_GROWTH_STOCK = NamedFilterQuery(
-    name="RSI cross-over 45 growth stock",
+
+
+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=[20, 40],
-    rsi_bullish_crossover_45=DATE_THRESHOLD,
+    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="market_capitalization",
+    order_by_desc="momentum",
     country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
 )
-MOMENTUM_STOCK_STRONG_FUNDAMENTAL = NamedFilterQuery(
-    name="Momentum stock strong fundamental",
+
+MOMENTUM_GROWTH_STRONG_FUNDAMENTALS = NamedFilterQuery(
+    name="Momentum Growth Strong Fundamentals (RSI 30)",
     income=[
         "positive_operating_income",
         "growing_operating_income",
@@ -319,80 +144,88 @@ MOMENTUM_STOCK_STRONG_FUNDAMENTAL = NamedFilterQuery(
     ],
     cash_flow=["positive_free_cash_flow"],
     properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[10, 400],
-    last_price=[1, 70],
-    order_by_desc="momentum",
-    country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
-)
-MOMENTUM_STOCK = NamedFilterQuery(
-    name="Momentum stock",
-    cash_flow=["positive_free_cash_flow"],
-    properties=["operating_cash_flow_is_higher_than_net_income"],
-    price_per_earning_ratio=[10, 400],
-    last_price=[1, 70],
+    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"],
 )
-MOMENTUM_STOCK_NO_FUNDAMENTAL_CHECKS = NamedFilterQuery(
-    name="Momentum stock no fundamental checks",
+MOMENTUM_GROWTH_RSI_30 = NamedFilterQuery(
+    name="Momentum Growth Screener (RSI 30)",
     price_per_earning_ratio=[10, 500],
-    last_price=[1, 10000],
+    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"],
 )
-MOMENTUM_TIME_SPAN_1_MONTH = NamedFilterQuery(
-    name="Momentum 1 month",
+MOMENTUM_GROWTH_RSI_40 = NamedFilterQuery(
+    name="Momentum Growth Screener (RSI 40)",
     price_per_earning_ratio=[10, 500],
-    last_price=[1, 10000],
-    momentum_time_span=[
-        datetime.date.today() - datetime.timedelta(days=90),
-        datetime.date.today() - datetime.timedelta(days=31),
+    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=10),
+        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"],
 )
-MOMENTUM_TIME_SPAN_1_MONTH_STRONG_FUNDAMENTALS = NamedFilterQuery(
-    name="Momentum 1 month strong fundamentals",
-    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"],
+
+GOLDEN_CROSS_LAST_SEVEN_DAYS = NamedFilterQuery(
+    name="Golden cross in the last five days",
     price_per_earning_ratio=[10, 500],
     last_price=[1, 10000],
-    momentum_time_span=[
-        datetime.date.today() - datetime.timedelta(days=90),
-        datetime.date.today() - datetime.timedelta(days=31),
-    ],
-    macd_12_26_9_bullish_crossover=[
-        datetime.date.today() - datetime.timedelta(days=10),
+    golden_cross=[
+        datetime.date.today() - datetime.timedelta(days=7),
         datetime.date.today(),
     ],
-    order_by_desc="momentum",
+    order_by_desc="market_capitalization",
     country=["Germany", "United states", "France", "United kingdom", "Canada", "Japan"],
 )
 
 
 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_45_GROWTH_STOCK_STRONG_FUNDAMENTAL,
         RSI_CROSSOVER_30_GROWTH_STOCK,
         RSI_CROSSOVER_40_GROWTH_STOCK,
-        RSI_CROSSOVER_45_GROWTH_STOCK,
-        MOMENTUM_STOCK_STRONG_FUNDAMENTAL,
-        MOMENTUM_STOCK,
-        MOMENTUM_STOCK_NO_FUNDAMENTAL_CHECKS,
-        MOMENTUM_TIME_SPAN_1_MONTH,
-        MOMENTUM_TIME_SPAN_1_MONTH_STRONG_FUNDAMENTALS,
+        MOMENTUM_GROWTH_GOOD_FUNDAMENTALS,
+        MOMENTUM_GROWTH_STRONG_FUNDAMENTALS,
+        MOMENTUM_GROWTH_RSI_30,
+        MOMENTUM_GROWTH_RSI_40,
+        GOLDEN_CROSS_LAST_SEVEN_DAYS,
     ]
 
 

bullish/app/app.py

@@ -12,6 +12,7 @@ from bearish.models.price.prices import Prices  # type: ignore
 from bearish.models.query.query import AssetQuery, Symbols  # type: ignore
 from streamlit_file_browser import st_file_browser  # type: ignore
 
+from bullish.analysis.industry_views import get_industry_comparison_data
 from bullish.analysis.predefined_filters import PredefinedFilters
 from bullish.database.crud import BullishDb
 from bullish.figures.figures import plot
@@ -83,12 +84,15 @@ def on_table_select() -> None:
         return
 
     symbol = st.session_state.data.iloc[row]["symbol"].to_numpy()[0]
+    country = st.session_state.data.iloc[row]["country"].to_numpy()[0]
+    industry = st.session_state.data.iloc[row]["industry"].to_numpy()[0]
     query = AssetQuery(symbols=Symbols(equities=[Ticker(symbol=symbol)]))
     prices = db.read_series(query, months=24)
     data = Prices(prices=prices).to_dataframe()
     dates = db.read_dates(symbol)
+    industry_data = get_industry_comparison_data(db, data, "Mean", industry, country)
 
-    fig = plot(data, symbol, dates=dates)
+    fig = plot(data, symbol, dates=dates, industry_data=industry_data)
 
     st.session_state.ticker_figure = fig