Merge pull request #601 from oracle/release_2022-10-25

Releasing version 3.19.0

Author: HamadaGabrIbrahim

CHANGELOG.rst

@@ -6,6 +6,74 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
 
+3.19.0 - 2022-10-25
+--------------------
+Added
+~~~~~~~~
+
+* Support for Full Stack Disaster Recovery service
+
+  * ``oci disaster-recovery``
+
+* The AI Language service
+
+  * Support for the Language custom models
+
+    * ``oci ai language project``
+    * ``oci ai language model``
+    * ``oci ai language endpoint``
+
+  * Support for the language translation
+
+    * ``oci ai language batch-language-translation``
+
+  * Support for new optional parameters in the batch service
+
+    * ``oci ai language batch-detect-entities --compartment-id --endpoint-id``
+    * ``oci ai language batch-detect-key-phrases --compartment-id``
+    * ``oci ai language batch-detect-language --compartment-id``
+    * ``oci ai language batch-detect-sentiments --compartment-id``
+    * ``oci ai language batch-detect-text-classification --compartment-id --endpoint-id``
+
+* Data Flow Service
+
+  * Support for running code interactively with Session Applications using Statement resource
+
+    * ``oci data-flow statement create --code --run-id``
+    * ``oci data-flow statement delete --run-id --statement-id``
+    * ``oci data-flow statement get --run-id --statement-id``
+    * ``ooci data-flow statement list --run-id``
+
+  * Support for new optional parameters
+
+    * ``oci data-flow application create --idle-timeout-in-minutes --max-duration-in-minutes``
+    * ``oci data-flow application update --idle-timeout-in-minutes --max-duration-in-minutes``
+    * ``oci data-flow run create --idle-timeout-in-minutes --max-duration-in-minutes``
+    * ``oci data-flow run submit --idle-timeout-in-minutes --max-duration-in-minutes``
+    * ``oci data-flow run update --idle-timeout-in-minutes --max-duration-in-minutes``
+
+* Support for using combination of environment variable and other required parameter in commands ,if config file is not present 
+
+Fixed
+~~~~~
+
+* Fixed mismatched help text format when using ``--help``
+
+Changed
+~~~~~~~
+
+* Dependency on click is upgraded to 8.0.4
+
+* Data Flow Service
+
+  * [BREAKING] The parameter --file-url has been removed from the below command
+
+    * ``oci data-flow application create``
+
+  * [BREAKING] The parameters --defined-tags, --force, --freeform-tags, --if-match, --max-wait-seconds, --wait-for-state, --wait-interval-seconds have been deleted from the below command
+
+    * ``oci data-flow statement list``
+
 3.18.1 - 2022-10-04
 --------------------
 Added

conftest.py

@@ -174,7 +174,7 @@ def invoke(*args, **kwargs):
             except TypeError:
                 new_output_bytes = cleaned_output
             finally:
-                result = click.testing.Result(result.runner, new_output_bytes, result.exit_code, result.exception, result.exc_info)
+                result = click.testing.Result(result.runner, new_output_bytes, result.stderr_bytes, result, result.exit_code, result.exception, result.exc_info)
 
         return result
 
@@ -183,11 +183,19 @@ def invoke(*args, **kwargs):
 
 
 @pytest.fixture(scope='session')
-def test_id():
+def test_id(request):
+    is_recording_test = request.config.getoption("--run-recordable-tests-only")
+    if is_recording_test:
+        return '1000000'
+    return str(random.randint(0, 1000000))
+
+
+@pytest.fixture(scope='session')
+def test_id_recorded(test_id):
     if test_config_container.using_vcr_with_mock_responses():
         return '1000000'
     else:
-        return str(random.randint(0, 1000000))
+        return test_id
 
 
 @pytest.fixture(scope='session')
@@ -417,11 +425,11 @@ def vcn_and_subnets(network_client):
 
 
 @pytest.fixture(scope='session')
-def tag_namespace_and_tags(identity_client, test_id):
+def tag_namespace_and_tags(identity_client, test_id_recorded):
     with test_config_container.create_vcr().use_cassette('_conftest_fixture_tag_namespace_and_tags.yml',
                                                          match_on=['method', 'scheme', 'host', 'port', 'vcr_query_matcher']):
         if not os.environ.get('OCI_CLI_TAG_NAMESPACE_ID'):
-            tag_namespace_name = 'cli_tag_ns_{}'.format(test_id)
+            tag_namespace_name = 'cli_tag_ns_{}'.format(test_id_recorded)
             create_tag_namespace_response = identity_client.create_tag_namespace(
                 oci.identity.models.CreateTagNamespaceDetails(
                     compartment_id=os.environ['OCI_CLI_COMPARTMENT_ID'],
@@ -446,7 +454,7 @@ def tag_namespace_and_tags(identity_client, test_id):
 
         tags = []
         if not os.environ.get('OCI_CLI_TAG_ONE_NAME'):
-            tag_one_name = 'cli_tag_{}'.format(test_id)
+            tag_one_name = 'cli_tag_{}'.format(test_id_recorded)
             create_tag_response = identity_client.create_tag(
                 tag_namespace.id,
                 oci.identity.models.CreateTagDetails(name=tag_one_name, description='CLI integration test tag')
@@ -457,7 +465,7 @@ def tag_namespace_and_tags(identity_client, test_id):
             tags.append(get_and_reactivate_tag(identity_client, tag_namespace, os.environ.get('OCI_CLI_TAG_ONE_NAME')))
 
         if not os.environ.get('OCI_CLI_TAG_TWO_NAME'):
-            tag_two_name = 'cli_tag2_{}'.format(test_id)
+            tag_two_name = 'cli_tag2_{}'.format(test_id_recorded)
             create_tag_response = identity_client.create_tag(
                 tag_namespace.id,
                 oci.identity.models.CreateTagDetails(name=tag_two_name, description='CLI integration test tag')

requirements.txt

@@ -6,15 +6,15 @@ appdirs==1.4.3
 arrow>=1.0.0
 certifi
 cffi>=1.9.1
-click==7.1.2
+click==8.0.4
 coverage==4.5.2
 cryptography>=3.2.1,<=37.0.2
 httpsig-cffi==15.0.0
 Jinja2==3.0.3
 jmespath==0.10.0
 ndg-httpsclient==0.4.2
 mock==2.0.0
-oci==2.85.0
+oci==2.86.0
 packaging==20.2
 pluggy==0.13.0
 py==1.10.0

services/ai_language/src/oci_cli_ai_service_language/aiservicelanguage_cli_extended.py

@@ -29,9 +29,8 @@
 def language_group():
     pass
 
-# Batch APIs
-
 
+# Batch APIs
 cli_util.rename_command(aiservicelanguage_cli, aiservicelanguage_cli.batch_detect_dominant_language_group, aiservicelanguage_cli.batch_detect_dominant_language, "batch-detect-language")
 cli_util.rename_command(aiservicelanguage_cli, aiservicelanguage_cli.batch_detect_language_entities_group, aiservicelanguage_cli.batch_detect_language_entities, "batch-detect-entities")
 cli_util.rename_command(aiservicelanguage_cli, aiservicelanguage_cli.batch_detect_language_key_phrases_group, aiservicelanguage_cli.batch_detect_language_key_phrases, "batch-detect-key-phrases")
@@ -74,3 +73,41 @@ def language_group():
 language_group.add_command(aiservicelanguage_cli.detect_language_key_phrases)
 language_group.add_command(aiservicelanguage_cli.detect_language_sentiments)
 language_group.add_command(aiservicelanguage_cli.detect_language_text_classification)
+
+# Remove polymorphic model commands
+aiservicelanguage_cli.model_group.commands.pop(aiservicelanguage_cli.create_model_data_science_labeling_dataset.name)
+aiservicelanguage_cli.model_group.commands.pop(aiservicelanguage_cli.create_model_object_storage_dataset.name)
+aiservicelanguage_cli.model_group.commands.pop(aiservicelanguage_cli.create_model_named_entity_recognition_model_details.name)
+aiservicelanguage_cli.model_group.commands.pop(aiservicelanguage_cli.create_model_text_classification_model_details.name)
+aiservicelanguage_cli.model_group.commands.pop(aiservicelanguage_cli.create_model_test_and_validation_dataset_strategy.name)
+
+# Rename evaluation result command
+cli_util.rename_command(aiservicelanguage_cli, aiservicelanguage_cli.evaluation_result_collection_group, aiservicelanguage_cli.list_evaluation_results, "list")
+cli_util.rename_command(aiservicelanguage_cli, aiservicelanguage_cli.ai_root_group, aiservicelanguage_cli.evaluation_result_collection_group, "evaluation-result")
+
+# Rename work-requst error and log
+cli_util.rename_command(aiservicelanguage_cli, aiservicelanguage_cli.ai_root_group, aiservicelanguage_cli.work_request_error_group, "error")
+cli_util.rename_command(aiservicelanguage_cli, aiservicelanguage_cli.ai_root_group, aiservicelanguage_cli.work_request_log_group, "log")
+
+# Remove project, model, endpoint, language_translation, work_request_long and work_request_error from root
+aiservicelanguage_cli.ai_root_group.commands.pop(aiservicelanguage_cli.project_group.name)
+aiservicelanguage_cli.ai_root_group.commands.pop(aiservicelanguage_cli.model_group.name)
+aiservicelanguage_cli.ai_root_group.commands.pop(aiservicelanguage_cli.endpoint_group.name)
+aiservicelanguage_cli.ai_root_group.commands.pop(aiservicelanguage_cli.work_request_group.name)
+aiservicelanguage_cli.ai_root_group.commands.pop(aiservicelanguage_cli.batch_language_translation_group.name)
+aiservicelanguage_cli.ai_root_group.commands.pop(aiservicelanguage_cli.work_request_error_group.name)
+aiservicelanguage_cli.ai_root_group.commands.pop(aiservicelanguage_cli.work_request_log_group.name)
+aiservicelanguage_cli.ai_root_group.commands.pop(aiservicelanguage_cli.evaluation_result_collection_group.name)
+
+# Add project, model, endpoint, language_translation group to language_group
+language_group.add_command(aiservicelanguage_cli.project_group)
+language_group.add_command(aiservicelanguage_cli.model_group)
+language_group.add_command(aiservicelanguage_cli.endpoint_group)
+language_group.add_command(aiservicelanguage_cli.work_request_group)
+language_group.add_command(aiservicelanguage_cli.batch_language_translation)
+language_group.add_command(aiservicelanguage_cli.evaluation_result_collection_group)
+
+# Add work-request error and logs messages to work-request group
+aiservicelanguage_cli.work_request_group.add_command(aiservicelanguage_cli.work_request_error_group)
+aiservicelanguage_cli.work_request_group.add_command(aiservicelanguage_cli.work_request_log_group)
+