From db92b5d2dd12ad7ca28cff6204e3d9dc8ff1820e Mon Sep 17 00:00:00 2001 From: "andrea.terzani" Date: Thu, 14 Nov 2024 11:52:55 +0100 Subject: [PATCH] Rinomina variabili per il supporto del modello AzureOpenAI-Preview in ScenarioExecutionService --- .../services/ScenarioExecutionService.java | 14 +------------- .../stepSolvers/AdvancedAIPromptSolver.java | 1 + 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java index 20855e5..087497c 100644 --- a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java +++ b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java @@ -323,19 +323,7 @@ public class ScenarioExecutionService { logger.info("AI model used: " + aiModel.getModel()); return azureOpenaichatModel; - case "AzureOpenAI-Preview": - OpenAIClient openAIClient = new OpenAIClientBuilder() - .credential(new AzureKeyCredential(aiModel.getApiKey())) - .endpoint(aiModel.getEndpoint()) - .buildClient(); - AzureOpenAiChatOptions openAIChatOptions = AzureOpenAiChatOptions.builder() - .withDeploymentName(aiModel.getModel()) - .withTemperature(aiModel.getTemperature()) - .build(); - - AzureOpenAiChatModel azureOpenaichatModel = new AzureOpenAiChatModel(openAIClient, openAIChatOptions); - logger.info("AI model used: " + aiModel.getModel()); - return azureOpenaichatModel; + case "OpenAI": OpenAiApi openAiApi = new OpenAiApi(aiModel.getApiKey()); diff --git a/src/main/java/com/olympus/hermione/stepSolvers/AdvancedAIPromptSolver.java b/src/main/java/com/olympus/hermione/stepSolvers/AdvancedAIPromptSolver.java index 92566f8..1a959fa 100644 --- a/src/main/java/com/olympus/hermione/stepSolvers/AdvancedAIPromptSolver.java +++ b/src/main/java/com/olympus/hermione/stepSolvers/AdvancedAIPromptSolver.java @@ -71,6 +71,7 @@ public class AdvancedAIPromptSolver extends StepSolver { if( chatModel.getDefaultOptions().getModel().contains("o1-") ){ + //Non funziona logger.info("Using o1- model => " + chatModel.getDefaultOptions().getModel()); String completePrompt = this.qai_system_prompt_template + userText;