Commit a951d896 authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch '999-chore-new-version-of-backend-v4-17-0' into 'main' 

4.17.0 Add AI rubric assessment

Closes #999, inject-issues#324, and inject-issues#240

See merge request inject/frontend!856
parents f3fcd69f 5f8682e5

analyst/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "@inject/analyst",

  "version": "4.16.0",

  "version": "4.17.0",

  "description": "Analyst module for Inject Exercise Platform",

  "main": "index.js",

  "license": "MIT",

analyst/src/components/TeamClustering/TeamClusteringOptions.tsx

+25 −29
Original line number Diff line number Diff line
@@ -122,12 +122,11 @@ export const TeamClusteringOptions: FC<TeamClusteringOptionsProps> = ({ 
          loading={fetching}

          intent='primary'

          icon='calculator'

          onClick={() => {

          onClick={async () => {

            setFetching(true)

            switch (clusteringType) {

              case 'achievedMilestones':

                client

                  .query<

              case 'achievedMilestones': {

                const { data } = await client.query<

                  ResultOf<typeof AchievedMilestonesClusteringQuery>,

                  VariablesOf<typeof AchievedMilestonesClusteringQuery>

                >(AchievedMilestonesClusteringQuery, {
@@ -135,14 +134,12 @@ export const TeamClusteringOptions: FC<TeamClusteringOptionsProps> = ({ 
                  teamIds,

                  recalculate: true,

                })

                  .then(({ data }) => {

                setData(data?.achievedMilestonesClustering)

                setFetching(false)

                  })

                break

              case 'milestoneSequence':

                client

                  .query<

              }

              case 'milestoneSequence': {

                const { data } = await client.query<

                  ResultOf<typeof MilestoneSequenceClusteringQuery>,

                  VariablesOf<typeof MilestoneSequenceClusteringQuery>

                >(MilestoneSequenceClusteringQuery, {
@@ -150,12 +147,11 @@ export const TeamClusteringOptions: FC<TeamClusteringOptionsProps> = ({ 
                  teamIds,

                  recalculate: true,

                })

                  .then(({ data }) => {

                setData(data?.milestoneSequenceClustering)

                setFetching(false)

                  })

                break

              }

            }

          }}

        />

      </div>

analyst/src/components/TeamClustering/TeamClusteringParams.tsx

+7 −8
Original line number Diff line number Diff line 
import { Classes, FormGroup, NumericInput } from '@blueprintjs/core'

import { SmallInfoSign } from '@blueprintjs/icons'

import { FormGroup, NumericInput } from '@blueprintjs/core'

import { css } from '@emotion/css'

import { HelpIcon } from '@inject/shared'

import type { Dispatch, FC, SetStateAction } from 'react'
@@ -45,7 +44,7 @@ export const TeamClusteringParams: FC<TeamClusteringParamsProps> = ({ 
          <div className={labelClass}>

            Neighbors

            <HelpIcon

              icon={<SmallInfoSign className={Classes.TEXT_MUTED} />}

              small

              text='The number of neighbors to consider during UMAP dimensionality reduction; affects how local vs. global structure is preserved in the reduced space.'

            />

          </div>
@@ -72,7 +71,7 @@ export const TeamClusteringParams: FC<TeamClusteringParamsProps> = ({ 
          <div className={labelClass}>

            Min Samples

            <HelpIcon

              icon={<SmallInfoSign className={Classes.TEXT_MUTED} />}

              small

              text='The minimum number of points required to form a cluster in DBSCAN; higher values result in fewer, more consolidated clusters.'

            />

          </div>
@@ -99,7 +98,7 @@ export const TeamClusteringParams: FC<TeamClusteringParamsProps> = ({ 
          <div className={labelClass}>

            Min Dist

            <HelpIcon

              icon={<SmallInfoSign className={Classes.TEXT_MUTED} />}

              small

              text='Controls how tightly UMAP packs points together in the reduced space; lower values create more compact clusters while higher values spread them out.'

            />

          </div>
@@ -136,7 +135,7 @@ export const TeamClusteringParams: FC<TeamClusteringParamsProps> = ({ 
          <div className={labelClass}>

            Iterations

            <HelpIcon

              icon={<SmallInfoSign className={Classes.TEXT_MUTED} />}

              small

              text='The number of times the clustering algorithm runs; results are combined using majority voting to produce more stable, consensus cluster assignments.'

            />

          </div>
@@ -163,7 +162,7 @@ export const TeamClusteringParams: FC<TeamClusteringParamsProps> = ({ 
          <div className={labelClass}>

            Eps

            <HelpIcon

              icon={<SmallInfoSign className={Classes.TEXT_MUTED} />}

              small

              text='The maximum distance between points in DBSCAN for them to be considered part of the same cluster; smaller values create more fragmented clusters.'

            />

          </div>
@@ -188,7 +187,7 @@ export const TeamClusteringParams: FC<TeamClusteringParamsProps> = ({ 
          <div className={labelClass}>

            Components

            <HelpIcon

              icon={<SmallInfoSign className={Classes.TEXT_MUTED} />}

              small

              text='The number of dimensions to reduce the data to (typically 2 for 2D visualization); must be less than or equal to the number of teams minus 2.'

            />

          </div>

analyst/src/components/utilities.ts

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ export const DUMMY_EXERCISE: Exercise = { 
  states: [],

  onDemand: true,

  sandbox: false,

  llm: false,

}



export const DEFAULT_PLOT_MARGIN = 20

backend @ c5942adb

Compare 8a2775de to c5942adb
Original line number Diff line number Diff line 
Subproject commit 8a2775deeecea0020cf08d09407848096b157ce8
 
Subproject commit c5942adb684df1bd7ffde1a352c10b08ff1524ea