oci-cli 3.70.0__py3-none-any.whl → 3.70.1__py3-none-any.whl

services/generative_ai/src/oci_cli_generative_ai/generativeai_cli_extended.py

@@ -0,0 +1,107 @@
+# coding: utf-8
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+
+import click  # noqa: F401
+import json  # noqa: F401
+from services.generative_ai.src.oci_cli_generative_ai.generated import generativeai_cli
+from oci_cli import cli_util  # noqa: F401
+from oci_cli import custom_types  # noqa: F401
+from oci_cli import json_skeleton_utils  # noqa: F401
+
+
+# oci generative-ai imported-model create-imported-model-hugging-face-model -> oci generative-ai imported-model create-from-huggingface
+cli_util.rename_command(generativeai_cli, generativeai_cli.imported_model_group, generativeai_cli.create_imported_model_hugging_face_model, "create-from-huggingface")
+
+
+# oci generative-ai imported-model create-imported-model-object-storage-object -> oci generative-ai imported-model create-from-objectstorage
+cli_util.rename_command(generativeai_cli, generativeai_cli.imported_model_group, generativeai_cli.create_imported_model_object_storage_object, "create-from-objectstorage")
+
+
+# Remove create from oci generative-ai imported-model
+generativeai_cli.imported_model_group.commands.pop(generativeai_cli.create_imported_model.name)
+
+
+@cli_util.copy_params_from_generated_command(generativeai_cli.create_imported_model_hugging_face_model, params_to_exclude=['data_source_model_id', 'data_source_access_token', 'data_source_branch', 'data_source_commit', 'version_parameterconflict'])
+@generativeai_cli.imported_model_group.command(name=generativeai_cli.create_imported_model_hugging_face_model.name, help=generativeai_cli.create_imported_model_hugging_face_model.help)
+@cli_util.option('--model-id', required=True, help=u"""The full model OCID from Hugging Face, typically in the format "org/model-name" (e.g., "meta-llama/Llama-2-7b"). [required]""")
+@cli_util.option('--access-token', help=u"""Hugging Face access token to authenticate requests for restricted models. This token will be securely stored in OCI Vault.""")
+@cli_util.option('--branch', help=u"""The name of the branch in the Hugging Face repository to import the model from. If not specified, "main" will be used by default. If you provide both a branch and a commit hash, the model will be imported from the specified commit.""")
+@cli_util.option('--commit', help=u"""The commit hash in the Hugging Face repository to import the model from. If both a branch and a commit are provided, the commit hash will be used.""")
+@cli_util.option('--version', help=u"""The version of the imported model.""")
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'generative_ai', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'generative_ai', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'generative_ai', 'class': 'ImportedModel'})
+@cli_util.wrap_exceptions
+def create_imported_model_hugging_face_model_extended(ctx, **kwargs):
+
+    if 'model_id' in kwargs:
+        kwargs['data_source_model_id'] = kwargs['model_id']
+        kwargs.pop('model_id')
+
+    if 'access_token' in kwargs:
+        kwargs['data_source_access_token'] = kwargs['access_token']
+        kwargs.pop('access_token')
+
+    if 'branch' in kwargs:
+        kwargs['data_source_branch'] = kwargs['branch']
+        kwargs.pop('branch')
+
+    if 'commit' in kwargs:
+        kwargs['data_source_commit'] = kwargs['commit']
+        kwargs.pop('commit')
+
+    if 'version' in kwargs:
+        kwargs['version_parameterconflict'] = kwargs['version']
+        kwargs.pop('version')
+
+    ctx.invoke(generativeai_cli.create_imported_model_hugging_face_model, **kwargs)
+
+
+@cli_util.copy_params_from_generated_command(generativeai_cli.create_imported_model_object_storage_object, params_to_exclude=['data_source_bucket_name', 'data_source_namespace_name', 'data_source_prefix_name', 'data_source_region', 'version_parameterconflict'])
+@generativeai_cli.imported_model_group.command(name=generativeai_cli.create_imported_model_object_storage_object.name, help=generativeai_cli.create_imported_model_object_storage_object.help)
+@cli_util.option('--bucket-name', required=True, help=u"""The name of the Object Storage bucket. [required]""")
+@cli_util.option('--namespace', required=True, help=u"""The namespace of the Object Storage where the files are stored. [required]""")
+@cli_util.option('--prefix-name', required=True, help=u"""The prefix path (or folder) within the bucket where files are located. [required]""")
+@cli_util.option('--region', help=u"""The full canonical Oracle Cloud region identifier (e.g., "us-ashburn-1") where the object storage bucket containing the files resides.""")
+@cli_util.option('--version', help=u"""The version of the imported model.""")
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'generative_ai', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'generative_ai', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'generative_ai', 'class': 'ImportedModel'})
+@cli_util.wrap_exceptions
+def create_imported_model_object_storage_object_extended(ctx, **kwargs):
+
+    if 'bucket_name' in kwargs:
+        kwargs['data_source_bucket_name'] = kwargs['bucket_name']
+        kwargs.pop('bucket_name')
+
+    if 'namespace' in kwargs:
+        kwargs['data_source_namespace_name'] = kwargs['namespace']
+        kwargs.pop('namespace')
+
+    if 'prefix_name' in kwargs:
+        kwargs['data_source_prefix_name'] = kwargs['prefix_name']
+        kwargs.pop('prefix_name')
+
+    if 'region' in kwargs:
+        kwargs['data_source_region'] = kwargs['region']
+        kwargs.pop('region')
+
+    if 'version' in kwargs:
+        kwargs['version_parameterconflict'] = kwargs['version']
+        kwargs.pop('version')
+
+    ctx.invoke(generativeai_cli.create_imported_model_object_storage_object, **kwargs)
+
+
+@cli_util.copy_params_from_generated_command(generativeai_cli.update_imported_model, params_to_exclude=['version_parameterconflict'])
+@generativeai_cli.imported_model_group.command(name=generativeai_cli.update_imported_model.name, help=generativeai_cli.update_imported_model.help)
+@cli_util.option('--version', help=u"""The version of the imported model.""")
+@click.pass_context
+@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'generative_ai', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'generative_ai', 'class': 'dict(str, dict(str, object))'}}, output_type={'module': 'generative_ai', 'class': 'ImportedModel'})
+@cli_util.wrap_exceptions
+def update_imported_model_extended(ctx, **kwargs):
+
+    if 'version' in kwargs:
+        kwargs['version_parameterconflict'] = kwargs['version']
+        kwargs.pop('version')
+
+    ctx.invoke(generativeai_cli.update_imported_model, **kwargs)

services/limits/src/oci_cli_limits/generated/limits_cli.py

@@ -59,18 +59,19 @@ limits_service_cli.limits_service_group.add_command(limit_definition_group)
 limits_service_cli.limits_service_group.add_command(resource_availability_group)
 
 
-@resource_availability_group.command(name=cli_util.override('limits.get_resource_availability.command_name', 'get'), help=u"""For a given compartmentId, resource limit name, and scope, returns the following:   * The number of available resources associated with the given limit.   * The usage in the selected compartment for the given limit. If Subscription Id is provided, then usage for resource created in that subscription will be returned Note that not all resource limits support this API. If the value is not available, the API returns a 404 response. \n[Command Reference](getResourceAvailability)""")
+@resource_availability_group.command(name=cli_util.override('limits.get_resource_availability.command_name', 'get'), help=u"""For a given compartmentId, resource limit name, and scope, returns the following:   * The number of available resources associated with the given limit.   * The usage in the selected compartment for the given limit. If the subscription ID is provided, then usage for resource created in that subscription will be returned. Note that not all resource limits support this API. If the value is not available, the API returns a 404 response. \n[Command Reference](getResourceAvailability)""")
 @cli_util.option('--service-name', required=True, help=u"""The service name of the target quota.""")
 @cli_util.option('--limit-name', required=True, help=u"""The limit name for which to fetch the data.""")
 @cli_util.option('--compartment-id', required=True, help=u"""The OCID of the compartment for which data is being fetched.""")
 @cli_util.option('--availability-domain', help=u"""This field is mandatory if the scopeType of the target resource limit is AD. Otherwise, this field should be omitted. If the above requirements are not met, the API returns a 400 - InvalidParameter response.""")
-@cli_util.option('--subscription-id', help=u"""The OCID of the subscription assigned to tenant""")
+@cli_util.option('--subscription-id', help=u"""The subscription OCID assigned to the tenant.""")
+@cli_util.option('--external-location', help=u"""External cloud provider location""")
 @json_skeleton_utils.get_cli_json_input_option({})
 @cli_util.help_option
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'limits', 'class': 'ResourceAvailability'})
 @cli_util.wrap_exceptions
-def get_resource_availability(ctx, from_json, service_name, limit_name, compartment_id, availability_domain, subscription_id):
+def get_resource_availability(ctx, from_json, service_name, limit_name, compartment_id, availability_domain, subscription_id, external_location):
 
     if isinstance(service_name, six.string_types) and len(service_name.strip()) == 0:
         raise click.UsageError('Parameter --service-name cannot be whitespace or empty string')
@@ -83,6 +84,8 @@ def get_resource_availability(ctx, from_json, service_name, limit_name, compartm
         kwargs['availability_domain'] = availability_domain
     if subscription_id is not None:
         kwargs['subscription_id'] = subscription_id
+    if external_location is not None:
+        kwargs['external_location'] = external_location
     kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
     client = cli_util.build_client('limits', 'limits', ctx)
     result = client.get_resource_availability(
@@ -94,9 +97,9 @@ def get_resource_availability(ctx, from_json, service_name, limit_name, compartm
     cli_util.render_response(result, ctx)
 
 
-@limit_definition_group.command(name=cli_util.override('limits.list_limit_definitions.command_name', 'list'), help=u"""Includes a list of resource limits that are currently supported. If subscription Id is provided, then only resource limits supported by subscription will be returned If the 'areQuotasSupported' property is true, you can create quota policies on top of this limit at the compartment level. \n[Command Reference](listLimitDefinitions)""")
+@limit_definition_group.command(name=cli_util.override('limits.list_limit_definitions.command_name', 'list'), help=u"""Includes a list of resource limits that are currently supported. If the subscription ID is provided, then only resource limits supported by the subscription will be returned. If the `areQuotasSupported` property is true, you can create quota policies on top of this limit at the compartment level. \n[Command Reference](listLimitDefinitions)""")
 @cli_util.option('--compartment-id', required=True, help=u"""The OCID of the parent compartment (remember that the tenancy is simply the root compartment).""")
-@cli_util.option('--subscription-id', help=u"""The OCID of the subscription assigned to tenant""")
+@cli_util.option('--subscription-id', help=u"""The subscription OCID assigned to the tenant.""")
 @cli_util.option('--service-name', help=u"""The target service name.""")
 @cli_util.option('--name', help=u"""Optional field, filter for a specific resource limit.""")
 @cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["name", "description"]), help=u"""The field to sort by.""")
@@ -157,10 +160,11 @@ def list_limit_definitions(ctx, from_json, all_pages, page_size, compartment_id,
     cli_util.render_response(result, ctx)
 
 
-@limit_value_group.command(name=cli_util.override('limits.list_limit_values.command_name', 'list'), help=u"""Includes a full list of resource limits belonging to a given service. If subscription Id is provided, limit value for subscription will be returned. \n[Command Reference](listLimitValues)""")
+@limit_value_group.command(name=cli_util.override('limits.list_limit_values.command_name', 'list'), help=u"""Includes a full list of resource limits belonging to a given service. If the subscription ID is provided, the limit value for the subscription will be returned. \n[Command Reference](listLimitValues)""")
 @cli_util.option('--compartment-id', required=True, help=u"""The OCID of the parent compartment (remember that the tenancy is simply the root compartment).""")
 @cli_util.option('--service-name', required=True, help=u"""The target service name.""")
-@cli_util.option('--subscription-id', help=u"""The OCID of the subscription assigned to tenant""")
+@cli_util.option('--subscription-id', help=u"""The subscription OCID assigned to the tenant.""")
+@cli_util.option('--external-location', help=u"""External cloud provider location""")
 @cli_util.option('--scope-type', type=custom_types.CliCaseInsensitiveChoice(["GLOBAL", "REGION", "AD"]), help=u"""Filter entries by scope type.""")
 @cli_util.option('--availability-domain', help=u"""Filter entries by availability domain. This implies that only AD-specific values are returned.""")
 @cli_util.option('--name', help=u"""Optional field, can be used to see a specific resource limit value.""")
@@ -175,7 +179,7 @@ def list_limit_definitions(ctx, from_json, all_pages, page_size, compartment_id,
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'limits', 'class': 'list[LimitValueSummary]'})
 @cli_util.wrap_exceptions
-def list_limit_values(ctx, from_json, all_pages, page_size, compartment_id, service_name, subscription_id, scope_type, availability_domain, name, sort_by, sort_order, limit, page):
+def list_limit_values(ctx, from_json, all_pages, page_size, compartment_id, service_name, subscription_id, external_location, scope_type, availability_domain, name, sort_by, sort_order, limit, page):
 
     if all_pages and limit:
         raise click.UsageError('If you provide the --all option you cannot provide the --limit option')
@@ -185,6 +189,8 @@ def list_limit_values(ctx, from_json, all_pages, page_size, compartment_id, serv
     kwargs = {}
     if subscription_id is not None:
         kwargs['subscription_id'] = subscription_id
+    if external_location is not None:
+        kwargs['external_location'] = external_location
     if scope_type is not None:
         kwargs['scope_type'] = scope_type
     if availability_domain is not None:
@@ -235,7 +241,7 @@ def list_limit_values(ctx, from_json, all_pages, page_size, compartment_id, serv
 @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The sort order to use, either 'asc' or 'desc'. By default, it is ascending.""")
 @cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return in a paginated \"List\" call.""")
 @cli_util.option('--page', help=u"""The value of the `opc-next-page` response header from the previous \"List\" call.""")
-@cli_util.option('--subscription-id', help=u"""The OCID of the subscription assigned to tenant""")
+@cli_util.option('--subscription-id', help=u"""The subscription OCID assigned to the tenant.""")
 @cli_util.option('--all', 'all_pages', is_flag=True, help="""Fetches all pages of results. If you provide this option, then you cannot provide the --limit option.""")
 @cli_util.option('--page-size', type=click.INT, help="""When fetching results, the number of results to fetch per call. Only valid when used with --all or --limit, and ignored otherwise.""")
 @json_skeleton_utils.get_cli_json_input_option({})