fix: fixing sec.

Author: andoludo

bullish/analysis/analysis.py

@@ -666,6 +666,7 @@ def run_signal_series_analysis(bullish_db: "BullishDb") -> None:
 
 
 def run_analysis(bullish_db: "BullishDb") -> None:
+    bullish_db.copy_sec_to_analysis()
     tickers = list(set(bullish_db._read_tracker(TrackerQuery(), PriceTracker)))
     parallel = Parallel(n_jobs=-1)
 

bullish/database/alembic/versions/55553b8098f9_.py

@@ -0,0 +1,46 @@
+"""
+
+Revision ID: 55553b8098f9
+Revises: c06dc04e782b
+Create Date: 2025-11-19 20:51:32.350934
+
+"""
+
+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 = "55553b8098f9"
+down_revision: Union[str, None] = "c06dc04e782b"
+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("occurrences", sa.Integer(), nullable=True))
+        batch_op.add_column(sa.Column("total_value", sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column("total_increase", sa.Float(), nullable=True))
+        batch_op.create_index("ix_analysis_occurrences", ["occurrences"], unique=False)
+        batch_op.create_index(
+            "ix_analysis_total_increase", ["total_increase"], unique=False
+        )
+        batch_op.create_index("ix_analysis_total_value", ["total_value"], 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_total_value")
+        batch_op.drop_index("ix_analysis_total_increase")
+        batch_op.drop_index("ix_analysis_occurrences")
+        batch_op.drop_column("total_increase")
+        batch_op.drop_column("total_value")
+        batch_op.drop_column("occurrences")

bullish/database/crud.py

@@ -62,13 +62,21 @@ def _engine(self) -> Engine:
         if not self.valid():
             raise DatabaseFileNotFoundError("Database file not found.")
         database_url = f"sqlite:///{Path(self.database_path)}"
+        try:
+            upgrade(self.database_path)
+        except Exception as e:
+            print(
+                f"Failed to upgrade the database at {self.database_path}. "
+                f"Reason: {e}"
+                "Skipping upgrade. "
+            )
+            logger.error(
+                f"Failed to upgrade the database at {self.database_path}. "
+                f"Reason: {e}"
+                "Skipping upgrade. "
+            )
         engine = create_engine(database_url)
         inspector = inspect(engine)
-        if "analysis" not in inspector.get_table_names():
-            upgrade(self.database_path)
-
-            engine = create_engine(database_url)
-            inspector = inspect(engine)
         if "subject" not in inspector.get_table_names():
             logger.info(
                 "Running tickermood upgrade to create the subject table in the database."
@@ -116,20 +124,33 @@ def read_symbols(self) -> List[str]:
         data = pd.read_sql_query(query, self._engine)
         return data["symbol"].tolist()
 
+    def copy_sec_to_analysis(self) -> None:
+        with Session(self._engine) as session:
+            query = text(
+                """UPDATE analysis
+    SET 
+        occurrences = (SELECT secshareincrease.occurrences 
+                       FROM secshareincrease WHERE secshareincrease.ticker = analysis.symbol),
+        total_value = (SELECT secshareincrease.total_value 
+                       FROM secshareincrease WHERE secshareincrease.ticker = analysis.symbol),
+        total_increase = (SELECT secshareincrease.total_increase 
+                          FROM secshareincrease WHERE secshareincrease.ticker = analysis.symbol)
+    WHERE EXISTS (SELECT 1 FROM secshareincrease WHERE secshareincrease.ticker = analysis.symbol);"""
+            )
+            session.exec(query)  # type: ignore
+            session.commit()
+
     def _read_analysis_data(
         self, columns: List[str], symbols: Optional[List[str]] = None
     ) -> pd.DataFrame:
-        columns__ = columns.copy()
 
-        columns_ = ",".join(columns__)
+        columns_ = ",".join(columns)
 
         if symbols:
             symbols_str = ",".join([f"'{s}'" for s in symbols])
-            query = f"""SELECT {columns_} FROM analysis 
-            LEFT JOIN secshareincrease ON secshareincrease.ticker=analysis.symbol WHERE symbol IN ({symbols_str})"""  # noqa: S608
+            query = f"""SELECT {columns_} FROM analysis WHERE symbol IN ({symbols_str})"""  # noqa: S608
         else:
-            query = f"""SELECT {columns_} FROM analysis 
-            LEFT JOIN secshareincrease ON secshareincrease.ticker=analysis.symbol"""  # noqa: S608
+            query = f"""SELECT {columns_} FROM analysis"""  # noqa: S608
         return pd.read_sql_query(query, self._engine)
 
     def _read_filter_query(self, query: str) -> pd.DataFrame:

bullish/interface/interface.py

@@ -35,26 +35,17 @@ def read_filter_query(self, query: FilterQuery) -> pd.DataFrame:
 
         query_ = query.to_query()
         columns = list(AnalysisView.model_fields)
-        columns_copy = columns.copy()
-        if "name" in columns_copy:
-            columns_copy.remove("name")
-            columns_copy.append("analysis.name AS name")
-        fields = ",".join(columns_copy)
+        fields = ",".join(columns)
         query_str: str = f""" 
-        SELECT {fields} FROM analysis 
-        LEFT JOIN secshareincrease ON secshareincrease.ticker=analysis.symbol  WHERE {query_}
+        SELECT {fields} FROM analysis WHERE {query_}
         """  # noqa: S608
         return self._read_filter_query(query_str)
 
     def read_analysis_data(
         self, columns: Optional[List[str]] = None, symbols: Optional[List[str]] = None
     ) -> pd.DataFrame:
         columns = columns or list(AnalysisView.model_fields)
-        columns_copy = columns.copy()
-        if "name" in columns_copy:
-            columns_copy.remove("name")
-            columns_copy.append("analysis.name AS name")
-        data = self._read_analysis_data(columns_copy, symbols=symbols)
+        data = self._read_analysis_data(columns, symbols=symbols)
         if set(data.columns) != set(columns):
             raise ValueError(
                 f"Expected columns {columns}, but got {data.columns.tolist()}"

poetry.lock

@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{ include = "bullish" }]
 [tool.poetry.dependencies]
 python = ">=3.12,<3.13"
-bearishpy = ">=0.45.0, <1.0.0"
+bearishpy = ">=0.49.0, <1.0.0"
 tickermood = "^0.29.0"
 streamlit = "^1.45.1"
 streamlit-pydantic = "^v0.6.1-rc.3"

pyproject.toml

@@ -12,8 +12,6 @@
 
 
 DATABASE_PATH = Path(__file__).parent / "data" / "bear.db"
-DATABASE_PATH_VIEW = Path(__file__).parent / "data" / "filter_bear.db"
-DATABASE_PATH_WITH_SERIES = Path(__file__).parent / "data" / "filter_bear_series.db"
 
 
 def delete_tables(database_path: Path):
@@ -33,38 +31,39 @@ def delete_tables(database_path: Path):
         conn.commit()
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def bullish_db() -> BullishDb:
     delete_tables(DATABASE_PATH)
 
     return BullishDb(database_path=DATABASE_PATH)
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def bullish_db_with_analysis(bullish_db: BullishDb) -> BullishDb:
     run_analysis(bullish_db)
     return bullish_db
 
 
-@pytest.fixture
-def bullish_view() -> BullishDb:
-    return BullishDb(database_path=DATABASE_PATH_VIEW)
+@pytest.fixture(scope="session")
+def bullish_view(bullish_db: BullishDb) -> BullishDb:
+    run_analysis(bullish_db)
+    return bullish_db
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def data_aapl(bullish_db: BullishDb) -> pd.DataFrame:
     ticker = Ticker(symbol="AAPL")
     prices = Prices.from_ticker(bullish_db, ticker)
     return prices.to_dataframe()
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def bullish_db_with_signal_series(bullish_view: BullishDb) -> BullishDb:
 
     bullish_db = BullishDb(database_path=DATABASE_PATH_WITH_SERIES)
     return bullish_db
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def custom_filter_path() -> Path:
     return Path(__file__).parent / "data" / "custom_filter.json"

tests/conftest.py

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dec564bf631cdd7fcb9752baf4ba1b354bb93041a5c61aff9ccf8cb72387d387
-size 163594240
+oid sha256:a1d78672d9ba33ca4a140730f5089fcdb25f36e84e48a232e3669c12ac0e8870
+size 186888192

tests/data/bear.db

@@ -1,14 +1,14 @@
 [
     {
         "symbol": [
-            "BPOST.BR",
-            "LOTB.BR"
+            "AAPL",
+            "NVDA"
         ],
         "name": "Sold Positions"
     },
     {
         "symbol": [
-            "KBC.BR"
+            "AMZN"
         ],
         "name": "Selection"
     }