Skip to content

Commit 2032ef1

Browse files
committed
remove more experimentinfo directly
1 parent adc657d commit 2032ef1

File tree

8 files changed

+37
-83
lines changed

8 files changed

+37
-83
lines changed

src/renderer/components/Experiment/Diffusion/Diffusion.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ import History from './History';
4141
import Inpainting from './Inpainting';
4242
import HistoryImageSelector from './HistoryImageSelector';
4343
import ControlNetModal from './ControlNetModal';
44-
45-
type DiffusionProps = {
46-
experimentInfo: any;
47-
};
44+
import { useExperimentInfo } from 'renderer/lib/ExperimentInfoContext';
4845

4946
// Helper component for labels with tooltips
5047
const LabelWithTooltip = ({
@@ -98,7 +95,8 @@ const samplePrompts = [
9895
'a whimsical and highly detailed illustration of a miniature world inside a glass terrarium, tiny people tending to giant flowers, a small waterfall, magical realism, storybook style.',
9996
];
10097

101-
export default function Diffusion({ experimentInfo }: DiffusionProps) {
98+
export default function Diffusion() {
99+
const { experimentInfo } = useExperimentInfo();
102100
const analytics = useAnalytics();
103101

104102
const initialModel = experimentInfo?.config?.foundation || '';

src/renderer/components/Experiment/Export/Export.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,20 @@ import {
1515
Table,
1616
Typography,
1717
} from '@mui/joy';
18+
import { useExperimentInfo } from 'renderer/lib/ExperimentInfoContext';
1819

1920
// fetcher used by SWR
2021
const fetcher = (url: string) => fetch(url).then((res) => res.json());
2122

22-
interface ExportProps {
23-
experimentInfo: any;
24-
}
25-
2623
interface Plugin {
2724
uniqueId: string;
2825
name: string;
2926
description: string;
3027
model_architectures: string[];
3128
}
3229

33-
export default function Export({ experimentInfo }: ExportProps) {
30+
export default function Export() {
31+
const { experimentInfo } = useExperimentInfo();
3432
const [runningPlugin, setRunningPlugin] = useState<string | null>(null);
3533
const [exportDetailsJobId, setExportDetailsJobId] = useState<number>(-1);
3634
const [selectedPlugin, setSelectedPlugin] = useState<Plugin | null>(null);

src/renderer/components/Experiment/Rag/index.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,21 @@ import {
1111
Typography,
1212
Option,
1313
Chip,
14-
FormLabel,
1514
} from '@mui/joy';
16-
import Documents from '../../Shared/Documents';
17-
import Query from './Query';
1815
import useSWR from 'swr';
1916

2017
import * as chatAPI from 'renderer/lib/transformerlab-api-sdk';
2118
import { CogIcon, XCircleIcon } from 'lucide-react';
22-
import ConfigurePlugin from './ConfigurePlugin';
2319
import { useState } from 'react';
20+
import { useExperimentInfo } from 'renderer/lib/ExperimentInfoContext';
21+
import Documents from '../../Shared/Documents';
22+
import Query from './Query';
23+
import ConfigurePlugin from './ConfigurePlugin';
2424

2525
const fetcher = (url) => fetch(url).then((res) => res.json());
2626

27-
export default function DocumentSearch({ experimentInfo, setRagEngine }) {
27+
export default function DocumentSearch({ setRagEngine }) {
28+
const { experimentInfo } = useExperimentInfo();
2829
const [openConfigureModal, setOpenConfigureModal] = useState(false);
2930
const {
3031
data: plugins,
@@ -117,7 +118,7 @@ export default function DocumentSearch({ experimentInfo, setRagEngine }) {
117118
flexDirection: 'column',
118119
}}
119120
>
120-
<Documents experimentInfo={experimentInfo} fixedFolder="rag" />
121+
<Documents fixedFolder="rag" />
121122
</Box>
122123
<Box sx={{ flex: 1, display: 'flex', flexDirection: 'column' }}>
123124
<Query experimentInfo={experimentInfo} />

src/renderer/components/Experiment/Settings.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ import { Button, Chip, Divider, Switch, Typography } from '@mui/joy';
55

66
import * as chatAPI from 'renderer/lib/transformerlab-api-sdk';
77
import { useState } from 'react';
8+
import { useExperimentInfo } from 'renderer/lib/ExperimentInfoContext';
89

910
const fetcher = (url) => fetch(url).then((res) => res.json());
1011

11-
export default function ExperimentSettings({
12-
experimentInfo,
13-
setExperimentId,
14-
experimentInfoMutate,
15-
}) {
12+
export default function ExperimentSettings() {
13+
const { experimentInfo, setExperimentId } = useExperimentInfo();
1614
const [showJSON, setShowJSON] = useState(false);
1715

1816
if (!experimentInfo) {

src/renderer/components/MainAppPanel.tsx

Lines changed: 11 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -375,66 +375,22 @@ export default function MainAppPanel({ setLogsDrawerOpen = null }) {
375375
<Route path="/experiment/documents" element={<Documents />} />
376376
<Route
377377
path="/experiment/rag"
378-
element={
379-
<Rag experimentInfo={experimentInfo} setRagEngine={setRagEngine} />
380-
}
381-
/>
382-
<Route
383-
path="/experiment/export"
384-
element={<Export experimentInfo={experimentInfo} />}
385-
/>
386-
<Route
387-
path="/experiment/generate"
388-
element={<Generate experimentInfo={experimentInfo} />}
389-
/>
390-
<Route
391-
path="/experiment/diffusion"
392-
element={<Diffusion experimentInfo={experimentInfo} />}
378+
element={<Rag setRagEngine={setRagEngine} />}
393379
/>
380+
<Route path="/experiment/export" element={<Export />} />
381+
<Route path="/experiment/diffusion" element={<Diffusion />} />
394382
<Route
395383
path="/plugins"
396-
element={
397-
<Plugins
398-
experimentInfo={experimentInfo}
399-
setLogsDrawerOpen={setLogsDrawerOpen}
400-
/>
401-
}
402-
/>
403-
<Route
404-
path="/plugins/:pluginName"
405-
element={<PluginDetails experimentInfo={experimentInfo} />}
384+
element={<Plugins setLogsDrawerOpen={setLogsDrawerOpen} />}
406385
/>
386+
<Route path="/plugins/:pluginName" element={<PluginDetails />} />
407387
<Route path="/api" element={<Api />} />
408-
<Route
409-
path="/experiment/settings"
410-
element={
411-
<Settings
412-
experimentInfo={experimentInfo}
413-
setExperimentId={setExperimentId}
414-
experimentInfoMutate={experimentInfoMutate}
415-
/>
416-
}
417-
/>
418-
<Route
419-
path="/zoo"
420-
element={<ModelZoo experimentInfo={experimentInfo} tab="groups" />}
421-
/>
422-
<Route
423-
path="/zoo/local"
424-
element={<ModelZoo experimentInfo={experimentInfo} tab="local" />}
425-
/>
426-
<Route
427-
path="/zoo/generated"
428-
element={<ModelZoo experimentInfo={experimentInfo} tab="generated" />}
429-
/>
430-
<Route
431-
path="/zoo/store"
432-
element={<ModelZoo experimentInfo={experimentInfo} tab="store" />}
433-
/>
434-
<Route
435-
path="/zoo/groups"
436-
element={<ModelZoo experimentInfo={experimentInfo} tab="groups" />}
437-
/>
388+
<Route path="/experiment/settings" element={<Settings />} />
389+
<Route path="/zoo" element={<ModelZoo tab="groups" />} />
390+
<Route path="/zoo/local" element={<ModelZoo tab="local" />} />
391+
<Route path="/zoo/generated" element={<ModelZoo tab="generated" />} />
392+
<Route path="/zoo/store" element={<ModelZoo tab="store" />} />
393+
<Route path="/zoo/groups" element={<ModelZoo tab="groups" />} />
438394
<Route path="/data" element={<Data />} />
439395
<Route path="/computer" element={<Computer />} />
440396
<Route path="/settings" element={<TransformerLabSettings />} />

src/renderer/components/ModelZoo/ModelZoo.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
/* eslint-disable jsx-a11y/anchor-is-valid */
2-
import { useState, useCallback } from 'react';
32
import Sheet from '@mui/joy/Sheet';
43
import { StoreIcon } from 'lucide-react';
54
import { Tab, TabList, TabPanel, Tabs } from '@mui/joy';
6-
import ModelStore from './ModelStore';
7-
import LocalModels from './LocalModels';
5+
import { useExperimentInfo } from 'renderer/lib/ExperimentInfoContext';
86
import { useNavigate } from 'react-router-dom';
7+
import LocalModels from './LocalModels';
98
import ModelGroups from './ModelGroups';
109

11-
export default function ModelZoo({ experimentInfo, tab = 'store' }) {
10+
export default function ModelZoo({ tab = 'store' }) {
1211
const navigate = useNavigate();
13-
const DEV_MODE = experimentInfo?.name === 'dev';
12+
const { experimentInfo } = useExperimentInfo();
1413

1514
return (
1615
<Sheet

src/renderer/components/Plugins/PluginDetails.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import fairyflossTheme from '../Shared/fairyfloss.tmTheme.js';
3939

4040
import * as chatAPI from 'renderer/lib/transformerlab-api-sdk';
4141
import useSWR from 'swr';
42+
import { useExperimentInfo } from 'renderer/lib/ExperimentInfoContext.js';
4243

4344
function ListPluginFiles({
4445
files,
@@ -147,7 +148,8 @@ function setTheme(editor: any, monaco: any) {
147148

148149
const fetcher = (url) => fetch(url).then((res) => res.json());
149150

150-
export default function PluginDetails({ experimentInfo }) {
151+
export default function PluginDetails() {
152+
const { experimentInfo } = useExperimentInfo();
151153
let { pluginName } = useParams();
152154
let { state: plugin } = useLocation();
153155

src/renderer/components/Plugins/Plugins.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ import { Circle, StoreIcon } from 'lucide-react';
1414
import { usePluginStatus } from 'renderer/lib/transformerlab-api-sdk';
1515
import * as chatAPI from 'renderer/lib/transformerlab-api-sdk';
1616
import { useState } from 'react';
17+
import { useExperimentInfo } from 'renderer/lib/ExperimentInfoContext';
1718
import PluginGallery from './PluginGallery';
1819
import LocalPlugins from './LocalPlugins';
1920
import OneTimePopup from '../Shared/OneTimePopup';
2021

21-
export default function Plugins({ experimentInfo, setLogsDrawerOpen = null }) {
22+
export default function Plugins({ setLogsDrawerOpen = null }) {
23+
const { experimentInfo } = useExperimentInfo();
2224
const { data: outdatedPlugins, mutate: outdatePluginsMutate } =
2325
usePluginStatus(experimentInfo);
2426
const [installing, setInstalling] = useState(null);

0 commit comments

Comments
 (0)