bullishpy 0.44.0__tar.gz → 0.46.0__tar.gz

{bullishpy-0.44.0 → bullishpy-0.46.0}/PKG-INFO

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

{bullishpy-0.44.0 → bullishpy-0.46.0}/bullish/analysis/predefined_filters.py

@@ -1,5 +1,8 @@
 import datetime
+import json
+import os
 from datetime import timedelta
+from pathlib import Path
 from typing import Dict, Any, Optional, List, Union, get_args
 
 from bullish.analysis.analysis import AnalysisView
@@ -141,6 +144,20 @@ class NamedFilterQuery(FilterQuery):
         ]
 
 
+def load_custom_filters() -> List[NamedFilterQuery]:
+    if "CUSTOM_FILTERS_PATH" in os.environ:
+        custom_filters_path = os.environ["CUSTOM_FILTERS_PATH"]
+        return read_custom_filters(Path(custom_filters_path))
+    return []
+
+
+def read_custom_filters(custom_filters_path: Path) -> List[NamedFilterQuery]:
+    if custom_filters_path.exists():
+        filters = json.loads(custom_filters_path.read_text())
+        return [NamedFilterQuery.model_validate(filter) for filter in filters]
+    return []
+
+
 SMALL_CAP = NamedFilterQuery(
     name="Small Cap",
     last_price=[1, 20],
@@ -193,11 +210,6 @@ NEXT_EARNINGS_DATE = NamedFilterQuery(
         datetime.date.today() + timedelta(days=20),
     ],
 ).variants()
-SOLD_POSITIONS = NamedFilterQuery(
-    name="Sold Positions",
-    order_by_desc="market_capitalization",
-    symbol=["R3NK.DE", "VKTX", "RHM.DE", "IQV", "DAL"],
-).variants()
 
 
 def predefined_filters() -> list[NamedFilterQuery]:
@@ -207,7 +219,7 @@ def predefined_filters() -> list[NamedFilterQuery]:
         *TOP_PERFORMERS_YEARLY,
         *LARGE_CAPS,
         *NEXT_EARNINGS_DATE,
-        *SOLD_POSITIONS,
+        *load_custom_filters(),
     ]
 
 

{bullishpy-0.44.0 → bullishpy-0.46.0}/bullish/cli.py

@@ -19,17 +19,24 @@ STREAMLIT_FILE = Path(__file__).parent.joinpath("app", "app.py")
 
 
 @app.command()
-def serve(
+def serve(  # noqa: C901
     host: str = typer.Option("0.0.0.0", help="Streamlit host"),  # noqa: S104
     port: int = typer.Option(8501, help="Streamlit port"),
     env_vars: Path = typer.Option(  # noqa: B008
         None, help="Environment variables file"
     ),
+    custom_filters: Path = typer.Option(  # noqa: B008
+        None, help="Environment variables file"
+    ),
 ) -> None:
     if env_vars:
         env_vars_path = Path(env_vars)
         if env_vars_path.exists():
             load_dotenv(dotenv_path=env_vars_path)
+    if custom_filters:
+        custom_filters_path = Path(custom_filters)
+        if custom_filters_path.exists():
+            os.environ["CUSTOM_FILTERS_PATH"] = str(custom_filters_path)
     children: list[subprocess.Popen] = []  # type: ignore
 
     def _shutdown(*_: Any) -> None:

{bullishpy-0.44.0 → bullishpy-0.46.0}/bullish/jobs/tasks.py

@@ -1,5 +1,6 @@
 import functools
 import logging
+import random
 from typing import Optional, Any, Callable, List
 
 from bearish.main import Bearish  # type: ignore
@@ -14,7 +15,7 @@ from .models import JobTrackerStatus, JobTracker, JobType
 from ..analysis.analysis import run_analysis, run_signal_series_analysis
 from ..analysis.backtest import run_many_tests, BackTestConfig
 from ..analysis.industry_views import compute_industry_view
-from ..analysis.predefined_filters import predefined_filters, NEXT_EARNINGS_DATE
+from ..analysis.predefined_filters import predefined_filters
 from ..database.crud import BullishDb
 from bullish.analysis.filter import FilterUpdate
 from ..utils.checks import DataBaseSingleTon
@@ -91,9 +92,10 @@ def cron_update(
     task: Optional[Task] = None,
 ) -> None:
     database = DataBaseSingleTon()
-    job_tracker(_base_update)(
-        database.path, "Update data", [], FilterUpdate(), task=task
-    )
+    if database.valid():
+        job_tracker(_base_update)(
+            database.path, "Update data", [], FilterUpdate(), task=task
+        )
 
 
 @huey.task(context=True)  # type: ignore
@@ -155,14 +157,16 @@ def news(
 def cron_news(
     task: Optional[Task] = None,
 ) -> None:
-    earnings_date = NEXT_EARNINGS_DATE[1]
+    filter = random.choice(predefined_filters())  # noqa: S311
     database = DataBaseSingleTon()
-    bullish_db = BullishDb(database_path=database.path)
-    data = bullish_db.read_filter_query(earnings_date)
-    job_tracker(base_news)(
-        database_path=database.path,
-        job_type="Fetching news",
-        symbols=data["symbol"].unique().tolist(),
-        headless=False,
-        task=task,
-    )
+    if database.valid():
+        bullish_db = BullishDb(database_path=database.path)
+        data = bullish_db.read_filter_query(filter)
+        if not data.empty and "symbol" in data.columns:
+            job_tracker(base_news)(
+                database_path=database.path,
+                job_type="Fetching news",
+                symbols=data["symbol"].unique().tolist(),
+                headless=False,
+                task=task,
+            )

{bullishpy-0.44.0 → bullishpy-0.46.0}/bullish/utils/checks.py

@@ -77,3 +77,6 @@ class DataBaseSingleTon:
     def __init__(self, path: Optional[Path] = None) -> None:
         if not hasattr(self, "path"):  # Only set once
             self.path = path
+
+    def valid(self) -> bool:
+        return hasattr(self, "path")

{bullishpy-0.44.0 → bullishpy-0.46.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bullishpy"
-version = "0.44.0"
+version = "0.46.0"
 description = ""
 authors = ["aan <andoludovic.andriamamonjy@gmail.com>"]
 readme = "README.md"