Refactor env code

Author: DanWahlin

package.json

@@ -7,9 +7,9 @@
  "type": "module",
  "main": "index.js",
  "scripts": {
- "start": "tsc && node dist/index.js",
- "build": "tsc",
- "dev": "tsc && concurrently \"tsc --watch\" \"nodemon dist/index.js\""
+ "start": "npx tsc && node dist/index.js",
+ "build": "npx tsc",
+ "watch": "npx tsc --watch"
  },
  "dependencies": {
  "@azure/ai-projects": "^1.0.0-beta.2",
@@ -21,7 +21,6 @@
  "concurrently": "^9.1.2",
  "nodemon": "^3.1.9",
  "ts-node": "^10.9.2",
- "tsc": "^2.0.4",
  "typescript": "^5.8.2"
  }
 }

src/env.ts

@@ -0,0 +1,27 @@
+import { config } from 'dotenv';
+config();
+
+export const aiFoundryConnectionString = process.env.AI_FOUNDRY_PROJECT_CONNECTION_STRING || '';
+export const aiSearchConnectionString = process.env.AI_SEARCH_CONNECTION_STRING || '';
+export const model = process.env.AI_MODEL || '';
+
+/**
+ * Validates that all required environment variables are set
+ * @throws Error if any required environment variable is missing
+ */
+export function validateEnvironment(): void {
+ if (!aiFoundryConnectionString) {
+ throw new Error('Please set the AI_FOUNDRY_PROJECT_CONNECTION_STRING environment variable.');
+ }
+
+ if (!aiSearchConnectionString) {
+ throw new Error('Please set the AI_SEARCH_CONNECTION_STRING environment variable.');
+ }
+
+ if (!model) {
+ throw new Error('Please set the AI_MODEL environment variable.');
+ }
+}
+
+// Validate environment variables when the module is imported
+validateEnvironment();

src/index.ts

@@ -1,28 +1,10 @@
 import fs from 'fs';
+import readline from 'readline';
 import { AIProjectsClient, DoneEvent, ErrorEvent, isOutputOfType, MessageStreamEvent, RunStreamEvent, ToolUtility } from '@azure/ai-projects';
 import type { AgentOutput, AgentThreadOutput, MessageDeltaChunk, MessageDeltaTextContent, MessageImageFileContentOutput, MessageTextContentOutput, OpenAIPageableListOfThreadMessageOutput, ThreadRunOutput } from '@azure/ai-projects';
 import { DefaultAzureCredential } from '@azure/identity';
-import readline from 'readline';
-import { config } from 'dotenv';
+import { aiFoundryConnectionString, aiSearchConnectionString, model } from './env.js';
 import { PromptConfig } from './types';
-config();
-
-// Environment variables with proper validation
-const aiFoundryConnectionString = process.env.AI_FOUNDRY_PROJECT_CONNECTION_STRING || '';
-const aiSearchConnectionString = process.env.AI_SEARCH_CONNECTION_STRING || '';
-const model = process.env.AI_MODEL || '';
-
-if (!aiFoundryConnectionString) {
- throw new Error('Please set the AI_FOUNDRY_PROJECT_CONNECTION_STRING environment variable.');
-}
-
-if (!aiSearchConnectionString) {
- throw new Error('Please set the AI_SEARCH_CONNECTION_STRING environment variable.');
-}
-
-if (!model) {
- throw new Error('Please set the AI_MODEL environment variable.');
-}
 
 // Define prompt configurations
 const promptConfig: Record<string, PromptConfig> = {
@@ -94,7 +76,7 @@ async function main() {
  }
  } catch (err) {
  console.error('The application encountered an error:', err);
- process.exit(1);
+ // process.exit(1);
  }
 }