GitLab and SWE fixes. Update Vertex LLMs

Author: danielcampagnolitg

frontend/package-lock.json

@@ -58,7 +58,7 @@ export class GoogleCloud {
 	 */
 	@func()
 	async executeGcloudCommandModification(gcloudModifyCommand: string): Promise<string> {
-		await waitForConsoleInput(`Agent "${agentContext().name}" is requesting to run the command ${gcloudModifyCommand}`);
+		await humanInTheLoop(`Agent "${agentContext().name}" is requesting to run the command ${gcloudModifyCommand}`);
 		if (!gcloudModifyCommand.includes('--project='))
 			throw new Error('When calling executeGcloudCommandQuery the gcloudQueryCommand parameter must include the --project=<projectId> argument');
 

src/functions/cloud/google/google-cloud.ts

@@ -185,24 +185,32 @@ export class GitLab implements SourceControlManagement {
 	async cloneProject(projectPathWithNamespace: string): Promise<string> {
 		if (!projectPathWithNamespace) throw new Error('Parameter "projectPathWithNamespace" must be truthy');
 		const path = join(systemDir(), 'gitlab', projectPathWithNamespace);
+		const fss = getFileSystem();
 
 		// If the project already exists pull updates from the main/dev branch
 		if (existsSync(path) && existsSync(join(path, '.git'))) {
-			logger.info(`${projectPathWithNamespace} exists at ${path}. Pulling updates`);
-
-			// If the repo has a projectInfo.json file with a devBranch defined, then switch to that
-			// else switch to the default branch defined in the GitLab project
-			const projectInfo = await getProjectInfo();
-			if (projectInfo.devBranch) {
-				await getFileSystem().vcs.switchToBranch(projectInfo.devBranch);
-			} else {
-				const gitProject = await this.getProject(projectPathWithNamespace);
-				const switchResult = await execCommand(`git switch ${gitProject.defaultBranch}`, { workingDirectory: path });
-				if (switchResult.exitCode === 0) logger.info(`Switched to branch ${gitProject.defaultBranch}`);
-			}
+			const currentWorkingDir = fss.getWorkingDirectory();
+			try {
+				fss.setWorkingDirectory(path);
+				logger.info(`${projectPathWithNamespace} exists at ${path}. Pulling updates`);
+
+				// If the repo has a projectInfo.json file with a devBranch defined, then switch to that
+				// else switch to the default branch defined in the GitLab project
+				const projectInfo = await getProjectInfo();
+				if (projectInfo.devBranch) {
+					await getFileSystem().vcs.switchToBranch(projectInfo.devBranch);
+				} else {
+					const gitProject = await this.getProject(projectPathWithNamespace);
+					const switchResult = await execCommand(`git switch ${gitProject.defaultBranch}`, { workingDirectory: path });
+					if (switchResult.exitCode === 0) logger.info(`Switched to branch ${gitProject.defaultBranch}`);
+				}
 
-			const result = await execCommand(`git -C ${path} pull`);
-			if (result.exitCode !== 0) logger.warn('Failed to pull updates');
+				const result = await execCommand(`git -C ${path} pull`);
+				if (result.exitCode !== 0) logger.warn('Failed to pull updates');
+			} finally {
+				// Current behaviour of this function is to not change the working directory
+				fss.setWorkingDirectory(currentWorkingDir);
+			}
 		} else {
 			logger.info(`Cloning project: ${projectPathWithNamespace} to ${path}`);
 			await fs.promises.mkdir(path, { recursive: true });
@@ -242,6 +250,7 @@ export class GitLab implements SourceControlManagement {
 		)}`;
 		const { exitCode, stdout, stderr } = await execCommand(cmd);
 		if (exitCode > 0) throw new Error(`${stdout}\n${stderr}`);
+		logger.info(stdout);
 
 		const url = await new LlmTools().processText(stdout, 'Respond only with the URL where the merge request is.');
 

src/functions/scm/gitlab.ts

@@ -114,20 +114,24 @@ export class FileSystemService {
 	setWorkingDirectory(dir: string): void {
 		if (!dir) throw new Error('dir must be provided');
 		let relativeDir = dir;
+		let isAbsolute = false;
 		// Check absolute directory path
 		if (dir.startsWith('/')) {
 			if (existsSync(dir)) {
 				this.workingDirectory = dir;
+				isAbsolute = true;
 			} else {
 				// try it as a relative path
 				relativeDir = dir.substring(1);
 			}
 		}
-		const relativePath = path.join(this.getWorkingDirectory(), relativeDir);
-		if (existsSync(relativePath)) {
-			this.workingDirectory = relativePath;
-		} else {
-			throw new Error(`New working directory ${dir} does not exist (current working directory ${this.workingDirectory}`);
+		if (!isAbsolute) {
+			const relativePath = path.join(this.getWorkingDirectory(), relativeDir);
+			if (existsSync(relativePath)) {
+				this.workingDirectory = relativePath;
+			} else {
+				throw new Error(`New working directory ${dir} does not exist (current working directory ${this.workingDirectory}`);
+			}
 		}
 
 		// After setting the working directory, update the vcs (version control system) property

src/functions/storage/fileSystemService.ts

@@ -3,7 +3,6 @@ import { GenerateTextOptions, LLM } from '#llm/llm';
 import { Claude3_5_Sonnet_Vertex } from '#llm/services/anthropic-vertex';
 import { fireworksLlama3_405B } from '#llm/services/fireworks';
 import { GPT4o } from '#llm/services/openai';
-import { Gemini_1_5_Pro } from '#llm/services/vertexai';
 import { logger } from '#o11y/logger';
 
 const MIND_OVER_DATA_SYS_PROMPT = `When addressing a problem, employ "Comparative Problem Analysis and Direct Reasoning" as follows:
@@ -66,7 +65,7 @@ const MIND_OVER_DATA_SYS_PROMPT = `When addressing a problem, employ "Comparativ
 `;
 
 export class Blackberry extends BaseLLM {
-	llms: LLM[] = [Claude3_5_Sonnet_Vertex(), GPT4o(), Gemini_1_5_Pro(), Claude3_5_Sonnet_Vertex(), fireworksLlama3_405B()];
+	llms: LLM[] = [Claude3_5_Sonnet_Vertex(), GPT4o(), Claude3_5_Sonnet_Vertex(), fireworksLlama3_405B()];
 	mediator: LLM = Claude3_5_Sonnet_Vertex();
 
 	constructor() {

src/llm/multi-agent/blackberry.ts

@@ -1,13 +1,9 @@
 import { BaseLLM } from '#llm/base-llm';
 import { GenerateTextOptions, LLM } from '#llm/llm';
 import { getLLM } from '#llm/llmFactory';
-import { Claude3_5_Sonnet_Vertex } from '#llm/services/anthropic-vertex';
 import { cerebrasLlama3_3_70b } from '#llm/services/cerebras';
-import { fireworksLlama3_405B } from '#llm/services/fireworks';
-import { GPT4o } from '#llm/services/openai';
-import { Gemini_1_5_Flash, Gemini_1_5_Pro } from '#llm/services/vertexai';
+import { Gemini_2_0_Flash } from '#llm/services/vertexai';
 import { logger } from '#o11y/logger';
-import { withActiveSpan } from '#o11y/trace';
 
 // sparse multi-agent debate https://arxiv.org/abs/2406.11776
 // self-refine https://arxiv.org/pdf/2303.17651
@@ -114,7 +110,7 @@ export class Blueberry extends BaseLLM {
 		// if (!this.llms) this.llms = [Claude3_5_Sonnet_Vertex(), GPT4o(), Gemini_1_5_Pro(), Claude3_5_Sonnet_Vertex(), fireworksLlama3_405B()];
 		let llm = cerebrasLlama3_3_70b();
 		// llm = groqLlama3_1_70B();
-		llm = Gemini_1_5_Flash();
+		llm = Gemini_2_0_Flash();
 		if (!this.llms) this.llms = [llm, llm, llm, llm, llm];
 		if (!this.mediator) this.mediator = llm;
 	}

src/llm/multi-agent/blueberry.ts

@@ -3,6 +3,7 @@ import { BaseLLM } from '../base-llm';
 import { GenerateTextOptions, LLM, LlmMessage } from '../llm';
 import { fireworksDeepSeekR1 } from '../services/fireworks';
 
+import { nebiusDeepSeekR1 } from '#llm/services/nebius';
 import { togetherDeepSeekR1 } from '#llm/services/together';
 
 export function deepSeekFallbackRegistry(): Record<string, () => LLM> {
@@ -22,12 +23,13 @@ export function DeepSeekR1_Together_Fireworks(): LLM {
 export class DeepSeekR1_Fallbacks extends BaseLLM {
 	private together: LLM = togetherDeepSeekR1();
 	private fireworks: LLM = fireworksDeepSeekR1();
+	private nebius: LLM = nebiusDeepSeekR1();
 
 	constructor() {
 		super(
-			'DeepSeek R1 (Together, Fireworks)',
+			'DeepSeek R1 (Together, Fireworks, Nebius)',
 			'DeepSeekFallback',
-			'deepseek-r1-together-fireworks',
+			'deepseek-r1-together-fireworks-nebius',
 			0, // Initialized later
 			() => 0,
 			() => 0,
@@ -48,8 +50,11 @@ export class DeepSeekR1_Fallbacks extends BaseLLM {
 		} catch (e) {
 			const errMsg = e.statuCode === '429' ? 'rate limited' : `error: ${e.message}`;
 			logger.error(`Together DeepSeek ${errMsg}`);
-
-			return await this.fireworks.generateText(messages, opts);
+			try {
+				return await this.fireworks.generateText(messages, opts);
+			} catch (e) {
+				return await this.nebius.generateText(messages, opts);
+			}
 		}
 	}
 }

src/llm/multi-agent/deepSeekR1_Fallbacks.ts

@@ -5,7 +5,7 @@ import { DeepSeekR1_Together_Fireworks } from '#llm/multi-agent/deepSeekR1_Fallb
 import { Claude3_5_Sonnet_Vertex } from '#llm/services/anthropic-vertex';
 import { deepSeekR1, deepSeekV3 } from '#llm/services/deepseek';
 import { fireworksDeepSeek, fireworksDeepSeekR1 } from '#llm/services/fireworks';
-import { openAIo1 } from '#llm/services/openai';
+import { openAIo1, openAIo3mini } from '#llm/services/openai';
 import { togetherDeepSeekR1 } from '#llm/services/together';
 import { Gemini_2_0_Flash_Thinking } from '#llm/services/vertexai';
 import { logger } from '#o11y/logger';
@@ -14,10 +14,10 @@ import { logger } from '#o11y/logger';
 
 export function MoA_reasoningLLMRegistry(): Record<string, () => LLM> {
 	return {
-		'MoA:R1x3': () => new ReasonerDebateLLM('R1x3', deepSeekV3, [deepSeekR1, deepSeekR1, deepSeekR1], 'MoA R1x3'),
+		'MoA:R1x3 DeepSeek': () => new ReasonerDebateLLM('R1x3 DeepSeek', deepSeekV3, [deepSeekR1, deepSeekR1, deepSeekR1], 'MoA R1x3'),
 		'MoA:R1x3-Together-Fireworks': Together_R1x3_Together_Fireworks,
 		'MoA:R1x3-Together': () => Together_R1x3(),
-		'MoA:Sonnet_R1,o1,Gemini_Together': TogetherMoA_Claude_Sonnet_R1x2_o1,
+		'MoA:Sonnet_Sonnet,o3-mini,R1': MoA_Sonnet__Sonnet_R1_o3mini,
 		'MoA:Sonnet-Claude-R1,o1,Gemini': () =>
 			new ReasonerDebateLLM(
 				'Sonnet-Claude-R1,o1,Gemini',
@@ -37,12 +37,12 @@ export function Together_R1x3_Together_Fireworks(): LLM {
 	);
 }
 
-export function TogetherMoA_Claude_Sonnet_R1x2_o1(): LLM {
+export function MoA_Sonnet__Sonnet_R1_o3mini(): LLM {
 	return new ReasonerDebateLLM(
-		'Sonnet_R1,o1,Gemini_Together',
+		'Sonnet_Sonnet,o3-mini,R1',
 		Claude3_5_Sonnet_Vertex,
-		[DeepSeekR1_Together_Fireworks, openAIo1, DeepSeekR1_Together_Fireworks],
-		'MoA:Claude-R1,o1,Gemini (Together, Fireworks)',
+		[DeepSeekR1_Together_Fireworks, openAIo3mini, Claude3_5_Sonnet_Vertex],
+		'MoA:Sonnet-Sonnet,o3-mini,R1(Together, Fireworks)',
 	);
 }
 

src/llm/multi-agent/reasoning-debate.ts

@@ -12,7 +12,7 @@ import { nebiusDeepSeekR1 } from '#llm/services/nebius';
 import { Ollama_Phi3 } from '#llm/services/ollama';
 import { GPT4oMini } from '#llm/services/openai';
 import { togetherLlama3_70B } from '#llm/services/together';
-import { Gemini_1_5_Flash, Gemini_2_0_Flash } from '#llm/services/vertexai';
+import { Gemini_2_0_Experimental, Gemini_2_0_Flash, Gemini_2_0_Flash_Lite, Gemini_2_0_Flash_Thinking } from '#llm/services/vertexai';
 
 const elephantBase64 = fs.readFileSync('test/llm/elephant.jpg', 'base64');
 const pdfBase64 = fs.readFileSync('test/llm/purple.pdf', 'base64');
@@ -192,21 +192,38 @@ describe('LLMs', () => {
 	});
 
 	describe('VertexAI', () => {
-		const llm = Gemini_2_0_Flash();
+		describe('Flash 2.0', () => {
+			const llm = Gemini_2_0_Flash();
 
-		it('should generateText', async () => {
-			const response = await llm.generateText(SKY_PROMPT, { temperature: 0 });
+			it('should generateText', async () => {
+				const response = await llm.generateText(SKY_PROMPT, { temperature: 0 });
+				expect(response.toLowerCase()).to.include('blue');
+			});
+
+			it('should handle image attachments', async () => {
+				const response = await llm.generateText(IMAGE_BASE64_PROMPT, { temperature: 0 });
+				expect(response.toLowerCase()).to.include('elephant');
+			});
+
+			it('should handle PDF attachments', async () => {
+				const response = await llm.generateText(PDF_PROMPT, { temperature: 0 });
+				expect(response.toLowerCase()).to.include('purple');
+			});
+		});
+
+		it('Gemini 2.0 experimental should generateText', async () => {
+			const response = await Gemini_2_0_Experimental().generateText(SKY_PROMPT, { temperature: 0 });
 			expect(response.toLowerCase()).to.include('blue');
 		});
 
-		it('should handle image attachments', async () => {
-			const response = await llm.generateText(IMAGE_BASE64_PROMPT, { temperature: 0 });
-			expect(response.toLowerCase()).to.include('elephant');
+		it('Gemini 2.0 Flash Lite should generateText', async () => {
+			const response = await Gemini_2_0_Flash_Lite().generateText(SKY_PROMPT, { temperature: 0 });
+			expect(response.toLowerCase()).to.include('blue');
 		});
 
-		it('should handle PDF attachments', async () => {
-			const response = await llm.generateText(PDF_PROMPT, { temperature: 0 });
-			expect(response.toLowerCase()).to.include('purple');
+		it('Gemini 2.0 thinking experimental should generateText', async () => {
+			const response = await Gemini_2_0_Flash_Thinking().generateText(SKY_PROMPT, { temperature: 0 });
+			expect(response.toLowerCase()).to.include('blue');
 		});
 	});
 });