Optimize env.ts and eliminate dependency cycles in webapp

apps/webapp/app/[modelId]/[layer]/[index]/opengraph-image.tsx

@@ -2,10 +2,10 @@
 /* eslint no-nested-ternary: 0 */
 /* eslint react/no-array-index-key: 0 */
 
+import { makeAuthedUserFromSessionOrReturnNull } from '@/lib/auth/utils';
 import { getNeuronOptimized } from '@/lib/db/neuron';
 import { getSourceSet } from '@/lib/db/source';
-import { makeAuthedUserFromSessionOrReturnNull } from '@/lib/db/user';
-import { NEXT_PUBLIC_URL } from '@/lib/env';
+import { env } from '@/lib/env';
 import { makeActivationBackgroundColorWithDFA, replaceHtmlAnomalies } from '@/lib/utils/activations';
 import { Activation } from '@prisma/client';
 import { notFound } from 'next/navigation';
@@ -352,7 +352,7 @@ export default async function Image({ params }: { params: { modelId: string; lay
           })}
         </div>
         <div tw="absolute flex flex-row justify-end bottom-0 text-slate-400 right-0 pb-2 pr-3 leading-none">
-          {NEXT_PUBLIC_URL}/{currentNeuron.modelId}/{currentNeuron.layer}/{currentNeuron.index}
+          {env.NEXT_PUBLIC_URL}/{currentNeuron.modelId}/{currentNeuron.layer}/{currentNeuron.index}
         </div>
       </div>
     ),

apps/webapp/app/[modelId]/[layer]/[index]/page.tsx

@@ -1,5 +1,5 @@
+import { makeAuthedUserFromSessionOrReturnNull } from '@/lib/auth/utils';
 import { getNeuronOptimized, neuronExistsAndUserHasAccess } from '@/lib/db/neuron';
-import { makeAuthedUserFromSessionOrReturnNull } from '@/lib/db/user';
 import { NeuronWithPartialRelations } from '@/prisma/generated/zod';
 import { Metadata } from 'next';
 import { notFound } from 'next/navigation';

apps/webapp/app/[modelId]/[layer]/page-source.tsx

@@ -8,7 +8,7 @@ import SearchTopkByTokenPane from '@/components/panes/search-topk-by-token-pane'
 import UmapPane from '@/components/panes/umap-pane';
 import { BreadcrumbItem, BreadcrumbLink } from '@/components/shadcn/breadcrumbs';
 import { getVisibilityBadge } from '@/components/visibility-badge';
-import { DEMO_MODE } from '@/lib/env';
+import { env } from '@/lib/env';
 import { getLayerNumAsStringFromSource } from '@/lib/utils/source';
 import {
   EvalWithPartialRelations,
@@ -166,7 +166,7 @@ export default function PageSource({ source }: { source: SourceWithRelations })
             />
           )}
 
-          {!DEMO_MODE && (
+          {!env.DEMO_MODE && (
             <SAEEvalsPane
               sae={source as SourceWithPartialRelations}
               evals={source.evals as EvalWithPartialRelations[]}

apps/webapp/app/[modelId]/[layer]/page.tsx

@@ -1,5 +1,5 @@
+import { makeAuthedUserFromSessionOrReturnNull } from '@/lib/auth/utils';
 import { getSource, getSourceSet } from '@/lib/db/source';
-import { makeAuthedUserFromSessionOrReturnNull } from '@/lib/db/user';
 import { getLayerNumAsStringFromSource, getSourceSetNameFromSource } from '@/lib/utils/source';
 import { SourceWithRelations } from '@/prisma/generated/zod';
 import { Metadata } from 'next';

apps/webapp/app/[modelId]/graph/graph-info-modal.tsx

@@ -3,7 +3,7 @@
 import { useGraphContext } from '@/components/provider/graph-provider';
 import { Button } from '@/components/shadcn/button';
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@/components/shadcn/dialog';
-import { NEXT_PUBLIC_URL } from '@/lib/env';
+import { env } from '@/lib/env';
 import { DownloadIcon, Info } from 'lucide-react';
 import { CLTGraph, CLTGraphQParams } from './graph-types';
 
@@ -44,7 +44,7 @@ export default function GraphInfoModal({ cltGraph, selectedMetadataGraph }: Grap
 
         // add current window url to metadata
         const location = window.location.href;
-        const sourceSetUrl = `${NEXT_PUBLIC_URL}/${selectedMetadataGraph.modelId}/${selectedMetadataGraph.sourceSetName}`;
+        const sourceSetUrl = `${env.NEXT_PUBLIC_URL}/${selectedMetadataGraph.modelId}/${selectedMetadataGraph.sourceSetName}`;
         if (data.metadata.info) {
           data.metadata.info.neuronpedia_link = location;
           data.metadata.info.neuronpedia_source_set = sourceSetUrl;

apps/webapp/app/[modelId]/graph/modals/save-subgraph-modal.tsx

@@ -5,7 +5,7 @@ import { useGraphModalContext } from '@/components/provider/graph-modal-provider
 import { useGraphContext } from '@/components/provider/graph-provider';
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/shadcn/dialog';
 import { LoadingSquare } from '@/components/svg/loading-square';
-import { NEXT_PUBLIC_URL } from '@/lib/env';
+import { env } from '@/lib/env';
 import { GraphMetadataSubgraph, GraphMetadataSubgraphWithPartialRelations } from '@/prisma/generated/zod';
 import copy from 'copy-to-clipboard';
 import { Field, Form, Formik } from 'formik';
@@ -159,7 +159,7 @@ export default function SaveSubgraphModal() {
 
   // Show success view if subgraph was saved
   if (savedSubgraph) {
-    const subgraphUrl = `${NEXT_PUBLIC_URL}/${savedSubgraph.modelId}/graph?slug=${savedSubgraph.slug}&subgraph=${savedSubgraph.subgraphId}`;
+    const subgraphUrl = `${env.NEXT_PUBLIC_URL}/${savedSubgraph.modelId}/graph?slug=${savedSubgraph.slug}&subgraph=${savedSubgraph.subgraphId}`;
 
     return (
       <Dialog

apps/webapp/app/[modelId]/graph/modals/welcome-modal.tsx

@@ -8,7 +8,7 @@ import { useGraphModalContext } from '@/components/provider/graph-modal-provider
 
 import { Button } from '@/components/shadcn/button';
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/shadcn/dialog';
-import { ASSET_BASE_URL } from '@/lib/env';
+import { ASSET_BASE_URL } from '@/lib/constants';
 import { MagicWandIcon } from '@radix-ui/react-icons';
 import { BookOpen, ChevronRight, Circle, GithubIcon, NewspaperIcon, NotebookIcon } from 'lucide-react';
 import { useSearchParams } from 'next/navigation';

apps/webapp/app/[modelId]/graph/page.tsx

@@ -1,12 +1,12 @@
 import { authOptions } from '@/app/api/auth/[...nextauth]/authOptions';
 import { GraphProvider } from '@/components/provider/graph-provider';
 import { GraphStateProvider } from '@/components/provider/graph-state-provider';
+import { ASSET_BASE_URL } from '@/lib/constants';
 import { prisma } from '@/lib/db';
 import { getModelById } from '@/lib/db/model';
-import { ASSET_BASE_URL } from '@/lib/env';
 import { ModelWithPartialRelations } from '@/prisma/generated/zod';
 import { Metadata } from 'next';
-import { getServerSession } from 'next-auth/next';
+import { getServerSession, Session } from 'next-auth';
 import { notFound } from 'next/navigation';
 import { ModelToGraphMetadatasMap } from './graph-types';
 import {
@@ -134,7 +134,7 @@ export default async function Page({
   };
 }) {
   const { modelId } = params;
-  const session = await getServerSession(authOptions);
+  const session: Session | null = await getServerSession(authOptions);
 
   const embedParam = searchParams.embed as string | undefined;
   const embed = embedParam === 'true';
@@ -172,8 +172,7 @@ export default async function Page({
     searchParams.sourceSet || (ANTHROPIC_MODELS.has(modelId) ? modelId : model?.defaultGraphSourceSetName || '');
 
   // always get the user's graphMetadatas from our database
-  const graphMetadatas =
-    session && session.user && session.user.id ? await getGraphMetadataWithUser({ userId: session.user.id }) : [];
+  const graphMetadatas = session?.user?.id ? await getGraphMetadataWithUser({ userId: session.user.id }) : [];
 
   // add those graphmetadatas to the modelIdToGraphMetadatasMap too
   graphMetadatas.forEach((graphMetadata) => {

apps/webapp/app/[modelId]/graph/utils.ts

@@ -1,5 +1,5 @@
 import ATTRIBUTION_GRAPH_SCHEMA from '@/app/api/graph/graph-schema.json';
-import { DEFAULT_CREATOR_USER_ID, NEXT_PUBLIC_URL } from '@/lib/env';
+import { env } from '@/lib/env';
 import { GraphMetadata } from '@/prisma/generated/zod';
 import cuid from 'cuid';
 import d3 from './d3-jetpack';
@@ -182,7 +182,7 @@ export function makeGraphPublicAccessGraphUri(modelId: string, slug: string) {
 }
 
 export function makeGraphPublicAccessGraphUrl(modelId: string, slug: string) {
-  return `${NEXT_PUBLIC_URL}${makeGraphPublicAccessGraphUri(modelId, slug)}`;
+  return `${env.NEXT_PUBLIC_URL}${makeGraphPublicAccessGraphUri(modelId, slug)}`;
 }
 
 export function nodeTypeHasFeatureDetail(node: CLTGraphNode): boolean {
@@ -210,7 +210,7 @@ export async function getGraphMetadatasFromBucket(baseUrl: string): Promise<Mode
     prompt: graph.prompt,
     titlePrefix: graph.title_prefix,
     url: `${baseUrl}/graph_data/${graph.slug}.json`,
-    userId: DEFAULT_CREATOR_USER_ID,
+    userId: env.DEFAULT_CREATOR_USER_ID,
     id: cuid(),
     createdAt: new Date(),
     updatedAt: new Date(),

apps/webapp/app/[modelId]/page.tsx

@@ -4,9 +4,9 @@ import BreadcrumbsComponent from '@/components/breadcrumbs-component';
 import ModelsDropdown from '@/components/nav/models-dropdown';
 import SearchInferenceModelPane from '@/components/panes/search-inference-model-pane';
 import { BreadcrumbItem, BreadcrumbLink, BreadcrumbPage } from '@/components/shadcn/breadcrumbs';
+import { makeAuthedUserFromSessionOrReturnNull } from '@/lib/auth/utils';
 import { getModelById, getModelByIdWithSourceSets } from '@/lib/db/model';
 import { getSourceRelease } from '@/lib/db/source';
-import { makeAuthedUserFromSessionOrReturnNull } from '@/lib/db/user';
 import { getLayerNumAsStringFromSource } from '@/lib/utils/source';
 import { SourceReleaseWithRelations } from '@/prisma/generated/zod';
 import { Metadata } from 'next';

apps/webapp/app/account/page.tsx

@@ -1,12 +1,12 @@
 import EditProfileForm from '@/components/edit-profile-form';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/shadcn/card';
 import { getUserById } from '@/lib/db/user';
-import { getServerSession } from 'next-auth';
+import { getServerSession, Session } from 'next-auth';
 import { redirect } from 'next/navigation';
 import { authOptions } from '../api/auth/[...nextauth]/authOptions';
 
 export default async function Account() {
-  const session = await getServerSession(authOptions);
+  const session: Session | null = await getServerSession(authOptions);
   if (!session) {
     redirect('/signin');
   }

apps/webapp/app/admin/page.tsx

@@ -1,11 +1,11 @@
 import { getUserById } from '@/lib/db/user';
-import { DEMO_MODE, IS_LOCALHOST } from '@/lib/env';
-import { getServerSession } from 'next-auth';
+import { env } from '@/lib/env';
+import { getServerSession, Session } from 'next-auth';
 import { authOptions } from '../api/auth/[...nextauth]/authOptions';
 import ManageSourcesPane from './manage-sources-pane';
 
 export default async function Page() {
-  const session = await getServerSession(authOptions);
+  const session: Session | null = await getServerSession(authOptions);
   let isAdminUser = false;
   if (session?.user?.id) {
     try {
@@ -15,7 +15,7 @@ export default async function Page() {
       console.error('Not admin user', error);
     }
   }
-  if (!DEMO_MODE && !IS_LOCALHOST && !isAdminUser) {
+  if (!env.DEMO_MODE && !env.IS_LOCALHOST && !isAdminUser) {
     return <div>Not authorized</div>;
   }
   return <ManageSourcesPane />;

apps/webapp/app/api/activation/get/route.ts

@@ -1,6 +1,7 @@
 import { ERROR_NOT_FOUND_MESSAGE } from '@/lib/db/userCanAccess';
-import { PUBLIC_ACTIVATIONS_USER_IDS } from '@/lib/env';
-import { RequestOptionalUser, withOptionalUser } from '@/lib/with-user';
+import { env } from '@/lib/env';
+import { RequestOptionalUser } from '@/lib/types/auth';
+import { withOptionalUser } from '@/lib/with-user';
 import { PrismaClient } from '@prisma/client';
 import { NextResponse } from 'next/server';
 
@@ -66,7 +67,7 @@ export const POST = withOptionalUser(async (request: RequestOptionalUser) => {
         layer: source,
         index,
         creatorId: {
-          in: PUBLIC_ACTIVATIONS_USER_IDS,
+          in: env.PUBLIC_ACTIVATIONS_USER_IDS,
         },
       },
       orderBy: {

apps/webapp/app/api/activation/new/route.tsx

@@ -1,7 +1,8 @@
 import { assertUserCanAccessModelAndSourceSet } from '@/lib/db/userCanAccess';
+import { RequestOptionalUser } from '@/lib/types/auth';
 import { getActivationForFeature } from '@/lib/utils/inference';
 import { getSourceSetNameFromSource } from '@/lib/utils/source';
-import { RequestOptionalUser, withOptionalUser } from '@/lib/with-user';
+import { withOptionalUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 
 /**

apps/webapp/app/api/activation/upload-batch/route.tsx

@@ -1,5 +1,6 @@
 import { createActivationsForVector } from '@/lib/db/activation';
-import { RequestAuthedUser, withAuthedUser } from '@/lib/with-user';
+import { RequestAuthedUser } from '@/lib/types/auth';
+import { withAuthedUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 import { array, number, object, string } from 'yup';
 

apps/webapp/app/api/admin/export-explanations/route.ts

@@ -1,5 +1,6 @@
 import { exportExplanations } from '@/lib/db/explanation';
-import { RequestAuthedAdminUser, withAuthedAdminUser } from '@/lib/with-user';
+import { RequestAuthedAdminUser } from '@/lib/types/auth';
+import { withAuthedAdminUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 import { number, object, string, ValidationError } from 'yup';
 

apps/webapp/app/api/admin/export-features/route.ts

@@ -1,5 +1,6 @@
 import { dangerousGetNeuronRangeInternalUseOnly } from '@/lib/db/neuron';
-import { RequestAuthedAdminUser, withAuthedAdminUser } from '@/lib/with-user';
+import { RequestAuthedAdminUser } from '@/lib/types/auth';
+import { withAuthedAdminUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 
 export const POST = withAuthedAdminUser(async (request: RequestAuthedAdminUser) => {

apps/webapp/app/api/admin/import-config/route.ts

@@ -1,10 +1,11 @@
 import { importConfigFromS3 } from '@/lib/db/import';
-import { IS_LOCALHOST } from '@/lib/env';
-import { getAuthedAdminUser, RequestAuthedAdminUser, RequestOptionalUser, withOptionalUser } from '@/lib/with-user';
+import { env } from '@/lib/env';
+import { RequestAuthedAdminUser, RequestOptionalUser } from '@/lib/types/auth';
+import { getAuthedAdminUser, withOptionalUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 
 export const GET = withOptionalUser(async (request: RequestOptionalUser) => {
-  if (!IS_LOCALHOST && request.user && !(await getAuthedAdminUser(request as RequestAuthedAdminUser))) {
+  if (!env.IS_LOCALHOST && request.user && !(await getAuthedAdminUser(request as RequestAuthedAdminUser))) {
     return NextResponse.json({ error: 'This route is only available on localhost or to admin users' }, { status: 400 });
   }
 

apps/webapp/app/api/admin/import-file/route.ts

@@ -2,9 +2,10 @@
 /* eslint-disable no-await-in-loop */
 
 import { importJsonlString } from '@/lib/db/import';
-import { IS_LOCALHOST } from '@/lib/env';
+import { env } from '@/lib/env';
+import { RequestAuthedAdminUser, RequestOptionalUser } from '@/lib/types/auth';
 import { downloadAndDecompressFile } from '@/lib/utils/s3';
-import { getAuthedAdminUser, RequestAuthedAdminUser, RequestOptionalUser, withOptionalUser } from '@/lib/with-user';
+import { getAuthedAdminUser, withOptionalUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 
 // Hobby plans don't support > 60 seconds
@@ -18,7 +19,7 @@ export const POST = withOptionalUser(async (request: RequestOptionalUser) => {
     return NextResponse.json({ error: 'path and tableName are required' }, { status: 400 });
   }
 
-  if (!IS_LOCALHOST && request.user && !(await getAuthedAdminUser(request as RequestAuthedAdminUser))) {
+  if (!env.IS_LOCALHOST && request.user && !(await getAuthedAdminUser(request as RequestAuthedAdminUser))) {
     return NextResponse.json({ error: 'This route is only available on localhost or to admin users' }, { status: 400 });
   }
   const linesJsonlString = await downloadAndDecompressFile(path);

apps/webapp/app/api/admin/import/route.ts

@@ -3,14 +3,15 @@
 
 import { prisma } from '@/lib/db';
 import { importConfigFromS3, importJsonlString } from '@/lib/db/import';
-import { IS_LOCALHOST } from '@/lib/env';
+import { env } from '@/lib/env';
+import { RequestAuthedAdminUser, RequestOptionalUser } from '@/lib/types/auth';
 import {
   DATASET_BASE_PATH,
   downloadAndDecompressFile,
   downloadFileJsonlParsedLines,
   getFilesInPath,
 } from '@/lib/utils/s3';
-import { getAuthedAdminUser, RequestAuthedAdminUser, RequestOptionalUser, withOptionalUser } from '@/lib/with-user';
+import { getAuthedAdminUser, withOptionalUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 
 // Hobby plans don't support > 60 seconds
@@ -32,7 +33,7 @@ export const GET = withOptionalUser(async (request: RequestOptionalUser) => {
   const path = `${DATASET_BASE_PATH}${modelId}/${sourceId}`;
   console.log('Importing data from', path);
 
-  if (!IS_LOCALHOST && request.user && !(await getAuthedAdminUser(request as RequestAuthedAdminUser))) {
+  if (!env.IS_LOCALHOST && request.user && !(await getAuthedAdminUser(request as RequestAuthedAdminUser))) {
     return NextResponse.json({ error: 'This route is only available on localhost or to admin users' }, { status: 400 });
   }
 

apps/webapp/app/api/admin/new-model/route.tsx

@@ -1,6 +1,7 @@
-import { RequestAuthedAdminUser, withAuthedAdminUser } from '@/lib/with-user';
+import { createModelAdmin } from '@/lib/db/model';
+import { RequestAuthedAdminUser } from '@/lib/types/auth';
+import { withAuthedAdminUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
-import { createModelAdmin } from '../../../../lib/db/model';
 
 type ModelToCreate = {
   id: string;

apps/webapp/app/api/admin/reset/route.ts

@@ -1,8 +1,8 @@
-import { IS_LOCALHOST } from '@/lib/env';
+import { env } from '@/lib/env';
 import { NextResponse } from 'next/server';
 
 export async function POST() {
-  if (!IS_LOCALHOST) {
+  if (!env.IS_LOCALHOST) {
     return NextResponse.json({ error: 'This route is only available on localhost or to admin users' }, { status: 400 });
   }
 

apps/webapp/app/api/admin/upload-autointerp/route.ts

@@ -1,5 +1,6 @@
 import { createNewExplanationWithoutScore } from '@/lib/db/explanation';
-import { RequestAuthedAdminUser, withAuthedAdminUser } from '@/lib/with-user';
+import { RequestAuthedAdminUser } from '@/lib/types/auth';
+import { withAuthedAdminUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 
 type ExplainedFeature = {

apps/webapp/app/api/admin/upload-eval/route.ts

@@ -1,7 +1,8 @@
 import { prisma } from '@/lib/db';
-import { DEFAULT_CREATOR_USER_ID } from '@/lib/env';
+import { env } from '@/lib/env';
+import { RequestAuthedAdminUser } from '@/lib/types/auth';
 import { getSourceSetNameFromSource } from '@/lib/utils/source';
-import { RequestAuthedAdminUser, withAuthedAdminUser } from '@/lib/with-user';
+import { withAuthedAdminUser } from '@/lib/with-user';
 import { Visibility } from '@prisma/client';
 import { NextResponse } from 'next/server';
 
@@ -47,7 +48,7 @@ export const POST = withAuthedAdminUser(async (request: RequestAuthedAdminUser)
             name: getSourceSetNameFromSource(evalUpload.sourceId),
             description: '',
             creatorName: '',
-            creatorId: DEFAULT_CREATOR_USER_ID,
+            creatorId: env.DEFAULT_CREATOR_USER_ID,
             hasDashboards: false,
             releaseName: SAEBENCH_RELEASE_NAME,
             visibility: Visibility.PUBLIC,
@@ -73,7 +74,7 @@ export const POST = withAuthedAdminUser(async (request: RequestAuthedAdminUser)
           modelId: evalUpload.modelId,
           id: evalUpload.sourceId,
           setName: getSourceSetNameFromSource(evalUpload.sourceId),
-          creatorId: DEFAULT_CREATOR_USER_ID,
+          creatorId: env.DEFAULT_CREATOR_USER_ID,
           hasDashboards: false,
           saelensConfig: evalUpload.saelensConfig,
           hfFolderId: evalUpload.hfFolderId,

apps/webapp/app/api/admin/upload-sae-config/route.ts

@@ -1,5 +1,6 @@
 import { prisma } from '@/lib/db';
-import { RequestAuthedAdminUser, withAuthedAdminUser } from '@/lib/with-user';
+import { RequestAuthedAdminUser } from '@/lib/types/auth';
+import { withAuthedAdminUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 
 type SaeConfigUpload = {

apps/webapp/app/api/admin/upload-skipped-features/route.tsx

@@ -1,5 +1,6 @@
 import { createNeurons } from '@/lib/db/neuron';
-import { RequestAuthedAdminUser, withAuthedAdminUser } from '@/lib/with-user';
+import { RequestAuthedAdminUser } from '@/lib/types/auth';
+import { withAuthedAdminUser } from '@/lib/with-user';
 import { NextResponse } from 'next/server';
 
 type SkippedData = {