bullishpy 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

bullish/figures/figures.py

@@ -4,33 +4,37 @@ import pandas as pd
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
 
+from bullish.analysis.functions import add_indicators
+
 
 def plot(
     data: pd.DataFrame,
     symbol: str,
     name: Optional[str] = None,
-    dates: Optional[pd.Series] = None,  # type: ignore
+    dates: Optional[pd.Series] = None,
 ) -> go.Figure:
-    data.ta.sma(50, append=True)
-    data.ta.sma(200, append=True)
-    data.ta.adx(append=True)
-    data.ta.macd(append=True)
-    data.ta.rsi(append=True)
+    data = add_indicators(data)
     fig = make_subplots(
-        rows=4,
+        rows=7,
         cols=1,
         shared_xaxes=True,
-        vertical_spacing=0.1,
+        vertical_spacing=0.05,
         specs=[
             [{"rowspan": 2}],  # Row 1: main chart
             [None],  # Row 2: skipped (part of row 1)
             [{}],  # Row 3: RSI
             [{}],  # Row 4: MACD
+            [{}],  # Row 5: ADX
+            [{}],  # Row 6: OBV
+            [{}],  # Row 7: ATR
         ],
         subplot_titles=(
             f"Price + SMAs ({symbol} [{name}])",
             f"RSI ({symbol} [{name}])",
             f"MACD ({symbol} [{name}])",
+            f"ADX ({symbol} [{name}])",
+            f"OBV ({symbol} [{name}])",
+            f"ATR ({symbol} [{name}])",
         ),
     )
     # Row 1: Candlestick + SMAs
@@ -61,7 +65,7 @@ def plot(
 
     # Row 2: RSI
     fig.add_trace(
-        go.Scatter(x=data.index, y=data.RSI_14, name="RSI 14", mode="lines"),
+        go.Scatter(x=data.index, y=data.RSI, name="RSI 14", mode="lines"),
         row=3,
         col=1,
     )
@@ -75,17 +79,52 @@ def plot(
 
     fig.add_trace(
         go.Scatter(
-            x=data.index, y=data.MACDs_12_26_9, name="MACD Signal", mode="lines"
+            x=data.index, y=data.MACD_12_26_9_SIGNAL, name="MACD Signal", mode="lines"
         ),
         row=4,
         col=1,
     )
 
     fig.add_trace(
-        go.Bar(x=data.index, y=data.MACDh_12_26_9, name="MACD Histogram", opacity=0.5),
+        go.Bar(
+            x=data.index, y=data.MACD_12_26_9_HIST, name="MACD Histogram", opacity=0.5
+        ),
         row=4,
         col=1,
     )
+
+    # Row 4: ADX
+    fig.add_trace(
+        go.Scatter(x=data.index, y=data.ADX_14, name="ADX_14", mode="lines"),
+        row=5,
+        col=1,
+    )
+
+    fig.add_trace(
+        go.Scatter(x=data.index, y=data.MINUS_DI, name="-DI", mode="lines"),
+        row=5,
+        col=1,
+    )
+    fig.add_trace(
+        go.Scatter(x=data.index, y=data.PLUS_DI, name="+DI", mode="lines"),
+        row=5,
+        col=1,
+    )
+    fig.add_trace(
+        go.Scatter(x=data.index, y=data.OBV, name="OBV", mode="lines"),
+        row=6,
+        col=1,
+    )
+    fig.add_trace(
+        go.Scatter(x=data.index, y=data.ADOSC, name="ADOSC", mode="lines"),
+        row=6,
+        col=1,
+    )
+    fig.add_trace(
+        go.Scatter(x=data.index, y=data.ATR, name="ATR", mode="lines"),
+        row=7,
+        col=1,
+    )
     if dates is not None and not dates.empty:
         for date in dates:
             fig.add_vline(
@@ -94,7 +133,7 @@ def plot(
 
     # Layout tweaks
     fig.update_layout(
-        height=900,
+        height=1500,
         showlegend=True,
         title="Technical Indicator Dashboard",
         margin={"t": 60, "b": 40},
@@ -103,5 +142,6 @@ def plot(
     # Optional: Add horizontal lines for RSI (e.g., 70/30 levels)
     fig.add_hline(y=70, line_dash="dash", line_color="red", row=3, col=1)
     fig.add_hline(y=30, line_dash="dash", line_color="green", row=3, col=1)
+    fig.add_hline(y=25, line_dash="dash", line_color="red", row=5, col=1)
 
     return fig

bullish/interface/interface.py

@@ -23,11 +23,6 @@ class BullishDbBase(BearishDbBase):  # type: ignore
 
     def read_filter_query(self, query: FilterQuery) -> pd.DataFrame:
 
-        if not set(query.query_parameters).issubset(set(Analysis.model_fields)):
-            raise ValueError(
-                f"Query parameters {query.query_parameters} are not a "
-                f"subset of Analysis model fields {Analysis.model_fields}"
-            )
         query_ = query.to_query()
         fields = ",".join(list(AnalysisView.model_fields))
         query_str: str = f""" 
@@ -50,47 +45,41 @@ class BullishDbBase(BearishDbBase):  # type: ignore
         return add_icons(self._read_job_trackers())
 
     @abc.abstractmethod
-    def _read_job_trackers(self) -> pd.DataFrame:
-        ...
+    def _read_job_trackers(self) -> pd.DataFrame: ...
 
     @abc.abstractmethod
-    def write_job_tracker(self, job_tracker: JobTracker) -> None:
-        ...
+    def write_job_tracker(self, job_tracker: JobTracker) -> None: ...
 
     @abc.abstractmethod
-    def delete_job_trackers(self, job_ids: List[str]) -> None:
-        ...
+    def delete_job_trackers(self, job_ids: List[str]) -> None: ...
 
     @abc.abstractmethod
-    def update_job_tracker_status(self, job_tracker_status: JobTrackerStatus) -> None:
-        ...
+    def update_job_tracker_status(
+        self, job_tracker_status: JobTrackerStatus
+    ) -> None: ...
 
     @abc.abstractmethod
-    def _write_analysis(self, analysis: "Analysis") -> None:
-        ...
+    def _write_analysis(self, analysis: "Analysis") -> None: ...
 
     @abc.abstractmethod
-    def _read_analysis(self, ticker: Ticker) -> Optional["Analysis"]:
-        ...
+    def _read_analysis(self, ticker: Ticker) -> Optional["Analysis"]: ...
 
     @abc.abstractmethod
-    def _read_filter_query(self, query: str) -> pd.DataFrame:
-        ...
+    def _read_filter_query(self, query: str) -> pd.DataFrame: ...
 
     @abc.abstractmethod
     def _read_analysis_data(
         self, columns: List[str], symbols: Optional[List[str]] = None
-    ) -> pd.DataFrame:
-        ...
+    ) -> pd.DataFrame: ...
+
+    @abc.abstractmethod
+    def read_filtered_results(self, name: str) -> Optional[FilteredResults]: ...
 
     @abc.abstractmethod
-    def read_filtered_results(self, name: str) -> Optional[FilteredResults]:
-        ...
+    def read_list_filtered_results(self) -> List[str]: ...
 
     @abc.abstractmethod
-    def read_list_filtered_results(self) -> List[str]:
-        ...
+    def write_filtered_results(self, filtered_results: FilteredResults) -> None: ...
 
     @abc.abstractmethod
-    def write_filtered_results(self, filtered_results: FilteredResults) -> None:
-        ...
+    def read_symbols(self) -> List[str]: ...

bullish/jobs/tasks.py

@@ -65,6 +65,16 @@ def update(
     run_analysis(bullish_db)
 
 
+@huey.task(context=True)  # type: ignore
+@job_tracker
+def analysis(
+    database_path: Path,
+    task: Optional[Task] = None,
+) -> None:
+    bullish_db = BullishDb(database_path=database_path)
+    run_analysis(bullish_db)
+
+
 @huey.task(context=True)  # type: ignore
 @job_tracker
 def news(

bullish/utils/checks.py

@@ -0,0 +1,64 @@
+import sqlite3
+from contextlib import contextmanager
+from pathlib import Path
+from sqlite3 import Connection
+from typing import List, Generator
+
+from bearish.database.schemas import *  # type: ignore # noqa: F403
+from bullish.database.schemas import *  # noqa: F403
+
+
+@contextmanager
+def get_sqlite_connection(database_path: Path) -> Generator[Connection, None, None]:
+    conn = sqlite3.connect(database_path)
+    try:
+        yield conn
+    finally:
+        conn.close()
+
+
+def get_table_names(module_name: str) -> List[str]:
+    return [
+        value.__tablename__
+        for _, value in locals().items()
+        if issubclass(value, SQLModel)  # type: ignore # noqa: F405
+        and hasattr(value, "__tablename__")
+        and hasattr(value, "__table__")
+        and module_name in value.__module__
+    ]
+
+
+def get_table_names_from_path(database_path: Path) -> List[str]:
+    with get_sqlite_connection(database_path) as conn:
+        cursor = conn.cursor()
+        cursor.execute(
+            "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%';"
+        )
+        tables = [row[0] for row in cursor.fetchall()]
+        cursor.close()
+        return tables
+
+
+def empty_analysis_table(database_path: Path) -> bool:
+    with get_sqlite_connection(database_path) as conn:
+        cursor = conn.cursor()
+
+        cursor.execute("SELECT COUNT(*) FROM analysis")
+        count = cursor.fetchone()[0]
+        conn.close()
+        return bool(count == 0)
+
+
+def _compatible_table(database_path: Path, module_name: str) -> bool:
+    if not database_path.exists() and not database_path.is_file():
+        raise FileNotFoundError(f"Database file {database_path} does not exist.")
+    table_names = get_table_names(module_name)
+    return set(table_names).issubset(get_table_names_from_path(database_path))
+
+
+def compatible_bearish_database(database_path: Path) -> bool:
+    return _compatible_table(database_path, "bearish.database.schemas")
+
+
+def compatible_bullish_database(database_path: Path) -> bool:
+    return _compatible_table(database_path, "bullish.database.schemas")

{bullishpy-0.4.0.dist-info → bullishpy-0.6.0.dist-info}/METADATA

@@ -1,21 +1,20 @@
 Metadata-Version: 2.3
 Name: bullishpy
-Version: 0.4.0
+Version: 0.6.0
 Summary: 
 Author: aan
 Author-email: andoludovic.andriamamonjy@gmail.com
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.12,<3.13
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: bearishpy (>=0.19.0,<0.20.0)
+Requires-Dist: bearishpy (>=0.20.0,<0.21.0)
 Requires-Dist: huey (>=2.5.3,<3.0.0)
 Requires-Dist: pandas-ta (>=0.3.14b0,<0.4.0)
 Requires-Dist: plotly (>=6.1.2,<7.0.0)
 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.4.0,<0.5.0)
 Description-Content-Type: text/markdown
 

bullishpy-0.6.0.dist-info/RECORD

@@ -0,0 +1,43 @@
+bullish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bullish/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bullish/analysis/analysis.py,sha256=ZqIMdAq1NJYgoQZ52PsV724VsXK8Jtno4alFFd_7_XU,17842
+bullish/analysis/filter.py,sha256=DzhA-cuKzZhIL1kwi61PTz77BBo8B6G_7EI4OVkPrww,17123
+bullish/analysis/functions.py,sha256=7mT6P6seLlgezjQlOyJNNL1J2Nydo6WeMM3A62t82Zc,11691
+bullish/analysis/indicators.py,sha256=LUNxhuimBdMbaIl5WpOu3Ofmw1Nv5ZSn7iVqdBlxoRY,16785
+bullish/analysis/predefined_filters.py,sha256=Ln1Wjz2x9RqU0_-u9e3TUNT2UT2VHnuogET0Q4Z_RAQ,2708
+bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bullish/app/app.py,sha256=Es244AnLce32d-MUYbKXZeEPE8GlfCUO4SQ7aiqooGc,12539
+bullish/cli.py,sha256=C31Pj7XGzdLz2Y3nIPQ7CF1DvyGVU5EyLvzj423QbwQ,1915
+bullish/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bullish/database/alembic/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
+bullish/database/alembic/alembic.ini,sha256=VuwqBJV5ObTyyRNrqv8Xr-TDIRfqPjP9R1mqewYM_xE,3695
+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/08ac1116e055_.py,sha256=zMEiCbraMEAZItT4ibc3evAH7-7mkXpdgnZy4tPVYeg,27263
+bullish/database/alembic/versions/11d35a452b40_.py,sha256=j2PaU1RssLQ20OevGmBC7S9E9ocWiXpBue9SOS4AQoY,11521
+bullish/database/alembic/versions/49c83f9eb5ac_.py,sha256=kCBItp7KmqpJ03roy5ikQjhefZia1oKgfZwournQDq8,3890
+bullish/database/alembic/versions/4b0a2f40b7d3_.py,sha256=G0K7w7pOPYjPZkXTB8LWhxoxuWBPcPwOfnubTBtdeEY,1827
+bullish/database/alembic/versions/73564b60fe24_.py,sha256=MTlDRDNHj3E9gK7IMeAzv2UxxxYtWiu3gI_9xTLE-wg,1008
+bullish/database/alembic/versions/ee5baabb35f8_.py,sha256=nBMEY-_C8AsSXVPyaDdUkwrFFo2gxShzJhmrjejDwtc,1632
+bullish/database/crud.py,sha256=2D0uDxJlDv1eJFRmgipiCQxCvlC5ILB2OR4OORlIJf4,5967
+bullish/database/schemas.py,sha256=bU-DW49NqpBp--1VN486LUdDmLeScrI8TF69afzjoTc,1507
+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=W4XJIs5wFtpX75OgoocVcuuA8Hdb_SNN58VW0LYI5oI,3808
+bullish/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bullish/interface/interface.py,sha256=T3MdJbX2ZF7hiMhnZ00ppXSXbDwyxaqD69a3M4bPswU,2806
+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=gJEB342nCTw2KD3YgDXpQhGGITcXd14GAMiqRRVbZ-A,2757
+bullish/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bullish/utils/checks.py,sha256=rUyFNkx9F5DuOSxjldXymNHwRxIddN7PYbqPICnz1uM,2101
+bullishpy-0.6.0.dist-info/METADATA,sha256=c6CwSmIdsRMmol4pyUig_AsSIJ3OfMO-lqJK-EYizT0,709
+bullishpy-0.6.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.6.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.6.0.dist-info/RECORD,,

bullishpy-0.4.0.dist-info/RECORD

@@ -1,34 +0,0 @@
-bullish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/analysis/analysis.py,sha256=JqaFzWfZ_AxF-7qa7BPmSWESnrcVdSEJKmUMRFGHzew,22168
-bullish/analysis/filter.py,sha256=rNqGGTIlaOq8Gw8mblX09bQOfR98by-NY8VY2TwP5oQ,3783
-bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/app/app.py,sha256=Ef9IfrOJelV5_oymPFtEhyW438LDw0mlK6EhZR9Yqq8,7656
-bullish/cli.py,sha256=mxobC_49Zpn_qgXThVGhtpexjKLJS2tZZbOlo_wMLfg,1893
-bullish/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/database/alembic/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
-bullish/database/alembic/alembic.ini,sha256=VuwqBJV5ObTyyRNrqv8Xr-TDIRfqPjP9R1mqewYM_xE,3695
-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=pbmfCcJBFwy0SH42lfYVXawDlM72bR0oUUO-0RgFmUM,8594
-bullish/database/alembic/versions/4b0a2f40b7d3_.py,sha256=iyLvZY1Wiy7NucqxPi0TCAYD0Q8zmuFweMRZsAYx6o4,1826
-bullish/database/alembic/versions/73564b60fe24_.py,sha256=zp9Hvr8e3FWc9SLNqiQpbA8lsd0cU8DKDScKQdQwHYA,1007
-bullish/database/crud.py,sha256=xUSSzhHGp-KKBlG4iCNVtAEs9U5BNv4VhGSrLIR4fmM,5611
-bullish/database/schemas.py,sha256=FjFhCa_VijAu2EEWsQ6rShSRzdH6FS9IM66ibh2kx3g,1104
-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=3Ifrnl4I7gq6DiMEWZs2P0589nEsaGKYNiq-Cxj35_g,2771
-bullish/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/interface/interface.py,sha256=1LiTFaMI1WXgUHLf73_KPiYKbv4RFcctyPxIcvzkkf0,3082
-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=vRjbCBcQciTC9283El_ji7BKxx40IbLcJkMbMVoE5wA,2533
-bullishpy-0.4.0.dist-info/METADATA,sha256=EVIlGsSkq8hAovop7OSQ_tNy2csZzF6QysWCrwXElNg,772
-bullishpy-0.4.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.4.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.4.0.dist-info/RECORD,,