Greff3 commited on
Commit
b71a8f0
·
1 Parent(s): 87b3568

fix: generation 500 (dead providers), empty login link, localhost OAuth redirect

Browse files

- ask-ai: stream via router.huggingface.co directly (library has no deepinfra),
model -> DeepSeek-V3.1, providers deepinfra + featherless-ai with auto fallback
- login: visible 'sign in' button (was an empty <a> with zero size)
- oauth: redirect_uri derived from SPACE_HOST instead of localhost
- settings: auto-toggle pointed at removed 'fireworks-ai'
- ask-ai: one Audio element instead of one per render

README.md CHANGED
@@ -9,7 +9,7 @@ app_port: 5173
9
  license: mit
10
  short_description: Generate any application with DeepSeek
11
  models:
12
- - deepseek-ai/DeepSeek-V3-0324
13
  ---
14
 
15
  Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
 
9
  license: mit
10
  short_description: Generate any application with DeepSeek
11
  models:
12
+ - deepseek-ai/DeepSeek-V3.1
13
  ---
14
 
15
  Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
server.js CHANGED
@@ -10,11 +10,10 @@ import {
10
  spaceInfo,
11
  fileExists,
12
  } from "@huggingface/hub";
13
- import { InferenceClient } from "@huggingface/inference";
14
  import bodyParser from "body-parser";
15
 
16
  import checkUser from "./middlewares/checkUser.js";
17
- import { PROVIDERS } from "./utils/providers.js";
18
  import { COLORS } from "./utils/colors.js";
19
 
20
  // Load environment variables from .env file
@@ -28,9 +27,31 @@ const __filename = fileURLToPath(import.meta.url);
28
  const __dirname = path.dirname(__filename);
29
 
30
  const PORT = process.env.APP_PORT || 3000;
31
- const REDIRECT_URI =
32
- process.env.REDIRECT_URI || `http://localhost:${PORT}/auth/login`;
33
- const MODEL_ID = "deepseek-ai/DeepSeek-V3-0324";
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
34
  const MAX_REQUESTS_PER_IP = 2;
35
 
36
  app.use(cookieParser());
@@ -230,20 +251,14 @@ app.post("/api/ask-ai", async (req, res) => {
230
  res.setHeader("Cache-Control", "no-cache");
231
  res.setHeader("Connection", "keep-alive");
232
 
233
- const client = new InferenceClient(token);
234
  let completeResponse = "";
235
 
236
  let TOKENS_USED = prompt?.length;
237
  if (previousPrompt) TOKENS_USED += previousPrompt.length;
238
  if (html) TOKENS_USED += html.length;
239
 
240
- const DEFAULT_PROVIDER = PROVIDERS.novita;
241
- // const selectedProvider =
242
- // provider === "auto"
243
- // ? TOKENS_USED < PROVIDERS.sambanova.max_tokens
244
- // ? PROVIDERS.sambanova
245
- // : DEFAULT_PROVIDER
246
- // : PROVIDERS[provider] ?? DEFAULT_PROVIDER;
247
  const selectedProvider =
248
  provider === "auto"
249
  ? DEFAULT_PROVIDER
@@ -257,71 +272,137 @@ app.post("/api/ask-ai", async (req, res) => {
257
  });
258
  }
259
 
260
- try {
261
- const chatCompletion = client.chatCompletionStream({
262
- model: MODEL_ID,
263
- provider: selectedProvider.id,
264
- messages: [
265
- {
266
- role: "system",
267
- content: `ONLY USE HTML, CSS AND JAVASCRIPT. If you want to use ICON make sure to import the library first. Try to create the best UI possible by using only HTML, CSS and JAVASCRIPT. Use as much as you can TailwindCSS for the CSS, if you can't do something with TailwindCSS, then use custom CSS (make sure to import <script src="https://cdn.tailwindcss.com"></script> in the head). Also, try to ellaborate as much as you can, to create something unique. ALWAYS GIVE THE RESPONSE INTO A SINGLE HTML FILE`,
268
- },
269
- ...(previousPrompt
270
- ? [
271
- {
272
- role: "user",
273
- content: previousPrompt,
274
- },
275
- ]
276
- : []),
277
- ...(html
278
- ? [
279
- {
280
- role: "assistant",
281
- content: `The current code is: ${html}.`,
282
- },
283
- ]
284
- : []),
285
- {
286
- role: "user",
287
- content: prompt,
288
- },
289
- ],
290
- ...(selectedProvider.id !== "sambanova"
291
- ? {
292
- max_tokens: selectedProvider.max_tokens,
293
- }
294
- : {}),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
295
  });
296
 
297
- while (true) {
298
- const { done, value } = await chatCompletion.next();
299
- if (done) {
300
- break;
 
 
 
301
  }
302
- const chunk = value.choices[0]?.delta?.content;
303
- if (chunk) {
304
- if (provider !== "sambanova") {
305
- res.write(chunk);
306
- completeResponse += chunk;
307
-
308
- if (completeResponse.includes("</html>")) {
309
- break;
310
- }
311
- } else {
312
- let newChunk = chunk;
313
- if (chunk.includes("</html>")) {
314
- // Replace everything after the last </html> tag with an empty string
315
- newChunk = newChunk.replace(/<\/html>[\s\S]*/, "</html>");
316
- }
317
- completeResponse += newChunk;
318
- res.write(newChunk);
319
- if (newChunk.includes("</html>")) {
320
- break;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
321
  }
 
322
  }
323
  }
324
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
325
  // End the response stream
326
  res.end();
327
  } catch (error) {
 
10
  spaceInfo,
11
  fileExists,
12
  } from "@huggingface/hub";
 
13
  import bodyParser from "body-parser";
14
 
15
  import checkUser from "./middlewares/checkUser.js";
16
+ import { PROVIDERS, DEFAULT_PROVIDER_ID } from "./utils/providers.js";
17
  import { COLORS } from "./utils/colors.js";
18
 
19
  // Load environment variables from .env file
 
27
  const __dirname = path.dirname(__filename);
28
 
29
  const PORT = process.env.APP_PORT || 3000;
30
+
31
+ // Редирект OAuth должен указывать на ПУБЛИЧНЫЙ адрес приложения.
32
+ // SPACE_HOST Hugging Face подставляет автоматически (greff3-deepsite.hf.space),
33
+ // поэтому на спейсе всё работает и без ручной переменной REDIRECT_URI.
34
+ const PUBLIC_HOST = process.env.SPACE_HOST
35
+ ? `https://${process.env.SPACE_HOST}`
36
+ : process.env.PUBLIC_URL ||
37
+ (process.env.REDIRECT_URI
38
+ ? new URL(process.env.REDIRECT_URI).origin
39
+ : `http://localhost:${PORT}`);
40
+
41
+ const REDIRECT_URI = `${
42
+ process.env.REDIRECT_URI && !process.env.REDIRECT_URI.includes("localhost")
43
+ ? process.env.REDIRECT_URI
44
+ : `${PUBLIC_HOST}/auth/login`
45
+ }`;
46
+
47
+ // Модель: DeepSeek-V3-0324 больше не обслуживается ни одним живым провайдером
48
+ // (novita/deepinfra дают "error"). V3.1 живёт на deepinfra и featherless-ai.
49
+ const MODEL_ID = process.env.MODEL_ID || "deepseek-ai/DeepSeek-V3.1";
50
+ // OpenAI-совместимый роутер HF: работает с ЛЮБЫМ живым провайдером,
51
+ // в отличие от @huggingface/inference 3.x (у него провайдеры зашиты в код).
52
+ const HF_ROUTER_URL =
53
+ process.env.HF_ROUTER_URL ||
54
+ "https://router.huggingface.co/v1/chat/completions";
55
  const MAX_REQUESTS_PER_IP = 2;
56
 
57
  app.use(cookieParser());
 
251
  res.setHeader("Cache-Control", "no-cache");
252
  res.setHeader("Connection", "keep-alive");
253
 
 
254
  let completeResponse = "";
255
 
256
  let TOKENS_USED = prompt?.length;
257
  if (previousPrompt) TOKENS_USED += previousPrompt.length;
258
  if (html) TOKENS_USED += html.length;
259
 
260
+ const DEFAULT_PROVIDER =
261
+ PROVIDERS[DEFAULT_PROVIDER_ID] ?? Object.values(PROVIDERS)[0];
 
 
 
 
 
262
  const selectedProvider =
263
  provider === "auto"
264
  ? DEFAULT_PROVIDER
 
272
  });
273
  }
274
 
275
+ // "auto" — перебираем всех живых провайдеров по порядку.
276
+ // Явный выбор — сначала он, дальше остальные как страховка от 500.
277
+ const providerChain =
278
+ provider === "auto"
279
+ ? Object.values(PROVIDERS)
280
+ : [
281
+ selectedProvider,
282
+ ...Object.values(PROVIDERS).filter(
283
+ (p) => p.id !== selectedProvider.id
284
+ ),
285
+ ];
286
+
287
+ const messages = [
288
+ {
289
+ role: "system",
290
+ content: `ONLY USE HTML, CSS AND JAVASCRIPT. If you want to use ICON make sure to import the library first. Try to create the best UI possible by using only HTML, CSS and JAVASCRIPT. Use as much as you can TailwindCSS for the CSS, if you can't do something with TailwindCSS, then use custom CSS (make sure to import <script src="https://cdn.tailwindcss.com"></script> in the head). Also, try to ellaborate as much as you can, to create something unique. ALWAYS GIVE THE RESPONSE INTO A SINGLE HTML FILE`,
291
+ },
292
+ ...(previousPrompt
293
+ ? [
294
+ {
295
+ role: "user",
296
+ content: previousPrompt,
297
+ },
298
+ ]
299
+ : []),
300
+ ...(html
301
+ ? [
302
+ {
303
+ role: "assistant",
304
+ content: `The current code is: ${html}.`,
305
+ },
306
+ ]
307
+ : []),
308
+ {
309
+ role: "user",
310
+ content: prompt,
311
+ },
312
+ ];
313
+
314
+ // Один проход стрима по конкретному провайдеру.
315
+ const streamFromProvider = async (activeProvider) => {
316
+ const response = await fetch(HF_ROUTER_URL, {
317
+ method: "POST",
318
+ headers: {
319
+ Authorization: `Bearer ${token}`,
320
+ "Content-Type": "application/json",
321
+ },
322
+ body: JSON.stringify({
323
+ model: MODEL_ID,
324
+ provider: activeProvider.id,
325
+ messages,
326
+ max_tokens: activeProvider.max_tokens,
327
+ stream: true,
328
+ }),
329
  });
330
 
331
+ if (!response.ok) {
332
+ const text = await response.text();
333
+ let message = text;
334
+ try {
335
+ message = JSON.parse(text)?.error ?? text;
336
+ } catch {
337
+ // не JSON — отдаём как есть
338
  }
339
+ throw new Error(String(message));
340
+ }
341
+
342
+ const reader = response.body.getReader();
343
+ const decoder = new TextDecoder();
344
+ let buffer = "";
345
+
346
+ while (true) {
347
+ const { done, value } = await reader.read();
348
+ if (done) break;
349
+
350
+ buffer += decoder.decode(value, { stream: true });
351
+ const lines = buffer.split("\n");
352
+ buffer = lines.pop() ?? "";
353
+
354
+ for (const line of lines) {
355
+ const trimmed = line.trim();
356
+ if (!trimmed.startsWith("data:")) continue;
357
+ const data = trimmed.slice(5).trim();
358
+ if (!data || data === "[DONE]") continue;
359
+
360
+ let parsed;
361
+ try {
362
+ parsed = JSON.parse(data);
363
+ } catch {
364
+ continue;
365
+ }
366
+
367
+ const chunk = parsed.choices?.[0]?.delta?.content;
368
+ if (!chunk) continue;
369
+
370
+ res.write(chunk);
371
+ completeResponse += chunk;
372
+
373
+ // Модель иногда дописывает текст после </html> — обрываем поток сами.
374
+ if (completeResponse.includes("</html>")) {
375
+ try {
376
+ await reader.cancel();
377
+ } catch {
378
+ // поток уже закрыт
379
  }
380
+ return;
381
  }
382
  }
383
  }
384
+ };
385
+
386
+ try {
387
+ let lastError;
388
+
389
+ for (const activeProvider of providerChain) {
390
+ try {
391
+ await streamFromProvider(activeProvider);
392
+ lastError = undefined;
393
+ break;
394
+ } catch (error) {
395
+ lastError = error;
396
+ // Пока клиенту ничего не отдали — молча переключаемся на запасного.
397
+ if (completeResponse.length > 0) throw error;
398
+ console.warn(
399
+ `[ask-ai] provider "${activeProvider.id}" failed: ${error.message}`
400
+ );
401
+ }
402
+ }
403
+
404
+ if (lastError) throw lastError;
405
+
406
  // End the response stream
407
  res.end();
408
  } catch (error) {
src/components/ask-ai/ask-ai.tsx CHANGED
@@ -1,5 +1,5 @@
1
  /* eslint-disable @typescript-eslint/no-explicit-any */
2
- import { useState } from "react";
3
  import { RiSparkling2Fill } from "react-icons/ri";
4
  import { GrSend } from "react-icons/gr";
5
  import classNames from "classnames";
@@ -38,8 +38,13 @@ function AskAI({
38
  const [providerError, setProviderError] = useState("");
39
  const [openProModal, setOpenProModal] = useState(false);
40
 
41
- const audio = new Audio(SuccessSound);
42
- audio.volume = 0.5;
 
 
 
 
 
43
 
44
  const callAi = async () => {
45
  if (isAiWorking || !prompt.trim()) return;
 
1
  /* eslint-disable @typescript-eslint/no-explicit-any */
2
+ import { useMemo, useState } from "react";
3
  import { RiSparkling2Fill } from "react-icons/ri";
4
  import { GrSend } from "react-icons/gr";
5
  import classNames from "classnames";
 
38
  const [providerError, setProviderError] = useState("");
39
  const [openProModal, setOpenProModal] = useState(false);
40
 
41
+ // Один экземпляр на компонент: при потоковой генерации рендер идёт сотнями,
42
+ // и new Audio() в теле функции плодит утечку + ломает автовоспроизведение.
43
+ const audio = useMemo(() => {
44
+ const element = new Audio(SuccessSound);
45
+ element.volume = 0.5;
46
+ return element;
47
+ }, []);
48
 
49
  const callAi = async () => {
50
  if (isAiWorking || !prompt.trim()) return;
src/components/login/login.tsx CHANGED
@@ -26,8 +26,26 @@ function Login({
26
  </header>
27
  <main className="px-4 py-4 space-y-3">
28
  {children}
29
- <a href="/api/login" onClick={handleClick}>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  </a>
 
 
 
31
  </main>
32
  </>
33
  );
 
26
  </header>
27
  <main className="px-4 py-4 space-y-3">
28
  {children}
29
+ {/* Кнопка входа обязана иметь видимое содержимое:
30
+ пустой <a> имеет нулевой размер, и войти невозможно. */}
31
+ <a
32
+ href="/api/login"
33
+ onClick={handleClick}
34
+ className="w-full flex items-center justify-center gap-2 rounded-lg bg-gray-900 hover:bg-gray-800 text-white text-sm font-semibold py-2.5 px-3 transition-colors duration-100 cursor-pointer"
35
+ >
36
+ <svg
37
+ className="size-4"
38
+ viewBox="0 0 256 256"
39
+ fill="currentColor"
40
+ aria-hidden="true"
41
+ >
42
+ <path d="M128 16c-62 0-112 50-112 112 0 62 50 112 112 112s112-50 112-112C240 66 190 16 128 16Zm0 36a24 24 0 1 1 0 48 24 24 0 0 1 0-48Zm-52 52a20 20 0 1 1 0 40 20 20 0 0 1 0-40Zm104 0a20 20 0 1 1 0 40 20 20 0 0 1 0-40Zm-52 116c-31 0-58-12-78-32 3-23 33-41 78-41s75 18 78 41c-20 20-47 32-78 32Z" />
43
+ </svg>
44
+ Войти через Hugging Face
45
  </a>
46
+ <p className="text-xs text-gray-500 text-center">
47
+ Вход нужен, чтобы продолжить и сохранять проекты.
48
+ </p>
49
  </main>
50
  </>
51
  );
src/components/settings/settings.tsx CHANGED
@@ -66,7 +66,12 @@ function Settings({
66
  }
67
  )}
68
  onClick={() => {
69
- onChange(provider === "auto" ? "fireworks-ai" : "auto");
 
 
 
 
 
70
  }}
71
  >
72
  <div
@@ -113,6 +118,10 @@ function Settings({
113
  src={`/providers/${id}.svg`}
114
  alt={PROVIDERS[id].name}
115
  className="size-5"
 
 
 
 
116
  />
117
  {PROVIDERS[id].name}
118
  </div>
 
66
  }
67
  )}
68
  onClick={() => {
69
+ // "fireworks-ai" больше не существует — берём первого живого провайдера
70
+ onChange(
71
+ provider === "auto"
72
+ ? (Object.keys(PROVIDERS)[0] as string)
73
+ : "auto"
74
+ );
75
  }}
76
  >
77
  <div
 
118
  src={`/providers/${id}.svg`}
119
  alt={PROVIDERS[id].name}
120
  className="size-5"
121
+ onError={(e) => {
122
+ // нет иконки — не показываем битую картинку
123
+ e.currentTarget.style.display = "none";
124
+ }}
125
  />
126
  {PROVIDERS[id].name}
127
  </div>
utils/providers.js CHANGED
@@ -1,27 +1,18 @@
 
 
 
1
  export const PROVIDERS = {
2
- "fireworks-ai": {
3
- name: "Fireworks AI",
4
- max_tokens: 131_000,
5
- id: "fireworks-ai",
6
- },
7
- nebius: {
8
- name: "Nebius AI Studio",
9
- max_tokens: 131_000,
10
- id: "nebius",
11
- },
12
- sambanova: {
13
- name: "SambaNova",
14
- max_tokens: 8_000,
15
- id: "sambanova",
16
  },
17
- novita: {
18
- name: "NovitaAI",
19
  max_tokens: 16_000,
20
- id: "novita",
21
  },
22
- // hyperbolic: {
23
- // name: "Hyperbolic",
24
- // max_tokens: 131_000,
25
- // id: "hyperbolic",
26
- // },
27
  };
 
 
 
 
1
+ // Провайдеры, которые ДЕЙСТВИТЕЛЬНО обслуживают нашу модель на HF Inference Providers.
2
+ // Проверять актуальный список: https://huggingface.co/api/models/<MODEL_ID>?expand[]=inferenceProviderMapping
3
+ // (status должен быть "live"; "error" = провайдер отвалился, запрос упадёт с 500).
4
  export const PROVIDERS = {
5
+ deepinfra: {
6
+ name: "DeepInfra",
7
+ max_tokens: 16_000,
8
+ id: "deepinfra",
 
 
 
 
 
 
 
 
 
 
9
  },
10
+ "featherless-ai": {
11
+ name: "Featherless AI",
12
  max_tokens: 16_000,
13
+ id: "featherless-ai",
14
  },
 
 
 
 
 
15
  };
16
+
17
+ // Порядок ключей = порядок фолбэка: первый — основной, остальные — запасные.
18
+ export const DEFAULT_PROVIDER_ID = "deepinfra";