Remove Video Indexer and ENABLE_MULTIMEDIA feature flag

app/backend/app.py

@@ -87,7 +87,6 @@
     "ENABLE_UNGROUNDED_CHAT": "false",
     "ENABLE_MATH_ASSISTANT": "false",
     "ENABLE_TABULAR_DATA_ASSISTANT": "false",
-    "ENABLE_MULTIMEDIA": "false",
     "MAX_CSV_FILE_SIZE": "7",
     "LOCAL_DEBUG": "false",
     "AZURE_AI_CREDENTIAL_DOMAIN": "cognitiveservices.azure.com"
@@ -849,14 +848,12 @@ async def get_feature_flags():
             - "ENABLE_UNGROUNDED_CHAT": Flag indicating whether ungrounded chat is enabled.
             - "ENABLE_MATH_ASSISTANT": Flag indicating whether the math assistant is enabled.
             - "ENABLE_TABULAR_DATA_ASSISTANT": Flag indicating whether the tabular data assistant is enabled.
-            - "ENABLE_MULTIMEDIA": Flag indicating whether multimedia is enabled.
     """
     response = {
         "ENABLE_WEB_CHAT": str_to_bool.get(ENV["ENABLE_WEB_CHAT"]),
         "ENABLE_UNGROUNDED_CHAT": str_to_bool.get(ENV["ENABLE_UNGROUNDED_CHAT"]),
         "ENABLE_MATH_ASSISTANT": str_to_bool.get(ENV["ENABLE_MATH_ASSISTANT"]),
         "ENABLE_TABULAR_DATA_ASSISTANT": str_to_bool.get(ENV["ENABLE_TABULAR_DATA_ASSISTANT"]),
-        "ENABLE_MULTIMEDIA": str_to_bool.get(ENV["ENABLE_MULTIMEDIA"]),
     }
     return response
 

app/backend/testsuite.py

@@ -309,7 +309,6 @@ def test_get_feature_flags():
         "ENABLE_UNGROUNDED_CHAT": os.getenv("ENABLE_UNGROUNDED_CHAT") == "true",
         "ENABLE_MATH_ASSISTANT": os.getenv("ENABLE_MATH_ASSISTANT") == "true",
         "ENABLE_TABULAR_DATA_ASSISTANT": os.getenv("ENABLE_TABULAR_DATA_ASSISTANT") == "true",
-        "ENABLE_MULTIMEDIA": os.getenv("ENABLE_MULTIMEDIA") == "true",
     }
 
     assert response.json() == expected_response

app/frontend/src/api/models.ts

@@ -214,6 +214,5 @@ export type GetFeatureFlagsResponse = {
     ENABLE_UNGROUNDED_CHAT: boolean;
     ENABLE_MATH_ASSISTANT: boolean;
     ENABLE_TABULAR_DATA_ASSISTANT: boolean;
-    ENABLE_MULTIMEDIA: boolean;
     error?: string;
 }

docs/deployment/deployment.md

@@ -50,8 +50,6 @@ Variable | Required | Description
 --- | --- | ---
 LOCATION | Yes | The location (West Europe is the default). The Terraform templates use this value. To get a list of all the current Azure regions you can run `az account list-locations -o table`. The value here needs to be the *Name* value and not *Display Name*.
 WORKSPACE | Yes  | The workspace name (use something simple and unique to you). This will appended to infoasst-????? as the name of the resource group created in your subscription.
-SUBSCRIPTION_ID | Yes | The GUID that represents the Azure Subscription you want the Accelerator to be deployed into. This can be obtained from the *Subscription* blade in the Azure Portal.
-TENANT_ID | Yes | The GUID that represents the Azure Active Directory Tenant for the Subscription you want the accelerator to be deployed into. This can be obtained from the *Tenant Info* blade in the Azure Portal.
 AZURE_ENVIRONMENT | Yes | This will determine the Azure cloud environment the deployment will target. Information Assistant currently supports, AzureCloud and AzureUSGovernment. Info available at [Azure cloud environments](https://docs.microsoft.com/en-us/cli/azure/manage-clouds-azure-cli?toc=/cli/azure/toc.json&bc=/cli/azure/breadcrumb/toc.json). If you are targeting "AzureUSGovernment" please see our [sovereign deployment support documentation](/docs/deployment/enable_sovereign_deployment.md).
 SECURE_MODE | Yes | Defaults to `false`. This feature flag will determine if the Information Assistant deploys it's Azure Infrastructure in a secure mode or not.</br>:warning: Before enabling secure mode please read the extra instructions on [Enabling Secure Deployment](/docs/secure_deployment/secure_deployment.md)
 ENABLE_WEB_CHAT | Yes | Defaults to `false`. This feature flag will enable the ability to use Web Search results as a data source for generating answers from the LLM. This feature will also deploy a Bing v7 Search instance in Azure to retrieve web results from, however Bing v7 Search is not available in AzureUSGovernment regions, so this feature flag is **NOT** compatible with `AZURE_ENVIRONMENT=AzureUSGovernment`.

docs/secure_deployment/secure_deployment.md

@@ -8,7 +8,6 @@
 > * Using an existing Azure OpenAI Services
 > * Web chat (secure endpoints for Bing API services are not yet available)
 > * SharePoint connector (secure endpoints for Azure Logic Apps and SharePoint connector for Logic Apps are not yet available)
-> * Multimedia (secure endpoints for Azure Video Indexer services are not yet available)
 >
 >Secure mode requires a DDOS Protection Plan for Virtual Network Protection. There is a limit of 1 DDOS protection plan for a subscription in a region. You can reuse an existing DDOS plan in your tenant or Info Assistant can deploy one for you.
 >
@@ -138,7 +137,6 @@ To perform a secure deployment, follow these steps:
    export ENABLE_WEB_CHAT=false
    export USE_EXISTING_AOAI=false
    export ENABLE_SHAREPOINT_CONNECTOR=false
-   export ENABLE_MULTIMEDIA=false
    ```
 
    *Note: Secure mode is blocked when using an existing Azure OpenAI service. We have blocked this scenario to prevent updating a shared instance of Azure OpenAI that may be in use by other workloads*

infra/core/network/network/variables.tf

@@ -70,10 +70,6 @@ variable "snetSearchServiceCIDR" {
   type    = string
 }
 
-variable "snetAzureVideoIndexerCIDR" {
-  type    = string
-}
-
 variable "snetBingServiceCIDR" {
   type    = string
 }

infra/main.tf

@@ -63,7 +63,6 @@ module "network" {
   snetEnrichmentCIDR              = var.enrichment_app_CIDR
   snetIntegrationCIDR             = var.integration_CIDR
   snetSearchServiceCIDR           = var.search_service_CIDR
-  snetAzureVideoIndexerCIDR       = var.azure_video_indexer_CIDR
   snetBingServiceCIDR             = var.bing_service_CIDR
   snetAzureOpenAICIDR             = var.azure_openAI_CIDR
   snetACRCIDR                     = var.acr_CIDR
@@ -281,7 +280,7 @@ module "enrichmentApp" {
   kind                                      = "linux"
   reserved                                  = true
   resourceGroupName                         = azurerm_resource_group.rg.name
-  storageAccountId                          = "/subscriptions/${var.subscriptionId}/resourceGroups/${azurerm_resource_group.rg.name}/providers/Microsoft.Storage/storageAccounts/${module.storage.name}/services/queue/queues/${var.embeddingsQueue}"
+  storageAccountId                          = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${azurerm_resource_group.rg.name}/providers/Microsoft.Storage/storageAccounts/${module.storage.name}/services/queue/queues/${var.embeddingsQueue}"
   scmDoBuildDuringDeployment                = false
   enableOryxBuild                           = false
   managedIdentity                           = true
@@ -356,7 +355,7 @@ module "webapp" {
   applicationInsightsConnectionString = module.logging.applicationInsightsConnectionString
   keyVaultUri                         = module.kvModule.keyVaultUri
   keyVaultName                        = module.kvModule.keyVaultName
-  tenantId                            = var.tenantId
+  tenantId                            = data.azurerm_client_config.current.tenant_id
   is_secure_mode                      = var.is_secure_mode
   subnet_name                         = var.is_secure_mode ? module.network[0].snetApp_name : null
   vnet_name                           = var.is_secure_mode ? module.network[0].vnet_name : null
@@ -411,7 +410,6 @@ module "webapp" {
     ENABLE_UNGROUNDED_CHAT                  = var.enableUngroundedChat
     ENABLE_MATH_ASSISTANT                   = var.enableMathAssitant
     ENABLE_TABULAR_DATA_ASSISTANT           = var.enableTabularDataAssistant
-    ENABLE_MULTIMEDIA                       = var.enableMultimedia
     MAX_CSV_FILE_SIZE                       = var.maxCsvFileSize
     AZURE_AI_CREDENTIAL_DOMAIN               = var.azure_ai_private_link_domain
   }
@@ -632,27 +630,13 @@ module "sharepoint" {
   ]
 }
 
-// Video Indexer is not supported in secure mode
-module "video_indexer" {
-  count                               = var.is_secure_mode ? 0 : var.enableMultimedia ? 1 : 0
-  source                              = "./core/videoindexer"
-  location                            = azurerm_resource_group.rg.location
-  resource_group_name                 = azurerm_resource_group.rg.name
-  subscription_id                     = data.azurerm_client_config.current.subscription_id
-  random_string                       = random_string.random.result
-  tags                                = local.tags
-  azuread_service_principal_object_id = module.entraObjects.azure_ad_web_app_client_id
-  arm_template_schema_mgmt_api        = var.arm_template_schema_mgmt_api
-  video_indexer_api_version           = var.video_indexer_api_version
-}
-
 module "azMonitor" {
   source            = "./core/logging/monitor"
   logAnalyticsName  = module.logging.logAnalyticsName
   location          = var.location
   logWorkbookName   = "infoasst-lw-${random_string.random.result}"
   resourceGroupName = azurerm_resource_group.rg.name 
-  componentResource = "/subscriptions/${var.subscriptionId}/resourceGroups/${azurerm_resource_group.rg.name}/providers/Microsoft.OperationalInsights/workspaces/${module.logging.logAnalyticsName}"
+  componentResource = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${azurerm_resource_group.rg.name}/providers/Microsoft.OperationalInsights/workspaces/${module.logging.logAnalyticsName}"
 }
 
 // Bing Search is not supported in US Government or Secure Mode
@@ -883,17 +867,6 @@ module "docIntel_StorageBlobDataReader" {
   resourceGroupId = azurerm_resource_group.rg.id
 }
 
-module "aviRoleBackend" {
-  source            = "./core/security/role"
-  count             = var.enableMultimedia ? 1 : 0
-  scope             = module.video_indexer[0].vi_id
-  principalId       = module.webapp.identityPrincipalId
-  roleDefinitionId  = local.azure_roles.Contributor
-  principalType     = "ServicePrincipal"
-  subscriptionId    = data.azurerm_client_config.current.subscription_id
-  resourceGroupId   = azurerm_resource_group.rg.id 
-}
-
 # // MANAGEMENT SERVICE PRINCIPAL ROLES
 module "openAiRoleMgmt" {
   source = "./core/security/role"

infra/outputs.tf

@@ -112,7 +112,7 @@ output "ENABLE_DEV_CODE" {
 }
 
 output "AZURE_SUBSCRIPTION_ID" {
-  value = var.subscriptionId
+  value = data.azurerm_client_config.current.subscription_id
 }
 
 output "BLOB_STORAGE_ACCOUNT_ENDPOINT" {

infra/variables.tf

@@ -13,16 +13,6 @@ variable "resourceGroupName" {
   default = ""
 }
 
-variable "tenantId" {
-  type    = string
-  default = ""
-}
-
-variable "subscriptionId" {
-  type    = string
-  default = ""
-}
-
 variable "buildNumber" {
   type    = string
   default = "local"
@@ -73,11 +63,6 @@ variable "enableSharePointConnector" {
   type    = bool
   default = false
 }
-
-variable "enableMultimedia" {
-  type    = bool
-  default = false
-}
 ////
 
 //// Variables that can vary based on the Azure environment being targeted
@@ -158,10 +143,6 @@ variable "azure_ai_document_intelligence_domain" {
   type = string
 }
 
-variable "azure_ai_videoindexer_domain" {
-  type = string
-}
-
 variable "azure_bing_search_domain" {
   type = string
 }
@@ -474,11 +455,6 @@ variable "functionsAppSkuTier" {
   default = "Standard"
 }
 
-variable "videoIndexerName" {
-  type    = string
-  default = ""
-}
-
 variable "searchServicesName" {
   type    = string
   default = ""