Merge pull request #4409 from withspectrum/remove-spectrum

Remove getspectrum as a toxicity check provider

api/mutations/thread/publishThread.js

@@ -19,7 +19,6 @@ import {
   _adminProcessToxicThreadQueue,
   _adminProcessUserSpammingThreadsQueue,
 } from 'shared/bull/queues';
-import getSpectrumScore from 'athena/queues/moderationEvents/spectrum';
 import getPerspectiveScore from 'athena/queues/moderationEvents/perspective';
 import { events } from 'shared/analytics';
 import { trackQueue } from 'shared/bull/queues';
@@ -275,27 +274,23 @@ export default requireAuth(
       const title = thread.content.title;
       const text = `${title} ${body}`;
 
-      const scores = await Promise.all([
-        getSpectrumScore(text, dbThread.id, dbThread.creatorId).catch(err => 0),
-        getPerspectiveScore(text).catch(err => 0),
-      ]).catch(err =>
+      const scores = await getPerspectiveScore(text).catch(err =>
         console.error(
           'Error getting thread moderation scores from providers',
           err.message
         )
       );
 
-      const spectrumScore = scores && scores[0];
       const perspectiveScore = scores && scores[1];
 
       // if neither models returned results
-      if (!spectrumScore && !perspectiveScore) {
+      if (!perspectiveScore) {
         debug('Toxicity checks from providers say not toxic');
         return false;
       }
 
       // if both services agree that the thread is >= 98% toxic
-      if ((spectrumScore + perspectiveScore) / 2 >= 0.9) {
+      if (perspectiveScore >= 0.9) {
         debug('Thread is toxic according to both providers');
         return true;
       }

athena/queues/moderationEvents/message.js

@@ -5,7 +5,6 @@ import { getThreadById } from '../../models/thread';
 import { getCommunityById } from '../../models/community';
 import { getChannelById } from '../../models/channel';
 import { toState, toPlainText } from 'shared/draft-utils';
-import getSpectrumScore from './spectrum';
 import getPerspectiveScore from './perspective';
 import { _adminSendToxicContentEmailQueue } from 'shared/bull/queues';
 import type { Job, AdminToxicMessageJobData } from 'shared/bull/types';
@@ -21,11 +20,8 @@ export default async (job: Job<AdminToxicMessageJobData>) => {
       ? toPlainText(toState(JSON.parse(message.content.body)))
       : message.content.body;
 
-  const scores = await Promise.all([
-    getSpectrumScore(text, message.id, message.senderId),
-    getPerspectiveScore(text),
-  ]).catch(err =>
-    console.error('Error getting message moderation scores from providers', {
+  const perspectiveScore = await getPerspectiveScore(text).catch(err =>
+    console.error('Error getting message moderation score from providers', {
       error: err.message,
       data: {
         text,
@@ -34,11 +30,7 @@ export default async (job: Job<AdminToxicMessageJobData>) => {
     })
   );
 
-  const spectrumScore = scores && scores[0];
-  const perspectiveScore = scores && scores[1];
-
-  // if neither models returned results
-  if (!spectrumScore && !perspectiveScore) return;
+  if (!perspectiveScore) return;
 
   const [user, thread] = await Promise.all([
     getUserById(message.senderId),
@@ -58,7 +50,6 @@ export default async (job: Job<AdminToxicMessageJobData>) => {
     community,
     channel,
     toxicityConfidence: {
-      spectrumScore,
       perspectiveScore,
     },
   });

athena/queues/moderationEvents/perspective.js

@@ -29,7 +29,7 @@ export default async (text: string) => {
   });
 
   // if something failed?
-  if (!request || !request.data) return;
+  if (!request || !request.data) return null;
 
   // get the scores from the request
   const { attributeScores } = request.data;

athena/queues/moderationEvents/thread.js

@@ -4,7 +4,6 @@ import { getUserById } from 'shared/db/queries/user';
 import { getCommunityById } from '../../models/community';
 import { getChannelById } from '../../models/channel';
 import { toState, toPlainText } from 'shared/draft-utils';
-import getSpectrumScore from './spectrum';
 import getPerspectiveScore from './perspective';
 import { _adminSendToxicContentEmailQueue } from 'shared/bull/queues';
 import type { Job, AdminToxicThreadJobData } from 'shared/bull/types';
@@ -26,10 +25,7 @@ export default async (job: Job<AdminToxicThreadJobData>) => {
   const title = thread.content.title;
   const text = `${title} ${body}`;
 
-  const scores = await Promise.all([
-    getSpectrumScore(text, thread.id, thread.creatorId),
-    getPerspectiveScore(text),
-  ]).catch(err =>
+  const perspectiveScore = await getPerspectiveScore(text).catch(err =>
     console.error('Error getting thread moderation scores from providers', {
       error: err.message,
       data: {
@@ -39,11 +35,8 @@ export default async (job: Job<AdminToxicThreadJobData>) => {
     })
   );
 
-  const spectrumScore = scores && scores[0];
-  const perspectiveScore = scores && scores[1];
-
   // if neither models returned results
-  if (!spectrumScore && !perspectiveScore) return;
+  if (!perspectiveScore) return;
 
   const [user, community, channel] = await Promise.all([
     getUserById(thread.creatorId),
@@ -59,7 +52,6 @@ export default async (job: Job<AdminToxicThreadJobData>) => {
     community,
     channel,
     toxicityConfidence: {
-      spectrumScore,
       perspectiveScore,
     },
   });

email-templates/adminToxicContent.html

@@ -31,10 +31,6 @@
 
   <p><strong>Info:</strong></p>
   <ul>
-    {{#data.toxicityConfidence.spectrumPercent}}
-      <li><strong>Spectrum:</strong> {{.}}% confident</li>
-    {{/data.toxicityConfidence.spectrumPercent}}
-
     {{#data.toxicityConfidence.perspectivePercent}}
       <li><strong>Perspective:</strong> {{.}}% confident</li>
     {{/data.toxicityConfidence.perspectivePercent}}

hermes/queues/send-admin-toxic-content-email.js

@@ -17,22 +17,14 @@ export default job => {
     thread,
     community,
     channel,
-    toxicityConfidence: { spectrumScore, perspectiveScore },
+    toxicityConfidence: { perspectiveScore },
   } = job.data;
 
   const toPercent = (num: number) => Math.round(num * 100);
-  const spectrumPercent = spectrumScore ? toPercent(spectrumScore) : null;
-  const perspectivePercent = perspectiveScore
-    ? toPercent(perspectiveScore)
-    : null;
-  let avgPercent;
-  if (spectrumPercent && perspectivePercent) {
-    avgPercent = (spectrumPercent + perspectivePercent) / 2;
-  } else {
-    avgPercent = spectrumPercent || perspectivePercent || 0;
-  }
 
-  const subject = `Toxic alert (${avgPercent.toString()}%): ${text}`;
+  const perspectivePercent = perspectiveScore.toPercent(perspectiveScore);
+
+  const subject = `Toxic alert (${perspectivePercent.toString()}%): ${text}`;
 
   try {
     return sendEmail({
@@ -50,7 +42,6 @@ export default job => {
           community,
           channel,
           toxicityConfidence: {
-            spectrumPercent,
             perspectivePercent,
           },
         },

now.json

@@ -46,7 +46,7 @@
 		"API_TOKEN_SECRET": "@api-token-secret",
 		"SENTRY_DSN_CLIENT": "@sentry-dsn-client",
 		"SENTRY_DSN_SERVER": "@sentry-dsn-server",
-		"SPECTRUM_MODERATION_API_KEY": "@spectrum-moderation-api-key",
+
 		"AMPLITUDE_API_KEY": "@amplitude-api-key",
 		"AMPLITUDE_API_KEY_DEVELOPMENT": "@amplitude-api-key-development",
     "ENCRYPTION_KEY": "@encryption-key",