diff --git a/app/database_query_facade.py b/app/database_query_facade.py index b6f2b8ec8..2a7a5b2fb 100644 --- a/app/database_query_facade.py +++ b/app/database_query_facade.py @@ -395,7 +395,7 @@ async def move_alert_to_articles(self, url: str) -> None: uri=alert['url'], title=alert['title'], summary=alert['summary'], - source=alert['source'], + news_source=alert['source'], topic=alert['topic'], analyzed=False ) @@ -735,15 +735,15 @@ def get_min_relevance_threshold(self): def get_auto_ingest_settings(self): statement = select( - keyword_article_matches.c.auto_ingest_enabled, - keyword_article_matches.c.min_relevance_threshold, - keyword_article_matches.c.quality_control_enabled, - keyword_article_matches.c.auto_save_approved_only, - keyword_article_matches.c.default_llm_model, - keyword_article_matches.c.llm_temperature, - keyword_article_matches.c.llm_max_tokens + keyword_monitor_settings.c.auto_ingest_enabled, + keyword_monitor_settings.c.min_relevance_threshold, + keyword_monitor_settings.c.quality_control_enabled, + keyword_monitor_settings.c.auto_save_approved_only, + keyword_monitor_settings.c.default_llm_model, + keyword_monitor_settings.c.llm_temperature, + keyword_monitor_settings.c.llm_max_tokens ).where( - keyword_article_matches.c.id == 1 + keyword_monitor_settings.c.id == 1 ) return self._execute_with_rollback(statement).fetchone() @@ -814,8 +814,8 @@ def get_topic_unprocessed_and_unread_articles_using_new_table_structure(self, to keyword_groups.c.topic == topic_id, keyword_article_matches.c.is_read == 0, or_( - keyword_article_matches.c.auto_ingested == 0, - keyword_article_matches.c.auto_ingested == None + articles.c.auto_ingested.is_(False), + articles.c.auto_ingested == None ) ) ).distinct().order_by( @@ -840,8 +840,8 @@ def get_topic_unprocessed_and_unread_articles_using_old_table_structure(self, to keyword_groups.c.topic == topic_id, keyword_alerts.c.is_read == 0, or_( - keyword_alerts.c.auto_ingested == 0, - keyword_alerts.c.auto_ingested == None + articles.c.auto_ingested.is_(False), + articles.c.auto_ingested == None ) ) ).distinct().order_by( @@ -1600,7 +1600,7 @@ def get_feed_item_count(self): def get_article_id_by_url(self, url): statement = select( - articles.c.id + articles.c.uri ).where( articles.c.uri == url ) @@ -1610,7 +1610,7 @@ def get_article_id_by_url(self, url): def check_if_article_exists_with_enrichment(self, url): statement = select( - articles.c.id + articles.c.uri ).where( articles.c.uri == url, articles.c.analyzed == True @@ -1655,8 +1655,7 @@ def update_feed_tags(self, params): ).where( feed_items.c.id == params[1] ).values( - tags = params[0], - updated_at = func.now() + tags = params[0] ) self._execute_with_rollback(statement) self.connection.commit() @@ -1737,8 +1736,8 @@ def get_unread_alerts(self): keyword_alerts.c.matched_keyword, articles.c.uri, articles.c.title, - articles.c.url, - articles.c.source, + articles.c.uri.label('url'), + articles.c.news_source.label('source'), articles.c.publication_date, articles.c.summary, articles.c.category, @@ -2435,9 +2434,7 @@ def create_podcast(self, params): id=params[0], title=params[1], created_at=func.current_timestamp(), - status= 'processing', - config=params[2], - article_uris=params[3] + status= 'processing' ) self._execute_with_rollback(statement) self.connection.commit() @@ -2734,7 +2731,7 @@ def get_all_groups_with_alerts_and_status_old_table_structure(self): cursor.execute(""" WITH alert_counts AS (SELECT kg.id as group_id, COUNT(DISTINCT CASE - WHEN ka.read = 0 AND a.uri IS NOT NULL + WHEN ka.is_read = 0 AND a.uri IS NOT NULL THEN ka.id END) as unread_count, COUNT(DISTINCT CASE WHEN a.uri IS NOT NULL THEN ka.id END) as total_count FROM keyword_groups kg @@ -4236,7 +4233,7 @@ def insert_media_bias(self, params): return result.inserted_primary_key[0] def update_media_bias_source(self, params): - statement = update(mediabias).where(mediabias.c.id == params[9]).values( + statement = update(mediabias).where(mediabias.c.source == params[0]).values( source = params[0], country = params[1], bias = params[2], @@ -4290,13 +4287,13 @@ def get_media_bias_status(self): def get_media_bias_source(self, source_id): statement = select( - mediabias.c.id - ).where(mediabias.c.id == source_id) + mediabias.c.source + ).where(mediabias.c.source == source_id) return self._execute_with_rollback(statement).fetchone() def delete_media_bias_source(self, source_id): - statement = delete(mediabias).where(mediabias.c.id == source_id) + statement = delete(mediabias).where(mediabias.c.source == source_id) self._execute_with_rollback(statement) self.connection.commit() @@ -4375,13 +4372,12 @@ def search_media_bias_sources(self, query, bias_filter, factual_filter, country_ return total_count, self._execute_with_rollback(paginated_stmt).mappings().fetchall() def delete_media_bias_source(self, source_id): - statement = delete(mediabias).where(mediabias.c.id == source_id) + statement = delete(mediabias).where(mediabias.c.source == source_id) self._execute_with_rollback(statement) self.connection.commit() def get_media_bias_source_by_id(self, source_id): statement = select( - mediabias.c.id, mediabias.c.source, mediabias.c.country, mediabias.c.bias, @@ -4390,7 +4386,7 @@ def get_media_bias_source_by_id(self, source_id): mediabias.c.media_type, mediabias.c.popularity, mediabias.c.mbfc_credibility_rating - ).where(mediabias.c.id == source_id) + ).where(mediabias.c.source == source_id) return self._execute_with_rollback(statement).mappings().fetchone()