Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
address review comments
  • Loading branch information
Nethra Sashikar committed Oct 25, 2024
commit 53cd2435db957814f346a38b13d0984527bc19e2
2 changes: 1 addition & 1 deletion sdk/ml/azure-ai-ml/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ repos:
"https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/",
],
),
("pylint", "3.0.3", []),
("pylint", "3.2.7", []),
]

# Make sure that correct versions are installed
Expand Down
6 changes: 5 additions & 1 deletion sdk/ml/azure-ai-ml/azure/ai/ml/_ml_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,11 @@ def __init__(

self._service_client_10_2024_preview = ServiceClient102024Preview(
credential=self._credential,
subscription_id=self._operation_scope._subscription_id,
subscription_id=(
self._ws_operation_scope._subscription_id
if registry_reference
else self._operation_scope._subscription_id
),
base_url=base_url,
**kwargs,
)
Expand Down
20 changes: 13 additions & 7 deletions sdk/ml/azure-ai-ml/samples/ml_samples_workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
"""

import os

from ml_samples_compute import handle_resource_exists_error

from azure.ai.ml import MLClient
from azure.identity import DefaultAzureCredential
from ml_samples_compute import handle_resource_exists_error

subscription_id = os.environ["AZURE_SUBSCRIPTION_ID"]
resource_group = os.environ["RESOURCE_GROUP_NAME"]
Expand Down Expand Up @@ -74,13 +76,14 @@ def ml_workspace_config_sample_snippets_entities(self):
# [END customermanagedkey]

# [START workspace_managed_network]
from azure.ai.ml.constants._workspace import FirewallSku
from azure.ai.ml.entities import (
Workspace,
ManagedNetwork,
FqdnDestination,
IsolationMode,
ServiceTagDestination,
ManagedNetwork,
PrivateEndpointDestination,
FqdnDestination,
ServiceTagDestination,
Workspace,
)

# Example private endpoint outbound to a blob
Expand All @@ -99,9 +102,13 @@ def ml_workspace_config_sample_snippets_entities(self):
# Example FQDN rule
pypirule = FqdnDestination(name="pypirule", destination="pypi.org")

# Example FirewallSku
firewallSku = FirewallSku.BASIC

network = ManagedNetwork(
isolation_mode=IsolationMode.ALLOW_ONLY_APPROVED_OUTBOUND,
outbound_rules=[blobrule, datafactoryrule, pypirule],
firewall_sku=firewallSku,
)

# Workspace configuration
Expand Down Expand Up @@ -230,8 +237,7 @@ def ml_workspace_config_sample_snippets_operations(self):

# [START create_or_update_connection]
from azure.ai.ml import MLClient
from azure.ai.ml.entities import WorkspaceConnection
from azure.ai.ml.entities import UsernamePasswordConfiguration
from azure.ai.ml.entities import UsernamePasswordConfiguration, WorkspaceConnection

ml_client_ws = MLClient(credential, subscription_id, resource_group, workspace_name="test-ws")
wps_connection = WorkspaceConnection(
Expand Down