Skip to content

Commit b15c665

Browse files
-Remove obsolete Bicep modules for Machine Learning Services: compute, connection, and workspace. These modules are no longer needed and have been deleted to streamline the infrastructure codebase.
-Disable prompt_flow from UI Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent e53460a commit b15c665

7 files changed

Lines changed: 114 additions & 1195 deletions

File tree

code/backend/batch/utilities/helpers/config/config_helper.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,18 @@ def get_available_loading_strategies(self):
8585
return [c.value for c in LoadingStrategy]
8686

8787
def get_available_orchestration_strategies(self):
88-
return [c.value for c in OrchestrationStrategy]
88+
# prompt_flow is hidden from the admin UI because the deployment
89+
# pipeline (Bicep / azd) does not provision the required Azure ML
90+
# workspace, endpoint, or env vars. The orchestrator class is kept
91+
# for backward compatibility; if a deployment already has it
92+
# selected, surface it so the selectbox stays valid.
93+
hidden = {OrchestrationStrategy.PROMPT_FLOW.value}
94+
current = self.orchestrator.strategy.value if self.orchestrator else None
95+
return [
96+
c.value
97+
for c in OrchestrationStrategy
98+
if c.value not in hidden or c.value == current
99+
]
89100

90101
def get_available_ai_assistant_types(self):
91102
return [c.value for c in AssistantStrategy]

code/tests/utilities/helpers/test_config_helper.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
from backend.batch.utilities.helpers.config.embedding_config import EmbeddingConfig
66
from backend.batch.utilities.document_chunking.chunking_strategy import ChunkingSettings
77
from backend.batch.utilities.document_loading import LoadingSettings
8+
from backend.batch.utilities.orchestrator.orchestration_strategy import (
9+
OrchestrationStrategy,
10+
)
811

912

1013
@pytest.fixture
@@ -483,6 +486,23 @@ def test_get_available_orchestration_strategies(config: Config):
483486
orchestration_strategies = config.get_available_orchestration_strategies()
484487

485488
# then
489+
# prompt_flow is intentionally hidden from the admin UI (the deployment
490+
# pipeline does not provision the Azure ML workspace it depends on).
491+
assert sorted(orchestration_strategies) == sorted(
492+
["openai_function", "langchain", "semantic_kernel"]
493+
)
494+
495+
496+
def test_get_available_orchestration_strategies_keeps_prompt_flow_when_currently_selected(
497+
config: Config,
498+
):
499+
# given - existing deployment already has prompt_flow selected
500+
config.orchestrator.strategy = OrchestrationStrategy.PROMPT_FLOW
501+
502+
# when
503+
orchestration_strategies = config.get_available_orchestration_strategies()
504+
505+
# then - prompt_flow is surfaced so the admin selectbox remains valid
486506
assert sorted(orchestration_strategies) == sorted(
487507
["openai_function", "langchain", "prompt_flow", "semantic_kernel"]
488508
)

infra/main.bicep

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,6 @@ var privateDnsZones = [
623623
'privatelink.cognitiveservices.azure.com'
624624
'privatelink.openai.azure.com'
625625
'privatelink.vaultcore.azure.net'
626-
'privatelink.api.azureml.ms'
627626
]
628627

629628
// DNS Zone Index Constants
@@ -637,7 +636,6 @@ var dnsZoneIndex = {
637636
cognitiveServices: 6
638637
openAI: 7
639638
keyVault: 8
640-
machinelearning: 9
641639
}
642640

643641
// ===================================================

0 commit comments

Comments
 (0)