refactored

Author: freelancing-solutions

src/models/models.py

@@ -15,13 +15,14 @@ class Sentiment(BaseModel):
     sentiment_title: None | str
     stock_codes: Optional[list[str]]
 
-    @classmethod
-    @validator('stock_codes')
-    def stock_codes(cls, value: list[str] | None):
-        if value is None:
-            return []
-        return value
-
+    @validator('stock_codes', pre=True)
+    def validate_stock_codes(cls, value):
+        if not value:
+            raise ValueError('invalid stock codes')
+        if isinstance(value, str):
+            return value.split(",")
+        if isinstance(value, list):
+            return value
 
 class Resolution(BaseModel):
     url: str

src/tasks/schedulers.py

@@ -76,7 +76,7 @@ def compose_default_tweets(api_name, tweet_lines, media_ids=None):
 
 class TaskScheduler:
     def __init__(self):
-        self._run_counter = 0
+        self._run_counter = 1
         self._tweepy_api = tweepy.API(auth=auth)
         self._article_queue = Queue()
         self._tweet_queue = Queue()
@@ -125,7 +125,7 @@ async def do_create_tweet(self, article: ArticleData) -> dict[str, str]:
         # Extract ticker symbols as hashtags
         if article.tickers:
             hashtags = ''.join(['#' + ticker for ticker in article.tickers])
-        elif article.sentiment.stock_codes:
+        elif article.sentiment and article.sentiment.stock_codes:
             _codes = article.sentiment.stock_codes
             hashtags = ''.join(['#' + ticker for ticker in _codes])
         else:
@@ -134,7 +134,7 @@ async def do_create_tweet(self, article: ArticleData) -> dict[str, str]:
         # Create the tweet text with hashtags
         _title: str = "Financial & Business News API"
         _crop_len: int = self._max_status_length - len(_title) - 6 - len(hashtags)
-        tweet_body = f"{article.sentiment.article_tldr[: _crop_len]}" if article.sentiment.article_tldr else article.title
+        tweet_body = f"{article.sentiment.article_tldr[: _crop_len]}" if article.sentiment and article.sentiment.article_tldr else article.title
 
         tweet_text = f"{_title}\n-{tweet_body}...\n{hashtags}"