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

bullish/database/crud.py

@@ -3,19 +3,27 @@ import logging
 from datetime import date
 from functools import cached_property
 from pathlib import Path
-from sqlite3 import OperationalError
 from typing import TYPE_CHECKING, Any, List, Optional
 
 import pandas as pd
 from bearish.database.crud import BearishDb  # type: ignore
 from bearish.models.base import Ticker  # type: ignore
-from bearish.database.schemas import EarningsDateORM  # type: ignore
+from bearish.database.schemas import EarningsDateORM, EquityORM  # type: ignore
+from bearish.types import Sources  # type: ignore
 from pydantic import ConfigDict
 from sqlalchemy import Engine, create_engine, insert, delete, update
 from sqlmodel import Session, select
 
 from bullish.analysis.analysis import Analysis
-from bullish.database.schemas import AnalysisORM, JobTrackerORM, FilteredResultsORM
+from bullish.analysis.constants import Industry, IndustryGroup, Sector, Country
+from bullish.analysis.industry_views import Type, IndustryView
+
+from bullish.database.schemas import (
+    AnalysisORM,
+    JobTrackerORM,
+    FilteredResultsORM,
+    IndustryViewORM,
+)
 from bullish.database.scripts.upgrade import upgrade
 from bullish.exceptions import DatabaseFileNotFoundError
 from bullish.analysis.filter import FilteredResults
@@ -45,7 +53,7 @@ class BullishDb(BearishDb, BullishDbBase):  # type: ignore
         database_url = f"sqlite:///{Path(self.database_path)}"
         try:
             upgrade(self.database_path)
-        except OperationalError as e:
+        except Exception as e:
             logger.warning(
                 f"Failed to upgrade the database at {self.database_path}. "
                 f"Reason: {e}"
@@ -193,3 +201,63 @@ class BullishDb(BearishDb, BullishDbBase):  # type: ignore
                     select(EarningsDateORM.date).where(EarningsDateORM.symbol == symbol)
                 )
             ]
+
+    def read_industry_symbols(
+        self, industries: List[Industry], country: Country, source: Sources = "Yfinance"
+    ) -> List[str]:
+        with Session(self._engine) as session:
+            stmt = select(EquityORM.symbol).where(
+                EquityORM.industry.in_(industries),
+                EquityORM.source == source,
+                EquityORM.country == country,
+            )
+            result = session.exec(stmt).all()
+            return list(result)
+
+    def read_industry_group_symbols(
+        self,
+        industry_groups: List[IndustryGroup],
+        country: Country,
+        source: Sources = "Yfinance",
+    ) -> List[str]:
+        with Session(self._engine) as session:
+            stmt = select(EquityORM.symbol).where(
+                EquityORM.industry_group.in_(industry_groups),
+                EquityORM.source == source,
+                EquityORM.country == country,
+            )
+            result = session.exec(stmt).all()
+            return list(result)
+
+    def read_sector_symbols(
+        self, sectors: List[Sector], country: Country, source: Sources = "Yfinance"
+    ) -> List[str]:
+        with Session(self._engine) as session:
+            stmt = select(EquityORM.symbol).where(
+                EquityORM.sector.in_(sectors),
+                EquityORM.source == source,
+                EquityORM.country == country,
+            )
+            result = session.exec(stmt).all()
+            return list(result)
+
+    def write_returns(self, industry_returns: List[IndustryView]) -> None:
+        with Session(self._engine) as session:
+            stmt = (
+                insert(IndustryViewORM)
+                .prefix_with("OR REPLACE")
+                .values([a.model_dump() for a in industry_returns])
+            )
+            session.exec(stmt)  # type: ignore
+            session.commit()
+
+    def read_returns(
+        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,
+            )
+            result = session.exec(stmt).all()
+            return [IndustryView.model_validate(r) for r in result]

bullish/database/schemas.py

@@ -4,6 +4,8 @@ from sqlmodel import Field, SQLModel
 from sqlalchemy import Column, JSON
 from bullish.analysis.analysis import Analysis
 from bullish.analysis.filter import FilteredResults
+from bullish.analysis.industry_views import IndustryView
+
 from bullish.jobs.models import JobTracker
 from sqlalchemy import Index
 
@@ -44,3 +46,18 @@ class FilteredResultsORM(SQLModel, FilteredResults, table=True):
     name: str = Field(primary_key=True)
     symbols: list[str] = Field(sa_column=Column(JSON))
     filter_query: Dict[str, Any] = Field(sa_column=Column(JSON))  # type: ignore
+
+
+class IndustryViewORM(SQLModel, IndustryView, table=True):
+    __tablename__ = "industryview"
+    __table_args__ = {"extend_existing": True}  # noqa:RUF012
+    date: str = Field(primary_key=True)  # type: ignore
+    created_at: str = Field(default=None, nullable=True)  # type: ignore
+    simple_return: float | None = Field(default=None, nullable=True)  # type: ignore
+    log_return: float | None = Field(default=None, nullable=True)  # type: ignore
+    normalized_close: float | None = Field(default=None, nullable=True)  # type: ignore
+    country: str = Field(primary_key=True)  # type: ignore
+    industry: str = Field(primary_key=True)  # type: ignore
+    industry_group: str | None = Field(default=None, nullable=True)  # type: ignore
+    sector: str | None = Field(default=None, nullable=True)  # type: ignore
+    type: str = Field(primary_key=True)  # type: ignore

bullish/figures/figures.py

@@ -14,6 +14,7 @@ def plot(
     symbol: str,
     name: Optional[str] = None,
     dates: Optional[List[date]] = None,
+    industry_data: Optional[pd.DataFrame] = None,
 ) -> go.Figure:
     data = add_indicators(data)
     fig = make_subplots(
@@ -122,11 +123,33 @@ def plot(
         row=6,
         col=1,
     )
-    fig.add_trace(
-        go.Scatter(x=data.index, y=data.ATR, name="ATR", mode="lines"),
-        row=7,
-        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 dates is not None and dates:
         for date in dates:
             if (

bullish/interface/interface.py

@@ -6,10 +6,13 @@ from typing import List, Optional
 import pandas as pd
 from bearish.interface.interface import BearishDbBase  # type: ignore
 from bearish.models.base import Ticker  # type: ignore
+from bearish.types import Sources  # type: ignore
 
 
 from bullish.analysis.analysis import Analysis, AnalysisView
+from bullish.analysis.constants import Industry, Sector, IndustryGroup, Country
 from bullish.analysis.filter import FilterQuery, FilteredResults
+from bullish.analysis.industry_views import Type, IndustryView
 from bullish.jobs.models import JobTracker, JobTrackerStatus, add_icons
 
 logger = logging.getLogger(__name__)
@@ -96,3 +99,29 @@ class BullishDbBase(BearishDbBase):  # type: ignore
 
     @abc.abstractmethod
     def read_dates(self, symbol: str) -> List[date]: ...
+
+    @abc.abstractmethod
+    def read_industry_symbols(
+        self, industries: List[Industry], country: Country, source: Sources = "Yfinance"
+    ) -> List[str]: ...
+
+    @abc.abstractmethod
+    def read_industry_group_symbols(
+        self,
+        industry_groups: List[IndustryGroup],
+        country: Country,
+        source: Sources = "Yfinance",
+    ) -> List[str]: ...
+
+    @abc.abstractmethod
+    def read_sector_symbols(
+        self, sectors: List[Sector], country: Country, source: Sources = "Yfinance"
+    ) -> List[str]: ...
+
+    @abc.abstractmethod
+    def write_returns(self, industry_returns: List[IndustryView]) -> None: ...
+
+    @abc.abstractmethod
+    def read_returns(
+        self, type: Type, industry: Industry, country: Country
+    ) -> List[IndustryView]: ...

{bullishpy-0.13.0.dist-info → bullishpy-0.14.0.dist-info}/METADATA

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

{bullishpy-0.13.0.dist-info → bullishpy-0.14.0.dist-info}/RECORD

@@ -1,12 +1,14 @@
 bullish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/analysis/analysis.py,sha256=v5MFGhQUpMwGAVE0dg2293ldRSgQmqy5CiF8MQFTibM,19165
-bullish/analysis/filter.py,sha256=S8TuxoTAUY0U8ARPjNHE0tSSE_ToWkfZazAgnfgswk4,18136
-bullish/analysis/functions.py,sha256=DYqx5ZGR-zjCwDwhDQJqRFH8LpmzvFEcfItojbIcddU,14699
-bullish/analysis/indicators.py,sha256=JXqXsRDn-hiXcrBqqzJ3-xxANAherwaCZy38XykjJBA,20726
-bullish/analysis/predefined_filters.py,sha256=MvIuGug-RWO7QtWNEtOFROf-sY8IXu444g174cE-5m0,15200
+bullish/analysis/analysis.py,sha256=ZTRf7YaEnFL9HBVkamY7JXys3XJtkLGNMkU4FbkV_04,19270
+bullish/analysis/constants.py,sha256=tVDPQEufH8lytMj4DdUdvXt79b7cvWaDwSUOpeqMWts,9851
+bullish/analysis/filter.py,sha256=kSG6fXZrnwqE1HvKQW6O3yVNV49qhVleer9M_7BIDpg,8381
+bullish/analysis/functions.py,sha256=A2eFBqNx5XohEhJFU_LvyU0_s0ozErtsiYUqVSb3Wvs,14367
+bullish/analysis/indicators.py,sha256=9-768_ntZRxNgeNXj3MbRO9QCq97uYKMHQ-9hQMu7Mo,20938
+bullish/analysis/industry_views.py,sha256=1B5V39Fm9rNQEsun1xrwELfOiKlGdTie0ZolS2UBh2w,6247
+bullish/analysis/predefined_filters.py,sha256=28e42hGaH7Qb6SPNeH7EK9YIhjERj-qpbY-7xLahvDM,8361
 bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/app/app.py,sha256=E0H78LOODl1H6s308jXpQGTUoFPoLOJkPBXOLQGLCeA,13331
+bullish/app/app.py,sha256=3xSO4x3T7BnD60M-AQM6-xkRVFLCWqGJ6DWqLmKxbzw,13663
 bullish/cli.py,sha256=uYLZmGDAolZKWzduZ58bP-xul1adg0oKfeUQtZMXTvA,1958
 bullish/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/database/alembic/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
@@ -14,35 +16,38 @@ bullish/database/alembic/alembic.ini,sha256=VuwqBJV5ObTyyRNrqv8Xr-TDIRfqPjP9R1mq
 bullish/database/alembic/env.py,sha256=TBsN4TyVppyc2QpWqViebd4-xxUT7Cs3GDYXQdKiAMs,2260
 bullish/database/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 bullish/database/alembic/versions/037dbd721317_.py,sha256=U7EA4odH3t9w0-J4FmvBUt8HOuGDMn0rEAu_0vPUYaI,8595
+bullish/database/alembic/versions/040b15fba458_.py,sha256=scSauB4wZe0sMFHOAMHkx-rNSF06Pn3D52QJ10PvERg,2314
 bullish/database/alembic/versions/08ac1116e055_.py,sha256=zMEiCbraMEAZItT4ibc3evAH7-7mkXpdgnZy4tPVYeg,27263
 bullish/database/alembic/versions/11d35a452b40_.py,sha256=j2PaU1RssLQ20OevGmBC7S9E9ocWiXpBue9SOS4AQoY,11521
 bullish/database/alembic/versions/17e51420e7ad_.py,sha256=xeiVIm1YUZb08opE9rocHZP1__9WQWXsKsXgeFV9cvs,2960
 bullish/database/alembic/versions/49c83f9eb5ac_.py,sha256=kCBItp7KmqpJ03roy5ikQjhefZia1oKgfZwournQDq8,3890
 bullish/database/alembic/versions/4b0a2f40b7d3_.py,sha256=G0K7w7pOPYjPZkXTB8LWhxoxuWBPcPwOfnubTBtdeEY,1827
+bullish/database/alembic/versions/5b10ee7604c1_.py,sha256=YlqaagPasR3RKASv7acME1jPS8p26VoTE2BvpOwdCpY,1463
 bullish/database/alembic/versions/73564b60fe24_.py,sha256=MTlDRDNHj3E9gK7IMeAzv2UxxxYtWiu3gI_9xTLE-wg,1008
 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=0AMrs07MMeDq5AVft_pf43KWPFOusMNzUmxuXwMX6K4,7400
-bullish/database/schemas.py,sha256=bU-DW49NqpBp--1VN486LUdDmLeScrI8TF69afzjoTc,1507
+bullish/database/crud.py,sha256=ubRXV88GAo4prDQPylouEn8DBvoyNtM6hx12HPhD_2w,9889
+bullish/database/schemas.py,sha256=gI6hWYv1C4G9xRXiNTSLxXftkgIOANDyfct2_KwSavo,2442
 bullish/database/scripts/create_revision.py,sha256=rggIf-3koPqJNth8FIg89EOfnIM7a9QrvL8X7UJsP0g,628
 bullish/database/scripts/stamp.py,sha256=PWgVUEBumjNUMjTnGw46qmU3p221LeN-KspnW_gFuu4,839
 bullish/database/scripts/upgrade.py,sha256=-Gz7aFNPEt9y9e1kltqXE76-j_8QeNtet_VlwY5AWjo,806
 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=SWTTiEoVyWMZeIIxg0ERi23v7s4tySB5BLKyPu12jC4,4193
+bullish/figures/figures.py,sha256=imrvIIcL9L-z-3vzWK5hDEsNttZs60QxlFI-PLw0hJQ,4829
 bullish/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/interface/interface.py,sha256=6HXSK-N-vOuOGVserizknP4CeUGbUhB8P642oZmgpk0,3252
+bullish/interface/interface.py,sha256=UB2ATVtUsnXetnLCrSmNVrFpIvCw_0kuVxKHZC7sT7U,4233
 bullish/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/jobs/app.py,sha256=5MJ5KXUo7JSNAvOPgkpIMasD11VTrjQvGzM7vmCY65E,77
 bullish/jobs/models.py,sha256=ndrGTMP08S57yGLGEG9TQt8Uw2slc4HvbG-TZtEEuN0,744
 bullish/jobs/tasks.py,sha256=V_b0c8_GQC0-KIxaHDlLFhtkclQJOsck0gXaW6OlC_w,3055
 bullish/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/utils/checks.py,sha256=Va10_xDVVnxYkOD2hafvyQ-TFV8FQpOkr4huJ7XgpDM,2188
-bullishpy-0.13.0.dist-info/METADATA,sha256=5aWLV_c8a5ys2AjiyEGgx-CnRK1Qs3EBXdCbu77wSIw,784
-bullishpy-0.13.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.13.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.13.0.dist-info/RECORD,,
+bullishpy-0.14.0.dist-info/METADATA,sha256=BH2BdzlEth8FoZFyxME0sbOlPnqqPdbHoxdHJ3X_GHg,784
+bullishpy-0.14.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.14.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.14.0.dist-info/RECORD,,