From ccfc129e44adc9005d03391ed54bf70017225fa9 Mon Sep 17 00:00:00 2001 From: Enrico Ros Date: Mon, 26 May 2025 16:39:19 -0700 Subject: [PATCH] Partially revert 2894c070 - fixed by the tRPC upgrade --- src/modules/aix/server/api/aix.router.ts | 5 ++--- src/modules/browse/browse.router.ts | 5 ++--- src/modules/elevenlabs/elevenlabs.router.ts | 5 ++--- src/modules/llms/server/openai/openai.router.ts | 5 ++--- src/modules/t2i/prodia/prodia.router.ts | 5 ++--- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/modules/aix/server/api/aix.router.ts b/src/modules/aix/server/api/aix.router.ts index e2faefea8..e3bbac824 100644 --- a/src/modules/aix/server/api/aix.router.ts +++ b/src/modules/aix/server/api/aix.router.ts @@ -2,7 +2,6 @@ import { z } from 'zod'; import { createEmptyReadableStream, createServerDebugWireEvents, safeErrorString, serverCapitalizeFirstLetter } from '~/server/wire'; import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server'; -import { delayPostAsyncGeneratorOnEdge } from '~/server/trpc/trpc.next-edge'; import { fetchResponseOrTRPCThrow } from '~/server/trpc/trpc.router.fetchers'; import { AixDemuxers } from '../dispatch/stream.demuxers'; @@ -38,7 +37,7 @@ export const aixRouter = createTRPCRouter({ streaming: z.boolean(), connectionOptions: AixWire_API.ConnectionOptions_schema.optional(), })) - .mutation(delayPostAsyncGeneratorOnEdge(0, async function* ({ input, ctx }): AsyncGenerator { + .mutation(async function* ({ input, ctx }): AsyncGenerator { // Intake derived state @@ -236,6 +235,6 @@ export const aixRouter = createTRPCRouter({ // or an error that has already been queued up for this last flush yield* chatGenerateTx.flushParticles(); - })), + }), }); diff --git a/src/modules/browse/browse.router.ts b/src/modules/browse/browse.router.ts index 2eded6657..6c3739c5f 100644 --- a/src/modules/browse/browse.router.ts +++ b/src/modules/browse/browse.router.ts @@ -6,7 +6,6 @@ import { default as TurndownService } from 'turndown'; import { load as cheerioLoad } from 'cheerio'; import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server'; -import { delayPostAsyncGeneratorOnEdge } from '~/server/trpc/trpc.next-edge'; import { env } from '~/server/env'; import { workerPuppeteerDownloadFileOrThrow } from './browse.files'; @@ -72,7 +71,7 @@ export const browseRouter = createTRPCRouter({ fetchPagesStreaming: publicProcedure .input(fetchPageInputSchema) - .mutation(delayPostAsyncGeneratorOnEdge(0, async function* ({ input: { access, requests } }) { + .mutation(async function* ({ input: { access, requests } }) { // get endpoint const endpoint = (access.wssEndpoint || env.PUPPETEER_WSS_ENDPOINT || '').trim(); @@ -117,7 +116,7 @@ export const browseRouter = createTRPCRouter({ pages, workerHost, }; - })), + }), }); diff --git a/src/modules/elevenlabs/elevenlabs.router.ts b/src/modules/elevenlabs/elevenlabs.router.ts index 67d6a78ec..64b5fc11a 100644 --- a/src/modules/elevenlabs/elevenlabs.router.ts +++ b/src/modules/elevenlabs/elevenlabs.router.ts @@ -3,7 +3,6 @@ import { z } from 'zod'; import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server'; import { env } from '~/server/env'; import { fetchJsonOrTRPCThrow, fetchResponseOrTRPCThrow } from '~/server/trpc/trpc.router.fetchers'; -import { delayPostAsyncGeneratorOnEdge } from '~/server/trpc/trpc.next-edge'; // configuration @@ -81,7 +80,7 @@ export const elevenlabsRouter = createTRPCRouter({ */ speech: publicProcedure .input(speechInputSchema) - .mutation(delayPostAsyncGeneratorOnEdge(0, async function* ({ input: { xiKey, text, voiceId, nonEnglish, audioStreaming, audioTurbo }, ctx }) { + .mutation(async function* ({ input: { xiKey, text, voiceId, nonEnglish, audioStreaming, audioTurbo }, ctx }) { // start streaming back yield { control: 'start' }; @@ -183,7 +182,7 @@ export const elevenlabsRouter = createTRPCRouter({ // end streaming (if a control error wasn't thrown) yield { control: 'end' }; - })), + }), }); diff --git a/src/modules/llms/server/openai/openai.router.ts b/src/modules/llms/server/openai/openai.router.ts index 2f281f34c..f74cb77cf 100644 --- a/src/modules/llms/server/openai/openai.router.ts +++ b/src/modules/llms/server/openai/openai.router.ts @@ -30,7 +30,6 @@ import { perplexityAIModelDescriptions, perplexityAIModelSort } from './models/p import { togetherAIModelsToModelDescriptions } from './models/together.models'; import { wilreLocalAIModelsApplyOutputSchema, wireLocalAIModelsAvailableOutputSchema, wireLocalAIModelsListOutputSchema } from './localai.wiretypes'; import { xaiModelDescriptions, xaiModelSort } from './models/xai.models'; -import { delayPostAsyncGeneratorOnEdge } from '~/server/trpc/trpc.next-edge'; const openAIDialects = z.enum([ @@ -275,7 +274,7 @@ export const llmOpenAIRouter = createTRPCRouter({ /* [OpenAI/LocalAI] images/generations */ createImages: publicProcedure .input(createImagesInputSchema) - .mutation(delayPostAsyncGeneratorOnEdge(0, async function* ({ input }): AsyncGenerator { + .mutation(async function* ({ input }): AsyncGenerator { const { access, generationConfig: config, editConfig } = input; @@ -395,7 +394,7 @@ export const llmOpenAIRouter = createTRPCRouter({ }, }; } - })), + }), /* [OpenAI] check for content policy violations */ diff --git a/src/modules/t2i/prodia/prodia.router.ts b/src/modules/t2i/prodia/prodia.router.ts index cbdbf505e..ad61046fc 100644 --- a/src/modules/t2i/prodia/prodia.router.ts +++ b/src/modules/t2i/prodia/prodia.router.ts @@ -1,7 +1,6 @@ import { z } from 'zod'; import { createTRPCRouter, publicProcedure } from '~/server/trpc/trpc.server'; -import { delayPostAsyncGeneratorOnEdge } from '~/server/trpc/trpc.next-edge'; import { env } from '~/server/env'; import { fetchResponseOrTRPCThrow } from '~/server/trpc/trpc.router.fetchers'; @@ -28,7 +27,7 @@ export const prodiaRouter = createTRPCRouter({ height: z.number().optional(), seed: z.number().optional(), })) - .query(delayPostAsyncGeneratorOnEdge(0, async function* ({ input }): AsyncGenerator { + .query(async function* ({ input }): AsyncGenerator { const key = (input.prodiaKey || env.PRODIA_API_KEY || '').trim(); if (!key) @@ -139,6 +138,6 @@ export const prodiaRouter = createTRPCRouter({ }, }; - })), + }), });