bullishpy 0.50.0__py3-none-any.whl → 0.52.0__py3-none-any.whl

bullish/analysis/indicators.py

@@ -359,6 +359,15 @@ def indicators_factory() -> List[Indicator]:
                     in_use_backtest=True,
                     processing=ProcessingFunction(date=find_last_true_run_start),
                 ),
+                Signal(
+                    name="SMA_50_BELOW_SMA_200",
+                    description="SMA 50 is below SMA 200",
+                    type_info="Overbought",
+                    type=Optional[date],
+                    function=lambda d: d.SMA_50 < d.SMA_200,
+                    in_use_backtest=True,
+                    processing=ProcessingFunction(date=find_last_true_run_start),
+                ),
                 Signal(
                     name="PRICE_ABOVE_SMA_50",
                     description="Price is above SMA 50",
@@ -368,6 +377,15 @@ def indicators_factory() -> List[Indicator]:
                     in_use_backtest=True,
                     processing=ProcessingFunction(date=find_last_true_run_start),
                 ),
+                Signal(
+                    name="PRICE_BELOW_SMA_50",
+                    description="Price is below SMA 50",
+                    type_info="Overbought",
+                    type=Optional[date],
+                    function=lambda d: d.SMA_50 > d.CLOSE,
+                    in_use_backtest=True,
+                    processing=ProcessingFunction(date=find_last_true_run_start),
+                ),
             ],
         ),
         Indicator(

bullish/analysis/predefined_filters.py

@@ -119,10 +119,99 @@ class NamedFilterQuery(FilterQuery):
             | {"name": f"{self.name} ({suffix})", rsi_parameter_name: DATE_THRESHOLD}
         )
 
+    def _custom_variant(
+        self, suffix: str, properties: Dict[str, Any]
+    ) -> "NamedFilterQuery":
+        return NamedFilterQuery.model_validate(
+            self.model_dump() | {"name": f"{self.name} ({suffix})", **properties}
+        )
+
+    def top_performers(self) -> "NamedFilterQuery":
+        properties = {
+            "volume_above_average": DATE_THRESHOLD,
+            "sma_50_above_sma_200": [
+                datetime.date.today() - datetime.timedelta(days=5000),
+                datetime.date.today(),
+            ],
+            "weekly_growth": [1, 100],
+            "monthly_growth": [8, 100],
+        }
+        return self._custom_variant("Top Performers", properties)
+
+    def poor_performers(self) -> "NamedFilterQuery":
+        properties = {
+            "sma_50_below_sma_200": [
+                datetime.date.today() - datetime.timedelta(days=5000),
+                datetime.date.today(),
+            ],
+            "price_below_sma_50": [
+                datetime.date.today() - datetime.timedelta(days=5000),
+                datetime.date.today(),
+            ],
+            "monthly_growth": [-100, 0],
+        }
+        return self._custom_variant("Poor Performers", properties)
+
+    def short_term_profitability(self) -> "NamedFilterQuery":
+        properties = {
+            "income": [
+                "positive_operating_income",
+                "positive_net_income",
+                "quarterly_positive_operating_income",
+                "quarterly_positive_net_income",
+            ],
+            "cash_flow": [
+                "positive_free_cash_flow",
+                "quarterly_positive_free_cash_flow",
+            ],
+            "eps": [
+                "positive_basic_eps",
+                "positive_diluted_eps",
+                "quarterly_positive_basic_eps",
+                "quarterly_positive_diluted_eps",
+            ],
+            "properties": [
+                "positive_return_on_assets",
+                "positive_return_on_equity",
+                "positive_debt_to_equity",
+                "operating_cash_flow_is_higher_than_net_income",
+                "quarterly_positive_return_on_assets",
+                "quarterly_positive_return_on_equity",
+                "quarterly_positive_debt_to_equity",
+                "quarterly_operating_cash_flow_is_higher_than_net_income",
+            ],
+        }
+        return self._custom_variant("Short-term profitability", properties)
+
+    def long_term_profitability(self) -> "NamedFilterQuery":
+        properties = {
+            "income": [
+                "growing_net_income",
+                "growing_operating_income",
+                "quarterly_growing_net_income",
+                "quarterly_growing_operating_income",
+            ],
+            "cash_flow": [
+                "growing_operating_cash_flow",
+                "quarterly_growing_operating_cash_flow",
+            ],
+            "eps": [
+                "growing_basic_eps",
+                "growing_diluted_eps",
+                "quarterly_growing_basic_eps",
+                "quarterly_growing_diluted_eps",
+            ],
+        }
+        return self._custom_variant("Long-term profitability", properties)
+
     def variants(self) -> List["NamedFilterQuery"]:
-        return [
+        variants_ = [
             self.country_variant("Europe", list(get_args(Europe))),
             self.country_variant("Us", list(get_args(Us))),
+            self.country_variant("Europe", list(get_args(Europe))).top_performers(),
+            self.country_variant("Us", list(get_args(Us))).top_performers(),
+            self.country_variant("Europe", list(get_args(Europe))).poor_performers(),
+            self.country_variant("Us", list(get_args(Us))).poor_performers(),
             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"),
@@ -142,6 +231,17 @@ class NamedFilterQuery(FilterQuery):
             .update_indicator_filter("RSI Neutral", "rsi_neutral")
             .update_indicator_filter("MACD", "macd_12_26_9_bullish_crossover"),
         ]
+        variants_short_term_profitability = [
+            v.short_term_profitability() for v in variants_
+        ]
+        variants_long_term_profitability = [
+            v.long_term_profitability() for v in variants_
+        ]
+        return [
+            *variants_,
+            *variants_short_term_profitability,
+            *variants_long_term_profitability,
+        ]
 
 
 def load_custom_filters() -> List[NamedFilterQuery]:
@@ -174,39 +274,16 @@ SMALL_CAP = NamedFilterQuery(
     order_by_desc="market_capitalization",
 ).variants()
 
-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(),
-    ],
-    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(),
-    ],
-    price_above_sma_50=[
-        datetime.date.today() - datetime.timedelta(days=5000),
-        datetime.date.today(),
-    ],
-    volume_above_average=DATE_THRESHOLD,
-    weekly_growth=[1, 100],
-    monthly_growth=[8, 100],
-    yearly_growth=[30, 100],
+LARGE_CAPS = NamedFilterQuery(
+    name="Large caps",
     order_by_desc="market_capitalization",
+    market_capitalization=[1e10, 1e14],
 ).variants()
 
-LARGE_CAPS = NamedFilterQuery(
-    name="Large caps",
+MID_CAPS = NamedFilterQuery(
+    name="Mid-caps",
     order_by_desc="market_capitalization",
-    limit="50",
+    market_capitalization=[5e8, 1e10],
 ).variants()
 
 NEXT_EARNINGS_DATE = NamedFilterQuery(
@@ -217,15 +294,26 @@ NEXT_EARNINGS_DATE = NamedFilterQuery(
         datetime.date.today() + timedelta(days=20),
     ],
 ).variants()
+SEMICONDUCTORS = NamedFilterQuery(
+    name="Semiconductors",
+    order_by_desc="market_capitalization",
+    industry=["Semiconductors"],
+).variants()
+SOFTWARE = NamedFilterQuery(
+    name="Software - Application",
+    order_by_desc="market_capitalization",
+    industry=["Software - Application"],
+).variants()
 
 
 def predefined_filters() -> list[NamedFilterQuery]:
     return [
         *SMALL_CAP,
-        *TOP_PERFORMERS,
-        *TOP_PERFORMERS_YEARLY,
         *LARGE_CAPS,
         *NEXT_EARNINGS_DATE,
+        *MID_CAPS,
+        *SEMICONDUCTORS,
+        *SOFTWARE,
         *load_custom_filters(),
     ]
 

bullish/app/app.py

@@ -234,33 +234,28 @@ def load() -> None:
 
 @st.dialog("🔍  Filter", width="large")
 def filter() -> None:
+    with st.container(), st.expander("Predefined filters"):
+        predefined_filter_names = PredefinedFilters().get_predefined_filter_names()
+        option = st.selectbox(
+            "Select a predefined filter",
+            ["", *predefined_filter_names],
+        )
+        if option:
+            data_ = PredefinedFilters().get_predefined_filter(option)
+            st.session_state.filter_query.update(data_)
     with st.container():
-        column_1, column_2 = st.columns(2)
-        with column_1:
-            # TODO: order here matters
-            with st.expander("Predefined filters"):
-                predefined_filter_names = (
-                    PredefinedFilters().get_predefined_filter_names()
-                )
-                option = st.selectbox(
-                    "Select a predefined filter",
-                    ["", *predefined_filter_names],
-                )
-                if option:
-                    data_ = PredefinedFilters().get_predefined_filter(option)
-                    st.session_state.filter_query.update(data_)
-            with st.expander("Technical Analysis"):
-                for filter in TechnicalAnalysisFilters:
-                    with st.expander(filter._description):  # type: ignore
-                        build_filter(filter, st.session_state.filter_query)
-
-        with column_2:
-            with st.expander("Fundamental Analysis"):
-                for filter in FundamentalAnalysisFilters:
-                    with st.expander(filter._description):  # type: ignore
-                        build_filter(filter, st.session_state.filter_query)
-            with st.expander("General filter"):
-                build_filter(GeneralFilter, st.session_state.filter_query)
+
+        with st.expander("Technical Analysis"):
+            for filter in TechnicalAnalysisFilters:
+                with st.expander(filter._description):  # type: ignore
+                    build_filter(filter, st.session_state.filter_query)
+
+        with st.expander("Fundamental Analysis"):
+            for filter in FundamentalAnalysisFilters:
+                with st.expander(filter._description):  # type: ignore
+                    build_filter(filter, st.session_state.filter_query)
+        with st.expander("General filter"):
+            build_filter(GeneralFilter, st.session_state.filter_query)
 
     if st.button("🔍 Apply"):
         query = FilterQuery.model_validate(st.session_state.filter_query)
@@ -419,11 +414,12 @@ def main() -> None:
 
     if st.session_state.database_path is None:
         dialog_pick_database()
+        initialize(
+            database_path=st.session_state.database_path,
+            job_type="Initialize",
+        )
     bearish_db_ = bearish_db(st.session_state.database_path)
-    initialize(
-        database_path=st.session_state.database_path,
-        job_type="Initialize",
-    )
+
     charts_tab, jobs_tab = st.tabs(["Charts", "Jobs"])
     if "data" not in st.session_state:
         st.session_state.data = load_analysis_data(bearish_db_)

bullish/database/alembic/versions/260fcff7212e_.py

@@ -0,0 +1,45 @@
+"""
+
+Revision ID: 260fcff7212e
+Revises: 4ee82b171449
+Create Date: 2025-08-11 10:08:17.582390
+
+"""
+
+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 = "260fcff7212e"
+down_revision: Union[str, None] = "4ee82b171449"
+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("sma_50_below_sma_200", sa.Date(), nullable=True))
+        batch_op.add_column(sa.Column("price_below_sma_50", sa.Date(), nullable=True))
+        batch_op.create_index(
+            "ix_analysis_price_below_sma_50", ["price_below_sma_50"], unique=False
+        )
+        batch_op.create_index(
+            "ix_analysis_sma_50_below_sma_200", ["sma_50_below_sma_200"], 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_sma_50_below_sma_200")
+        batch_op.drop_index("ix_analysis_price_below_sma_50")
+        batch_op.drop_column("price_below_sma_50")
+        batch_op.drop_column("sma_50_below_sma_200")
+
+    # ### end Alembic commands ###

{bullishpy-0.50.0.dist-info → bullishpy-0.52.0.dist-info}/METADATA

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

{bullishpy-0.50.0.dist-info → bullishpy-0.52.0.dist-info}/RECORD

@@ -5,11 +5,11 @@ bullish/analysis/backtest.py,sha256=x91ek5kOzJHvYq0TmJh1Q8wBDDduIaieE0zDaoZFXew,
 bullish/analysis/constants.py,sha256=X3oCyYNA6B-jsZSYJLeGQ94S453Z7jIVNPmv3lMPp8Q,9922
 bullish/analysis/filter.py,sha256=LKmsO3ei7Eo_SJsEVbZqETyIdOpW55xVheO6_GNoA0s,9286
 bullish/analysis/functions.py,sha256=CuMgOjpQeg4KsDMUBdHRlxL1dRlos16KRyLhQe8PYUQ,14819
-bullish/analysis/indicators.py,sha256=XsMHc4-hEZwxFpI3JI-s4C2hcg0eCQLWcAQ8P46dtL8,26812
+bullish/analysis/indicators.py,sha256=f5FReOeM1qgs_v3yEFp2ebPYqIQNib_4tftG0WDkhRQ,27648
 bullish/analysis/industry_views.py,sha256=-B4CCAYz2arGQtWTXLLMpox0loO_MGdVQd2ycCRMOQQ,6799
-bullish/analysis/predefined_filters.py,sha256=96SFmkATBvq2TmIBRJCMi92-J8I4V1jW_6xJIzM6ueI,8815
+bullish/analysis/predefined_filters.py,sha256=LD_68Gi84gGifT4I4Vgz6VN8y8o1hFBKyQBbpE1i9Bo,12340
 bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/app/app.py,sha256=-LXZC9w5DR4m6sXvsc5JXNQU85yi6-4vScFKcIUeFH4,16876
+bullish/app/app.py,sha256=oF0ew2TtWSZ9iIsBK7H0Dy-FvOCjzSA4MdEsBzeRI9g,16630
 bullish/cli.py,sha256=yYqiEQAvOIQ-pTn77RPuE449gwaEGBeQwNHHAJ5yQDM,2739
 bullish/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/database/alembic/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
@@ -22,6 +22,7 @@ bullish/database/alembic/versions/08ac1116e055_.py,sha256=zMEiCbraMEAZItT4ibc3ev
 bullish/database/alembic/versions/11d35a452b40_.py,sha256=j2PaU1RssLQ20OevGmBC7S9E9ocWiXpBue9SOS4AQoY,11521
 bullish/database/alembic/versions/12889a2cbd7d_.py,sha256=LT_-dM-UstatA1xloCAQnvVgFXMyIAR_LpHPbQnWyVo,1668
 bullish/database/alembic/versions/17e51420e7ad_.py,sha256=xeiVIm1YUZb08opE9rocHZP1__9WQWXsKsXgeFV9cvs,2960
+bullish/database/alembic/versions/260fcff7212e_.py,sha256=3Gx9WTyYcFWuMYunJEez0545eLWBxqTsu2Mmd7UDlDY,1498
 bullish/database/alembic/versions/49c83f9eb5ac_.py,sha256=kCBItp7KmqpJ03roy5ikQjhefZia1oKgfZwournQDq8,3890
 bullish/database/alembic/versions/4b0a2f40b7d3_.py,sha256=G0K7w7pOPYjPZkXTB8LWhxoxuWBPcPwOfnubTBtdeEY,1827
 bullish/database/alembic/versions/4ee82b171449_.py,sha256=QtPy5VyZPyZxS7MVkk_wGi3C44PVDoHyJ-9m9fWdqqc,1047
@@ -55,7 +56,7 @@ bullish/jobs/models.py,sha256=rBXxtGFBpgZprrxq5_X2Df-bh8BLYEfw-VLMRucrqa8,784
 bullish/jobs/tasks.py,sha256=vmglWAADUUkhc_2ArzgAGdjtWotkYymvK6LQt08vGo4,6096
 bullish/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/utils/checks.py,sha256=g-5QXNWNe1_BwHKrc2PtvPiLraL0tqGgxnzG7u-Wkgo,2189
-bullishpy-0.50.0.dist-info/METADATA,sha256=ndTkDX8uYRTwBLq68DTvI7bnjsaaxm0q2mR8sN6MiD0,830
-bullishpy-0.50.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.50.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.50.0.dist-info/RECORD,,
+bullishpy-0.52.0.dist-info/METADATA,sha256=ieDfl02-98ddCFh7GVTQZFfhNeyx8o6b1-2ILF4ecRg,830
+bullishpy-0.52.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.52.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.52.0.dist-info/RECORD,,