Set Channel Weight (setChannelsWeights) mutation

.env

@@ -38,9 +38,10 @@ VIDEO_RELEVANCE_VIEWS_TICK=50
 #   views weight,
 #   comments weight,
 #   rections weights,
-#   [joystream creation weight, YT creation weight]
+#   [joystream creation weight, YT creation weight],
+#   Default channel weight/bias
 # ]
-RELEVANCE_WEIGHTS="[1, 0.03, 0.3, 0.5, [7,3]]"
+RELEVANCE_WEIGHTS="[1, 0.03, 0.3, 0.5, [7,3], 1]"
 MAX_CACHED_ENTITIES=1000
 APP_PRIVATE_KEY=this-is-not-so-secret-change-it
 SESSION_EXPIRY_AFTER_INACTIVITY_MINUTES=60
@@ -59,4 +60,4 @@ SENDGRID_FROM_EMAIL=gateway@example.com
 
 # Debug settings
 SQD_DEBUG=api:*
-OPENAPI_PLAYGROUND=true
+OPENAPI_PLAYGROUND=true

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.1.0
+
+- Adds supports for new permissions model for gateway operator users. Now the root user can assign/revoke operator permission/s to users using `grantPermissions` & `revokePermissions` mutations
+- Adds new `setVideoWeights` operator mutation to set weight/bias for any channel/s which will be used to calculate the Atlas homepage video relevance scores
+
 # 3.0.4
 
 ### Misc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "orion",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "engines": {
     "node": ">=16"
   },

schema/auth.graphql

@@ -2,6 +2,7 @@ enum OperatorPermission {
   GRANT_OPERATOR_PERMISSIONS
   REVOKE_OPERATOR_PERMISSIONS
   SET_VIDEO_WEIGHTS
+  SET_CHANNEL_WEIGHTS
   SET_KILL_SWITCH
   SET_VIDEO_VIEW_PER_USER_TIME_LIMIT
   SET_VIDEO_HERO

schema/channels.graphql

@@ -64,6 +64,9 @@ type Channel @entity {
 
   "Cumulative rewards paid to this channel"
   cumulativeReward: BigInt!
+
+  "Weight/Bias of the channel affecting video relevance in the Homepage"
+  channelWeight: Float
 }
 
 type BannedMember @entity @index(fields: ["member", "channel"], unique: true) {

src/server-extension/resolvers/AdminResolver/index.ts

@@ -10,9 +10,10 @@ import { getResolveTree } from '@subsquid/openreader/lib/util/resolve-tree'
 import { GraphQLResolveInfo } from 'graphql'
 import 'reflect-metadata'
 import { Args, Ctx, Info, Mutation, Query, Resolver, UseMiddleware } from 'type-graphql'
-import { EntityManager, In, Not } from 'typeorm'
+import { EntityManager, In, Not, UpdateResult } from 'typeorm'
 import { videoRelevanceManager } from '../../../mappings/utils'
 import {
+  Channel,
   OperatorPermission,
   User,
   Video,
@@ -27,6 +28,7 @@ import { OperatorOnly } from '../middleware'
 import { model } from '../model'
 import {
   AppActionSignatureInput,
+  ChannelWeight,
   ExcludableContentType,
   ExcludeContentArgs,
   ExcludeContentResult,
@@ -39,6 +41,7 @@ import {
   RevokeOperatorPermissionsInput,
   SetCategoryFeaturedVideosArgs,
   SetCategoryFeaturedVideosResult,
+  SetChannelsWeightsArgs,
   SetFeaturedNftsInput,
   SetFeaturedNftsResult,
   SetKillSwitchInput,
@@ -105,13 +108,47 @@ export class AdminResolver {
         args.commentsWeight,
         args.reactionsWeight,
         [args.joysteamTimestampSubWeight, args.ytTimestampSubWeight],
+        args.defaultChannelWeight,
       ],
       em
     )
     await videoRelevanceManager.updateVideoRelevanceValue(em, true)
     return { isApplied: true }
   }
 
+  @UseMiddleware(OperatorOnly(OperatorPermission.SET_CHANNEL_WEIGHTS))
+  @Mutation(() => [ChannelWeight])
+  async setChannelsWeights(@Args() { inputs }: SetChannelsWeightsArgs): Promise<ChannelWeight[]> {
+    const em = await this.em()
+
+    const results: ChannelWeight[] = []
+
+    // Process each SetChannelWeightInput
+    for (const weightInput of inputs) {
+      const { channelId, weight } = weightInput
+
+      // Update the channel weight in the database
+      const updateResult: UpdateResult = await em.transaction(
+        async (transactionalEntityManager) => {
+          return transactionalEntityManager
+            .createQueryBuilder()
+            .update(Channel)
+            .set({ channelWeight: weight })
+            .where('id = :id', { id: channelId })
+            .execute()
+        }
+      )
+
+      // Push the result into the results array
+      results.push({
+        channelId,
+        isApplied: !!updateResult.affected,
+      })
+    }
+
+    return results
+  }
+
   @UseMiddleware(OperatorOnly(OperatorPermission.SET_KILL_SWITCH))
   @Mutation(() => KillSwitch)
   async setKillSwitch(@Args() args: SetKillSwitchInput): Promise<KillSwitch> {

src/server-extension/resolvers/AdminResolver/types.ts

@@ -21,6 +21,9 @@ export class SetVideoWeightsInput {
 
   @Field(() => Float, { nullable: false })
   ytTimestampSubWeight!: number
+
+  @Field(() => Float, { nullable: false })
+  defaultChannelWeight!: number
 }
 
 @ObjectType()
@@ -29,6 +32,30 @@ export class VideoWeights {
   isApplied!: boolean
 }
 
+@InputType()
+export class ChannelWeightInput {
+  @Field(() => String, { nullable: false })
+  channelId!: string
+
+  @Field(() => Float, { nullable: false })
+  weight!: number
+}
+
+@ArgsType()
+export class SetChannelsWeightsArgs {
+  @Field(() => [ChannelWeightInput], { nullable: false })
+  inputs!: ChannelWeightInput[]
+}
+
+@ObjectType()
+export class ChannelWeight {
+  @Field(() => String, { nullable: false })
+  channelId!: string
+
+  @Field(() => Boolean, { nullable: false })
+  isApplied!: boolean
+}
+
 @ArgsType()
 export class SetKillSwitchInput {
   @Field(() => Boolean, { nullable: false })

src/utils/VideoRelevanceManager.ts

@@ -31,21 +31,25 @@ export class VideoRelevanceManager {
         commentsWeight,
         reactionsWeight,
         [joystreamTimestampWeight, ytTimestampWeight] = [7, 3],
+        defaultChannelWeight,
       ] = await config.get(ConfigVariable.RelevanceWeights, em)
       await em.query(`
         WITH weighted_timestamp AS (
     SELECT 
-        id,
+        "video"."id",
         (
-          extract(epoch from created_at)*${joystreamTimestampWeight} +
-          COALESCE(extract(epoch from published_before_joystream), extract(epoch from created_at))*${ytTimestampWeight}
-        ) / ${joystreamTimestampWeight + ytTimestampWeight} as wtEpoch
+          extract(epoch from video.created_at)*${joystreamTimestampWeight} +
+          COALESCE(extract(epoch from video.published_before_joystream), extract(epoch from video.created_at))*${ytTimestampWeight}
+        ) / ${joystreamTimestampWeight} + ${ytTimestampWeight} as wtEpoch,
+        "channel"."channel_weight" as CW
     FROM 
         "video" 
+        INNER JOIN
+          "channel" ON "video"."channel_id" = "channel"."id"
         ${
           forceUpdateAll
             ? ''
-            : `WHERE "id" IN (${[...this.videosToUpdate.values()]
+            : `WHERE "video"."id" IN (${[...this.videosToUpdate.values()]
                 .map((id) => `'${id}'`)
                 .join(', ')})`
         }
@@ -54,10 +58,12 @@ export class VideoRelevanceManager {
         "video"
     SET
         "video_relevance" = ROUND(
-        (extract(epoch from now()) - wtEpoch) / (60 * 60 * 24) * ${newnessWeight * -1} +
+      (
+        (extract(epoch from now()) - wtEpoch) / ${NEWNESS_SECONDS_DIVIDER} * ${newnessWeight * -1} +
         (views_num * ${viewsWeight}) +
         (comments_count * ${commentsWeight}) +
-        (reactions_count * ${reactionsWeight}), 
+        (reactions_count * ${reactionsWeight})
+      ) * COALESCE(CW, ${defaultChannelWeight}),
             2)
     FROM
         weighted_timestamp

src/utils/config.ts

@@ -47,7 +47,8 @@ export const configVariables = {
   [ConfigVariable.KillSwitch]: boolType,
   [ConfigVariable.VideoViewPerUserTimeLimit]: intType,
   [ConfigVariable.VideoRelevanceViewsTick]: intType,
-  [ConfigVariable.RelevanceWeights]: jsonType<[number, number, number, number, [number, number]]>(),
+  [ConfigVariable.RelevanceWeights]:
+    jsonType<[number, number, number, number, [number, number], number]>(),
   [ConfigVariable.AppPrivateKey]: stringType,
   [ConfigVariable.SessionMaxDurationHours]: intType,
   [ConfigVariable.SessionExpiryAfterInactivityMinutes]: intType,

src/utils/offchainState.ts

@@ -1,10 +1,10 @@
-import { EntityManager } from 'typeorm'
-import fs from 'fs'
-import path from 'path'
 import { createLogger } from '@subsquid/logger'
 import assert from 'assert'
-import { uniqueId } from './crypto'
+import fs from 'fs'
+import path from 'path'
+import { EntityManager } from 'typeorm'
 import { NextEntityId } from '../model'
+import { uniqueId } from './crypto'
 
 const DEFAULT_EXPORT_PATH = path.resolve(__dirname, '../../db/export/export.json')
 
@@ -22,7 +22,7 @@ const exportedStateMap = {
   User: true,
   Account: true,
   Token: true,
-  Channel: ['is_excluded', 'video_views_num', 'follows_num'],
+  Channel: ['is_excluded', 'video_views_num', 'follows_num', 'channel_weight'],
   Video: ['is_excluded', 'views_num'],
   Comment: ['is_excluded'],
   OwnedNft: ['is_featured'],
@@ -80,6 +80,7 @@ export class OffchainState {
     '3.0.2': ['Account'],
     '3.0.3': ['Account'],
     '3.0.4': ['Account'],
+    '3.1.0': ['Account'],
   }
 
   private migrations: Migrations = {