From 1080b8a380821ac7fbbf5eb43963817728f4d470 Mon Sep 17 00:00:00 2001 From: porink0424 Date: Wed, 17 Apr 2024 12:03:18 +0900 Subject: [PATCH] Update type def file --- optuna_dashboard/ts/action.ts | 1 + optuna_dashboard/ts/apiClient.ts | 1 + optuna_dashboard/ts/components/App.tsx | 2 + optuna_dashboard/ts/components/AppDrawer.tsx | 1 + .../components/Artifact/ArtifactCardMedia.tsx | 2 + .../Artifact/DeleteArtifactDialog.tsx | 1 + .../Artifact/StudyArtifactCards.tsx | 3 +- .../Artifact/ThreejsArtifactViewer.tsx | 2 + .../Artifact/TrialArtifactCards.tsx | 3 +- .../ts/components/BestTrialsCard.tsx | 2 + .../ts/components/CompareStudies.tsx | 1 + .../ts/components/CreateStudyDialog.tsx | 1 + .../ts/components/GraphContour.tsx | 1 + optuna_dashboard/ts/components/GraphEdf.tsx | 1 + .../ts/components/GraphHistory.tsx | 1 + .../GraphHyperparameterImportances.tsx | 5 +- .../ts/components/GraphIntermediateValues.tsx | 1 + .../ts/components/GraphParallelCoordinate.tsx | 1 + .../ts/components/GraphParetoFront.tsx | 1 + optuna_dashboard/ts/components/GraphRank.tsx | 1 + optuna_dashboard/ts/components/GraphSlice.tsx | 1 + .../ts/components/GraphTimeline.tsx | 1 + optuna_dashboard/ts/components/Note.tsx | 6 +++ .../Preferential/PreferentialGraph.tsx | 2 + .../Preferential/PreferentialHistory.tsx | 8 +++ .../PreferentialOutputComponent.tsx | 1 + .../Preferential/PreferentialTrials.tsx | 13 +++-- .../ts/components/RenameStudyDialog.tsx | 1 + optuna_dashboard/ts/components/Settings.tsx | 1 + .../ts/components/StudyDetail.tsx | 1 + .../ts/components/StudyHistory.tsx | 1 + optuna_dashboard/ts/components/StudyList.tsx | 15 +++--- .../ts/components/TrialFormWidgets.tsx | 1 + optuna_dashboard/ts/components/TrialList.tsx | 1 + optuna_dashboard/ts/components/TrialTable.tsx | 1 + .../ts/components/UserDefinedPlot.tsx | 3 +- optuna_dashboard/ts/dominatedTrials.ts | 1 + optuna_dashboard/ts/graphUtil.ts | 7 ++- .../ts/hooks/useParamImportance.ts | 1 + optuna_dashboard/ts/searchSpace.ts | 8 +-- optuna_dashboard/ts/state.ts | 1 + optuna_dashboard/ts/trialFilter.ts | 1 + optuna_dashboard/ts/types/index.d.ts | 52 +++++-------------- 43 files changed, 102 insertions(+), 58 deletions(-) diff --git a/optuna_dashboard/ts/action.ts b/optuna_dashboard/ts/action.ts index d906d1c5..43fd76a2 100644 --- a/optuna_dashboard/ts/action.ts +++ b/optuna_dashboard/ts/action.ts @@ -34,6 +34,7 @@ import { studySummariesLoadingState, } from "./state" import { getDominatedTrials } from "./dominatedTrials" +import { Artifact, FeedbackComponentType, Note, StudyDetail, StudyDetails, StudySummary, Trial } from "./types" // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types export const actionCreator = () => { diff --git a/optuna_dashboard/ts/apiClient.ts b/optuna_dashboard/ts/apiClient.ts index 3177541b..1fd04ff4 100644 --- a/optuna_dashboard/ts/apiClient.ts +++ b/optuna_dashboard/ts/apiClient.ts @@ -1,6 +1,7 @@ import * as plotly from "plotly.js-dist-min" import axios from "axios" import * as Optuna from "@optuna/types" +import { API_ENDPOINT, Artifact, FeedbackComponentType, FormWidgets, Note, ParamImportance, PlotlyGraphObject, PreferenceFeedbackMode, PreferenceHistory, SearchSpaceItem, StudyDetail, StudySummary, Trial, TrialParam } from "./types" const axiosInstance = axios.create({ baseURL: API_ENDPOINT }) diff --git a/optuna_dashboard/ts/components/App.tsx b/optuna_dashboard/ts/components/App.tsx index 7c0cbff6..090f78c0 100644 --- a/optuna_dashboard/ts/components/App.tsx +++ b/optuna_dashboard/ts/components/App.tsx @@ -16,6 +16,7 @@ import { CompareStudies } from "./CompareStudies" import { StudyDetail } from "./StudyDetail" import { StudyList } from "./StudyList" import { QueryClient, QueryClientProvider } from "@tanstack/react-query" +import { URL_PREFIX } from "ts/types" const queryClient = new QueryClient({ defaultOptions: { @@ -55,6 +56,7 @@ export const App: FC = () => { void, diff --git a/optuna_dashboard/ts/components/Artifact/StudyArtifactCards.tsx b/optuna_dashboard/ts/components/Artifact/StudyArtifactCards.tsx index 63b6686b..cf41b8a4 100644 --- a/optuna_dashboard/ts/components/Artifact/StudyArtifactCards.tsx +++ b/optuna_dashboard/ts/components/Artifact/StudyArtifactCards.tsx @@ -27,6 +27,7 @@ import { isThreejsArtifact, } from "./ThreejsArtifactViewer" import { ArtifactCardMedia } from "./ArtifactCardMedia" +import { StudyDetail } from "ts/types" export const StudyArtifactCards: FC<{ study: StudyDetail }> = ({ study }) => { const theme = useTheme() @@ -40,7 +41,7 @@ export const StudyArtifactCards: FC<{ study: StudyDetail }> = ({ study }) => { return ( <> - + {study.artifacts.map((artifact) => { const urlPath = `/artifacts/${study.id}/${artifact.artifact_id}` return ( diff --git a/optuna_dashboard/ts/components/Artifact/ThreejsArtifactViewer.tsx b/optuna_dashboard/ts/components/Artifact/ThreejsArtifactViewer.tsx index 70d2cccf..141ea49e 100644 --- a/optuna_dashboard/ts/components/Artifact/ThreejsArtifactViewer.tsx +++ b/optuna_dashboard/ts/components/Artifact/ThreejsArtifactViewer.tsx @@ -9,6 +9,7 @@ import { PerspectiveCamera } from "three" import { Modal, Box, useTheme } from "@mui/material" import ClearIcon from "@mui/icons-material/Clear" import IconButton from "@mui/material/IconButton" +import { Artifact } from "ts/types" export const isThreejsArtifact = (artifact: Artifact): boolean => { return ( @@ -145,6 +146,7 @@ export const useThreejsArtifactModal = (): [ }} > = ({ trial }) => { const theme = useTheme() @@ -49,7 +50,7 @@ export const TrialArtifactCards: FC<{ trial: Trial }> = ({ trial }) => { > Artifacts - + {trial.artifacts.map((artifact) => { const urlPath = `/artifacts/${trial.study_id}/${trial.trial_id}/${artifact.artifact_id}` return ( diff --git a/optuna_dashboard/ts/components/BestTrialsCard.tsx b/optuna_dashboard/ts/components/BestTrialsCard.tsx index cb560921..255ba207 100644 --- a/optuna_dashboard/ts/components/BestTrialsCard.tsx +++ b/optuna_dashboard/ts/components/BestTrialsCard.tsx @@ -14,6 +14,7 @@ import { } from "@mui/material" import { Link } from "react-router-dom" import LinkIcon from "@mui/icons-material/Link" +import { StudyDetail, Trial, URL_PREFIX } from "ts/types" const useBestTrials = (studyDetail: StudyDetail | null): Trial[] => { return useMemo(() => studyDetail?.best_trials || [], [studyDetail]) @@ -75,6 +76,7 @@ export const BestTrialsCard: FC<{ orientation="horizontal" /> void, () => ReactNode] => { const theme = useTheme() diff --git a/optuna_dashboard/ts/components/GraphContour.tsx b/optuna_dashboard/ts/components/GraphContour.tsx index 140d9dc0..e866cf1f 100644 --- a/optuna_dashboard/ts/components/GraphContour.tsx +++ b/optuna_dashboard/ts/components/GraphContour.tsx @@ -20,6 +20,7 @@ import { getAxisInfo } from "../graphUtil" import { PlotType } from "../apiClient" import { useBackendRender } from "../state" import { usePlot } from "../hooks/usePlot" +import { SearchSpaceItem, StudyDetail, Trial } from "ts/types" const plotDomId = "graph-contour" const CONTOUR_DISABLED_THRESHOLD = 100 diff --git a/optuna_dashboard/ts/components/GraphEdf.tsx b/optuna_dashboard/ts/components/GraphEdf.tsx index 97523c66..55258b7b 100644 --- a/optuna_dashboard/ts/components/GraphEdf.tsx +++ b/optuna_dashboard/ts/components/GraphEdf.tsx @@ -4,6 +4,7 @@ import { Typography, useTheme, Box } from "@mui/material" import { Target, useFilteredTrialsFromStudies } from "../trialFilter" import { getCompareStudiesPlotAPI, CompareStudiesPlotType } from "../apiClient" import { usePlotlyColorTheme, useBackendRender } from "../state" +import { StudyDetail, Trial } from "ts/types" const getPlotDomId = (objectiveId: number) => `graph-edf-${objectiveId}` diff --git a/optuna_dashboard/ts/components/GraphHistory.tsx b/optuna_dashboard/ts/components/GraphHistory.tsx index 37950d33..c06ea58e 100644 --- a/optuna_dashboard/ts/components/GraphHistory.tsx +++ b/optuna_dashboard/ts/components/GraphHistory.tsx @@ -23,6 +23,7 @@ import { import { usePlotlyColorTheme } from "../state" import { useNavigate } from "react-router-dom" import * as Optuna from "@optuna/types" +import { StudyDetail, Trial, URL_PREFIX } from "ts/types" const plotDomId = "graph-history" diff --git a/optuna_dashboard/ts/components/GraphHyperparameterImportances.tsx b/optuna_dashboard/ts/components/GraphHyperparameterImportances.tsx index 12ef8d2c..2828ce44 100644 --- a/optuna_dashboard/ts/components/GraphHyperparameterImportances.tsx +++ b/optuna_dashboard/ts/components/GraphHyperparameterImportances.tsx @@ -10,6 +10,7 @@ import { } from "../state" import { PlotType } from "../apiClient" import { usePlot } from "../hooks/usePlot" +import { ParamImportance, StudyDetail } from "ts/types" const plotDomId = "graph-hyperparameter-importances" @@ -61,7 +62,7 @@ const GraphHyperparameterImportanceBackend: FC<{ } }, [error]) - return + return } const GraphHyperparameterImportanceFrontend: FC<{ @@ -99,7 +100,7 @@ const GraphHyperparameterImportanceFrontend: FC<{ > Hyperparameter Importance - + ) diff --git a/optuna_dashboard/ts/components/GraphIntermediateValues.tsx b/optuna_dashboard/ts/components/GraphIntermediateValues.tsx index bd18a886..65085a97 100644 --- a/optuna_dashboard/ts/components/GraphIntermediateValues.tsx +++ b/optuna_dashboard/ts/components/GraphIntermediateValues.tsx @@ -2,6 +2,7 @@ import * as plotly from "plotly.js-dist-min" import React, { FC, useEffect } from "react" import { Box, Typography, useTheme, CardContent, Card } from "@mui/material" import { usePlotlyColorTheme } from "../state" +import { Trial } from "ts/types" const plotDomId = "graph-intermediate-values" diff --git a/optuna_dashboard/ts/components/GraphParallelCoordinate.tsx b/optuna_dashboard/ts/components/GraphParallelCoordinate.tsx index 10c1eed5..d26f10c7 100644 --- a/optuna_dashboard/ts/components/GraphParallelCoordinate.tsx +++ b/optuna_dashboard/ts/components/GraphParallelCoordinate.tsx @@ -20,6 +20,7 @@ import { useMergedUnionSearchSpace } from "../searchSpace" import { PlotType } from "../apiClient" import { useBackendRender } from "../state" import { usePlot } from "../hooks/usePlot" +import { SearchSpaceItem, StudyDetail, Trial } from "ts/types" const plotDomId = "graph-parallel-coordinate" diff --git a/optuna_dashboard/ts/components/GraphParetoFront.tsx b/optuna_dashboard/ts/components/GraphParetoFront.tsx index d3255a1e..cac556b4 100644 --- a/optuna_dashboard/ts/components/GraphParetoFront.tsx +++ b/optuna_dashboard/ts/components/GraphParetoFront.tsx @@ -18,6 +18,7 @@ import { PlotType } from "../apiClient" import { useBackendRender } from "../state" import { usePlot } from "../hooks/usePlot" import * as Optuna from "@optuna/types" +import { StudyDetail, Trial, URL_PREFIX } from "ts/types" const plotDomId = "graph-pareto-front" diff --git a/optuna_dashboard/ts/components/GraphRank.tsx b/optuna_dashboard/ts/components/GraphRank.tsx index 78c54264..80125b25 100644 --- a/optuna_dashboard/ts/components/GraphRank.tsx +++ b/optuna_dashboard/ts/components/GraphRank.tsx @@ -16,6 +16,7 @@ import { useMergedUnionSearchSpace } from "../searchSpace" import { PlotType } from "../apiClient" import { usePlotlyColorTheme, useBackendRender } from "../state" import { usePlot } from "../hooks/usePlot" +import { SearchSpaceItem, StudyDetail, Trial } from "ts/types" const plotDomId = "graph-rank" diff --git a/optuna_dashboard/ts/components/GraphSlice.tsx b/optuna_dashboard/ts/components/GraphSlice.tsx index 2137296e..4e897b46 100644 --- a/optuna_dashboard/ts/components/GraphSlice.tsx +++ b/optuna_dashboard/ts/components/GraphSlice.tsx @@ -22,6 +22,7 @@ import { useMergedUnionSearchSpace } from "../searchSpace" import { PlotType } from "../apiClient" import { usePlotlyColorTheme, useBackendRender } from "../state" import { usePlot } from "../hooks/usePlot" +import { SearchSpaceItem, StudyDetail, Trial } from "ts/types" const plotDomId = "graph-slice" diff --git a/optuna_dashboard/ts/components/GraphTimeline.tsx b/optuna_dashboard/ts/components/GraphTimeline.tsx index d7a4b108..bf71ba93 100644 --- a/optuna_dashboard/ts/components/GraphTimeline.tsx +++ b/optuna_dashboard/ts/components/GraphTimeline.tsx @@ -7,6 +7,7 @@ import { PlotType } from "../apiClient" import { useBackendRender } from "../state" import { usePlot } from "../hooks/usePlot" import * as Optuna from "@optuna/types" +import { StudyDetail, Trial } from "ts/types" const plotDomId = "graph-timeline" const maxBars = 100 diff --git a/optuna_dashboard/ts/components/Note.tsx b/optuna_dashboard/ts/components/Note.tsx index ec2df900..7bcb34be 100644 --- a/optuna_dashboard/ts/components/Note.tsx +++ b/optuna_dashboard/ts/components/Note.tsx @@ -31,6 +31,7 @@ import React, { import ReactMarkdown from "react-markdown" import remarkGfm from "remark-gfm" import remarkMath from "remark-math" +// @ts-ignore import rehypeMathjax from "rehype-mathjax" import rehypeRaw from "rehype-raw" import LoadingButton from "@mui/lab/LoadingButton" @@ -41,6 +42,7 @@ import { Theme } from "@mui/material/styles" import { CodeComponent, ReactMarkdownNames, + // @ts-ignore } from "react-markdown/lib/ast-to-react" import HtmlIcon from "@mui/icons-material/Html" import ModeEditIcon from "@mui/icons-material/ModeEdit" @@ -51,6 +53,7 @@ import { darcula } from "react-syntax-highlighter/dist/esm/styles/prism" import { actionCreator } from "../action" import { useRecoilValue } from "recoil" import { artifactIsAvailable, isFileUploading, useArtifacts } from "../state" +import { Note } from "ts/types" const placeholder = `## What is this feature for? @@ -74,8 +77,11 @@ $$ ` const CodeBlock: CodeComponent | ReactMarkdownNames = ({ + // @ts-ignore inline, + // @ts-ignore className, + // @ts-ignore children, ...props }) => { diff --git a/optuna_dashboard/ts/components/Preferential/PreferentialGraph.tsx b/optuna_dashboard/ts/components/Preferential/PreferentialGraph.tsx index dd7a3691..98514ba2 100644 --- a/optuna_dashboard/ts/components/Preferential/PreferentialGraph.tsx +++ b/optuna_dashboard/ts/components/Preferential/PreferentialGraph.tsx @@ -26,6 +26,7 @@ import { ElkNode } from "elkjs/lib/elk-api.js" import { useStudyDetailValue } from "../../state" import { getArtifactUrlPath } from "./PreferentialTrials" import { PreferentialOutputComponent } from "./PreferentialOutputComponent" +import { StudyDetail, Trial } from "ts/types" const elk = new ELK() const nodeWidth = 400 @@ -67,6 +68,7 @@ const GraphNode: FC> = ({ data, isConnectable }) => { }} > setDetailShown(false)}> = ({ return ( diff --git a/optuna_dashboard/ts/components/Preferential/PreferentialOutputComponent.tsx b/optuna_dashboard/ts/components/Preferential/PreferentialOutputComponent.tsx index 077e514e..3dc70c45 100644 --- a/optuna_dashboard/ts/components/Preferential/PreferentialOutputComponent.tsx +++ b/optuna_dashboard/ts/components/Preferential/PreferentialOutputComponent.tsx @@ -1,6 +1,7 @@ import React, { FC, useMemo } from "react" import { ArtifactCardMedia } from "../Artifact/ArtifactCardMedia" import { MarkdownRenderer } from "../Note" +import { Artifact, FeedbackComponentType, Trial } from "ts/types" export const PreferentialOutputComponent: FC<{ trial: Trial diff --git a/optuna_dashboard/ts/components/Preferential/PreferentialTrials.tsx b/optuna_dashboard/ts/components/Preferential/PreferentialTrials.tsx index 56aa9844..b8a56d16 100644 --- a/optuna_dashboard/ts/components/Preferential/PreferentialTrials.tsx +++ b/optuna_dashboard/ts/components/Preferential/PreferentialTrials.tsx @@ -34,6 +34,7 @@ import { useThreejsArtifactModal, } from "../Artifact/ThreejsArtifactViewer" import { PreferentialOutputComponent } from "./PreferentialOutputComponent" +import { Artifact, FeedbackComponentArtifact, FeedbackComponentNote, FeedbackComponentType, StudyDetail, Trial } from "ts/types" const SettingsPage: FC<{ studyDetail: StudyDetail @@ -216,6 +217,7 @@ const PreferentialTrial: FC<{ if (trial === undefined) { return ( = ({ null return ( - - + + = ({ Which trial is the worst? = ({ - + {displayTrials.display.map((t, index) => { const trial = activeTrials.find((trial) => trial.number === t) const candidates = displayTrials.display.filter( @@ -573,6 +578,7 @@ export const PreferentialTrials: FC<{ studyDetail: StudyDetail | null }> = ({ {detailTrial !== null && ( setDetailTrial(null)}> = ({ }} > void diff --git a/optuna_dashboard/ts/components/StudyDetail.tsx b/optuna_dashboard/ts/components/StudyDetail.tsx index 898856df..9277b836 100644 --- a/optuna_dashboard/ts/components/StudyDetail.tsx +++ b/optuna_dashboard/ts/components/StudyDetail.tsx @@ -34,6 +34,7 @@ import { PreferentialTrials } from "./Preferential/PreferentialTrials" import { PreferentialHistory } from "./Preferential/PreferentialHistory" import { PreferentialAnalytics } from "./Preferential/PreferentialAnalytics" import { PreferentialGraph } from "./Preferential/PreferentialGraph" +import { URL_PREFIX } from "ts/types" type ParamTypes = { studyId: string diff --git a/optuna_dashboard/ts/components/StudyHistory.tsx b/optuna_dashboard/ts/components/StudyHistory.tsx index ea979db2..029c4d64 100644 --- a/optuna_dashboard/ts/components/StudyHistory.tsx +++ b/optuna_dashboard/ts/components/StudyHistory.tsx @@ -27,6 +27,7 @@ import { import FormControlLabel from "@mui/material/FormControlLabel" import { artifactIsAvailable } from "../state" import * as Optuna from "@optuna/types" +import { Trial } from "ts/types" export const StudyHistory: FC<{ studyId: number }> = ({ studyId }) => { const theme = useTheme() diff --git a/optuna_dashboard/ts/components/StudyList.tsx b/optuna_dashboard/ts/components/StudyList.tsx index f5071497..885a0f19 100644 --- a/optuna_dashboard/ts/components/StudyList.tsx +++ b/optuna_dashboard/ts/components/StudyList.tsx @@ -39,6 +39,7 @@ import { useCreateStudyDialog } from "./CreateStudyDialog" import { useDeleteStudyDialog } from "./DeleteStudyDialog" import { useRenameStudyDialog } from "./RenameStudyDialog" import { useQuery } from "../urlQuery" +import { StudySummary, URL_PREFIX } from "ts/types" export const StudyList: FC<{ toggleColorMode: () => void @@ -97,6 +98,7 @@ export const StudyList: FC<{ })) const sortBySelect = ( + @@ -170,7 +173,7 @@ export const StudyList: FC<{ - + + - + { setStudyFilterText(e.target.value) @@ -229,7 +232,7 @@ export const StudyList: FC<{ }} /> {sortBySelect} - +