Refactor environment variable access to use 'env' for consistency across the application

Author: thediymaker

actions/actions.tsx

@@ -3,10 +3,11 @@
 import { generateObject } from "ai";
 import { z } from "zod";
 import { createOpenAI } from "@ai-sdk/openai";
+import { env } from "process";
 
 const openai = createOpenAI({
-  baseURL: process.env.OPENAI_API_URL,
-  apiKey: process.env.OPENAI_API_KEY,
+  baseURL: env.OPENAI_API_URL,
+  apiKey: env.OPENAI_API_KEY,
 });
 
 export async function generateFollowUpQuestions(
@@ -16,8 +17,8 @@ export async function generateFollowUpQuestions(
   try {
     const { object } = await generateObject({
       model: openai.chat(
-        process.env.OPENAI_API_MODEL_SUGGESTION ||
-          process.env.OPENAI_API_MODEL ||
+        env.OPENAI_API_MODEL_SUGGESTION ||
+          env.OPENAI_API_MODEL ||
           "gpt-3.5-turbo"
       ),
       schema: z.object({

app/api/chat/route.ts

@@ -2,15 +2,16 @@ import { createOpenAI } from "@ai-sdk/openai";
 import { streamText, tool, convertToModelMessages } from "ai";
 import { z } from "zod";
 import { fetchSlurmData } from "@/lib/slurm-api";
+import { env } from "process";
 
 export const maxDuration = 30;
 
 export async function POST(req: Request) {
   const { messages } = await req.json();
 
   const openai = createOpenAI({
-    baseURL: process.env.OPENAI_API_URL,
-    apiKey: process.env.OPENAI_API_KEY,
+    baseURL: env.OPENAI_API_URL,
+    apiKey: env.OPENAI_API_KEY,
     fetch: async (url, options) => {
       console.log("OpenAI Fetch URL:", url);
       // console.log("OpenAI Fetch Options:", JSON.stringify(options, null, 2)); // Don't log full options to avoid leaking keys in logs if possible, or just log headers keys
@@ -21,7 +22,7 @@ export async function POST(req: Request) {
   });
 
   const result = await streamText({
-    model: openai.chat(process.env.OPENAI_API_MODEL || "gpt-3.5-turbo"),
+    model: openai.chat(env.OPENAI_API_MODEL || "gpt-3.5-turbo"),
     messages: convertToModelMessages(messages),
     onError: (error) => {
       console.error("StreamText Error:", error);

app/api/prometheus/dcgm/route.ts

@@ -1,7 +1,8 @@
 import { NextResponse } from "next/server";
 import { PrometheusDriver } from "prometheus-query";
+import { env } from "process";
 
-const PROMETHEUS_URL = process.env.PROMETHEUS_URL;
+const PROMETHEUS_URL = env.PROMETHEUS_URL;
 
 let prom: PrometheusDriver | null = null;
 

app/api/prometheus/ipmi/route.ts

@@ -1,9 +1,10 @@
 import { PrometheusQueryResponse } from "@/types/types";
 import { NextResponse } from "next/server";
 import { PrometheusDriver } from "prometheus-query";
+import { env } from "process";
 
 export const revalidate = 0;
-const PROMETHEUS_URL = process.env.PROMETHEUS_URL;
+const PROMETHEUS_URL = env.PROMETHEUS_URL;
 const MAX_DATA_POINTS = 200;
 const CACHE_TTL = 5 * 60 * 1000; // 5 minutes cache for node list
 
@@ -38,7 +39,7 @@ async function getClusterNodes(): Promise<string[]> {
 
   try {
     // Fetch node information from Slurm API
-    const baseURL = process.env.NEXT_PUBLIC_BASE_URL || "http://localhost:3000";
+    const baseURL = env.NEXT_PUBLIC_BASE_URL || "http://localhost:3000";
     const response = await fetch(`${baseURL}/api/slurm/nodes`);
 
     if (!response.ok) {

app/api/prometheus/route.ts

@@ -1,8 +1,9 @@
 import { PrometheusQueryResponse } from "@/types/types";
 import { NextResponse } from "next/server";
 import { PrometheusDriver } from "prometheus-query";
+import { env } from "process";
 
-const PROMETHEUS_URL = process.env.PROMETHEUS_URL;
+const PROMETHEUS_URL = env.PROMETHEUS_URL;
 
 let prom: PrometheusDriver | null = null;
 

app/api/prometheus/utilization/route.ts

@@ -1,5 +1,6 @@
 import { NextResponse } from "next/server";
 import { PrometheusDriver } from "prometheus-query";
+import { env } from "process";
 
 type PrometheusMetric = {
   labels: Record<string, string>;
@@ -23,7 +24,7 @@ type UtilizationResponse = {
   error?: string;
 };
 
-const PROMETHEUS_URL = process.env.PROMETHEUS_URL!;
+const PROMETHEUS_URL = env.PROMETHEUS_URL!;
 const HOURS_TO_ANALYZE = 24;
 const STEP_INTERVAL = 900; // 15 minutes in seconds
 

app/api/reporting/gpu/route.ts

@@ -1,8 +1,9 @@
 // app/api/reporting/gpu/route.ts
 import { NextResponse } from "next/server";
 import { PrometheusDriver } from "prometheus-query";
+import { env } from "process";
 
-const PROMETHEUS_URL = process.env.PROMETHEUS_URL;
+const PROMETHEUS_URL = env.PROMETHEUS_URL;
 const STALE_JOB_THRESHOLD_SECONDS = 30; // Consider a job stale if no metrics in the last 30 seconds
 
 let prom: PrometheusDriver | null = null;
@@ -118,7 +119,7 @@ const checkJobFreshness = async (jobId: string): Promise<boolean> => {
 // Get the actual running jobs from Slurm
 const getRunningJobsFromSlurm = async (): Promise<Set<string>> => {
   try {
-    const baseURL = process.env.NEXT_PUBLIC_BASE_URL || "http://localhost:3000";
+    const baseURL = env.NEXT_PUBLIC_BASE_URL || "http://localhost:3000";
     const response = await fetch(`${baseURL}/api/slurm/jobs`);
 
     if (!response.ok) {

app/api/rewind/route.ts

@@ -3,6 +3,7 @@ import fs from "fs/promises";
 import path from "path";
 import zlib from "zlib";
 import { promisify } from "util";
+import { env } from "process";
 
 const gunzip = promisify(zlib.gunzip);
 
@@ -45,7 +46,7 @@ export async function GET(request: Request) {
     }
 
     const dataDir =
-      process.env.HISTORICAL_DATA_DIR || path.join(process.cwd(), "data");
+      env.HISTORICAL_DATA_DIR || path.join(process.cwd(), "data");
     const files = await fs.readdir(dataDir);
     const [hour] = time.split(":");
     const targetStartTime = new Date(`${date}T${hour}:00:00.000Z`);

app/api/slurm/reservations/route.ts

@@ -1,11 +1,12 @@
 export const dynamic = 'force-dynamic';
+import { env } from "process";
 
 import { NextResponse } from "next/server";
 import { fetchSlurmData } from "@/lib/slurm-api";
 
 export async function GET() {
   const isEnabled =
-    String(process.env.MAINT_NOTIFICATIONS_ENABLED ?? "true").toLowerCase() === "true";
+    String(env.MAINT_NOTIFICATIONS_ENABLED ?? "true").toLowerCase() === "true";
 
   if (!isEnabled) {
     return NextResponse.json({ meta: { enabled: false }, reservations: [] });

app/layout.tsx

@@ -2,11 +2,12 @@ import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "./globals.css";
 import { ThemeProvider } from "@/components/theme-provider";
+import { env } from "process";
 
 const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
-  title: `${process.env.CLUSTER_NAME} Supercomputer`,
+  title: `${env.CLUSTER_NAME} Supercomputer`,
   description: "A Slurm supercomputer dashboard.",
   icons: {
     icon: "/favicon.ico",