Added commands using the v1 foundry project client library

Author: johanste

src/azure-cli/azure/cli/command_modules/cognitiveservices/_client_factory.py

@@ -40,3 +40,46 @@ def cf_models(cli_ctx, *_):
 
 def cf_usages(cli_ctx, *_):
     return get_cognitiveservices_management_client(cli_ctx).usages
+
+
+def cf_ai_projects(cli_ctx, command_args):
+    """
+    Create AI Projects client for data plane operations.
+    Similar to keyvault's data plane client factory pattern.
+    """
+    from azure.ai.projects import AIProjectClient
+    from azure.cli.core.commands.client_factory import prepare_client_kwargs_track2
+    from azure.cli.core._profile import Profile
+    
+    # Get credentials using Azure CLI login
+    profile = Profile(cli_ctx=cli_ctx)
+    credential, _, _ = profile.get_login_credentials(
+        subscription_id=cli_ctx.data.get('subscription_id')
+    )
+    
+    # Get endpoint from command arguments (similar to keyvault's vault_url)
+    account_name = command_args.get('account_name', None)
+    endpoint = command_args.get('endpoint', None)
+    project = command_args.get('project_name', None)
+
+    # If no explicit endpoint provided, construct from account name
+    if not endpoint and account_name:
+        # Construct endpoint URL from account name
+        # Format: https://{account_name}.cognitiveservices.azure.com
+        endpoint = f"https://{account_name}.services.ai.azure.com/api/projects/{project}"
+    
+    if not endpoint:
+        from azure.cli.core.azclierror import RequiredArgumentMissingError
+        raise RequiredArgumentMissingError(
+            'Please specify --account-name or --endpoint'
+        )
+    
+    # Prepare client kwargs with proper logging and telemetry
+    client_kwargs = prepare_client_kwargs_track2(cli_ctx)
+    
+    # Create and return the AI Projects client
+    return AIProjectClient(
+        endpoint=endpoint,
+        credential=credential,
+        **client_kwargs
+    )

src/azure-cli/azure/cli/command_modules/cognitiveservices/_params.py

@@ -121,6 +121,26 @@ def _validate_subnet(cmd, namespace):
             child_name_1=subnet)
 
 
+def validate_agent_endpoint_or_account_name(namespace):
+    """
+    Validate that either account_name or endpoint is provided, but not both.
+    """
+    from azure.cli.core.azclierror import MutuallyExclusiveArgumentError, RequiredArgumentMissingError
+    
+    account_name = getattr(namespace, 'account_name', None)
+    endpoint = getattr(namespace, 'endpoint', None)
+    
+    if account_name and endpoint:
+        raise MutuallyExclusiveArgumentError(
+            'Cannot specify both --name and --endpoint. Please provide only one.'
+        )
+    
+    if not account_name and not endpoint:
+        raise RequiredArgumentMissingError(
+            'Must specify either --name or --endpoint.'
+        )
+
+
 @Completer
 def sku_name_completer(cmd, prefix, namespace, **kwargs):  # pylint: disable=unused-argument
     names = {x.name for x in _sku_filter(cmd, namespace)}
@@ -216,13 +236,29 @@ def load_arguments(self, _):
         c.argument('next_tier', help='Cognitive Services account commitment plan next commitment period tier.')
 
     with self.argument_context('cognitiveservices agent') as c:
+        c.argument('account_name', arg_type=name_arg_type,
+                   help='cognitive service account name. Mutually exclusive with --endpoint.',
+                   completer=get_resource_name_completion_list('Microsoft.CognitiveServices/accounts'),
+                   required=False)
+        c.argument('project_name', help='AI Project name')
         c.argument('agent_name', help='Cognitive Services hosted agent name')
         c.argument('agent_version', help='Cognitive Services hosted agent version')
+        c.argument('endpoint', help='AI Projects endpoint URL. Mutually exclusive with --name.')
 
     with self.argument_context('cognitiveservices agent update') as c:
-        c.argument('min_replica', help='Minimum number of replicas for horizontal scaling')
-        c.argument('max_replica', help='Maximum number of replicas for horizontal scaling')
+        c.argument('min_replica', options_list=['--min-replica'], help='Minimum number of replicas for horizontal scaling')
+        c.argument('max_replica', options_list=['--max-replica'], help='Maximum number of replicas for horizontal scaling')
         c.argument('description', help='Description of the agent')
 
     with self.argument_context('cognitiveservices agent delete') as c:
         c.argument('agent_version', help='Cognitive Services hosted agent version. If not provided, deletes all versions.', required=False)
+
+    with self.argument_context('cognitiveservices agent versions') as c:
+        c.argument('account_name', arg_type=name_arg_type,
+                   help='cognitive service account name. Mutually exclusive with --endpoint.',
+                   completer=get_resource_name_completion_list('Microsoft.CognitiveServices/accounts'),
+                   required=False,
+                   validator=validate_agent_endpoint_or_account_name)
+        c.argument('project_name', help='AI Project name')
+        c.argument('agent_name', help='Cognitive Services hosted agent name')
+        c.argument('endpoint', help='AI Projects endpoint URL. Mutually exclusive with --name.')

src/azure-cli/azure/cli/command_modules/cognitiveservices/commands.py

@@ -5,7 +5,8 @@
 
 from azure.cli.core.commands import CliCommandType
 from azure.cli.command_modules.cognitiveservices._client_factory import cf_accounts, cf_resource_skus, \
-    cf_deleted_accounts, cf_deployments, cf_commitment_plans, cf_commitment_tiers, cf_models, cf_usages
+    cf_deleted_accounts, cf_deployments, cf_commitment_plans, cf_commitment_tiers, cf_models, cf_usages, \
+    cf_ai_projects
 
 
 def load_command_table(self, _):
@@ -104,10 +105,12 @@ def load_command_table(self, _):
     with self.command_group('cognitiveservices usage', usages_type) as g:
         g.command('list', 'list')
 
-    with self.command_group('cognitiveservices agent', client_factory=cf_accounts) as g:
+    with self.command_group('cognitiveservices agent', client_factory=cf_ai_projects) as g:
         g.custom_command('update', 'agent_update')
         g.custom_command('stop', 'agent_stop')
         g.custom_command('start', 'agent_start')
         g.custom_command('delete-deployment', 'agent_delete_deployment')
         g.custom_command('delete', 'agent_delete')
         g.custom_command('list', 'agent_list')
+        g.custom_command('list-versions', 'agent_versions_list')
+        g.custom_command('show', 'agent_show')

src/azure-cli/azure/cli/command_modules/cognitiveservices/custom.py

@@ -4,10 +4,12 @@
 # --------------------------------------------------------------------------------------------
 
 import json
+import urllib.parse
 
 from knack.util import CLIError
 from knack.log import get_logger
 
+import azure.core.rest
 from azure.mgmt.cognitiveservices.models import Account as CognitiveServicesAccount, Sku, \
     VirtualNetworkRule, IpRule, NetworkRuleSet, NetworkRuleAction, \
     AccountProperties as CognitiveServicesAccountProperties, ApiProperties as CognitiveServicesAccountApiProperties, \
@@ -327,52 +329,108 @@ def commitment_plan_create_or_update(
     return client.create_or_update(resource_group_name, account_name, commitment_plan_name, plan)
 
 
-def agent_update(client, account_name, agent_name, agent_version,
-                 min_replica=None, max_replica=None, description=None, tags=None):
+AGENT_API_VERSION_PARAMS = { 'api-version': '2025-11-15-preview' }
+
+def agent_update(client, account_name, project_name, agent_name, agent_version,
+                 min_replica=None, max_replica=None, description=None, tags=None, endpoint=None):
     """
     Update hosted agent deployment configuration.
     Updates horizontal scale configuration (min and max replica), agent meta-data such as description and tags.
     New version is not created for this update.
     """
-    raise NotImplementedError("agent_update command is not yet implemented")
-
+    request_body = {}
+    if min_replica is not None:
+        request_body['min_replica'] = min_replica
+    if max_replica is not None:
+        request_body['max_replica'] = max_replica
+    request = azure.core.rest.HttpRequest('POST', f'/agents/{urllib.parse.quote(agent_name)}/containers/default:update', json = request_body, params=AGENT_API_VERSION_PARAMS)
+    response = client.send_request(request)
+    response.raise_for_status()
+    return response.json()
 
-def agent_stop(client, account_name, agent_name, agent_version):
+def agent_stop(client, account_name, project_name, agent_name, agent_version, endpoint=None):
     """
     Stop hosted agent deployment.
     """
-    raise NotImplementedError("agent_stop command is not yet implemented")
+    request = azure.core.rest.HttpRequest('POST', f'/agents/{urllib.parse.quote(agent_name)/containers/default:start}', params=AGENT_API_VERSION_PARAMS)
+    response = client.send_request(request)
+    response.raise_for_status()
+    return response.json()
 
 
-def agent_start(client, account_name, agent_name, agent_version):
+def agent_start(client, account_name, project_name, agent_name, agent_version, endpoint=None):
     """
     Start hosted agent deployment.
     """
-    raise NotImplementedError("agent_start command is not yet implemented")
+    request = azure.core.rest.HttpRequest('POST', f'/agents/{urllib.parse.quote(agent_name)/containers/default:start}', params=AGENT_API_VERSION_PARAMS)
+    response = client.send_request(request)
+    response.raise_for_status()
+    return response.json()
 
 
-def agent_delete_deployment(client, account_name, agent_name, agent_version):
+def agent_delete_deployment(client, account_name, project_name, agent_name, agent_version, endpoint=None):
     """
     Delete hosted agent deployment.
     Deletes the agent deployment only, agent version associated with the deployment remains.
     """
     raise NotImplementedError("agent_delete_deployment command is not yet implemented")
 
 
-def agent_delete(client, account_name, agent_name, agent_version=None):
+def agent_delete(client, account_name, project_name, agent_name, agent_version=None, endpoint=None):
     """
     Delete hosted agent version or all versions.
-    If agent_version is provided, deletes the agent instance and agent definition associated with that version.
+    If agent_version is provided, deletes the agent instance and agent definition associated with `that version.
     If agent_version is not provided, deletes all agent instances and agent definitions associated with the agent name.
     """
-    raise NotImplementedError("agent_delete command is not yet implemented")
+    request = azure.core.rest.HttpRequest('DELETE', f'/agents/{urllib.parse.quote(agent_name)}', params = AGENT_API_VERSION_PARAMS)
+    response = client.send_request(request)
+    response.raise_for_status()
+    return response.json()
 
 
-def agent_list(client, account_name, agent_name, agent_version=None):
+def agent_list(client, account_name, project_name, endpoint=None):
     """
     List hosted agent versions or deployments.
     If agent_version is not provided, lists all versions for an agent.
     If agent_version is provided, lists all deployments for that agent version.
     """
-    raise NotImplementedError("agent_list command is not yet implemented")
-        
+    agents = []
+    params = AGENT_API_VERSION_PARAMS.copy()
+    while True:
+        request = azure.core.rest.HttpRequest('GET', f'/agents', params=params)
+        response = client.send_request(request)
+        response.raise_for_status()
+        body = response.json()
+        agents.extend(body.get('data', []))
+        if body.get('has_more'):
+            params['after'] = body.get('last_id')
+        else:
+            return agents
+
+
+def agent_versions_list(client, account_name, project_name, agent_name, endpoint=None):
+    """
+    List all versions of a hosted agent.
+    """
+    versions = []
+    params = AGENT_API_VERSION_PARAMS.copy()
+    while True:
+        request = azure.core.rest.HttpRequest('GET', f'/agents/{urllib.parse.quote(agent_name)}/versions', params=params)
+        response = client.send_request(request)
+        response.raise_for_status()
+        body = response.json()
+        versions.extend(body.get('data', []))
+        if body.get('has_more'):
+            params['after'] = body.get('last_id')
+        else:
+            return versions
+
+
+def agent_show(client, account_name, project_name, agent_name, endpoint=None):
+    """
+    Show details of a hosted agent.
+    """
+    request = azure.core.rest.HttpRequest('GET', f'/agents/{urllib.parse.quote(agent_name)}', params=AGENT_API_VERSION_PARAMS)
+    response = client.send_request(request)
+    response.raise_for_status()
+    return response.json()

src/azure-cli/setup.py

@@ -53,6 +53,7 @@
 DEPENDENCIES = [
     "antlr4-python3-runtime~=4.13.1",
     'azure-appconfiguration~=1.7.1',
+    'azure-ai-projects~=1.0.0',
     'azure-batch==15.0.0b1',
     'azure-cli-core=={}'.format(VERSION),
     'azure-cosmos~=3.0,>=3.0.2',