bullishpy 0.45.0__py3-none-any.whl → 0.47.0__py3-none-any.whl

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(),
     ]
 
 

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:

bullish/jobs/tasks.py

@@ -1,8 +1,8 @@
 import functools
 import logging
-import random
 from typing import Optional, Any, Callable, List
 
+import pandas as pd
 from bearish.main import Bearish  # type: ignore
 from tickermood.main import get_news  # type: ignore
 from tickermood.types import DatabaseConfig  # type: ignore
@@ -15,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
+from ..analysis.predefined_filters import predefined_filters, load_custom_filters
 from ..database.crud import BullishDb
 from bullish.analysis.filter import FilterUpdate
 from ..utils.checks import DataBaseSingleTon
@@ -157,11 +157,11 @@ def news(
 def cron_news(
     task: Optional[Task] = None,
 ) -> None:
-    filter = random.choice(predefined_filters())  # noqa: S311
+    filters = load_custom_filters()
     database = DataBaseSingleTon()
-    if database.valid():
+    if database.valid() and filters:
         bullish_db = BullishDb(database_path=database.path)
-        data = bullish_db.read_filter_query(filter)
+        data = pd.concat([bullish_db.read_filter_query(f) for f in filters])
         if not data.empty and "symbol" in data.columns:
             job_tracker(base_news)(
                 database_path=database.path,

{bullishpy-0.45.0.dist-info → bullishpy-0.47.0.dist-info}/METADATA

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

{bullishpy-0.45.0.dist-info → bullishpy-0.47.0.dist-info}/RECORD

@@ -7,10 +7,10 @@ bullish/analysis/filter.py,sha256=LKmsO3ei7Eo_SJsEVbZqETyIdOpW55xVheO6_GNoA0s,92
 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/analysis/predefined_filters.py,sha256=0HHEvy8fpLq2Ub3Hh23J7_V35bIPdsJNMu2jNo998Oc,8589
 bullish/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/app/app.py,sha256=WUyM51r57BEmoXkn1Y4Sy1nGqYZ4L3kJkZkhuNK_h6Y,16839
-bullish/cli.py,sha256=azhVLwOUrmwrtFAJSgva8-UFgNgkepXhjp7DxQNc-yw,2427
+bullish/cli.py,sha256=yYqiEQAvOIQ-pTn77RPuE449gwaEGBeQwNHHAJ5yQDM,2739
 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
@@ -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=XO8Pa6MoYeJQ4uvD3OYStEOh7l5zTK7hUFKvZksvpOM,5346
+bullish/jobs/tasks.py,sha256=HN3AD-WW84XSa8MHyYO3yD_YkWjbRb62Y78EArhSVIU,5383
 bullish/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bullish/utils/checks.py,sha256=jolHOnxkc5GvVuvVzlwHhM6EO-Y-eC0q3rXlHE-UG9Y,2633
-bullishpy-0.45.0.dist-info/METADATA,sha256=6snNwR53hVtt4_8QYdRGaTSWwjk63Rnr5rwiJJhoBf4,830
-bullishpy-0.45.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-bullishpy-0.45.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
-bullishpy-0.45.0.dist-info/RECORD,,
+bullishpy-0.47.0.dist-info/METADATA,sha256=waetdHaboJqQAU4qbs2xp3RGhdMU24StqT4tKIwGt1g,830
+bullishpy-0.47.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+bullishpy-0.47.0.dist-info/entry_points.txt,sha256=eaPpmL6vmSBFo0FBtwibCXGqAW4LFJ83whJzT1VjD-0,43
+bullishpy-0.47.0.dist-info/RECORD,,