bullishpy 0.37.0__py3-none-any.whl → 0.39.0__py3-none-any.whl

bullish/analysis/analysis.py

@@ -1,6 +1,8 @@
+import json
 import logging
+import re
 import time
-from datetime import date
+from datetime import date, datetime
 from itertools import batched, chain
 from pathlib import Path
 from typing import (
@@ -13,6 +15,7 @@ from typing import (
     get_args,
     TYPE_CHECKING,
     ClassVar,
+    Dict,
 )
 
 import pandas as pd
@@ -488,12 +491,54 @@ class AnalysisView(BaseModel):
             default=None,
         ),
     ]
+    consensus: Optional[str] = None
+    recommendation: Optional[str] = None
     yearly_growth: Optional[float] = None
     weekly_growth: Optional[float] = None
     monthly_growth: Optional[float] = None
 
 
-class Analysis(AnalysisEarningsDate, AnalysisView, BaseEquity, TechnicalAnalysis, FundamentalAnalysis):  # type: ignore
+def json_loads(value: Any) -> Any:
+    if isinstance(value, str):
+        try:
+            return json.loads(value)
+        except Exception as e:
+            logger.debug(e)
+            return None
+    return value
+
+
+def scrub(text: str) -> str:
+    strip_markup = re.compile(r"[\\`*_{}\[\]()>#+\-.!|~:$;\"\'<>&]").sub
+    return strip_markup("", text)
+
+
+class SubjectAnalysis(BaseModel):
+    high_price_target: Optional[float] = None
+    low_price_target: Optional[float] = None
+    consensus: Optional[str] = None
+    reason: Optional[str] = None
+    recommendation: Optional[str] = None
+    explanation: Optional[str] = None
+    news_date: Optional[datetime] = None
+    news_summary: Annotated[
+        Optional[List[Dict[str, Any]]], BeforeValidator(json_loads)
+    ] = None
+    summary: Annotated[Optional[Dict[str, Any]], BeforeValidator(json_loads)] = None
+
+    def to_news(self) -> Optional[str]:
+        if not self.news_summary:
+            return None
+        return "".join(
+            [
+                f"<p>{scrub(t.get('content').replace("\n",""))}</p>"  # type: ignore
+                for t in self.news_summary
+                if t.get("content")
+            ]
+        )
+
+
+class Analysis(SubjectAnalysis, AnalysisEarningsDate, AnalysisView, BaseEquity, TechnicalAnalysis, FundamentalAnalysis):  # type: ignore
 
     @classmethod
     def from_ticker(cls, bearish_db: "BullishDb", ticker: Ticker) -> "Analysis":
@@ -503,16 +548,20 @@ class Analysis(AnalysisEarningsDate, AnalysisView, BaseEquity, TechnicalAnalysis
                 excluded_sources=get_args(TickerOnlySources),
             )
         )
+
         equity = asset.get_one_equity()
         financials = Financials.from_ticker(bearish_db, ticker)
         fundamental_analysis = FundamentalAnalysis.from_financials(financials, ticker)
         prices = Prices.from_ticker(bearish_db, ticker)
         technical_analysis = TechnicalAnalysis.from_data(prices.to_dataframe(), ticker)
         next_earnings_date = bearish_db.read_next_earnings_date(ticker.symbol)
+        subject = bearish_db.read_subject(ticker.symbol)
+
         return cls.model_validate(
             equity.model_dump()
             | fundamental_analysis.model_dump()
             | technical_analysis.model_dump()
+            | (subject.model_dump() if subject else {})
             | {
                 "next_earnings_date": next_earnings_date,
                 "price_per_earning_ratio": (

bullish/app/app.py

@@ -91,11 +91,13 @@ def on_table_select() -> None:
     prices = db.read_series(query, months=24)
     data = Prices(prices=prices).to_dataframe()
     dates = db.read_dates(symbol)
+    subject = db.read_subject(symbol)
     industry_data = get_industry_comparison_data(db, data, "Mean", industry, country)
 
     fig = plot(data, symbol, dates=dates, industry_data=industry_data)
 
     st.session_state.ticker_figure = fig
+    st.session_state.ticker_news = subject
 
 
 @st.dialog("🔑  Provide database file to continue")
@@ -278,6 +280,7 @@ def filter() -> None:
                 st.session_state.database_path
             ).read_filter_query(query)
             st.session_state.ticker_figure = None
+            st.session_state.ticker_news = None
             st.session_state.filter_query = {}
             st.session_state.query = query
             st.rerun()
@@ -297,8 +300,87 @@ def dialog_plot_figure() -> None:
         unsafe_allow_html=True,
     )
     st.html("<span class='big-dialog'></span>")
+    if st.session_state.ticker_news:
+        st.markdown(
+            f"""
+            <div class="news-hover" >
+              📰 <span class="label">News</span>
+              <div class="tooltip">
+                <h2>Date: {st.session_state.ticker_news.news_date.date()}</h2>
+                <h2>Price targets</h2>
+                <p>High price target: {st.session_state.ticker_news.high_price_target}</p>
+                <p>Low price target: {st.session_state.ticker_news.low_price_target}</p>
+                <h2>Recommendation: {st.session_state.ticker_news.recommendation}</h2>
+                <h2>Consensus: {st.session_state.ticker_news.consensus}</h2>
+                <h2>Explanation & reasons</h2>
+                <p>{st.session_state.ticker_news.explanation}</p>
+                <p>{st.session_state.ticker_news.reason}</p>
+                <h2>News summaries</h2>
+                {st.session_state.ticker_news.to_news()}
+              </div>
+            </div>    
+            <style>
+              /* Hover target (fixed top-left) */
+              .news-hover {{
+                position: absolute;
+                left: 1rem;
+                display: inline-flex;
+                align-items: center;
+                gap: .4rem;
+                font-size: 1.7rem;       /* big label */
+                font-weight: 600;
+                color: #333;
+                cursor: pointer;
+                user-select: none;
+                z-index: 1100;
+              }}    
+              /* Tooltip bubble */
+              .news-hover .tooltip {{
+                position: absolute;
+                top: 110%;               /* below the label */
+                left: 0;
+                width: 840px;
+                max-height: 620px;
+                overflow-y: auto;
+                background: #222;
+                color: #fff;
+                padding: 1.2rem;
+                border-radius: 10px;
+                font-size: .95rem;
+                line-height: 1.45;
+                box-shadow: 0 8px 20px rgba(0,0,0,.4);
+                opacity: 0;
+                visibility: hidden;
+                transition: opacity .25s ease;
+              }}
+              .news-hover .tooltip hr {{
+                border: none;
+                border-top: 1px solid #444;
+                margin: 1rem 0;
+              }}    
+              /* Show tooltip on hover or keyboard focus */
+              .news-hover:hover .tooltip,
+              .news-hover:focus-within .tooltip {{
+                opacity: 1;
+                visibility: visible;
+              }}
+              /* Little arrow under the bubble */
+              .news-hover .tooltip::after {{
+                content: "";
+                position: absolute;
+                top: -10px;
+                left: 20px;
+                border: 10px solid transparent;
+                border-top-color: #222;
+              }}
+            </style>
+            """,
+            unsafe_allow_html=True,
+        )
+
     st.plotly_chart(st.session_state.ticker_figure, use_container_width=True)
     st.session_state.ticker_figure = None
+    st.session_state.ticker_news = None
 
 
 @st.dialog("⭐ Save filtered results")

bullish/database/alembic/versions/ae444f338124_.py

@@ -0,0 +1,96 @@
+"""
+
+Revision ID: ae444f338124
+Revises: d0e58e050845
+Create Date: 2025-08-07 11:07:48.169941
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import sqlite
+import sqlmodel
+
+# revision identifiers, used by Alembic.
+revision: str = "ae444f338124"
+down_revision: Union[str, None] = "d0e58e050845"
+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("consensus", sqlmodel.sql.sqltypes.AutoString(), nullable=True)
+        )
+        batch_op.add_column(
+            sa.Column(
+                "recommendation", sqlmodel.sql.sqltypes.AutoString(), nullable=True
+            )
+        )
+        batch_op.add_column(sa.Column("high_price_target", sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column("low_price_target", sa.Float(), nullable=True))
+        batch_op.add_column(
+            sa.Column("reason", sqlmodel.sql.sqltypes.AutoString(), nullable=True)
+        )
+        batch_op.add_column(
+            sa.Column("explanation", sqlmodel.sql.sqltypes.AutoString(), nullable=True)
+        )
+        batch_op.add_column(sa.Column("news_date", sa.DateTime(), nullable=True))
+        batch_op.add_column(sa.Column("news_summary", sa.JSON(), nullable=True))
+        batch_op.alter_column(
+            "summary",
+            existing_type=sa.VARCHAR(),
+            type_=sa.JSON(),
+            existing_nullable=True,
+        )
+        batch_op.create_index("ix_analysis_consensus", ["consensus"], unique=False)
+        batch_op.create_index("ix_analysis_explanation", ["explanation"], unique=False)
+        batch_op.create_index(
+            "ix_analysis_high_price_target", ["high_price_target"], unique=False
+        )
+        batch_op.create_index(
+            "ix_analysis_low_price_target", ["low_price_target"], unique=False
+        )
+        batch_op.create_index("ix_analysis_news_date", ["news_date"], unique=False)
+        batch_op.create_index(
+            "ix_analysis_news_summary", ["news_summary"], unique=False
+        )
+        batch_op.create_index("ix_analysis_reason", ["reason"], unique=False)
+        batch_op.create_index(
+            "ix_analysis_recommendation", ["recommendation"], 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_recommendation")
+        batch_op.drop_index("ix_analysis_reason")
+        batch_op.drop_index("ix_analysis_news_summary")
+        batch_op.drop_index("ix_analysis_news_date")
+        batch_op.drop_index("ix_analysis_low_price_target")
+        batch_op.drop_index("ix_analysis_high_price_target")
+        batch_op.drop_index("ix_analysis_explanation")
+        batch_op.drop_index("ix_analysis_consensus")
+        batch_op.alter_column(
+            "summary",
+            existing_type=sa.JSON(),
+            type_=sa.VARCHAR(),
+            existing_nullable=True,
+        )
+        batch_op.drop_column("news_summary")
+        batch_op.drop_column("news_date")
+        batch_op.drop_column("explanation")
+        batch_op.drop_column("reason")
+        batch_op.drop_column("low_price_target")
+        batch_op.drop_column("high_price_target")
+        batch_op.drop_column("recommendation")
+        batch_op.drop_column("consensus")
+
+    # ### end Alembic commands ###

bullish/database/crud.py

@@ -7,21 +7,21 @@ 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, EquityORM, PriceORM  # type: ignore
-from bearish.types import Sources  # type: ignore
+from bearish.models.base import Ticker  # type: ignore
 from bearish.models.price.price import Price  # type: ignore
 from bearish.models.price.prices import Prices  # type: ignore
+from bearish.types import Sources  # type: ignore
 from pydantic import ConfigDict
 from sqlalchemy import Engine, create_engine, insert, delete, update
+from sqlalchemy import text
 from sqlmodel import Session, select
 
-from bullish.analysis.analysis import Analysis
-
+from bullish.analysis.analysis import Analysis, SubjectAnalysis
 from bullish.analysis.constants import Industry, IndustryGroup, Sector, Country
+from bullish.analysis.filter import FilteredResults
 from bullish.analysis.indicators import SignalSeries
 from bullish.analysis.industry_views import Type, IndustryView
-
 from bullish.database.schemas import (
     AnalysisORM,
     JobTrackerORM,
@@ -32,7 +32,6 @@ from bullish.database.schemas import (
 )
 from bullish.database.scripts.upgrade import upgrade
 from bullish.exceptions import DatabaseFileNotFoundError
-from bullish.analysis.filter import FilteredResults
 from bullish.interface.interface import BullishDbBase
 from bullish.jobs.models import JobTracker, JobTrackerStatus
 
@@ -341,3 +340,22 @@ class BullishDb(BearishDb, BullishDbBase):  # type: ignore
             if result:
                 return result.date()  # type: ignore
             return None
+
+    def read_subject(self, symbol: str) -> Optional[SubjectAnalysis]:
+        sql = text(
+            """
+            SELECT *
+            FROM   subject
+            WHERE  symbol = :symbol
+            ORDER  BY date DESC
+            LIMIT  1
+        """
+        )
+
+        with Session(self._engine) as session:
+            row = session.execute(sql, {"symbol": symbol}).mappings().one_or_none()
+            if row:
+                row_dict = dict(row)
+                row_dict = row_dict | {"news_date": row_dict["date"]}
+                return SubjectAnalysis.model_validate(row_dict)
+            return None

bullish/database/schemas.py

@@ -1,4 +1,4 @@
-from typing import Dict, Any
+from typing import Dict, Any, List, Optional
 
 from sqlmodel import Field, SQLModel
 from sqlalchemy import Column, JSON
@@ -25,6 +25,10 @@ dynamic_indexes = tuple(
 class AnalysisORM(BaseTable, Analysis, table=True):
     __tablename__ = "analysis"
     __table_args__ = {"extend_existing": True}  # noqa:RUF012
+    news_summary: Optional[List[Dict[str, Any]]] = Field(
+        default=None, sa_column=Column(JSON)
+    )
+    summary: Optional[Dict[str, Any]] = Field(default=None, sa_column=Column(JSON))
 
 
 AnalysisORM.__table_args__ = tuple(  # type: ignore # noqa: RUF005

bullish/interface/interface.py

@@ -9,7 +9,7 @@ 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.analysis import Analysis, AnalysisView, SubjectAnalysis
 from bullish.analysis.backtest import BacktestResult, BacktestResultQuery
 from bullish.analysis.constants import Industry, Sector, IndustryGroup, Country
 from bullish.analysis.filter import FilterQuery, FilteredResults
@@ -152,3 +152,6 @@ class BullishDbBase(BearishDbBase):  # type: ignore
 
     @abc.abstractmethod
     def read_next_earnings_date(self, symbol: str) -> Optional[date]: ...
+
+    @abc.abstractmethod
+    def read_subject(self, symbol: str) -> Optional[SubjectAnalysis]: ...

{bullishpy-0.37.0.dist-info → bullishpy-0.39.0.dist-info}/METADATA

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

{bullishpy-0.37.0.dist-info → bullishpy-0.39.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 bullish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/analysis/analysis.py,sha256=nCb___Tb2aOFIu1wWtPwS1VVZfXOSCp5zUWaIOCdvl4,22345
+bullish/analysis/analysis.py,sha256=8FMEaDlgFERrgRPYq5zqIRgoeBvJVh3C91Zxl8eD7HU,23788
 bullish/analysis/backtest.py,sha256=x91ek5kOzJHvYq0TmJh1Q8wBDDduIaieE0zDaoZFXew,14325
 bullish/analysis/constants.py,sha256=X3oCyYNA6B-jsZSYJLeGQ94S453Z7jIVNPmv3lMPp8Q,9922
 bullish/analysis/filter.py,sha256=mGWizTda_QHEmusDmB_xvOhjlsOKcbILfKLjJLAnCnE,9285
@@ -9,7 +9,7 @@ bullish/analysis/indicators.py,sha256=XsMHc4-hEZwxFpI3JI-s4C2hcg0eCQLWcAQ8P46dtL
 bullish/analysis/industry_views.py,sha256=-B4CCAYz2arGQtWTXLLMpox0loO_MGdVQd2ycCRMOQQ,6799
 bullish/analysis/predefined_filters.py,sha256=kx3vhtvGu_0ySWsWPzkqXONmB7COWgMowv3TEVrk1Uc,8198
 bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/app/app.py,sha256=9zxskm5gHt2uDGn59vL4ltI2zgrIBGhavp7jogt1us0,14411
+bullish/app/app.py,sha256=37RPSxKkncP9yzrlJtTr9xkgf7PLdOByN-hyERF3Y5Q,17554
 bullish/cli.py,sha256=azhVLwOUrmwrtFAJSgva8-UFgNgkepXhjp7DxQNc-yw,2427
 bullish/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/database/alembic/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
@@ -28,6 +28,7 @@ bullish/database/alembic/versions/5b10ee7604c1_.py,sha256=YlqaagPasR3RKASv7acME1
 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/ae444f338124_.py,sha256=u8RphcniLCQce-HvN666QgCJpLsv6A91-a4R-Nif4bU,3672
 bullish/database/alembic/versions/b76079e9845f_.py,sha256=W8eeTABjI9tT1dp3hlK7g7tiKqDhmA8AoUX9Sw-ykLI,1165
 bullish/database/alembic/versions/bf6b86dd5463_.py,sha256=fKB8knCprGmiL6AEyFdhybVmB7QX_W4MPFF9sPzUrSM,1094
 bullish/database/alembic/versions/d0e58e050845_.py,sha256=x_LS3J27FNyy_WD99uvZzNehly-jpgn9abOYN-VjjZc,1164
@@ -36,8 +37,8 @@ bullish/database/alembic/versions/ec25c8fa449f_.py,sha256=8Yts74KEjK4jg20zIo90_0
 bullish/database/alembic/versions/ee5baabb35f8_.py,sha256=nBMEY-_C8AsSXVPyaDdUkwrFFo2gxShzJhmrjejDwtc,1632
 bullish/database/alembic/versions/fc191121f522_.py,sha256=0sstF6TpAJ09-Mt-Vek9SdSWksvi4C58a5D92rBtuY8,1894
 bullish/database/alembic/versions/ff0cc4ba40ec_.py,sha256=74lxga54ig_LoNZYK9toJL9iRwGbNRezh1zvO1YI40U,2719
-bullish/database/crud.py,sha256=TvA3TGjr6RNYdNP0u-7RmVU1i9mqNbsv8lOcRbaXbn8,13122
-bullish/database/schemas.py,sha256=3uRcNKuobqWC3mCfInzo-4KhrZp3DH6yx_0TEbLoHME,3428
+bullish/database/crud.py,sha256=8qc1WqL3AR9_7TkIDMB_icbXghl1DgJnxVxPnopHPho,13778
+bullish/database/schemas.py,sha256=fQ4RZeOjlFoIor7rjwpisbHRNDd7-zbyDdzNKaiNGQQ,3637
 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
@@ -46,14 +47,14 @@ bullish/exceptions.py,sha256=4z_i-dD-CDz1bkGmZH9DOf1L_awlCPCgdUDPF7dhWAI,106
 bullish/figures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/figures/figures.py,sha256=EpJQOiSqSp7cHvZoGlZrF6UVpyv-fFyDApAfskqdUkU,4562
 bullish/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/interface/interface.py,sha256=dFQW0tMYbFL-gWrlWTWP1qKKSzqlrhz6-T_lLqhILyw,5134
+bullish/interface/interface.py,sha256=R2qVEMyBl9mBlPUO40zXp4vhfLKH7pgl_u2BmAVlD4w,5250
 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=jqiTTe9PV4x9ebV5QPRBiGyANhOoAymigYqs44WWH9k,3714
 bullish/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/utils/checks.py,sha256=Va10_xDVVnxYkOD2hafvyQ-TFV8FQpOkr4huJ7XgpDM,2188
-bullishpy-0.37.0.dist-info/METADATA,sha256=dalQXAyD3JnwPRmQylOJSC1o9ao5B4yJKnfguRjYAE0,830
-bullishpy-0.37.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.37.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.37.0.dist-info/RECORD,,
+bullishpy-0.39.0.dist-info/METADATA,sha256=IMv3i6VaCnGsaBH4F3SuYXNGQzkFclHglk8AklF4ngw,830
+bullishpy-0.39.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.39.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.39.0.dist-info/RECORD,,