Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: CognitiveServices - Updated OpenAI model to non-deprecated v4 #4450

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix: CognitiveServices - Updated OpenAI model to non-deprecated v4 #4450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51eb4e9
Removed split conditions and updated to latest PE
AlexanderSehr Feb 14, 2025
541dc80
Switched model
AlexanderSehr Feb 14, 2025
d37678b
Update to latest
AlexanderSehr Feb 14, 2025
05e9312
Update to latest
AlexanderSehr Feb 14, 2025
507f5d3
Update to latest
AlexanderSehr Feb 14, 2025
722f93b
Update to latest
AlexanderSehr Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions avm/res/cognitive-services/account/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ module account 'br/public:avm/res/cognitive-services/account:<version>' = {
{
model: {
format: 'OpenAI'
name: 'gpt-35-turbo'
version: '0301'
name: 'gpt-4'
version: '0613'
}
name: 'gpt-35-turbo'
name: 'gpt-4'
sku: {
capacity: 10
name: 'Standard'
Expand Down Expand Up @@ -124,10 +124,10 @@ module account 'br/public:avm/res/cognitive-services/account:<version>' = {
{
"model": {
"format": "OpenAI",
"name": "gpt-35-turbo",
"version": "0301"
"name": "gpt-4",
"version": "0613"
},
"name": "gpt-35-turbo",
"name": "gpt-4",
"sku": {
"capacity": 10,
"name": "Standard"
Expand Down Expand Up @@ -181,10 +181,10 @@ param deployments = [
{
model: {
format: 'OpenAI'
name: 'gpt-35-turbo'
version: '0301'
name: 'gpt-4'
version: '0613'
}
name: 'gpt-35-turbo'
name: 'gpt-4'
sku: {
capacity: 10
name: 'Standard'
Expand Down Expand Up @@ -235,10 +235,10 @@ module account 'br/public:avm/res/cognitive-services/account:<version>' = {
{
model: {
format: 'OpenAI'
name: 'gpt-35-turbo'
version: '0301'
name: 'gpt-4'
version: '0613'
}
name: 'gpt-35-turbo'
name: 'gpt-4'
sku: {
capacity: 10
name: 'Standard'
Expand Down Expand Up @@ -278,10 +278,10 @@ module account 'br/public:avm/res/cognitive-services/account:<version>' = {
{
"model": {
"format": "OpenAI",
"name": "gpt-35-turbo",
"version": "0301"
"name": "gpt-4",
"version": "0613"
},
"name": "gpt-35-turbo",
"name": "gpt-4",
"sku": {
"capacity": 10,
"name": "Standard"
Expand Down Expand Up @@ -315,10 +315,10 @@ param deployments = [
{
model: {
format: 'OpenAI'
name: 'gpt-35-turbo'
version: '0301'
name: 'gpt-4'
version: '0613'
}
name: 'gpt-35-turbo'
name: 'gpt-4'
sku: {
capacity: 10
name: 'Standard'
Expand Down Expand Up @@ -951,10 +951,10 @@ module account 'br/public:avm/res/cognitive-services/account:<version>' = {
{
model: {
format: 'OpenAI'
name: 'gpt-35-turbo'
version: '0301'
name: 'gpt-4'
version: '0613'
}
name: 'gpt-35-turbo'
name: 'gpt-4'
sku: {
capacity: 10
name: 'Standard'
Expand Down Expand Up @@ -1007,10 +1007,10 @@ module account 'br/public:avm/res/cognitive-services/account:<version>' = {
{
"model": {
"format": "OpenAI",
"name": "gpt-35-turbo",
"version": "0301"
"name": "gpt-4",
"version": "0613"
},
"name": "gpt-35-turbo",
"name": "gpt-4",
"sku": {
"capacity": 10,
"name": "Standard"
Expand Down Expand Up @@ -1061,10 +1061,10 @@ param deployments = [
{
model: {
format: 'OpenAI'
name: 'gpt-35-turbo'
version: '0301'
name: 'gpt-4'
version: '0613'
}
name: 'gpt-35-turbo'
name: 'gpt-4'
sku: {
capacity: 10
name: 'Standard'
Expand Down Expand Up @@ -2906,7 +2906,7 @@ This section gives you an overview of all local-referenced module files (i.e., o

| Reference | Type |
| :-- | :-- |
| `br/public:avm/res/network/private-endpoint:0.8.0` | Remote reference |
| `br/public:avm/res/network/private-endpoint:0.10.1` | Remote reference |
| `br/public:avm/utl/types/avm-common-types:0.4.0` | Remote reference |

## Data Collection
Expand Down
71 changes: 49 additions & 22 deletions avm/res/cognitive-services/account/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,22 +287,22 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableT
}

resource cMKKeyVault 'Microsoft.KeyVault/vaults@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId)) {
name: last(split((customerManagedKey.?keyVaultResourceId ?? 'dummyVault'), '/'))
name: last(split(customerManagedKey.?keyVaultResourceId!, '/'))
scope: resourceGroup(
split((customerManagedKey.?keyVaultResourceId ?? '//'), '/')[2],
split((customerManagedKey.?keyVaultResourceId ?? '////'), '/')[4]
split(customerManagedKey.?keyVaultResourceId!, '/')[2],
split(customerManagedKey.?keyVaultResourceId!, '/')[4]
)

resource cMKKey 'keys@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId) && !empty(customerManagedKey.?keyName)) {
name: customerManagedKey.?keyName ?? 'dummyKey'
name: customerManagedKey.?keyName!
}
}

resource cMKUserAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = if (!empty(customerManagedKey.?userAssignedIdentityResourceId)) {
name: last(split(customerManagedKey.?userAssignedIdentityResourceId ?? 'dummyMsi', '/'))
name: last(split(customerManagedKey.?userAssignedIdentityResourceId!, '/'))
scope: resourceGroup(
split((customerManagedKey.?userAssignedIdentityResourceId ?? '//'), '/')[2],
split((customerManagedKey.?userAssignedIdentityResourceId ?? '////'), '/')[4]
split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[2],
split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[4]
)
}

Expand Down Expand Up @@ -340,7 +340,7 @@ resource cognitiveService 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
keyVaultUri: cMKKeyVault.properties.vaultUri
keyName: customerManagedKey!.keyName
keyVersion: !empty(customerManagedKey.?keyVersion ?? '')
? customerManagedKey!.keyVersion
? customerManagedKey!.?keyVersion
: last(split(cMKKeyVault::cMKKey.properties.keyUriWithVersion, '/'))
}
}
Expand Down Expand Up @@ -413,10 +413,13 @@ resource cognitiveService_diagnosticSettings 'Microsoft.Insights/diagnosticSetti
}
]

module cognitiveService_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.8.0' = [
module cognitiveService_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.10.1' = [
for (privateEndpoint, index) in (privateEndpoints ?? []): {
name: '${uniqueString(deployment().name, location)}-cognitiveService-PrivateEndpoint-${index}'
scope: resourceGroup(privateEndpoint.?resourceGroupName ?? '')
scope: resourceGroup(
split(privateEndpoint.?resourceGroupResourceId ?? resourceGroup().id, '/')[2],
split(privateEndpoint.?resourceGroupResourceId ?? resourceGroup().id, '/')[4]
)
params: {
name: privateEndpoint.?name ?? 'pep-${last(split(cognitiveService.id, '/'))}-${privateEndpoint.?service ?? 'account'}-${index}'
privateLinkServiceConnections: privateEndpoint.?isManualConnection != true
Expand Down Expand Up @@ -484,25 +487,25 @@ resource cognitiveService_roleAssignments 'Microsoft.Authorization/roleAssignmen
module secretsExport 'modules/keyVaultExport.bicep' = if (secretsExportConfiguration != null) {
name: '${uniqueString(deployment().name, location)}-secrets-kv'
scope: resourceGroup(
split((secretsExportConfiguration.?keyVaultResourceId ?? '//'), '/')[2],
split((secretsExportConfiguration.?keyVaultResourceId ?? '////'), '/')[4]
split(secretsExportConfiguration.?keyVaultResourceId!, '/')[2],
split(secretsExportConfiguration.?keyVaultResourceId!, '/')[4]
)
params: {
keyVaultName: last(split(secretsExportConfiguration.?keyVaultResourceId ?? '//', '/'))
keyVaultName: last(split(secretsExportConfiguration.?keyVaultResourceId!, '/'))
secretsToSet: union(
[],
contains(secretsExportConfiguration!, 'accessKey1Name')
? [
{
name: secretsExportConfiguration!.accessKey1Name
name: secretsExportConfiguration!.?accessKey1Name
value: cognitiveService.listKeys().key1
}
]
: [],
contains(secretsExportConfiguration!, 'accessKey2Name')
? [
{
name: secretsExportConfiguration!.accessKey2Name
name: secretsExportConfiguration!.?accessKey2Name
value: cognitiveService.listKeys().key2
}
]
Expand Down Expand Up @@ -539,20 +542,44 @@ output exportedSecrets secretsOutputType = (secretsExportConfiguration != null)
: {}

@description('The private endpoints of the congitive services account.')
output privateEndpoints array = [
for (pe, i) in (!empty(privateEndpoints) ? array(privateEndpoints) : []): {
name: cognitiveService_privateEndpoints[i].outputs.name
resourceId: cognitiveService_privateEndpoints[i].outputs.resourceId
groupId: cognitiveService_privateEndpoints[i].outputs.groupId
customDnsConfig: cognitiveService_privateEndpoints[i].outputs.customDnsConfig
networkInterfaceIds: cognitiveService_privateEndpoints[i].outputs.networkInterfaceIds
output privateEndpoints privateEndpointOutputType[] = [
for (pe, index) in (privateEndpoints ?? []): {
name: cognitiveService_privateEndpoints[index].outputs.name
resourceId: cognitiveService_privateEndpoints[index].outputs.resourceId
groupId: cognitiveService_privateEndpoints[index].outputs.?groupId!
customDnsConfigs: cognitiveService_privateEndpoints[index].outputs.customDnsConfigs
networkInterfaceResourceIds: cognitiveService_privateEndpoints[index].outputs.networkInterfaceResourceIds
}
]

// ================ //
// Definitions //
// ================ //

@export()
type privateEndpointOutputType = {
@description('The name of the private endpoint.')
name: string

@description('The resource ID of the private endpoint.')
resourceId: string

@description('The group Id for the private endpoint Group.')
groupId: string?

@description('The custom DNS configurations of the private endpoint.')
customDnsConfigs: {
@description('FQDN that resolves to private endpoint IP address.')
fqdn: string?

@description('A list of private IP addresses of the private endpoint.')
ipAddresses: string[]
}[]

@description('The IDs of the network interfaces associated with the private endpoint.')
networkInterfaceResourceIds: string[]
}

@export()
type deploymentsType = {
@description('Optional. Specify the name of cognitive service account deployment.')
Expand Down
Loading