bullishpy 0.30.0__py3-none-any.whl → 0.32.0__py3-none-any.whl

bullish/analysis/filter.py

@@ -214,6 +214,12 @@ class FilterQuery(GeneralFilter, *TechnicalAnalysisFilters, *FundamentalAnalysis
                 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)
+            ):
+                query.append(f"{parameter} BETWEEN {value[0]} AND {value[1]}")
             elif (
                 (
                     isinstance(value, list)
@@ -224,14 +230,8 @@ class FilterQuery(GeneralFilter, *TechnicalAnalysisFilters, *FundamentalAnalysis
                 or (
                     isinstance(value, list)
                     and len(value) == SIZE_RANGE
-                    and all(isinstance(item, (int, float)) for item in value)
+                    and all(isinstance(item, date) for item in value)
                 )
-            ):
-                query.append(f"{parameter} BETWEEN {value[0]} AND {value[1]}")
-            elif (
-                isinstance(value, list)
-                and len(value) == SIZE_RANGE
-                and all(isinstance(item, date) for item in value)
             ):
                 query.append(f"{parameter} BETWEEN '{value[0]}' AND '{value[1]}'")
             elif (
@@ -242,7 +242,7 @@ class FilterQuery(GeneralFilter, *TechnicalAnalysisFilters, *FundamentalAnalysis
                 general_filters = [f"'{v}'" for v in value]
                 query.append(f"{parameter} IN ({', '.join(general_filters)})")
             else:
-                raise NotImplementedError
+                raise NotImplementedError(f"with value {value}")
         query_ = " AND ".join(query)
         query__ = f"{query_} {order_by_desc.strip()} {order_by_asc.strip()}".strip()
         if limit is not None:

bullish/analysis/predefined_filters.py

@@ -108,10 +108,36 @@ class NamedFilterQuery(FilterQuery):
             | {"name": f"{self.name} ({suffix})", "country": countries}
         )
 
+    def update_indicator_filter(
+        self, suffix: str, rsi_parameter_name: str
+    ) -> "NamedFilterQuery":
+        return NamedFilterQuery.model_validate(
+            self.model_dump()
+            | {"name": f"{self.name} ({suffix})", rsi_parameter_name: DATE_THRESHOLD}
+        )
+
     def variants(self) -> List["NamedFilterQuery"]:
         return [
             self.country_variant("Europe", list(get_args(Europe))),
             self.country_variant("Us", list(get_args(Us))),
+            self.country_variant("Europe", list(get_args(Europe)))
+            .update_indicator_filter("RSI 30", "rsi_bullish_crossover_30")
+            .update_indicator_filter("MACD", "macd_12_26_9_bullish_crossover"),
+            self.country_variant("Europe", list(get_args(Europe)))
+            .update_indicator_filter("RSI 40", "rsi_bullish_crossover_40")
+            .update_indicator_filter("MACD", "macd_12_26_9_bullish_crossover"),
+            self.country_variant("Europe", list(get_args(Europe)))
+            .update_indicator_filter("RSI Neutral", "rsi_neutral")
+            .update_indicator_filter("MACD", "macd_12_26_9_bullish_crossover"),
+            self.country_variant("Us", list(get_args(Us)))
+            .update_indicator_filter("RSI 30", "rsi_bullish_crossover_30")
+            .update_indicator_filter("MACD", "macd_12_26_9_bullish_crossover"),
+            self.country_variant("Us", list(get_args(Us)))
+            .update_indicator_filter("RSI 40", "rsi_bullish_crossover_40")
+            .update_indicator_filter("MACD", "macd_12_26_9_bullish_crossover"),
+            self.country_variant("Us", list(get_args(Us)))
+            .update_indicator_filter("RSI Neutral", "rsi_neutral")
+            .update_indicator_filter("MACD", "macd_12_26_9_bullish_crossover"),
         ]
 
 
@@ -126,6 +152,18 @@ SMALL_CAP = NamedFilterQuery(
 
 TOP_PERFORMERS = NamedFilterQuery(
     name="Top Performers",
+    volume_above_average=DATE_THRESHOLD,
+    sma_50_above_sma_200=[
+        datetime.date.today() - datetime.timedelta(days=5000),
+        datetime.date.today() - datetime.timedelta(days=10),
+    ],
+    weekly_growth=[1, 100],
+    monthly_growth=[8, 100],
+    order_by_desc="market_capitalization",
+).variants()
+
+TOP_PERFORMERS_YEARLY = NamedFilterQuery(
+    name="Top Performers Yearly",
     sma_50_above_sma_200=[
         datetime.date.today() - datetime.timedelta(days=5000),
         datetime.date.today() - datetime.timedelta(days=10),
@@ -137,6 +175,7 @@ TOP_PERFORMERS = NamedFilterQuery(
     volume_above_average=DATE_THRESHOLD,
     weekly_growth=[1, 100],
     monthly_growth=[8, 100],
+    yearly_growth=[30, 100],
     order_by_desc="market_capitalization",
 ).variants()
 
@@ -155,31 +194,14 @@ NEXT_EARNINGS_DATE = NamedFilterQuery(
     ],
 ).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()
-
-RSI_CROSSOVER_30 = NamedFilterQuery(
-    name="RSI cross-over 30",
-    price_per_earning_ratio=[10, 500],
-    rsi_bullish_crossover_30=DATE_THRESHOLD,
-    market_capitalization=[5e8, 1e13],
-    order_by_desc="market_capitalization",
-).variants()
-
 
 def predefined_filters() -> list[NamedFilterQuery]:
     return [
         *SMALL_CAP,
         *TOP_PERFORMERS,
+        *TOP_PERFORMERS_YEARLY,
         *LARGE_CAPS,
         *NEXT_EARNINGS_DATE,
-        *RSI_CROSSOVER_40,
-        *RSI_CROSSOVER_30,
     ]
 
 

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)

{bullishpy-0.30.0.dist-info → bullishpy-0.32.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bullishpy
-Version: 0.30.0
+Version: 0.32.0
 Summary: 
 Author: aan
 Author-email: andoludovic.andriamamonjy@gmail.com
@@ -17,7 +17,7 @@ Requires-Dist: streamlit (>=1.45.1,<2.0.0)
 Requires-Dist: streamlit-file-browser (>=3.2.22,<4.0.0)
 Requires-Dist: streamlit-pydantic (>=v0.6.1-rc.3,<0.7.0)
 Requires-Dist: ta-lib (>=0.6.4,<0.7.0)
-Requires-Dist: tickermood (>=0.12.0,<0.13.0)
+Requires-Dist: tickermood (>=0.13.0,<0.14.0)
 Requires-Dist: vectorbt (>=0.28.0,<0.29.0)
 Description-Content-Type: text/markdown
 

{bullishpy-0.30.0.dist-info → bullishpy-0.32.0.dist-info}/RECORD

@@ -3,11 +3,11 @@ bullish/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 bullish/analysis/analysis.py,sha256=nCb___Tb2aOFIu1wWtPwS1VVZfXOSCp5zUWaIOCdvl4,22345
 bullish/analysis/backtest.py,sha256=x91ek5kOzJHvYq0TmJh1Q8wBDDduIaieE0zDaoZFXew,14325
 bullish/analysis/constants.py,sha256=X3oCyYNA6B-jsZSYJLeGQ94S453Z7jIVNPmv3lMPp8Q,9922
-bullish/analysis/filter.py,sha256=0h4wfAuZ-ohhACPhOjZrNEV17gbZ7FopNv0k0HBtIWE,9262
+bullish/analysis/filter.py,sha256=mGWizTda_QHEmusDmB_xvOhjlsOKcbILfKLjJLAnCnE,9285
 bullish/analysis/functions.py,sha256=CuMgOjpQeg4KsDMUBdHRlxL1dRlos16KRyLhQe8PYUQ,14819
 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/analysis/predefined_filters.py,sha256=O_elRTipLcL3leo0RWkhs3bEU-1_Rszx4MCTv27TPTg,8089
 bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/app/app.py,sha256=9zxskm5gHt2uDGn59vL4ltI2zgrIBGhavp7jogt1us0,14411
 bullish/cli.py,sha256=azhVLwOUrmwrtFAJSgva8-UFgNgkepXhjp7DxQNc-yw,2427
@@ -50,10 +50,10 @@ bullish/interface/interface.py,sha256=dFQW0tMYbFL-gWrlWTWP1qKKSzqlrhz6-T_lLqhILy
 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=5dGWT7uZlirlQsqvI2BR9V3ywbt8yD0s-jaNiTFaIAg,3717
+bullish/jobs/tasks.py,sha256=vXPbISYFUZlrYkMVUb7y-g-z0BBi91wQLm8RbYqR4I0,3691
 bullish/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/utils/checks.py,sha256=Va10_xDVVnxYkOD2hafvyQ-TFV8FQpOkr4huJ7XgpDM,2188
-bullishpy-0.30.0.dist-info/METADATA,sha256=9WAIcyoEhmc6lRgp9WoIu8xhjEOyDJD-st2OB4T0ExE,830
-bullishpy-0.30.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.30.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.30.0.dist-info/RECORD,,
+bullishpy-0.32.0.dist-info/METADATA,sha256=eqQ22h8IXWTm9MrZuO0zQCQBC--Yo1J6YoHywBRE_Wc,830
+bullishpy-0.32.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.32.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.32.0.dist-info/RECORD,,