Merge pull request #1094 from gchq/chore/remove-old-v1-types

removed v1 types. removed some duplicated types between types and int…

backend/config/default.cjs

@@ -211,32 +211,11 @@ module.exports = {
       host: 'localhost:8080',
     },
 
-    // A configurable checkbox on the last page when uploading a model
-    uploadWarning: {
-      showWarning: true,
-      checkboxText: 'By checking here you confirm that the information is correct',
-    },
-
-    // A configurable checkbox on the last page when requesting a deployment
-    deploymentWarning: {
-      showWarning: true,
-      checkboxText: 'By checking here you confirm that the information is correct',
-    },
-
     // Used by some admin pages (e.g. the logs) to directly open the correct page in your IDE
     // Not needed in production
     development: {
       logUrl: 'vscode://file/home/ec2-user/git/Bailo/',
     },
-
-    // The available seldon versions that can be used to build images
-    seldonVersions: [
-      {
-        name: 'seldonio - 1.10.0',
-        image: 'seldonio/seldon-core-s2i-python37:1.10.0',
-      },
-    ],
-    maxModelSizeGB: 50,
   },
 
   connectors: {

frontend/actions/accessRequest.ts

@@ -1,5 +1,5 @@
 import useSWR from 'swr'
-import { AccessRequestInterface } from 'types/interfaces'
+import { AccessRequestInterface } from 'types/types'
 import { ErrorInfo, fetcher } from 'utils/fetcher'
 
 export function useGetAccessRequestsForModelId(modelId?: string) {

frontend/actions/model.ts

@@ -1,8 +1,7 @@
 import qs from 'querystring'
 import useSWR from 'swr'
 
-import { ModelImage } from '../types/interfaces'
-import { ModelForm, ModelInterface, Role } from '../types/v2/types'
+import { ModelForm, ModelImage, ModelInterface, Role } from '../types/types'
 import { ErrorInfo, fetcher } from '../utils/fetcher'
 
 export interface ModelSearchResult {

frontend/actions/modelCard.ts

@@ -1,9 +1,8 @@
 import axios from 'axios'
 import useSWR from 'swr'
-
-import { ModelCardInterface, ModelCardRevisionInterface } from '../types/v2/types'
-import { handleAxiosError } from '../utils/axios'
-import { ErrorInfo, fetcher } from '../utils/fetcher'
+import { ModelCardInterface, ModelCardRevisionInterface } from 'types/types'
+import { handleAxiosError } from 'utils/axios'
+import { ErrorInfo, fetcher } from 'utils/fetcher'
 
 export async function postFromSchema(modelId: string, schemaId: string) {
   try {

frontend/actions/review.ts

@@ -1,10 +1,8 @@
 import qs from 'querystring'
 import { ResponseTypeKeys } from 'src/common/ReviewWithComment'
 import useSWR from 'swr'
-import { ModelInterface, ReleaseInterface } from 'types/types'
-import { ReviewRequestInterface } from 'types/v2/types'
+import { AccessRequestInterface, ModelInterface, ReleaseInterface, ReviewRequestInterface } from 'types/types'
 
-import { AccessRequestInterface } from '../types/interfaces'
 import { ErrorInfo, fetcher } from '../utils/fetcher'
 
 export function useGetReviewRequestsForUser() {

frontend/actions/team.ts

@@ -1,5 +1,5 @@
 import useSWR from 'swr'
-import { TeamInterface } from 'types/interfaces'
+import { TeamInterface } from 'types/types'
 import { ErrorInfo, fetcher } from 'utils/fetcher'
 
 export const useGetTeams = () => {

frontend/actions/user.ts

@@ -1,7 +1,7 @@
 import qs from 'querystring'
 import { UserInformation } from 'src/common/UserDisplay'
 import useSWR from 'swr'
-import { EntityObject, ModelInterface, TokenActionsKeys, TokenInterface, TokenScopeKeys, User } from 'types/v2/types'
+import { EntityObject, ModelInterface, TokenActionsKeys, TokenInterface, TokenScopeKeys, User } from 'types/types'
 
 import { ErrorInfo, fetcher } from '../utils/fetcher'
 

frontend/pages/model/[modelId]/access-request/new.tsx

@@ -14,7 +14,7 @@ import JsonSchemaForm from 'src/Form/JsonSchemaForm'
 import Link from 'src/Link'
 import MessageAlert from 'src/MessageAlert'
 import Wrapper from 'src/Wrapper'
-import { SplitSchemaNoRender } from 'types/interfaces'
+import { SplitSchemaNoRender } from 'types/types'
 import { getErrorMessage } from 'utils/fetcher'
 import { getStepsData, getStepsFromSchema, setStepValidate, validateForm } from 'utils/formUtils'
 

frontend/pages/model/[modelId]/access-request/schema.tsx

@@ -11,8 +11,7 @@ import MultipleErrorWrapper from 'src/errors/MultipleErrorWrapper'
 import Link from 'src/Link'
 import SchemaButton from 'src/model/common/SchemaButton'
 import Wrapper from 'src/Wrapper'
-import { SchemaInterface } from 'types/types'
-import { SchemaKind } from 'types/v2/types'
+import { SchemaInterface, SchemaKind } from 'types/types'
 
 export default function NewSchemaSelection() {
   const router = useRouter()

frontend/pages/model/[modelId]/history/[modelCardVersion].tsx

@@ -8,7 +8,7 @@ import Loading from 'src/common/Loading'
 import MultipleErrorWrapper from 'src/errors/MultipleErrorWrapper'
 import JsonSchemaForm from 'src/Form/JsonSchemaForm'
 import Wrapper from 'src/Wrapper'
-import { SplitSchemaNoRender } from 'types/interfaces'
+import { SplitSchemaNoRender } from 'types/types'
 import { getStepsFromSchema } from 'utils/formUtils'
 
 export default function ViewModelCardVersion() {

frontend/pages/model/[modelId]/release/new.tsx

@@ -11,8 +11,7 @@ import Link from 'src/Link'
 import MessageAlert from 'src/MessageAlert'
 import ReleaseForm from 'src/model/releases/ReleaseForm'
 import Wrapper from 'src/Wrapper'
-import { FileWithMetadata, FlattenedModelImage } from 'types/interfaces'
-import { FileInterface, isFileInterface } from 'types/v2/types'
+import { FileInterface, FileWithMetadata, FlattenedModelImage, isFileInterface } from 'types/types'
 import { getErrorMessage } from 'utils/fetcher'
 import { isValidSemver } from 'utils/stringUtils'
 

frontend/pages/model/[modelId]/schema.tsx

@@ -15,8 +15,7 @@ import Link from 'src/Link'
 import MessageAlert from 'src/MessageAlert'
 import SchemaButton from 'src/model/common/SchemaButton'
 import Wrapper from 'src/Wrapper'
-import { SchemaInterface } from 'types/types'
-import { SchemaKind } from 'types/v2/types'
+import { SchemaInterface, SchemaKind } from 'types/types'
 
 export default function NewSchemaSelection() {
   const router = useRouter()

frontend/pages/model/new.tsx

@@ -20,8 +20,7 @@ import ModelDescriptionInput from 'src/model/ModelDescriptionInput'
 import ModelNameInput from 'src/model/ModelNameInput'
 import TeamSelect from 'src/TeamSelect'
 import Wrapper from 'src/Wrapper'
-import { TeamInterface } from 'types/interfaces'
-import { ModelForm, ModelVisibility } from 'types/v2/types'
+import { ModelForm, ModelVisibility, TeamInterface } from 'types/types'
 import { getErrorMessage } from 'utils/fetcher'
 
 export default function NewModel() {

frontend/pages/settings/personal-access-tokens/new.tsx

@@ -21,7 +21,7 @@ import Link from 'src/Link'
 import MessageAlert from 'src/MessageAlert'
 import TokenDialog from 'src/settings/authentication/TokenDialog'
 import Wrapper from 'src/Wrapper'
-import { TokenActions, TokenActionsKeys, TokenInterface, TokenScope } from 'types/v2/types'
+import { TokenActions, TokenActionsKeys, TokenInterface, TokenScope } from 'types/types'
 import { getErrorMessage } from 'utils/fetcher'
 import { plural } from 'utils/stringUtils'
 

frontend/src/Form/JsonSchemaForm.tsx

@@ -19,7 +19,7 @@ import { ArrayFieldTemplateProps, ObjectFieldTemplateProps, RJSFSchema } from '@
 import validator from '@rjsf/validator-ajv8'
 import { Dispatch, SetStateAction, useState } from 'react'
 
-import { SplitSchemaNoRender } from '../../types/interfaces'
+import { SplitSchemaNoRender } from '../../types/types'
 import { setStepState } from '../../utils/formUtils'
 import { widgets } from '../../utils/formUtils'
 import ValidationErrorIcon from '../model/common/ValidationErrorIcon'

frontend/src/MuiForms/EntitySelector.tsx

@@ -5,7 +5,7 @@ import TextField from '@mui/material/TextField'
 import { FormContextType } from '@rjsf/utils'
 import { debounce } from 'lodash-es'
 import { KeyboardEvent, SyntheticEvent, useCallback, useEffect, useMemo, useState } from 'react'
-import { EntityObject } from 'types/v2/types'
+import { EntityObject } from 'types/types'
 
 import { useGetCurrentUser, useListUsers } from '../../actions/user'
 import Loading from '../common/Loading'

frontend/src/TeamSelect.tsx

@@ -3,7 +3,7 @@ import { useGetTeams } from 'actions/team'
 import { SyntheticEvent } from 'react'
 import LabelledInput from 'src/common/LabelledInput'
 import MessageAlert from 'src/MessageAlert'
-import { TeamInterface } from 'types/interfaces'
+import { TeamInterface } from 'types/types'
 
 const htmlId = 'team-input'
 

frontend/src/common/MultiFileInput.tsx

@@ -3,8 +3,7 @@ import Button from '@mui/material/Button'
 import { styled } from '@mui/material/styles'
 import { ChangeEvent, useCallback, useMemo } from 'react'
 import MultiFileInputFileDisplay from 'src/common/MultiFileInputFileDisplay'
-import { FileWithMetadata } from 'types/interfaces'
-import { FileInterface } from 'types/v2/types'
+import { FileInterface, FileWithMetadata } from 'types/types'
 
 const Input = styled('input')({
   display: 'none',

frontend/src/common/MultiFileInputFileDisplay.tsx

@@ -1,8 +1,7 @@
 import { Chip, Grid, TextField, Tooltip, Typography } from '@mui/material'
 import prettyBytes from 'pretty-bytes'
 import { ChangeEvent, useState } from 'react'
-import { FileWithMetadata } from 'types/interfaces'
-import { FileInterface } from 'types/v2/types'
+import { FileInterface, FileWithMetadata } from 'types/types'
 
 interface MultiFileInputDisplayProps {
   file: File | FileInterface

frontend/src/common/ReviewWithComment.tsx

@@ -12,12 +12,10 @@ import {
 } from '@mui/material'
 import { useTheme } from '@mui/material/styles'
 import { SyntheticEvent, useMemo, useState } from 'react'
-import { ReviewRequestInterface } from 'types/v2/types'
 
 import { useGetModelRoles } from '../../actions/model'
 import { useGetReviewRequestsForModel } from '../../actions/review'
-import { AccessRequestInterface } from '../../types/interfaces'
-import { ReleaseInterface } from '../../types/types'
+import { AccessRequestInterface, ReleaseInterface, ReviewRequestInterface } from '../../types/types'
 import { getRoleDisplay } from '../../utils/roles'
 import MessageAlert from '../MessageAlert'
 import Loading from './Loading'

frontend/src/common/UserAvatar.tsx

@@ -2,8 +2,7 @@ import Avatar from '@mui/material/Avatar'
 import Typography from '@mui/material/Typography'
 import { randomColor } from 'randomcolor'
 import React, { useEffect, useState } from 'react'
-
-import { Entity } from '../../types/types'
+import { Entity } from 'types/types'
 
 export default function UserAvatar({
   entity,

frontend/src/model/AccessRequests.tsx

@@ -6,7 +6,7 @@ import MessageAlert from 'src/MessageAlert'
 import AccessRequestDisplay from 'src/model/accessRequests/AccessRequestDisplay'
 import { sortByCreatedAtDescending } from 'utils/dateUtils'
 
-import { ModelInterface } from '../../types/v2/types'
+import { ModelInterface } from '../../types/types'
 import EmptyBlob from '../common/EmptyBlob'
 import Loading from '../common/Loading'
 

frontend/src/model/ModelImageList.tsx

@@ -4,10 +4,9 @@ import TextField from '@mui/material/TextField'
 import { useGetModelImages } from 'actions/model'
 import { SyntheticEvent, useMemo } from 'react'
 import Loading from 'src/common/Loading'
-import { ModelInterface } from 'types/v2/types'
 import { sortByNameAscending } from 'utils/arrayUtils'
 
-import { FlattenedModelImage } from '../../types/interfaces'
+import { FlattenedModelImage, ModelInterface } from '../../types/types'
 import MessageAlert from '../MessageAlert'
 
 interface ModelImageListProps {

frontend/src/model/ModelImages.tsx

@@ -3,7 +3,7 @@ import { useGetModelImages } from 'actions/model'
 import { useMemo, useState } from 'react'
 import Forbidden from 'src/common/Forbidden'
 
-import { ModelInterface } from '../../types/v2/types'
+import { ModelInterface } from '../../types/types'
 import EmptyBlob from '../common/EmptyBlob'
 import Loading from '../common/Loading'
 import MessageAlert from '../MessageAlert'

frontend/src/model/Overview.tsx

@@ -1,6 +1,6 @@
 import { Container } from '@mui/material'
 import { useMemo } from 'react'
-import { ModelInterface } from 'types/v2/types'
+import { ModelInterface } from 'types/types'
 
 import FormEditPage from './overview/FormEditPage'
 import TemplatePage from './overview/TemplatePage'

frontend/src/model/Releases.tsx

@@ -4,7 +4,7 @@ import { useEffect, useMemo, useState } from 'react'
 import MessageAlert from 'src/MessageAlert'
 
 import { useGetReleasesForModelId } from '../../actions/release'
-import { ModelInterface } from '../../types/v2/types'
+import { ModelInterface } from '../../types/types'
 import EmptyBlob from '../common/EmptyBlob'
 import Loading from '../common/Loading'
 import ReleaseDisplay from './releases/ReleaseDisplay'

frontend/src/model/Settings.tsx

@@ -3,7 +3,7 @@ import { Container, Divider, List, ListItem, ListItemButton, Stack, Typography }
 import { useRouter } from 'next/router'
 import { useEffect, useState } from 'react'
 
-import { ModelInterface } from '../../types/v2/types'
+import { ModelInterface } from '../../types/types'
 import AccessRequestSettings from './settings/AccessRequestSettings'
 import ModelAccess from './settings/ModelAccess'
 import ModelDetails from './settings/ModelDetails'

frontend/src/model/accessRequests/AccessRequestDisplay.tsx

@@ -4,8 +4,7 @@ import { groupBy } from 'lodash-es'
 import { useEffect, useState } from 'react'
 import UserDisplay from 'src/common/UserDisplay'
 import Link from 'src/Link'
-import { AccessRequestInterface } from 'types/interfaces'
-import { ReviewRequestInterface, ReviewResponse } from 'types/v2/types'
+import { AccessRequestInterface, ReviewRequestInterface, ReviewResponse } from 'types/types'
 import { formatDateString, sortByCreatedAtAscending } from 'utils/dateUtils'
 import { plural } from 'utils/stringUtils'
 

frontend/src/model/accessRequests/EditableAccessRequestForm.tsx

@@ -6,7 +6,7 @@ import EditableFormHeading from 'src/Form/EditableFormHeading'
 import { getErrorMessage } from 'utils/fetcher'
 
 import { useGetSchema } from '../../../actions/schema'
-import { AccessRequestInterface, SplitSchemaNoRender } from '../../../types/interfaces'
+import { AccessRequestInterface, SplitSchemaNoRender } from '../../../types/types'
 import { getStepsData, getStepsFromSchema } from '../../../utils/formUtils'
 import Loading from '../../common/Loading'
 import JsonSchemaForm from '../../Form/JsonSchemaForm'

frontend/src/model/common/ValidationErrorIcon.tsx

@@ -2,7 +2,7 @@ import ErrorIcon from '@mui/icons-material/ErrorOutline'
 import { Tooltip } from '@mui/material'
 import { useTheme } from '@mui/material/styles'
 
-import { StepNoRender } from '../../../types/interfaces'
+import { StepNoRender } from '../../../types/types'
 
 interface ValidationErrorIconProps {
   step: StepNoRender

frontend/src/model/overview/FormEditPage.tsx

@@ -6,8 +6,7 @@ import UnsavedChangesContext from 'src/contexts/unsavedChangesContext'
 import { useGetModel } from '../../../actions/model'
 import { putModelCard, useGetModelCardRevisions } from '../../../actions/modelCard'
 import { useGetSchema } from '../../../actions/schema'
-import { SplitSchemaNoRender } from '../../../types/interfaces'
-import { ModelInterface } from '../../../types/v2/types'
+import { ModelInterface, SplitSchemaNoRender } from '../../../types/types'
 import { getStepsData, getStepsFromSchema } from '../../../utils/formUtils'
 import Loading from '../../common/Loading'
 import JsonSchemaForm from '../../Form/JsonSchemaForm'

frontend/src/model/overview/ModelCardHistoryDialog.tsx

@@ -14,7 +14,7 @@ import { useTheme } from '@mui/material/styles'
 import { useMemo } from 'react'
 
 import { useGetModelCardRevisions } from '../../../actions/modelCard'
-import { ModelInterface } from '../../../types/v2/types'
+import { ModelInterface } from '../../../types/types'
 import { sortByCreatedAtDescending } from '../../../utils/dateUtils'
 import Loading from '../../common/Loading'
 import MessageAlert from '../../MessageAlert'

frontend/src/model/overview/ModelCardRevisionListDisplay.tsx

@@ -2,7 +2,7 @@ import { TableBody, TableCell, TableRow } from '@mui/material'
 import { useTheme } from '@mui/material/styles'
 import { useRouter } from 'next/router'
 
-import { ModelCardRevisionInterface } from '../../../types/v2/types'
+import { ModelCardRevisionInterface } from '../../../types/types'
 import { formatDateString } from '../../../utils/dateUtils'
 
 type revisionProp = {

frontend/src/model/overview/TemplatePage.tsx

@@ -2,7 +2,7 @@ import { PostAdd } from '@mui/icons-material'
 import { Box, Button, Card, Divider, Stack, Typography } from '@mui/material'
 import Link from 'src/Link'
 
-import { ModelInterface } from '../../../types/v2/types'
+import { ModelInterface } from '../../../types/types'
 
 type TemplatePageProps = {
   model: ModelInterface

frontend/src/model/registry/ModelImageDisplay.tsx

@@ -5,7 +5,7 @@ import Loading from 'src/common/Loading'
 import MessageAlert from 'src/MessageAlert'
 import CodeLine from 'src/model/registry/CodeLine'
 
-import { ModelImage } from '../../../types/interfaces'
+import { ModelImage } from '../../../types/types'
 
 type ModelImageDisplayProps = {
   modelImage: ModelImage

frontend/src/model/registry/UploadModelImageDialog.tsx

@@ -15,7 +15,7 @@ import Loading from 'src/common/Loading'
 import Link from 'src/Link'
 import MessageAlert from 'src/MessageAlert'
 import CodeLine from 'src/model/registry/CodeLine'
-import { ModelInterface } from 'types/v2/types'
+import { ModelInterface } from 'types/types'
 
 interface UploadModelImageDialogProps {
   open: boolean

frontend/src/model/releases/EditableRelease.tsx

@@ -7,9 +7,7 @@ import UnsavedChangesContext from 'src/contexts/unsavedChangesContext'
 import EditableFormHeading from 'src/Form/EditableFormHeading'
 import MessageAlert from 'src/MessageAlert'
 import ReleaseForm from 'src/model/releases/ReleaseForm'
-import { FileWithMetadata, FlattenedModelImage } from 'types/interfaces'
-import { ReleaseInterface } from 'types/types'
-import { FileInterface, isFileInterface } from 'types/v2/types'
+import { FileInterface, FileWithMetadata, FlattenedModelImage, isFileInterface, ReleaseInterface } from 'types/types'
 import { getErrorMessage } from 'utils/fetcher'
 
 type EditableReleaseProps = {

frontend/src/model/releases/ReleaseDisplay.tsx

@@ -6,12 +6,10 @@ import { useRouter } from 'next/router'
 import prettyBytes from 'pretty-bytes'
 import { useEffect, useState } from 'react'
 import UserDisplay from 'src/common/UserDisplay'
-import { ReviewRequestInterface, ReviewResponse } from 'types/v2/types'
 import { formatDateString, sortByCreatedAtAscending } from 'utils/dateUtils'
 
 import { useGetReviewRequestsForModel } from '../../../actions/review'
-import { ReleaseInterface } from '../../../types/types'
-import { ModelInterface } from '../../../types/v2/types'
+import { ModelInterface, ReleaseInterface, ReviewRequestInterface, ReviewResponse } from '../../../types/types'
 import Loading from '../../common/Loading'
 import Markdown from '../../common/MarkdownDisplay'
 import Link from '../../Link'