cmcd
Browse files
src/App.svelte
CHANGED
@@ -18,12 +18,12 @@
|
|
18 |
// Gradio client instances
|
19 |
let fluxClient: GradioClient | null = $state(null);
|
20 |
let joyCaptionClient: GradioClient | null = $state(null);
|
21 |
-
let
|
22 |
|
23 |
// Unused clients (kept for future use but not initialized)
|
|
|
24 |
// let zephyrClient: GradioClient | null = $state(null);
|
25 |
// let qwenClient: GradioClient | null = $state(null);
|
26 |
-
// let commandClient: GradioClient | null = $state(null);
|
27 |
// let dotsClient: GradioClient | null = $state(null);
|
28 |
|
29 |
// Navigation state
|
@@ -113,12 +113,17 @@
|
|
113 |
opts
|
114 |
);
|
115 |
|
116 |
-
|
117 |
-
"
|
118 |
opts
|
119 |
);
|
120 |
|
121 |
// Unused clients (commented out to save resources)
|
|
|
|
|
|
|
|
|
|
|
122 |
// zephyrClient = await gradioClient.Client.connect(
|
123 |
// "Fraser/zephyr-7b",
|
124 |
// opts
|
@@ -129,11 +134,6 @@
|
|
129 |
// opts
|
130 |
// );
|
131 |
|
132 |
-
// commandClient = await gradioClient.Client.connect(
|
133 |
-
// "Fraser/command-a-vision",
|
134 |
-
// opts
|
135 |
-
// );
|
136 |
-
|
137 |
// dotsClient = await gradioClient.Client.connect(
|
138 |
// "Fraser/dots-demo",
|
139 |
// opts
|
@@ -173,7 +173,7 @@
|
|
173 |
<Scanner
|
174 |
{fluxClient}
|
175 |
{joyCaptionClient}
|
176 |
-
{
|
177 |
/>
|
178 |
{:else if activeTab === 'encounters'}
|
179 |
<Encounters />
|
|
|
18 |
// Gradio client instances
|
19 |
let fluxClient: GradioClient | null = $state(null);
|
20 |
let joyCaptionClient: GradioClient | null = $state(null);
|
21 |
+
let commandClient: GradioClient | null = $state(null);
|
22 |
|
23 |
// Unused clients (kept for future use but not initialized)
|
24 |
+
// let hunyuanClient: GradioClient | null = $state(null);
|
25 |
// let zephyrClient: GradioClient | null = $state(null);
|
26 |
// let qwenClient: GradioClient | null = $state(null);
|
|
|
27 |
// let dotsClient: GradioClient | null = $state(null);
|
28 |
|
29 |
// Navigation state
|
|
|
113 |
opts
|
114 |
);
|
115 |
|
116 |
+
commandClient = await gradioClient.Client.connect(
|
117 |
+
"Fraser/command-a-vision",
|
118 |
opts
|
119 |
);
|
120 |
|
121 |
// Unused clients (commented out to save resources)
|
122 |
+
// hunyuanClient = await gradioClient.Client.connect(
|
123 |
+
// "tencent/hunyuan-turbos",
|
124 |
+
// opts
|
125 |
+
// );
|
126 |
+
|
127 |
// zephyrClient = await gradioClient.Client.connect(
|
128 |
// "Fraser/zephyr-7b",
|
129 |
// opts
|
|
|
134 |
// opts
|
135 |
// );
|
136 |
|
|
|
|
|
|
|
|
|
|
|
137 |
// dotsClient = await gradioClient.Client.connect(
|
138 |
// "Fraser/dots-demo",
|
139 |
// opts
|
|
|
173 |
<Scanner
|
174 |
{fluxClient}
|
175 |
{joyCaptionClient}
|
176 |
+
{commandClient}
|
177 |
/>
|
178 |
{:else if activeTab === 'encounters'}
|
179 |
<Encounters />
|
src/lib/components/AutoTrainerScanner/AutoTrainerScanner.svelte
CHANGED
@@ -12,16 +12,16 @@
|
|
12 |
interface Props {
|
13 |
joyCaptionClient: GradioClient;
|
14 |
fluxClient: GradioClient;
|
15 |
-
|
16 |
|
17 |
// Unused clients (kept for future use)
|
|
|
18 |
// zephyrClient: GradioClient;
|
19 |
// qwenClient: GradioClient;
|
20 |
-
// commandClient: GradioClient;
|
21 |
// dotsClient: GradioClient;
|
22 |
}
|
23 |
|
24 |
-
let { joyCaptionClient, fluxClient,
|
25 |
|
26 |
// Scanner state
|
27 |
let scanState = $state({
|
@@ -52,7 +52,7 @@
|
|
52 |
|
53 |
// Initialize trainer paths on component mount
|
54 |
$effect(() => {
|
55 |
-
if (joyCaptionClient && fluxClient &&
|
56 |
loadInitialState();
|
57 |
}
|
58 |
});
|
@@ -338,7 +338,7 @@
|
|
338 |
bind:this={picletGenerator}
|
339 |
{joyCaptionClient}
|
340 |
{fluxClient}
|
341 |
-
{
|
342 |
isTrainerMode={true}
|
343 |
onTrainerImageCompleted={onTrainerImageCompleted}
|
344 |
onTrainerImageFailed={onTrainerImageFailed}
|
|
|
12 |
interface Props {
|
13 |
joyCaptionClient: GradioClient;
|
14 |
fluxClient: GradioClient;
|
15 |
+
commandClient: GradioClient;
|
16 |
|
17 |
// Unused clients (kept for future use)
|
18 |
+
// hunyuanClient: GradioClient;
|
19 |
// zephyrClient: GradioClient;
|
20 |
// qwenClient: GradioClient;
|
|
|
21 |
// dotsClient: GradioClient;
|
22 |
}
|
23 |
|
24 |
+
let { joyCaptionClient, fluxClient, commandClient }: Props = $props();
|
25 |
|
26 |
// Scanner state
|
27 |
let scanState = $state({
|
|
|
52 |
|
53 |
// Initialize trainer paths on component mount
|
54 |
$effect(() => {
|
55 |
+
if (joyCaptionClient && fluxClient && commandClient) {
|
56 |
loadInitialState();
|
57 |
}
|
58 |
});
|
|
|
338 |
bind:this={picletGenerator}
|
339 |
{joyCaptionClient}
|
340 |
{fluxClient}
|
341 |
+
{commandClient}
|
342 |
isTrainerMode={true}
|
343 |
onTrainerImageCompleted={onTrainerImageCompleted}
|
344 |
onTrainerImageFailed={onTrainerImageFailed}
|
src/lib/components/Pages/Scanner.svelte
CHANGED
@@ -6,32 +6,32 @@
|
|
6 |
interface Props {
|
7 |
fluxClient: GradioClient | null;
|
8 |
joyCaptionClient: GradioClient | null;
|
9 |
-
|
10 |
|
11 |
// Unused clients (kept for future use)
|
|
|
12 |
// zephyrClient: GradioClient | null;
|
13 |
// qwenClient: GradioClient | null;
|
14 |
-
// commandClient: GradioClient | null;
|
15 |
// dotsClient: GradioClient | null;
|
16 |
}
|
17 |
|
18 |
-
let { fluxClient, joyCaptionClient,
|
19 |
</script>
|
20 |
|
21 |
<div class="scanner-page">
|
22 |
-
{#if fluxClient && joyCaptionClient &&
|
23 |
<!-- Auto Trainer Scanner -->
|
24 |
<AutoTrainerScanner
|
25 |
{joyCaptionClient}
|
26 |
{fluxClient}
|
27 |
-
{
|
28 |
/>
|
29 |
|
30 |
<!-- Manual Piclet Generator -->
|
31 |
<PicletGenerator
|
32 |
{fluxClient}
|
33 |
{joyCaptionClient}
|
34 |
-
{
|
35 |
/>
|
36 |
{:else}
|
37 |
<div class="loading-state">
|
|
|
6 |
interface Props {
|
7 |
fluxClient: GradioClient | null;
|
8 |
joyCaptionClient: GradioClient | null;
|
9 |
+
commandClient: GradioClient | null;
|
10 |
|
11 |
// Unused clients (kept for future use)
|
12 |
+
// hunyuanClient: GradioClient | null;
|
13 |
// zephyrClient: GradioClient | null;
|
14 |
// qwenClient: GradioClient | null;
|
|
|
15 |
// dotsClient: GradioClient | null;
|
16 |
}
|
17 |
|
18 |
+
let { fluxClient, joyCaptionClient, commandClient }: Props = $props();
|
19 |
</script>
|
20 |
|
21 |
<div class="scanner-page">
|
22 |
+
{#if fluxClient && joyCaptionClient && commandClient}
|
23 |
<!-- Auto Trainer Scanner -->
|
24 |
<AutoTrainerScanner
|
25 |
{joyCaptionClient}
|
26 |
{fluxClient}
|
27 |
+
{commandClient}
|
28 |
/>
|
29 |
|
30 |
<!-- Manual Piclet Generator -->
|
31 |
<PicletGenerator
|
32 |
{fluxClient}
|
33 |
{joyCaptionClient}
|
34 |
+
{commandClient}
|
35 |
/>
|
36 |
{:else}
|
37 |
<div class="loading-state">
|
src/lib/components/PicletGenerator/PicletGenerator.svelte
CHANGED
@@ -22,12 +22,12 @@
|
|
22 |
let {
|
23 |
joyCaptionClient,
|
24 |
fluxClient,
|
25 |
-
|
26 |
|
27 |
// Unused clients (kept for future use)
|
|
|
28 |
// zephyrClient,
|
29 |
// qwenClient,
|
30 |
-
// commandClient,
|
31 |
// dotsClient,
|
32 |
|
33 |
isTrainerMode = false,
|
@@ -35,17 +35,17 @@
|
|
35 |
onTrainerImageFailed
|
36 |
}: Props = $props();
|
37 |
|
38 |
-
// Text generation client management -
|
39 |
type TextGenerationClient = 'hunyuan' | 'command' | 'zephyr' | 'qwen' | 'dots';
|
40 |
-
let currentTextClient: TextGenerationClient = $state('
|
41 |
|
42 |
-
// Get the active text generation client (now only returns
|
43 |
const getActiveTextClient = () => {
|
44 |
-
if (!
|
45 |
-
console.warn('
|
46 |
return null;
|
47 |
}
|
48 |
-
return
|
49 |
|
50 |
// Unused client switching (kept for future use)
|
51 |
// switch (currentTextClient) {
|
@@ -54,22 +54,22 @@
|
|
54 |
// case 'zephyr': return zephyrClient;
|
55 |
// case 'qwen': return qwenClient;
|
56 |
// case 'dots': return dotsClient;
|
57 |
-
// default: return
|
58 |
// }
|
59 |
};
|
60 |
|
61 |
-
// Unified text generation function (
|
62 |
const generateText = async (prompt: string): Promise<string> => {
|
63 |
const client = getActiveTextClient();
|
64 |
if (!client) {
|
65 |
-
throw new Error(`
|
66 |
}
|
67 |
|
68 |
-
console.log(`Generating text with
|
69 |
|
70 |
-
// Use
|
71 |
-
const
|
72 |
-
return
|
73 |
};
|
74 |
|
75 |
let workflowState: PicletWorkflowState = $state({
|
|
|
22 |
let {
|
23 |
joyCaptionClient,
|
24 |
fluxClient,
|
25 |
+
commandClient,
|
26 |
|
27 |
// Unused clients (kept for future use)
|
28 |
+
// hunyuanClient,
|
29 |
// zephyrClient,
|
30 |
// qwenClient,
|
|
|
31 |
// dotsClient,
|
32 |
|
33 |
isTrainerMode = false,
|
|
|
35 |
onTrainerImageFailed
|
36 |
}: Props = $props();
|
37 |
|
38 |
+
// Text generation client management - now using Command client
|
39 |
type TextGenerationClient = 'hunyuan' | 'command' | 'zephyr' | 'qwen' | 'dots';
|
40 |
+
let currentTextClient: TextGenerationClient = $state('command'); // Fixed to Command client only
|
41 |
|
42 |
+
// Get the active text generation client (now only returns Command client)
|
43 |
const getActiveTextClient = () => {
|
44 |
+
if (!commandClient) {
|
45 |
+
console.warn('Command client not yet initialized');
|
46 |
return null;
|
47 |
}
|
48 |
+
return commandClient; // Only Command client is active
|
49 |
|
50 |
// Unused client switching (kept for future use)
|
51 |
// switch (currentTextClient) {
|
|
|
54 |
// case 'zephyr': return zephyrClient;
|
55 |
// case 'qwen': return qwenClient;
|
56 |
// case 'dots': return dotsClient;
|
57 |
+
// default: return commandClient;
|
58 |
// }
|
59 |
};
|
60 |
|
61 |
+
// Unified text generation function (now using Command client)
|
62 |
const generateText = async (prompt: string): Promise<string> => {
|
63 |
const client = getActiveTextClient();
|
64 |
if (!client) {
|
65 |
+
throw new Error(`Command client is not available`);
|
66 |
}
|
67 |
|
68 |
+
console.log(`Generating text with Command client...`);
|
69 |
|
70 |
+
// Use Command client
|
71 |
+
const result = await client.predict("/chat", [prompt]);
|
72 |
+
return result.data[0] || '';
|
73 |
};
|
74 |
|
75 |
let workflowState: PicletWorkflowState = $state({
|
src/lib/types/index.ts
CHANGED
@@ -99,12 +99,12 @@ export interface PicletWorkflowState {
|
|
99 |
export interface PicletGeneratorProps {
|
100 |
joyCaptionClient: GradioClient | null;
|
101 |
fluxClient: GradioClient | null;
|
102 |
-
|
103 |
|
104 |
// Unused clients (kept for future use)
|
|
|
105 |
// zephyrClient: GradioClient | null;
|
106 |
// qwenClient: GradioClient | null;
|
107 |
-
// commandClient: GradioClient | null;
|
108 |
// dotsClient: GradioClient | null;
|
109 |
}
|
110 |
|
|
|
99 |
export interface PicletGeneratorProps {
|
100 |
joyCaptionClient: GradioClient | null;
|
101 |
fluxClient: GradioClient | null;
|
102 |
+
commandClient: GradioClient | null;
|
103 |
|
104 |
// Unused clients (kept for future use)
|
105 |
+
// hunyuanClient: GradioClient | null;
|
106 |
// zephyrClient: GradioClient | null;
|
107 |
// qwenClient: GradioClient | null;
|
|
|
108 |
// dotsClient: GradioClient | null;
|
109 |
}
|
110 |
|