Naprawa wykresów, Dagbladet RSS, usunięcie Nettavisen

TruthScan AI_backend/app/config.py

@@ -36,7 +36,7 @@ NEWS_FEEDS = {
     # Norweskie
     "NRK":          "https://www.nrk.no/toppsaker.rss",
     "VG":           "https://www.vg.no/rss/feed/?limit=10",
-    "TV2":          "https://www.tv2.no/rss/alt",
+    "E24":          "https://e24.no/rss",
     "Aftenposten":  "https://www.aftenposten.no/rss",
 }
 

TruthScan AI_frontend/app/dashboard/components/ChartsSection.tsx

@@ -73,11 +73,17 @@ export default function ChartsSection({
 
   useEffect(() => {
     if (!isClient || hasLoadedRef.current) return;
-    
+
     const el = chartsSectionRef.current;
     if (!el) return;
 
-    if (cachedCharts) {
+    // Traktuj cache jako ważny tylko gdy zawiera dane
+    const cacheIsValid = !!(
+      cachedCharts &&
+      (cachedCharts.barData.length > 0 || cachedCharts.emotionData.length > 0)
+    );
+
+    if (cacheIsValid) {
       console.log("✅ Używam cache dla wykresów");
       return;
     }
@@ -162,19 +168,27 @@ export default function ChartsSection({
   const effectiveEmotionData = cachedCharts?.emotionData ?? emotionData;
   const effectiveTotalSources = cachedCharts?.totalSources ?? totalSources;
 
-  const effectiveHasBars = cachedCharts
-    ? cachedCharts.barData.length > 0
-    : hasBars;
-  const effectiveHasEmos = cachedCharts
-    ? cachedCharts.emotionData.length > 0
-    : hasEmos;
-
-  const effectiveChartsStarted = cachedCharts ? true : chartsStarted;
-  const effectiveChartsLoading = cachedCharts ? false : chartsLoading;
-  const effectiveProgressCount = cachedCharts
-    ? effectiveTotalSources
-    : progressCount;
-  const effectiveProgressPct = cachedCharts ? 100 : progressPct;
+  // Warunek oparty wyłącznie na długości tablicy — wartości 0 nie blokują wykresu
+  const effectiveHasBars = effectiveBarData.length > 0;
+  const effectiveHasEmos = effectiveEmotionData.length > 0;
+
+  const cacheIsValid = !!(
+    cachedCharts &&
+    (cachedCharts.barData.length > 0 || cachedCharts.emotionData.length > 0)
+  );
+  const effectiveChartsStarted = cacheIsValid ? true : chartsStarted;
+  const effectiveChartsLoading = cacheIsValid ? false : chartsLoading;
+  const effectiveProgressCount = cacheIsValid ? effectiveTotalSources : progressCount;
+  const effectiveProgressPct = cacheIsValid ? 100 : progressPct;
+
+  console.log("[ChartsSection] render →", {
+    cachedCharts: !!cachedCharts,
+    barData: barData.length, emotionData: emotionData.length,
+    effectiveBarData: effectiveBarData.length, effectiveEmotionData: effectiveEmotionData.length,
+    effectiveHasBars, effectiveHasEmos,
+    effectiveChartsStarted, effectiveChartsLoading,
+    progressCount, effectiveProgressCount,
+  });
 
   const t = locales[language] ?? locales.pl;
 

TruthScan AI_frontend/app/dashboard/components/SourceComparison.tsx

@@ -20,7 +20,7 @@ interface Props {
 const ALL_SOURCES = [
 	"BBC", "CNN", "NYTimes", "Guardian", "AlJazeera",
 	"Money", "PolsatNews", "TVN24", "SpidersWeb", "Bankier",
-	"NRK", "VG", "TV2", "Aftenposten",
+	"NRK", "VG", "E24", "Aftenposten",
 ] as const;
 
 export default function SourceComparison({ language }: Props) {

TruthScan AI_frontend/app/dashboard/page.tsx

@@ -15,7 +15,7 @@ import { useNewsCache, newsKey } from "../../app/stores/newsCache";
 const ALL_SOURCES = [
   "BBC", "CNN", "NYTimes", "Guardian", "AlJazeera",
   "Money", "PolsatNews", "TVN24", "SpidersWeb", "Bankier",
-  "NRK", "VG", "TV2", "Aftenposten",
+  "NRK", "VG", "E24", "Aftenposten",
 ] as const;
 
 export default function DashboardPage() {
@@ -37,7 +37,7 @@ export default function DashboardPage() {
 
   const handleRefresh = () => {
     ALL_SOURCES.forEach((src) => {
-      cache.del(newsKey(src, language));
+      cache.del(newsKey(src));
     });
     cache.del("dashboard:charts");
     setReloadKey((k) => k + 1);

TruthScan AI_frontend/app/hooks/useDashboardCharts.ts

@@ -1,31 +1,37 @@
 /**
  * Hook odpowiedzialny za pobieranie i agregację danych do wykresów dashboardu.
+ *
+ * Architektura reaktywna:
+ *   1. Subskrypcja Zustand (useNewsCache) — wykresy aktualizują się automatycznie
+ *      gdy SSE lub HTTP fallback zapisze artykuły do cache.
+ *   2. loadCharts() pobiera przez HTTP źródła nieobecne w cache i zapisuje artykuły;
+ *      subskrypcja wyłapuje zapis i przelicza wykresy.
+ *
+ * Dzięki temu fake_probability pochodzi zawsze z tych samych artykułów co stream SSE.
  */
 
-import { useCallback, useRef, useState } from "react";
-import { fetchOneSource, NewsData } from "../../lib/fetchNews";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { fetchOneSource } from "../../lib/fetchNews";
+import { useNewsCache, newsKey } from "../../app/stores/newsCache";
+import type { Article } from "../../lib/fetchNews";
 import type { Lang } from "../../lib/types";
 
 const ALL_SOURCES = [
   "BBC", "CNN", "NYTimes", "Guardian", "AlJazeera",
   "Money", "PolsatNews", "TVN24", "SpidersWeb", "Bankier",
-  "NRK", "VG", "TV2", "Aftenposten",
+  "NRK", "VG", "E24", "Aftenposten",
 ] as const;
 
+const SOURCE_ORDER = new Map(ALL_SOURCES.map((s, i) => [s as string, i]));
+
 export function useDashboardCharts(language: Lang) {
-  const [barData, setBarData] = useState<{ label: string; value: number }[]>([]);
+  const [barData, setBarData]         = useState<{ label: string; value: number }[]>([]);
   const [emotionData, setEmotionData] = useState<{ name: string; value: number }[]>([]);
   const [progressCount, setProgressCount] = useState(0);
   const [chartsLoading, setChartsLoading] = useState(false);
-  const [chartsError, setChartsError] = useState<string | null>(null);
-  
-  // Struktury w useRef – pozwalają aktualizować dane bez nadmiarowych re-renderów
-  const barsMapRef = useRef<Map<string, number>>(new Map());
-  const emosMapRef = useRef<Record<string, number>>({ 
-    POSITIVE: 0, NEGATIVE: 0, NEUTRAL: 0 
-  });
-  const chartsStartedRef = useRef(false);
+  const [chartsError, setChartsError]     = useState<string | null>(null);
 
+  const chartsStartedRef = useRef(false);
   const progressPct = Math.round((progressCount / ALL_SOURCES.length) * 100);
 
   const normalizeSent = (s: string): "POSITIVE" | "NEGATIVE" | "NEUTRAL" => {
@@ -36,62 +42,121 @@ export function useDashboardCharts(language: Lang) {
     return "NEUTRAL";
   };
 
-  const refreshChartsFromRefs = () => {
-    const order = new Map(ALL_SOURCES.map((s, i) => [s as string, i]));
-    const arr = Array.from(barsMapRef.current.entries()).map(([label, value]) => ({
-      label, value,
-    }));
-    arr.sort((a, b) => (order.get(a.label) ?? 999) - (order.get(b.label) ?? 999));
-    setBarData(arr);
+  /**
+   * Przelicza barData i emotionData na podstawie tego co aktualnie jest w cache.
+   * Wywoływana przy każdej zmianie store (subskrypcja) oraz po mount.
+   */
+  const recomputeFromCache = useCallback(() => {
+    const cacheState = useNewsCache.getState();
+    const barsMap    = new Map<string, number>();
+    const emosMap    = { POSITIVE: 0, NEGATIVE: 0, NEUTRAL: 0 };
+
+    for (const src of ALL_SOURCES) {
+      const articles = cacheState.get<Article[]>(newsKey(src));
+      if (!articles || articles.length === 0) continue;
+
+      // DEBUG: typ i wartość fake_probability pierwszego artykułu
+      const first = articles[0];
+      console.log(
+        `[CHARTS] [${src}] article[0].fake_probability:`,
+        typeof first.fake_probability, "=", first.fake_probability,
+        "| sentiment:", first.sentiment
+      );
+
+      const avgFake =
+        articles.reduce((sum, a) => {
+          const num = Number(a.fake_probability);
+          return sum + (Number.isFinite(num) ? num : 0);
+        }, 0) / articles.length;
+
+      console.log(`[CHARTS] [${src}] avgFake=${avgFake.toFixed(4)} (${articles.length} art)`);
+      barsMap.set(src, avgFake);
+
+      for (const art of articles) {
+        if (art.sentiment) {
+          const norm = normalizeSent(art.sentiment);
+          emosMap[norm] = (emosMap[norm] || 0) + 1;
+        }
+      }
+    }
+
+    if (barsMap.size === 0) return; // nic w cache — nie nadpisuj pustą tablicą
+
+    const arr = Array.from(barsMap.entries())
+      .map(([label, value]) => ({ label, value }))
+      .sort((a, b) => (SOURCE_ORDER.get(a.label) ?? 999) - (SOURCE_ORDER.get(b.label) ?? 999));
 
     const emoArr = [
-      { name: "POSITIVE", value: emosMapRef.current.POSITIVE },
-      { name: "NEUTRAL", value: emosMapRef.current.NEUTRAL },
-      { name: "NEGATIVE", value: emosMapRef.current.NEGATIVE }
+      { name: "POSITIVE", value: emosMap.POSITIVE },
+      { name: "NEUTRAL",  value: emosMap.NEUTRAL  },
+      { name: "NEGATIVE", value: emosMap.NEGATIVE },
     ];
+
+    console.log(`[CHARTS] recompute → bars=${arr.length}`, arr.map(x => `${x.label}:${x.value.toFixed(1)}`));
+    setBarData(arr);
     setEmotionData(emoArr);
-  };
+  }, []);
+
+  /** Subskrypcja Zustand — reaguje na każdą zmianę cache (SSE lub HTTP fallback). */
+  useEffect(() => {
+    // Przelicz raz od razu (cache może już mieć dane z poprzedniej sesji)
+    recomputeFromCache();
+
+    const unsub = useNewsCache.subscribe(() => {
+      recomputeFromCache();
+    });
 
+    return () => unsub();
+  }, [recomputeFromCache]);
+
+  /**
+   * Pobiera przez HTTP artykuły dla źródeł nieobecnych w cache
+   * i zapisuje je do store — co wyzwala subskrypcję i przeliczenie wykresów.
+   */
   const loadCharts = useCallback(async () => {
-    if (chartsStartedRef.current) return;
+    if (chartsStartedRef.current) {
+      console.log("[CHARTS] loadCharts: już uruchomione, pomijam");
+      return;
+    }
     chartsStartedRef.current = true;
     setChartsLoading(true);
     setChartsError(null);
     setProgressCount(0);
-    barsMapRef.current.clear();
-    emosMapRef.current = { POSITIVE: 0, NEGATIVE: 0, NEUTRAL: 0 };
 
-    console.log(`📊 Ładuję wykresy: ${ALL_SOURCES.length} źródeł, lang=${language}`);
+    console.log(`[CHARTS] start: ${ALL_SOURCES.length} źródeł, lang=${language}`);
+
+    const cacheState = useNewsCache.getState();
 
     const promises = ALL_SOURCES.map(async (src) => {
       try {
-        const { news, emotions } = await fetchOneSource(src, language);
+        const cached = cacheState.get<Article[]>(newsKey(src));
 
-        if (news) {
-          barsMapRef.current.set(news.source, parseFloat(news.fake_news));
-        }
+        if (cached && cached.length > 0) {
+          console.log(`[CHARTS] [${src}] → CACHE HIT (${cached.length} art)`);
+          // recomputeFromCache działa reaktywnie; nic więcej nie trzeba robić
+        } else {
+          console.log(`[CHARTS] [${src}] → CACHE MISS → HTTP`);
+          const { articles } = await fetchOneSource(src, language);
 
-        for (const [emotionKey, count] of Object.entries(emotions)) {
-          const normalized = normalizeSent(emotionKey);
-          emosMapRef.current[normalized] = (emosMapRef.current[normalized] || 0) + (count as number);
-        }
+          console.log(`[CHARTS] [${src}] HTTP: ${articles.length} art`);
 
-        console.log(`✅ [${src}] fake=${news?.fake_news}, emotions=`, emotions);
+          if (articles.length > 0) {
+            // Zapis do cache wyzwala subskrypcję → recomputeFromCache()
+            useNewsCache.getState().set(newsKey(src), articles);
+          }
+        }
       } catch (error) {
-        console.warn(`⚠️ [${src}] błąd pobierania:`, error);
-        // Ustaw 0 dla niedostępnych źródeł tak żeby słupek się pojawił
-        barsMapRef.current.set(src, 0);
+        console.warn(`[CHARTS] [${src}] błąd:`, error);
       } finally {
-        // Zawsze aktualizuj stan — nawet przy błędzie żeby wykresy się pokazały
-        refreshChartsFromRefs();
         setProgressCount((c) => c + 1);
       }
     });
 
     await Promise.allSettled(promises);
     setChartsLoading(false);
-    console.log(`📊 Wykresy gotowe. Słupki:`, barsMapRef.current.size, `Emocje:`, emosMapRef.current);
-  }, [language]);
+
+    console.log("[CHARTS] gotowe. barsMap rozmiar po HTTP:", barData.length);
+  }, [language, barData.length]);
 
   return {
     barData,
@@ -103,7 +168,7 @@ export function useDashboardCharts(language: Lang) {
     chartsStarted: chartsStartedRef.current,
     loadCharts,
     totalSources: ALL_SOURCES.length,
-    hasBars: barData.length > 0,
-    hasEmos: emotionData.length > 0,
+    hasBars:  barData.length > 0,
+    hasEmos:  emotionData.length > 0,
   };
-}
+}

TruthScan AI_frontend/app/hooks/useNewsCache.ts

@@ -1,6 +1,10 @@
 /**
  * Hook pobierający listę newsów dla wybranego źródła.
  * Wykorzystuje cache po stronie klienta w celu ograniczenia liczby zapytań do API.
+ *
+ * Klucz cache zawiera tylko source i model — NIE lang.
+ * Etykiety sentymentu są tłumaczone po stronie frontendu przez useSentiment,
+ * więc zmiana języka UI nie wymusza ponownego pobierania artykułów.
  */
 
 import { useEffect, useState } from "react";
@@ -13,13 +17,15 @@ type Article = {
   summary: string;
   published: string;
   source: string;
-  sentiment: string;       
+  sentiment: string;
   fake_probability: number;
   sentiment_score?: number;
 };
 
 type NewsResponse = { source: string; articles: Article[] };
 
+const API_URL = process.env.NEXT_PUBLIC_API_URL || "http://127.0.0.1:8000";
+
 export function useCachedNews(source: string, lang: Lang = "pl", model: string = "roberta") {
   const [data, setData] = useState<Article[] | null>(null);
   const [loading, setLoading] = useState<boolean>(true);
@@ -28,9 +34,9 @@ export function useCachedNews(source: string, lang: Lang = "pl", model: string =
 
   useEffect(() => {
     let mounted = true;
-    const key = newsKey(source, lang, model);
+    // Klucz cache bez lang — artykuły są language-agnostic po stronie cache
+    const key = newsKey(source, model);
 
-    // Odczyt danych z cache przed wykonaniem zapytania HTTP
     const cached = cache.get<Article[]>(key);
     if (cached) {
       setData(cached);
@@ -41,14 +47,16 @@ export function useCachedNews(source: string, lang: Lang = "pl", model: string =
     (async () => {
       try {
         setLoading(true);
-        const res = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/news/${encodeURIComponent(source)}?lang=${lang}&model=${model}`);
+        // Lang przekazywany do backendu (wpływa na format dat itp.),
+        // ale nie jest częścią klucza cache
+        const res = await fetch(
+          `${API_URL}/news/${encodeURIComponent(source)}?lang=${lang}&model=${model}`
+        );
         if (!res.ok) throw new Error(`HTTP ${res.status}`);
         const json: NewsResponse = await res.json();
         const articles = json.articles ?? [];
         if (!mounted) return;
         setData(articles);
-
-        // Zapis danych w cache po poprawnym pobraniu
         cache.set(key, articles);
       } catch (e: any) {
         if (!mounted) return;
@@ -58,19 +66,19 @@ export function useCachedNews(source: string, lang: Lang = "pl", model: string =
       }
     })();
 
-    return () => {
-      // Zabezpieczenie przed aktualizacją stanu po odmontowaniu komponentu
-      mounted = false;
-    };
-  }, [source, lang, model]);
+    return () => { mounted = false; };
+  // lang pominięty z deps — zmiana języka nie triggeruje re-fetch
+  }, [source, model]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const refresh = async () => {
-    const key = newsKey(source, lang, model);
+    const key = newsKey(source, model);
     cache.del(key);
     setData(null);
     setLoading(true);
     try {
-      const res = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/news/${encodeURIComponent(source)}?lang=${lang}&model=${model}`);
+      const res = await fetch(
+        `${API_URL}/news/${encodeURIComponent(source)}?lang=${lang}&model=${model}`
+      );
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
       const json: NewsResponse = await res.json();
       const articles = json.articles ?? [];

TruthScan AI_frontend/app/hooks/useNewsStream.ts

@@ -32,7 +32,8 @@ export function useNewsStream(source: string, lang: Lang = "pl", limit: number =
   useEffect(() => {
     if (!source) return;
 
-    const cacheKey = newsKey(source, lang);
+    // Klucz cache bez lang — etykiety tłumaczone przez useSentiment po stronie UI
+    const cacheKey = newsKey(source);
     const cached = cache.get<Article[]>(cacheKey);
 
     // Jeżeli dane są w cache, pomijamy połączenie SSE
@@ -100,7 +101,7 @@ export function useNewsStream(source: string, lang: Lang = "pl", limit: number =
       setState((s) => ({ ...s, loading: false }));
       // Zapis pełnego wyniku do cache po zakończeniu strumienia
       if (collected.length > 0) {
-        cache.set(cacheKey, collected);
+        cache.set(cacheKey, collected); // zapisane bez lang w kluczu
       }
       es.close();
     };

TruthScan AI_frontend/app/stores/newsCache.tsx

@@ -84,7 +84,9 @@ export const useNewsCache = create<NewsCacheState>((set, get) => ({
   },
 }));
 
-// helper: klucz cache dla /news (uwzględnia model NLP)
-export const newsKey = (source: string, lang = "pl", model = "roberta") => `news:${source}:${lang}:${model}`;
+// helper: klucz cache dla /news — lang celowo pominięty, bo etykiety
+// sentymentu są tłumaczone po stronie frontendu przez useSentiment.
+// Zmiana języka UI nie powinna wymuszać ponownego pobrania artykułów.
+export const newsKey = (source: string, model = "roberta") => `news:${source}:${model}`;
 // helper: klucz cache dla /emotion-stats
 export const statsKey = (source: string) => `stats:${source}`;

TruthScan AI_frontend/components/SourceSelector.tsx

@@ -45,7 +45,7 @@ export default function SourceSelector({ selectedSource, setSelectedSource, lang
       <optgroup label="🇳🇴 Norsk">
         <option value="NRK">NRK</option>
         <option value="VG">VG</option>
-        <option value="TV2">TV2</option>
+        <option value="E24">E24</option>
         <option value="Aftenposten">Aftenposten</option>
       </optgroup>
     </select>

TruthScan AI_frontend/lib/fetchNews.ts

@@ -71,7 +71,7 @@ const SOURCE_MAP: Record<string, string> = {
   bankier: "Bankier",
   nrk: "NRK",
   vg: "VG",
-  tv2: "TV2",
+  e24: "E24",
   aftenposten: "Aftenposten",
 };
 
@@ -97,15 +97,16 @@ function normalizeArticle(raw: any, sourceLabel: string): Article {
 export async function fetchOneSource(
   source: string,
   language: "pl" | "en" | "no" = "pl"
-): Promise<{ news?: NewsData; emotions: Emotions }> {
+): Promise<{ news?: NewsData; emotions: Emotions; articles: Article[] }> {
   const src = normalizeSource(source);
   const emotions: Emotions = {};
+  const apiBase = process.env.NEXT_PUBLIC_API_URL || "http://127.0.0.1:8000";
 
   try {
     const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 30_000);
+    const timeoutId = setTimeout(() => controller.abort(), 45_000);
     const res = await fetch(
-      `http://127.0.0.1:8000/news/${src}?lang=${language}`,
+      `${apiBase}/news/${src}?lang=${language}`,
       { signal: controller.signal }
     );
     clearTimeout(timeoutId);
@@ -115,35 +116,22 @@ export async function fetchOneSource(
     const rawArticles = Array.isArray(data?.articles) ? (data.articles as any[]) : [];
     const articles = rawArticles.map((a) => normalizeArticle(a, src));
 
-    // DEBUG: logi pomocnicze używane podczas walidacji danych z backendu
-    console.log(`📊 Source: ${src}, Articles: ${articles.length}`);
-    articles.forEach((article, index) => {
-      console.log(`  Article ${index + 1}:`, {
-        title: article.title?.substring(0, 50) + '...',
-        sentiment: article.sentiment,
-        fake_probability: article.fake_probability
-      });
-    });
-
     if (!articles.length) {
-      return { news: { source: src, fake_news: "0" }, emotions };
+      return { news: { source: src, fake_news: "0" }, emotions, articles: [] };
     }
 
     const avgFake =
-      articles.reduce((sum: number, a: any) => sum + (a.fake_probability ?? 0), 0) /
-      (articles.length || 1);
+      articles.reduce((sum: number, a: any) => sum + (Number(a.fake_probability) || 0), 0) /
+      articles.length;
 
     for (const art of articles) {
       if (art.sentiment) emotions[art.sentiment] = (emotions[art.sentiment] ?? 0) + 1;
     }
 
-    // 🆕 DEBUG: sprawdźmy jakie emocje zebraliśmy
-    console.log(`🎭 Emotions for ${src}:`, emotions);
-
-    return { news: { source: src, fake_news: avgFake.toFixed(2) }, emotions };
+    return { news: { source: src, fake_news: avgFake.toFixed(2) }, emotions, articles };
   } catch (err) {
     console.warn(`❌ Błąd źródła: ${src}`, err);
-    return { news: { source: src, fake_news: "0" }, emotions };
+    return { news: { source: src, fake_news: "0" }, emotions, articles: [] };
   }
 }