bullishpy 0.16.0__py3-none-any.whl → 0.18.0__py3-none-any.whl

bullish/analysis/analysis.py

@@ -114,6 +114,13 @@ class TechnicalAnalysisBase(BaseModel):
             default=None,
         ),
     ]
+    max_year_loss: Annotated[
+        Optional[float],
+        BeforeValidator(to_float),
+        Field(
+            default=None,
+        ),
+    ]
 
 
 TechnicalAnalysisModels = [*IndicatorModels, TechnicalAnalysisBase]
@@ -131,7 +138,10 @@ class TechnicalAnalysis(*TechnicalAnalysisModels):  # type: ignore
             return cls()
         try:
             res = Indicators().compute(prices)
-            return cls(last_price=prices.close.iloc[-1], **res)
+            last_price = prices.close.iloc[-1]
+            max_price = prices.close.iloc[-253 * 2 :].max()
+            max_year_loss = (max_price - last_price) / max_price
+            return cls(last_price=last_price, max_year_loss=max_year_loss, **res)
         except Exception as e:
             logger.error(
                 f"Failing to calculate technical analysis for {ticker.symbol}: {e}",
@@ -467,6 +477,13 @@ class AnalysisView(BaseModel):
             default=None,
         ),
     ]
+    max_year_loss: Annotated[
+        Optional[float],
+        BeforeValidator(to_float),
+        Field(
+            default=None,
+        ),
+    ]
     median_yearly_growth: Optional[float] = None
     median_weekly_growth: Optional[float] = None
     median_monthly_growth: Optional[float] = None

bullish/analysis/constants.py

@@ -308,6 +308,8 @@ Sector = Literal[
     "Financial Services",
     "Conglomerates",
 ]
+
+SubCountry = Literal["United kingdom", "United states", "Germany", "Belgium", "France"]
 Country = Literal[
     "Australia",
     "China",

bullish/analysis/industry_views.py

@@ -1,4 +1,5 @@
 import datetime
+import logging
 from typing import (
     Optional,
     Any,
@@ -17,11 +18,18 @@ 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
+from bullish.analysis.constants import (
+    Industry,
+    IndustryGroup,
+    Sector,
+    Country,
+    SubCountry,
+)
 
 if TYPE_CHECKING:
     from bullish.database.crud import BullishDb
 
+logger = logging.getLogger(__name__)
 Type = Literal["Mean"]
 
 FUNCTIONS = {"Mean": np.mean}
@@ -47,12 +55,23 @@ def get_industry_comparison_data(
     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:
+        normalized_industry = industry_data.normalized_close.rename(industry)
+        data = [normalized_symbol, normalized_industry]
+        for country in get_args(SubCountry):
+            views = bullish_db.read_returns(type, industry, country)
+            if views:
+                industry_data = IndustryViews.from_views(views).to_dataframe()
+                normalized_industry = industry_data.normalized_close.rename(
+                    f"{industry}-{country}"
+                )
+                data.append(normalized_industry)
+        return pd.concat(data, axis=1)
+    except Exception as e:
+        logger.error(e)
         return pd.DataFrame()
 
 

bullish/analysis/predefined_filters.py

@@ -176,7 +176,7 @@ 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=[5e8, 1e12],
+    market_capitalization=[1e10, 1e13],
     order_by_desc="market_capitalization",
     country=[
         "Germany",
@@ -188,11 +188,25 @@ RSI_CROSSOVER_30_GROWTH_STOCK = NamedFilterQuery(
         "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=[5e8, 1e12],
+    market_capitalization=[1e10, 1e13],
     order_by_desc="market_capitalization",
     country=[
         "Germany",
@@ -360,6 +374,7 @@ def predefined_filters() -> list[NamedFilterQuery]:
         MOMENTUM_GROWTH_RSI_30,
         MOMENTUM_GROWTH_RSI_40,
         GOLDEN_CROSS_LAST_SEVEN_DAYS,
+        MEDIAN_YEARLY_GROWTH,
     ]
 
 

bullish/database/alembic/versions/79bc71ec6f9e_.py

@@ -0,0 +1,39 @@
+"""
+
+Revision ID: 79bc71ec6f9e
+Revises: 6d252e23f543
+Create Date: 2025-08-02 15:07:58.266933
+
+"""
+
+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 = "79bc71ec6f9e"
+down_revision: Union[str, None] = "6d252e23f543"
+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("max_year_loss", sa.Float(), nullable=True))
+        batch_op.create_index(
+            "ix_analysis_max_year_loss", ["max_year_loss"], 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_max_year_loss")
+        batch_op.drop_column("max_year_loss")
+
+    # ### end Alembic commands ###

bullish/database/crud.py

@@ -261,10 +261,11 @@ class BullishDb(BearishDb, BullishDbBase):  # type: ignore
         self, type: Type, industry: Industry, country: Country
     ) -> List[IndustryView]:
         with Session(self._engine) as session:
-            stmt = select(IndustryViewORM).where(
-                IndustryViewORM.industry == industry,
-                IndustryViewORM.country == country,
-            )
+            stmt = select(IndustryViewORM)
+            if industry:
+                stmt = stmt.where(IndustryViewORM.industry == industry)
+            if country:
+                stmt = stmt.where(IndustryViewORM.country == country)
             result = session.exec(stmt).all()
             return [IndustryView.model_validate(r) for r in result]
 
@@ -326,4 +327,7 @@ class BullishDb(BearishDb, BullishDbBase):  # type: ignore
         with Session(self._engine) as session:
             stmt = select(BacktestResultORM)
             results = session.exec(stmt).all()
-            return [BacktestResult.model_validate(r) for r in results]
+            if results:
+                return [BacktestResult.model_validate(r) for r in results]
+            else:
+                return []

bullish/figures/figures.py

@@ -37,7 +37,7 @@ def plot(
             f"MACD ({symbol} [{name}])",
             f"ADX ({symbol} [{name}])",
             f"OBV ({symbol} [{name}])",
-            f"ATR ({symbol} [{name}])",
+            f"Industry ({symbol} [{name}])",
         ),
     )
     # Row 1: Candlestick + SMAs
@@ -123,33 +123,20 @@ def plot(
         row=6,
         col=1,
     )
-    if (
-        industry_data is not None
-        and not industry_data.empty
-        and "symbol" in industry_data.columns
-        and "industry" in industry_data.columns
-    ):
-        fig.add_trace(
-            go.Scatter(
-                x=industry_data.index,
-                y=industry_data.symbol,
-                name="Symbol",
-                mode="lines",
-            ),
-            row=7,
-            col=1,
-        )
-        fig.add_trace(
-            go.Scatter(
-                x=industry_data.index,
-                y=industry_data.industry,
-                name="Industry",
-                mode="lines",
-                opacity=0.5,
-            ),
-            row=7,
-            col=1,
-        )
+    if industry_data is not None and not industry_data.empty:
+        for c in industry_data.columns:
+            fig.add_trace(
+                go.Scatter(
+                    x=industry_data.index,
+                    y=industry_data[c],
+                    name=c,
+                    mode="lines",
+                    opacity=0.5 if c != "symbol" else 1.0,
+                ),
+                row=7,
+                col=1,
+            )
+
     if dates is not None and dates:
         for date in dates:
             if (

bullish/jobs/tasks.py

@@ -13,6 +13,7 @@ from huey.api import Task  # type: ignore
 from .models import JobTrackerStatus, JobTracker, JobType
 from ..analysis.analysis import run_analysis, run_signal_series_analysis
 from ..analysis.backtest import run_many_tests, BackTestConfig
+from ..analysis.industry_views import compute_industry_view
 from ..analysis.predefined_filters import predefined_filters
 from ..database.crud import BullishDb
 from bullish.analysis.filter import FilterUpdate
@@ -85,6 +86,7 @@ def analysis(
 ) -> None:
     bullish_db = BullishDb(database_path=database_path)
     run_analysis(bullish_db)
+    compute_industry_view(bullish_db)
 
 
 @huey.task(context=True)  # type: ignore

{bullishpy-0.16.0.dist-info → bullishpy-0.18.0.dist-info}/METADATA

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

{bullishpy-0.16.0.dist-info → bullishpy-0.18.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 bullish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/analysis/analysis.py,sha256=SqlLrbhMzm2dvK89Ip5KCyTOoLS41vNf1WJolevLKfc,21638
+bullish/analysis/analysis.py,sha256=9a1j1-Fe0XW5_fiNXtgs7XM_0Rl0mQOWvXQv9nUirdg,22124
 bullish/analysis/backtest.py,sha256=u3zzdP0IzpcxSzoI_wWT-YkmBulwVCFfhusttquTjSQ,14291
-bullish/analysis/constants.py,sha256=tVDPQEufH8lytMj4DdUdvXt79b7cvWaDwSUOpeqMWts,9851
+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=1B5V39Fm9rNQEsun1xrwELfOiKlGdTie0ZolS2UBh2w,6247
-bullish/analysis/predefined_filters.py,sha256=5G75u4uDLHJR-iEtGZ2s-gkAqNIRUYu5msK8G-LWmD0,12074
+bullish/analysis/industry_views.py,sha256=3TwruMdRYtmBC5bRYFptLt18AN9PQSY9d-uWnTiJKgY,6787
+bullish/analysis/predefined_filters.py,sha256=FnEyWcVKlCSlDhE8LHGXGY3tFZmFTnExQmg78BW9ICs,12417
 bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/app/app.py,sha256=rIvz4A0aJu7wGXBSCqO3EBA4QGhV8GPYVOYLOd9WjnY,14253
 bullish/cli.py,sha256=uYLZmGDAolZKWzduZ58bP-xul1adg0oKfeUQtZMXTvA,1958
@@ -27,13 +27,14 @@ bullish/database/alembic/versions/4b0a2f40b7d3_.py,sha256=G0K7w7pOPYjPZkXTB8LWhx
 bullish/database/alembic/versions/5b10ee7604c1_.py,sha256=YlqaagPasR3RKASv7acME1jPS8p26VoTE2BvpOwdCpY,1463
 bullish/database/alembic/versions/6d252e23f543_.py,sha256=izF-ejdXk733INkAokGqjA2U_M0_c1f_ruihZ-cgP7s,1525
 bullish/database/alembic/versions/73564b60fe24_.py,sha256=MTlDRDNHj3E9gK7IMeAzv2UxxxYtWiu3gI_9xTLE-wg,1008
+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/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=g7gA0NKmAw7SLF-Wk-r5m1BJFOtcxDVC9idPYYKICjk,12565
+bullish/database/crud.py,sha256=mu4Ddvg94gLNUENGTw1dbT6dgW5AiS7O3JpehB5vOWo,12701
 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
@@ -41,16 +42,16 @@ bullish/database/scripts/upgrade.py,sha256=-Gz7aFNPEt9y9e1kltqXE76-j_8QeNtet_Vlw
 bullish/database/settings.py,sha256=nMudufmF7iC_62_PHrGSMjlqDLN2I0qTbtz9JKZHSko,164
 bullish/exceptions.py,sha256=4z_i-dD-CDz1bkGmZH9DOf1L_awlCPCgdUDPF7dhWAI,106
 bullish/figures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/figures/figures.py,sha256=imrvIIcL9L-z-3vzWK5hDEsNttZs60QxlFI-PLw0hJQ,4829
+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/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=6IH45-JV3GFM6Q9uIsuLNjCvdburx3gJZJLI3x0Dn2Y,3593
+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.16.0.dist-info/METADATA,sha256=db70yObjbrRpbGeqwITzNA1XGHjKZ_KXOOUTRimxgi0,828
-bullishpy-0.16.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.16.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.16.0.dist-info/RECORD,,
+bullishpy-0.18.0.dist-info/METADATA,sha256=fK-rvdh92W54Rk10x5_uJzWGG8zG15KYB8jyiAuLZak,828
+bullishpy-0.18.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.18.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.18.0.dist-info/RECORD,,