From ec21f905490119f96297c2137a5e6f934531cf12 Mon Sep 17 00:00:00 2001
From: Chris Pietschmann <chris@build5nines.com>
Date: Fri, 15 Mar 2024 17:50:40 -0400
Subject: [PATCH] added GPT-4 model deployment to v2 Bicep and Terraform

---
 IaC/Bicep/v1/deploy.bicep |  4 ++--
 IaC/Bicep/v2/deploy.bicep | 23 +++++++++++++++++++++++
 IaC/Terraform/v1/main.tf  |  2 +-
 IaC/Terraform/v2/main.tf  | 31 +++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/IaC/Bicep/v1/deploy.bicep b/IaC/Bicep/v1/deploy.bicep
index f7c1109..e58616d 100644
--- a/IaC/Bicep/v1/deploy.bicep
+++ b/IaC/Bicep/v1/deploy.bicep
@@ -5,7 +5,7 @@ param location string = resourceGroup().location
 
 param azureOpenAISku string = 'S0'
 
-param openai_deployment_name string = 'b59-gpt35-turbo'
+param azureOpenAIDeploymentName string = 'b59-gpt-35-turbo'
 
 var resourceTags = {
   project: 'https://github.com/build5nines/AIChatUI'
@@ -30,7 +30,7 @@ resource azureopenai 'Microsoft.CognitiveServices/accounts@2023-10-01-preview' =
 }
 
 resource azureopenaideployment 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = {
-  name: openai_deployment_name
+  name: azureOpenAIDeploymentName
   sku: {
     capacity: 120
     name: 'Standard'
diff --git a/IaC/Bicep/v2/deploy.bicep b/IaC/Bicep/v2/deploy.bicep
index 115c538..9fd528b 100644
--- a/IaC/Bicep/v2/deploy.bicep
+++ b/IaC/Bicep/v2/deploy.bicep
@@ -5,6 +5,8 @@ param location string = resourceGroup().location
 
 param azureOpenAISku string = 'S0'
 
+param azureOpenAIDeploymentName string = 'b59-gpt4'
+
 param azureSearchSku string = 'standard'
 
 param azureStorageSku string = 'Standard_LRS'
@@ -95,3 +97,24 @@ resource storagecontainer 'Microsoft.Storage/storageAccounts/blobServices/contai
   name: azureStorageBlobContainerName
   parent: storageblobservice
 }
+
+resource azureopenaideployment 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = {
+  name: azureOpenAIDeploymentName
+  sku: {
+    capacity: 10
+    name: 'Standard'
+  }
+  parent: azureopenai
+  properties: {
+    model: {
+      format: 'OpenAI'
+      name: 'gpt-4'
+      version: '1106-Preview'
+    }
+    raiPolicyName: 'Microsoft.Default'
+    versionUpgradeOption: 'OnceCurrentVersionExpired'
+    scaleSettings: {
+      capacity: 10
+    }
+  }
+}
diff --git a/IaC/Terraform/v1/main.tf b/IaC/Terraform/v1/main.tf
index b5ebcc4..1cbb096 100644
--- a/IaC/Terraform/v1/main.tf
+++ b/IaC/Terraform/v1/main.tf
@@ -26,7 +26,7 @@ locals {
     
     openai_sku                = "S0"
 
-    openai_deployment_name    = "b59-gpt35-turbo"
+    openai_deployment_name    = "b59-gpt-35-turbo"
 
     resourceTags = {
         project = "https://github.com/build5nines/AIChatUI"
diff --git a/IaC/Terraform/v2/main.tf b/IaC/Terraform/v2/main.tf
index e5a65e9..79a8213 100644
--- a/IaC/Terraform/v2/main.tf
+++ b/IaC/Terraform/v2/main.tf
@@ -5,6 +5,9 @@ terraform {
       source  = "hashicorp/azurerm"
       version = "~>3"
     }
+    azapi = {
+      source = "azure/azapi"
+    }
   }
 }
 
@@ -12,6 +15,11 @@ provider "azurerm" {
   features {}
 }
 
+provider "azapi" {
+
+}
+
+
 locals {
     resource_prefix           = "b59-eus2-aichatui"
     location                  = "eastus2"
@@ -20,6 +28,8 @@ locals {
 
     azure_search_sku                = "standard"
 
+    openai_deployment_name          = "b59-gpt4"
+
     azure_storage_sku               = "Standard"
     azure_storage_replication_type  = "LRS"
 
@@ -67,3 +77,24 @@ resource azurerm_storage_container azurestoragecontainer {
   name                  = local.azure_storage_blob_container_name
   storage_account_name  = azurerm_storage_account.azurestorage.name
 }
+
+resource "azapi_resource" azureopenaideployment {
+  type = "Microsoft.CognitiveServices/accounts/deployments@2023-05-01"
+  name = local.openai_deployment_name
+  parent_id = azurerm_cognitive_account.azureopenai.id
+  body = jsonencode({
+    properties = {
+      model = {
+        format = "OpenAI"
+        name = "gpt-4"
+        version = "1106-Preview"
+      }
+      versionUpgradeOption = "OnceCurrentVersionExpired"
+      raiPolicyName = "Microsoft.Default"
+    }
+    sku = {
+      capacity = 10
+      name = "Standard"
+    }
+  })
+}
\ No newline at end of file