bullishpy 0.12.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

bullish/analysis/filter.py

@@ -1,6 +1,6 @@
 import datetime
 from datetime import date
-from typing import Literal, get_args, Any, Optional, List, Tuple, Type, Dict
+from typing import get_args, Any, Optional, List, Tuple, Type, Dict
 
 from bearish.types import SeriesLength  # type: ignore
 from pydantic import BaseModel, Field, ConfigDict
@@ -14,411 +14,8 @@ from bullish.analysis.analysis import (
     TechnicalAnalysis,
     AnalysisView,
 )
+from bullish.analysis.constants import Industry, IndustryGroup, Sector, Country
 
-Industry = Literal[
-    "Publishing",
-    "Internet Retail",
-    "Scientific & Technical Instruments",
-    "Engineering & Construction",
-    "Diagnostics & Research",
-    "Software - Infrastructure",
-    "Thermal Coal",
-    "Software - Application",
-    "Auto Manufacturers",
-    "Farm Products",
-    "Medical Devices",
-    "Education & Training Services",
-    "Auto Parts",
-    "Specialty Chemicals",
-    "Marine Shipping",
-    "Biotechnology",
-    "Real Estate Services",
-    "Gold",
-    "Entertainment",
-    "Specialty Retail",
-    "Utilities - Independent Power Producers",
-    "Steel",
-    "Mortgage Finance",
-    "Communication Equipment",
-    "Drug Manufacturers - Specialty & Generic",
-    "Electronic Gaming & Multimedia",
-    "Banks - Regional",
-    "Oil & Gas E&P",
-    "Travel Services",
-    "Real Estate - Diversified",
-    "Telecom Services",
-    "Uranium",
-    "Consulting Services",
-    "Waste Management",
-    "Agricultural Inputs",
-    "Utilities - Diversified",
-    "Auto & Truck Dealerships",
-    "Confectioners",
-    "Other Industrial Metals & Mining",
-    "Beverages - Wineries & Distilleries",
-    "Oil & Gas Midstream",
-    "Recreational Vehicles",
-    "Electrical Equipment & Parts",
-    "Household & Personal Products",
-    "Packaging & Containers",
-    "REIT - Specialty",
-    "Home Improvement Retail",
-    "Electronic Components",
-    "Asset Management",
-    "Consumer Electronics",
-    "Conglomerates",
-    "Health Information Services",
-    "Medical Instruments & Supplies",
-    "Building Products & Equipment",
-    "Information Technology Services",
-    "Specialty Industrial Machinery",
-    "Food Distribution",
-    "Packaged Foods",
-    "Rental & Leasing Services",
-    "Medical Distribution",
-    "Grocery Stores",
-    "Advertising Agencies",
-    "Beverages - Non - Alcoholic",
-    "Apparel Manufacturing",
-    "Oil & Gas Equipment & Services",
-    "Coking Coal",
-    "Industrial Distribution",
-    "Restaurants",
-    "Beverages - Brewers",
-    "Chemicals",
-    "Real Estate - Development",
-    "Credit Services",
-    "Tobacco",
-    "Metal Fabrication",
-    "Building Materials",
-    "Residential Construction",
-    "Specialty Business Services",
-    "REIT - Hotel & Motel",
-    "Internet Content & Information",
-    "Lodging",
-    "Furnishings, Fixtures & Appliances",
-    "Airlines",
-    "Computer Hardware",
-    "Integrated Freight & Logistics",
-    "Solar",
-    "Capital Markets",
-    "Leisure",
-    "Airports & Air Services",
-    "Aluminum",
-    "Insurance Brokers",
-    "Semiconductors",
-    "REIT - Retail",
-    "Luxury Goods",
-    "Lumber & Wood Production",
-    "REIT - Mortgage",
-    "Semiconductor Equipment & Materials",
-    "Aerospace & Defense",
-    "Security & Protection Services",
-    "Utilities - Renewable",
-    "Utilities - Regulated Gas",
-    "Apparel Retail",
-    "Pollution & Treatment Controls",
-    "Broadcasting",
-    "Resorts & Casinos",
-    "Other Precious Metals & Mining",
-    "Financial Data & Stock Exchanges",
-    "Footwear & Accessories",
-    "Medical Care Facilities",
-    "Electronics & Computer Distribution",
-    "Gambling",
-    "Tools & Accessories",
-    "Insurance - Property & Casualty",
-    "Utilities - Regulated Water",
-    "Insurance - Specialty",
-    "Personal Services",
-    "Pharmaceutical Retailers",
-    "Farm & Heavy Construction Machinery",
-    "Utilities - Regulated Electric",
-    "Department Stores",
-    "Staffing & Employment Services",
-    "Textile Manufacturing",
-    "Silver",
-    "REIT - Industrial",
-    "REIT - Diversified",
-    "Copper",
-    "Business Equipment & Supplies",
-    "Infrastructure Operations",
-    "Trucking",
-    "Insurance - Reinsurance",
-    "Insurance - Diversified",
-    "Drug Manufacturers - General",
-    "Oil & Gas Drilling",
-    "Banks - Diversified",
-    "REIT - Residential",
-    "Oil & Gas Refining & Marketing",
-    "Shell Companies",
-    "Financial Conglomerates",
-    "Paper & Paper Products",
-    "Insurance - Life",
-    "REIT - Office",
-    "Railroads",
-    "Oil & Gas Integrated",
-    "Healthcare Plans",
-    "REIT - Healthcare Facilities",
-    "Discount Stores",
-]
-
-IndustryGroup = Literal[
-    "publishing",
-    "internet-retail",
-    "scientific-technical-instruments",
-    "engineering-construction",
-    "diagnostics-research",
-    "software-infrastructure",
-    "thermal-coal",
-    "software-application",
-    "auto-manufacturers",
-    "farm-products",
-    "medical-devices",
-    "education-training-services",
-    "auto-parts",
-    "specialty-chemicals",
-    "marine-shipping",
-    "biotechnology",
-    "real-estate-services",
-    "gold",
-    "entertainment",
-    "specialty-retail",
-    "utilities-independent-power-producers",
-    "steel",
-    "mortgage-finance",
-    "communication-equipment",
-    "drug-manufacturers-specialty-generic",
-    "electronic-gaming-multimedia",
-    "banks-regional",
-    "oil-gas-e-p",
-    "travel-services",
-    "real-estate-diversified",
-    "telecom-services",
-    "uranium",
-    "consulting-services",
-    "waste-management",
-    "agricultural-inputs",
-    "utilities-diversified",
-    "auto-truck-dealerships",
-    "confectioners",
-    "other-industrial-metals-mining",
-    "beverages-wineries-distilleries",
-    "oil-gas-midstream",
-    "recreational-vehicles",
-    "electrical-equipment-parts",
-    "household-personal-products",
-    "packaging-containers",
-    "reit-specialty",
-    "home-improvement-retail",
-    "electronic-components",
-    "asset-management",
-    "consumer-electronics",
-    "conglomerates",
-    "health-information-services",
-    "medical-instruments-supplies",
-    "building-products-equipment",
-    "information-technology-services",
-    "specialty-industrial-machinery",
-    "food-distribution",
-    "packaged-foods",
-    "rental-leasing-services",
-    "medical-distribution",
-    "grocery-stores",
-    "advertising-agencies",
-    "beverages-non-alcoholic",
-    "apparel-manufacturing",
-    "oil-gas-equipment-services",
-    "coking-coal",
-    "industrial-distribution",
-    "restaurants",
-    "beverages-brewers",
-    "chemicals",
-    "real-estate-development",
-    "credit-services",
-    "tobacco",
-    "metal-fabrication",
-    "building-materials",
-    "residential-construction",
-    "specialty-business-services",
-    "reit-hotel-motel",
-    "internet-content-information",
-    "lodging",
-    "furnishings-fixtures-appliances",
-    "airlines",
-    "computer-hardware",
-    "integrated-freight-logistics",
-    "solar",
-    "capital-markets",
-    "leisure",
-    "airports-air-services",
-    "aluminum",
-    "insurance-brokers",
-    "semiconductors",
-    "reit-retail",
-    "luxury-goods",
-    "lumber-wood-production",
-    "reit-mortgage",
-    "semiconductor-equipment-materials",
-    "aerospace-defense",
-    "security-protection-services",
-    "utilities-renewable",
-    "utilities-regulated-gas",
-    "apparel-retail",
-    "pollution-treatment-controls",
-    "broadcasting",
-    "resorts-casinos",
-    "other-precious-metals-mining",
-    "financial-data-stock-exchanges",
-    "footwear-accessories",
-    "medical-care-facilities",
-    "electronics-computer-distribution",
-    "gambling",
-    "tools-accessories",
-    "insurance-property-casualty",
-    "utilities-regulated-water",
-    "insurance-specialty",
-    "personal-services",
-    "pharmaceutical-retailers",
-    "farm-heavy-construction-machinery",
-    "utilities-regulated-electric",
-    "department-stores",
-    "staffing-employment-services",
-    "textile-manufacturing",
-    "silver",
-    "reit-industrial",
-    "reit-diversified",
-    "copper",
-    "business-equipment-supplies",
-    "infrastructure-operations",
-    "trucking",
-    "insurance-reinsurance",
-    "insurance-diversified",
-    "drug-manufacturers-general",
-    "oil-gas-drilling",
-    "banks-diversified",
-    "reit-residential",
-    "oil-gas-refining-marketing",
-    "shell-companies",
-    "financial-conglomerates",
-    "paper-paper-products",
-    "insurance-life",
-    "reit-office",
-    "railroads",
-    "oil-gas-integrated",
-    "healthcare-plans",
-    "reit-healthcare-facilities",
-    "discount-stores",
-]
-
-Sector = Literal[
-    "Communication Services",
-    "Consumer Cyclical",
-    "Technology",
-    "Industrials",
-    "Healthcare",
-    "Energy",
-    "Consumer Defensive",
-    "Basic Materials",
-    "Real Estate",
-    "Utilities",
-    "Financial Services",
-    "Conglomerates",
-]
-
-Country = Literal[
-    "Australia",
-    "China",
-    "Japan",
-    "United kingdom",
-    "United states",
-    "Poland",
-    "Switzerland",
-    "Canada",
-    "Greece",
-    "Spain",
-    "Germany",
-    "Indonesia",
-    "Belgium",
-    "France",
-    "Netherlands",
-    "British virgin islands",
-    "Italy",
-    "Hungary",
-    "Austria",
-    "Finland",
-    "Sweden",
-    "Bermuda",
-    "Taiwan",
-    "Israel",
-    "Ukraine",
-    "Singapore",
-    "Jersey",
-    "Ireland",
-    "Luxembourg",
-    "Cyprus",
-    "Cayman islands",
-    "Norway",
-    "Denmark",
-    "Hong kong",
-    "New zealand",
-    "Kazakhstan",
-    "Nigeria",
-    "Argentina",
-    "Brazil",
-    "Czech republic",
-    "Mauritius",
-    "South africa",
-    "India",
-    "Mexico",
-    "Mongolia",
-    "Slovenia",
-    "Thailand",
-    "Malaysia",
-    "Costa rica",
-    "Isle of man",
-    "Egypt",
-    "Turkey",
-    "United arab emirates",
-    "Colombia",
-    "Gibraltar",
-    "Malta",
-    "Liechtenstein",
-    "Guernsey",
-    "Peru",
-    "Estonia",
-    "French guiana",
-    "Portugal",
-    "Uruguay",
-    "Chile",
-    "Martinique",
-    "Monaco",
-    "Panama",
-    "Papua new guinea",
-    "South korea",
-    "Macau",
-    "Gabon",
-    "Romania",
-    "Senegal",
-    "Morocco",
-    "Jordan",
-    "Lithuania",
-    "Dominican republic",
-    "Reunion",
-    "Zambia",
-    "Cambodia",
-    "Myanmar",
-    "Bahamas",
-    "Philippines",
-    "Bangladesh",
-    "Latvia",
-    "Vietnam",
-    "Iceland",
-    "Azerbaijan",
-    "Georgia",
-    "Liberia",
-    "Kenya",
-]
 SIZE_RANGE = 2
 
 

bullish/analysis/functions.py

@@ -1,4 +1,3 @@
-import datetime
 import logging
 from datetime import date
 from typing import Optional, Callable, cast
@@ -122,6 +121,9 @@ def compute_roc(data: pd.DataFrame) -> pd.DataFrame:
     results["ROC_7"] = talib.ROC(data.close, timeperiod=7)  # type: ignore
     results["ROC_1"] = talib.ROC(data.close, timeperiod=1)  # type: ignore
     results["ROC_30"] = talib.ROC(data.close, timeperiod=30)  # type: ignore
+    mom = talib.MOM(data.close, timeperiod=252)  # type: ignore
+    results["MOM"] = mom.shift(21)  # type: ignore
+
     return results
 
 
@@ -137,6 +139,7 @@ def compute_sma(data: pd.DataFrame) -> pd.DataFrame:
     results = pd.DataFrame(index=data.index)
     results["SMA_50"] = talib.SMA(data.close, timeperiod=50)  # type: ignore
     results["SMA_200"] = talib.SMA(data.close, timeperiod=200)  # type: ignore
+    results["CLOSE"] = data.close
     return results
 
 
@@ -144,6 +147,8 @@ def compute_pandas_ta_sma(data: pd.DataFrame) -> pd.DataFrame:
     results = pd.DataFrame(index=data.index)
     results["SMA_50"] = ta.sma(data.close, length=50)
     results["SMA_200"] = ta.sma(data.close, length=200)
+    results["CLOSE"] = data.close
+
     return results
 
 
@@ -276,22 +281,33 @@ def compute_price(data: pd.DataFrame) -> pd.DataFrame:
     return results
 
 
-def compute_percentile_return_after_rsi_crossover(
-    data: pd.DataFrame, rsi_threshold: int = 45, period: int = 90
-) -> float:
-    data_ = cross_value_series(data.RSI, rsi_threshold)
-    values = []
-    for crossing_date in data_[data_ == 1].index:
-        data_crossed = data[
-            (data.index >= crossing_date)
-            & (data.index <= crossing_date + datetime.timedelta(days=period))
-        ]
-        v = (
-            data_crossed.CLOSE.pct_change(periods=len(data_crossed.CLOSE) - 1).iloc[-1]
-            * 100
-        )
-        values.append(v)
-    return float(np.percentile(values, 30))
+def find_last_true_run_start(series: pd.Series) -> Optional[date]:
+    if not series.iloc[-1]:
+        return None
+    arr = series.to_numpy()
+    change_points = np.flatnonzero(np.r_[True, arr[1:] != arr[:-1]])
+    run_starts = change_points
+    true_runs = run_starts[arr[run_starts]]
+    last_true_run_start = true_runs[-1]
+    return series.index[last_true_run_start].date()  # type: ignore
+
+
+def sma_50_above_sma_200(data: pd.DataFrame) -> Optional[date]:
+    date_1 = find_last_true_run_start(data.SMA_50 > data.SMA_200)
+    return date_1
+
+
+def price_above_sma50(data: pd.DataFrame) -> Optional[date]:
+    date_1 = find_last_true_run_start(data.SMA_50 < data.CLOSE)
+    return date_1
+
+
+def momentum(data: pd.DataFrame) -> Optional[date]:
+    date_1 = find_last_true_run_start(data.SMA_50 < data.CLOSE)
+    date_2 = find_last_true_run_start(data.SMA_200 < data.SMA_50)
+    if date_1 is None or date_2 is None:
+        return None
+    return max(date_1, date_2)
 
 
 class IndicatorFunction(BaseModel):
@@ -334,7 +350,7 @@ MFI = IndicatorFunction(
     expected_columns=["MFI"], functions=[compute_mfi, compute_pandas_ta_mfi]
 )
 ROC = IndicatorFunction(
-    expected_columns=["ROC_7", "ROC_1", "ROC_30"],
+    expected_columns=["ROC_7", "ROC_1", "ROC_30", "MOM"],
     functions=[compute_roc, compute_pandas_ta_roc],
 )
 CANDLESTOCK_PATTERNS = IndicatorFunction(
@@ -351,7 +367,7 @@ CANDLESTOCK_PATTERNS = IndicatorFunction(
 )
 
 SMA = IndicatorFunction(
-    expected_columns=["SMA_50", "SMA_200"],
+    expected_columns=["SMA_50", "SMA_200", "CLOSE"],
     functions=[compute_sma, compute_pandas_ta_sma],
 )
 

bullish/analysis/indicators.py

@@ -19,7 +19,9 @@ from bullish.analysis.functions import (
     SMA,
     ADOSC,
     PRICE,
-    compute_percentile_return_after_rsi_crossover,
+    momentum,
+    sma_50_above_sma_200,
+    price_above_sma50,
 )
 
 logger = logging.getLogger(__name__)
@@ -205,13 +207,6 @@ def indicators_factory() -> List[Indicator]:
                         (d.RSI < 60) & (d.RSI > 40)
                     ].last_valid_index(),
                 ),
-                Signal(
-                    name="RETURN_AFTER_RSI_CROSSOVER_45_PERIOD_90",
-                    description="Percentile 30 return after RSI crossover 45 in the next 90 days",
-                    type_info="Long",
-                    type=Optional[float],
-                    function=lambda d: compute_percentile_return_after_rsi_crossover(d),
-                ),
             ],
         ),
         Indicator(
@@ -282,6 +277,27 @@ def indicators_factory() -> List[Indicator]:
                     type=Optional[date],
                     function=lambda d: cross(d.SMA_50, d.SMA_200, above=False),
                 ),
+                Signal(
+                    name="MOMENTUM_TIME_SPAN",
+                    description="Momentum time span",
+                    type_info="Overbought",
+                    type=Optional[date],
+                    function=lambda d: momentum(d),
+                ),
+                Signal(
+                    name="SMA_50_ABOVE_SMA_200",
+                    description="SMA 50 is above SMA 200",
+                    type_info="Overbought",
+                    type=Optional[date],
+                    function=lambda d: sma_50_above_sma_200(d),
+                ),
+                Signal(
+                    name="PRICE_ABOVE_SMA_50",
+                    description="Price is above SMA 50",
+                    type_info="Overbought",
+                    type=Optional[date],
+                    function=lambda d: price_above_sma50(d),
+                ),
             ],
         ),
         Indicator(
@@ -334,7 +350,7 @@ def indicators_factory() -> List[Indicator]:
         Indicator(
             name="ROC",
             description="Rate Of Change",
-            expected_columns=["ROC_7", "ROC_30", "ROC_1"],
+            expected_columns=ROC.expected_columns,
             function=ROC.call,
             signals=[
                 Signal(
@@ -379,6 +395,13 @@ def indicators_factory() -> List[Indicator]:
                     type=Optional[float],
                     function=lambda d: d.ROC_7.tolist()[-1],
                 ),
+                Signal(
+                    name="MOMENTUM",
+                    type_info="Value",
+                    description="7-day Rate of Change",
+                    type=Optional[float],
+                    function=lambda d: d.MOM.iloc[-1],
+                ),
             ],
         ),
         Indicator(