From f2b739fcacb016e27a4abd6302e5aa2245690abc Mon Sep 17 00:00:00 2001 From: Bruno Carlos <6951456+brnovasco@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:23:18 -0300 Subject: [PATCH] removing tensorboard api route and custom env variables --- apps/deepsirius-ui/.env.example | 6 +-- apps/deepsirius-ui/Dockerfile | 2 - apps/deepsirius-ui/src/env.mjs | 4 -- apps/deepsirius-ui/src/server/api/root.ts | 2 - .../src/server/api/routers/tb_consumer.ts | 52 ------------------- compose.registry.yaml | 2 - compose.yaml | 3 -- 7 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 apps/deepsirius-ui/src/server/api/routers/tb_consumer.ts diff --git a/apps/deepsirius-ui/.env.example b/apps/deepsirius-ui/.env.example index 87d277c..78df44d 100644 --- a/apps/deepsirius-ui/.env.example +++ b/apps/deepsirius-ui/.env.example @@ -46,8 +46,4 @@ STORAGE_API_KEY="" # deepsirius cli PROCESSING_CONTAINER_STORAGE_BIND="" -PROCESSING_CONTAINER_PATH="" - -# tensorboard api -TENSORBOARD_API_URL="https://tensorboard.example.com" -TENSORBOARD_API_KEY="key" \ No newline at end of file +PROCESSING_CONTAINER_PATH="" \ No newline at end of file diff --git a/apps/deepsirius-ui/Dockerfile b/apps/deepsirius-ui/Dockerfile index 51e8385..bc7b5c9 100644 --- a/apps/deepsirius-ui/Dockerfile +++ b/apps/deepsirius-ui/Dockerfile @@ -40,8 +40,6 @@ ARG PROCESSING_CONTAINER_STORAGE_BIND ARG PROCESSING_CONTAINER_PATH ARG STORAGE_API_URL ARG STORAGE_API_KEY -ARG TENSORBOARD_API_URL -ARG TENSORBOARD_API_KEY COPY --from=deps /app/out/full . COPY turbo.json . diff --git a/apps/deepsirius-ui/src/env.mjs b/apps/deepsirius-ui/src/env.mjs index 9375be3..78dab2f 100644 --- a/apps/deepsirius-ui/src/env.mjs +++ b/apps/deepsirius-ui/src/env.mjs @@ -27,8 +27,6 @@ const server = z.object({ PROCESSING_CONTAINER_PATH: z.string(), STORAGE_API_URL: z.string().url(), STORAGE_API_KEY: z.string(), - TENSORBOARD_API_URL: z.string().url(), - TENSORBOARD_API_KEY: z.string(), }); /** @@ -61,8 +59,6 @@ const processEnv = { PROCESSING_CONTAINER_PATH: process.env.PROCESSING_CONTAINER_PATH, STORAGE_API_URL: process.env.STORAGE_API_URL, STORAGE_API_KEY: process.env.STORAGE_API_KEY, - TENSORBOARD_API_URL: process.env.TENSORBOARD_API_URL, - TENSORBOARD_API_KEY: process.env.TENSORBOARD_API_KEY, }; // Don't touch the part below diff --git a/apps/deepsirius-ui/src/server/api/root.ts b/apps/deepsirius-ui/src/server/api/root.ts index 1ef79a1..af2ba9e 100644 --- a/apps/deepsirius-ui/src/server/api/root.ts +++ b/apps/deepsirius-ui/src/server/api/root.ts @@ -3,7 +3,6 @@ import { jobRouter } from './routers/job'; import { deepsiriusJobRouter } from './routers/deepsirius-job'; import { sshRouter } from './routers/ssh'; import { dbRouter } from './routers/db'; -import { tbConsumerRouter } from './routers/tb_consumer'; /** * This is the primary router for your server. @@ -15,7 +14,6 @@ export const appRouter = createTRPCRouter({ db: dbRouter, job: jobRouter, deepsiriusJob: deepsiriusJobRouter, - tbConsumer: tbConsumerRouter, }); // export type definition of API diff --git a/apps/deepsirius-ui/src/server/api/routers/tb_consumer.ts b/apps/deepsirius-ui/src/server/api/routers/tb_consumer.ts deleted file mode 100644 index 530bdfa..0000000 --- a/apps/deepsirius-ui/src/server/api/routers/tb_consumer.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { TRPCError } from '@trpc/server'; -import { z } from 'zod'; -import { env } from '~/env.mjs'; -import { createTRPCRouter, protectedProcedure } from '~/server/api/trpc'; - -const TensorboardResponseSchema = z.object({ - logdir: z.string(), - name: z.string(), - url: z.string(), - pid: z.number(), -}); - -export const tbConsumerRouter = createTRPCRouter({ - start: protectedProcedure - .input( - z.object({ - logdir: z.string(), - name: z.string(), - }), - ) - .query(async ({ input }) => { - const url = `${env.TENSORBOARD_API_URL}/api/tensorboard/start`; - const res = await fetch(url, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'x-api-key': env.TENSORBOARD_API_KEY, - }, - body: JSON.stringify(input), - }); - - const data: unknown = await res.json(); - - if (!res.ok) { - const error = z - .object({ - status: z.string(), - message: z.string(), - }) - .parse(data); - - throw new TRPCError({ - code: 'INTERNAL_SERVER_ERROR', - message: error.message, - cause: data, - }); - } - const parsed = TensorboardResponseSchema.parse(data); - - return parsed; - }), -}); diff --git a/compose.registry.yaml b/compose.registry.yaml index 302d884..0f4659b 100644 --- a/compose.registry.yaml +++ b/compose.registry.yaml @@ -21,8 +21,6 @@ services: - PROCESSING_CONTAINER_STORAGE_BIND=${PROCESSING_CONTAINER_STORAGE_BIND} - STORAGE_API_URL=${STORAGE_API_URL} - STORAGE_API_KEY=${STORAGE_API_KEY} - - TENSORBOARD_API_URL=${TENSORBOARD_API_URL} - - TENSORBOARD_API_KEY=${TENSORBOARD_API_KEY} networks: - deepsirius-ui-network db: diff --git a/compose.yaml b/compose.yaml index 72c1223..d39a44e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -29,8 +29,6 @@ services: - PRIVATE_KEY_PASSPHRASE=${PRIVATE_KEY_PASSPHRASE} - PROCESSING_CONTAINER_PATH=${PROCESSING_CONTAINER_PATH} - PROCESSING_CONTAINER_STORAGE_BIND=${PROCESSING_CONTAINER_STORAGE_BIND} - - TENSORBOARD_API_URL=${TENSORBOARD_API_URL} - - TENSORBOARD_API_KEY=${TENSORBOARD_API_KEY} networks: - deepsirius-ui-network db: @@ -62,7 +60,6 @@ services: volumes: pgdata: - networks: deepsirius-ui-network: name: deepsirius-ui-network