bullishpy 0.38.0__py3-none-any.whl → 0.40.0__py3-none-any.whl

bullish/analysis/analysis.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import re
 import time
 from datetime import date, datetime
 from itertools import batched, chain
@@ -507,6 +508,11 @@ def json_loads(value: Any) -> Any:
     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
@@ -525,7 +531,7 @@ class SubjectAnalysis(BaseModel):
             return None
         return "".join(
             [
-                f"<p>{t.get('content')}</p>"
+                f"<p>{scrub(t.get('content').replace("\n",""))}</p>"  # type: ignore
                 for t in self.news_summary
                 if t.get("content")
             ]

bullish/analysis/filter.py

@@ -256,7 +256,7 @@ class FilterQueryStored(FilterQuery): ...
 
 
 class FilterUpdate(BaseModel):
-    window_size: SeriesLength = Field("5d")
+    window_size: SeriesLength = Field("1m")
     data_age_in_days: int = 1
     update_financials: bool = False
     update_analysis_only: bool = False

bullish/app/app.py

@@ -6,13 +6,13 @@ from typing import Optional, List, Type, Dict, Any
 
 import pandas as pd
 import streamlit as st
+
 import streamlit_pydantic as sp
 from bearish.models.base import Ticker  # type: ignore
 from bearish.models.price.prices import Prices  # type: ignore
 from bearish.models.query.query import AssetQuery, Symbols  # type: ignore
 from streamlit_file_browser import st_file_browser  # type: ignore
 
-from bullish.analysis.backtest import BacktestResults
 from bullish.analysis.industry_views import get_industry_comparison_data
 from bullish.analysis.predefined_filters import PredefinedFilters
 from bullish.database.crud import BullishDb
@@ -27,7 +27,7 @@ from bullish.analysis.filter import (
     GeneralFilter,
     TechnicalAnalysisFilters,
 )
-from bullish.jobs.tasks import update, news, analysis, backtest_signals
+from bullish.jobs.tasks import update, news, analysis
 from pydantic import BaseModel
 
 from bullish.utils.checks import (
@@ -39,7 +39,7 @@ from bullish.utils.checks import (
 CACHE_SHELVE = "user_cache"
 DB_KEY = "db_path"
 
-st.set_page_config(layout="wide")
+st.set_page_config(page_title="Bullish", page_icon="💰", layout="wide")
 logger = logging.getLogger(__name__)
 
 
@@ -100,7 +100,7 @@ def on_table_select() -> None:
     st.session_state.ticker_news = subject
 
 
-@st.dialog("🔑  Provide database file to continue")
+@st.dialog("🔑  Select database file to continue")
 def dialog_pick_database() -> None:
     current_working_directory = Path.cwd()
     event = st_file_browser(
@@ -216,17 +216,6 @@ def jobs() -> None:
 
             st.success("Data update job has been enqueued.")
             st.rerun()
-    with st.expander("Update analysis"):
-        if st.button("Update analysis"):
-            analysis(st.session_state.database_path, job_type="Update analysis")
-            st.success("Data update job has been enqueued.")
-            st.rerun()
-    with st.expander("Compute backtest signals"):
-        if st.button("Compute backtest signals"):
-            backtest_signals(
-                st.session_state.database_path, job_type="backtest signals"
-            )
-            st.rerun()
 
 
 @st.dialog("📥  Load", width="large")
@@ -431,7 +420,7 @@ def main() -> None:
     if st.session_state.database_path is None:
         dialog_pick_database()
     bearish_db_ = bearish_db(st.session_state.database_path)
-    charts_tab, jobs_tab, backtests = st.tabs(["Charts", "Jobs", "Backtests"])
+    charts_tab, jobs_tab = st.tabs(["Charts", "Jobs"])
     if "data" not in st.session_state:
         st.session_state.data = load_analysis_data(bearish_db_)
 
@@ -482,12 +471,6 @@ def main() -> None:
             use_container_width=True,
             hide_index=True,
         )
-    with backtests:
-        results = bearish_db_.read_many_backtest_results()
-        backtest_results = BacktestResults(results=results)
-        with st.container():
-            figure = backtest_results.figure()
-            st.plotly_chart(figure)
 
 
 if __name__ == "__main__":

bullish/database/crud.py

@@ -13,7 +13,7 @@ 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 Engine, create_engine, insert, delete, update, inspect
 from sqlalchemy import text
 from sqlmodel import Session, select
 
@@ -34,6 +34,7 @@ from bullish.database.scripts.upgrade import upgrade
 from bullish.exceptions import DatabaseFileNotFoundError
 from bullish.interface.interface import BullishDbBase
 from bullish.jobs.models import JobTracker, JobTrackerStatus
+from tickermood.database.scripts.upgrade import upgrade as tickermood_upgrade  # type: ignore
 
 if TYPE_CHECKING:
     from bullish.analysis.backtest import BacktestResult, BacktestResultQuery
@@ -65,6 +66,12 @@ class BullishDb(BearishDb, BullishDbBase):  # type: ignore
                 "Skipping upgrade. "
             )
         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."
+            )
+            tickermood_upgrade(database_url=database_url, no_migration=True)
         return engine
 
     def model_post_init(self, __context: Any) -> None:

bullish/jobs/tasks.py

@@ -75,6 +75,7 @@ def update(
             bearish.update_financials(symbols)
     bullish_db = BullishDb(database_path=database_path)
     run_analysis(bullish_db)
+    compute_industry_view(bullish_db)
 
 
 @huey.task(context=True)  # type: ignore

{bullishpy-0.38.0.dist-info → bullishpy-0.40.0.dist-info}/METADATA

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

{bullishpy-0.38.0.dist-info → bullishpy-0.40.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 bullish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bullish/analysis/analysis.py,sha256=O7bTqZfgRBj3jMXhcm8COy8M5u9rUQuKKMBsicr1N70,23600
+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
+bullish/analysis/filter.py,sha256=zM1zeNqHtaLmk6QEmYQMcg_nfFU9MaUOUtaDpspBuJs,9285
 bullish/analysis/functions.py,sha256=CuMgOjpQeg4KsDMUBdHRlxL1dRlos16KRyLhQe8PYUQ,14819
 bullish/analysis/indicators.py,sha256=XsMHc4-hEZwxFpI3JI-s4C2hcg0eCQLWcAQ8P46dtL8,26812
 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=37RPSxKkncP9yzrlJtTr9xkgf7PLdOByN-hyERF3Y5Q,17554
+bullish/app/app.py,sha256=yYBfP1_VumcGnd2DsCLoyoDBvkCOg3x-rxgl2ChbcQo,16757
 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
@@ -37,7 +37,7 @@ 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=8qc1WqL3AR9_7TkIDMB_icbXghl1DgJnxVxPnopHPho,13778
+bullish/database/crud.py,sha256=69dq-vvhPQI3aopGIwaBSowBW37EGUnN0f7olVbOmEM,14180
 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
@@ -51,10 +51,10 @@ bullish/interface/interface.py,sha256=R2qVEMyBl9mBlPUO40zXp4vhfLKH7pgl_u2BmAVlD4
 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/jobs/tasks.py,sha256=XzA4p9mtXoZLhh_3LLa2SFy83F3yT2DHjNXg2Vufx8I,3752
 bullish/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/utils/checks.py,sha256=Va10_xDVVnxYkOD2hafvyQ-TFV8FQpOkr4huJ7XgpDM,2188
-bullishpy-0.38.0.dist-info/METADATA,sha256=egDaIIcxG8oKLLvNhrZETkS7JkvPX6f5Q5m7_bf49ZI,830
-bullishpy-0.38.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.38.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.38.0.dist-info/RECORD,,
+bullishpy-0.40.0.dist-info/METADATA,sha256=BhShliBToQVQv0lK2a96dzV-ap98t6iFu8XLQ_ZM310,830
+bullishpy-0.40.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.40.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.40.0.dist-info/RECORD,,