pygeai 0.6.0b13__py3-none-any.whl → 0.6.1__py3-none-any.whl

pygeai/cli/commands/evaluation.py

@@ -32,26 +32,16 @@ def list_datasets():
 
 
 def create_dataset(option_list: list):
-    dataset_file = None
-    dataset_name = None
-    dataset_description = None
-    dataset_type = None
-    dataset_active = True
-    rows = list()
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_file = opts.get("dataset_file")
+    dataset_name = opts.get("dataset_name")
+    dataset_description = opts.get("dataset_description")
+    dataset_type = opts.get("dataset_type")
+    dataset_active_arg = opts.get("dataset_active")
+    dataset_active = get_boolean_value(dataset_active_arg) if dataset_active_arg else True
+    rows = []
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_file":
-            dataset_file = option_arg
-        if option_flag.name == "dataset_name":
-            dataset_name = option_arg
-        if option_flag.name == "dataset_description":
-            dataset_description = option_arg
-        if option_flag.name == "dataset_type":
-            dataset_type = option_arg
-        if option_flag.name == "dataset_type":
-            dataset_type = option_arg
-        if option_flag.name == "dataset_active":
-            dataset_active = get_boolean_value(option_arg)
         if option_flag.name == "row":
             try:
                 row_json = json.loads(option_arg)
@@ -136,11 +126,8 @@ create_dataset_options = [
 
 
 def get_dataset(option_list: list):
-    dataset_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
 
     if not dataset_id:
         raise MissingRequirementException("Cannot retrieve dataset without specifying id.")
@@ -163,26 +150,16 @@ get_dataset_options = [
 
 
 def update_dataset(option_list: list):
-    dataset_id = None
-    dataset_name = None
-    dataset_description = None
-    dataset_type = None
-    dataset_active = True
-    rows = list()
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    dataset_name = opts.get("dataset_name")
+    dataset_description = opts.get("dataset_description")
+    dataset_type = opts.get("dataset_type")
+    dataset_active_arg = opts.get("dataset_active")
+    dataset_active = get_boolean_value(dataset_active_arg) if dataset_active_arg else True
+    rows = []
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "dataset_name":
-            dataset_name = option_arg
-        if option_flag.name == "dataset_description":
-            dataset_description = option_arg
-        if option_flag.name == "dataset_type":
-            dataset_type = option_arg
-        if option_flag.name == "dataset_type":
-            dataset_type = option_arg
-        if option_flag.name == "dataset_active":
-            dataset_active = get_boolean_value(option_arg)
         if option_flag.name == "row":
             try:
                 row_json = json.loads(option_arg)
@@ -261,11 +238,8 @@ update_dataset_options = [
 
 
 def delete_dataset(option_list: list):
-    dataset_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
 
     if not dataset_id:
         raise MissingRequirementException("Cannot delete dataset without specifying id.")
@@ -288,12 +262,11 @@ delete_dataset_options = [
 
 
 def create_dataset_row(option_list: list):
-    dataset_id = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
     row = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
         if option_flag.name == "row":
             try:
                 row_json = json.loads(option_arg)
@@ -343,11 +316,8 @@ create_dataset_row_options = [
 
 
 def list_dataset_rows(option_list: list):
-    dataset_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
 
     if not dataset_id:
         raise MissingRequirementException("Cannot list dataset rows without specifying id.")
@@ -370,14 +340,9 @@ list_dataset_rows_options = [
 
 
 def get_dataset_row(option_list: list):
-    dataset_id = None
-    row_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
 
     if not (dataset_id and row_id):
         raise MissingRequirementException("Cannot get dataset row without specifying id of dataset and row.")
@@ -407,15 +372,12 @@ get_dataset_row_options = [
 
 
 def update_dataset_row(option_list: list):
-    dataset_id = None
-    row_id = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
     row = None
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
         if option_flag.name == "row":
             try:
                 row_json = json.loads(option_arg)
@@ -472,14 +434,9 @@ update_dataset_row_options = [
 
 
 def delete_dataset_row(option_list: list):
-    dataset_id = None
-    row_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
 
     if not (dataset_id and row_id):
         raise MissingRequirementException("Cannot delete dataset row without specifying id of dataset and row.")
@@ -509,23 +466,12 @@ delete_dataset_row_options = [
 
 
 def create_dataset_row_expected_source(option_list: list):
-    dataset_id = None
-    row_id = None
-    name = None
-    value = None
-    extension = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "value":
-            value = option_arg
-        if option_flag.name == "extension":
-            extension = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
+    name = opts.get("name")
+    value = opts.get("value")
+    extension = opts.get("extension")
 
     if not (dataset_id and row_id):
         raise MissingRequirementException("Cannot create dataset row expected source without specifying id of dataset and row.")
@@ -576,14 +522,9 @@ create_dataset_row_expected_source_options = [
 
 
 def list_dataset_row_expected_sources(option_list: list):
-    dataset_id = None
-    row_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
 
     if not (dataset_id and row_id):
         raise MissingRequirementException("Cannot list dataset row expected sources without specifying id of dataset and row.")
@@ -613,17 +554,10 @@ list_dataset_row_expected_sources_options = [
 
 
 def get_dataset_row_expected_source(option_list: list):
-    dataset_id = None
-    row_id = None
-    expected_source_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
-        if option_flag.name == "expected_source_id":
-            expected_source_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
+    expected_source_id = opts.get("expected_source_id")
 
     if not (dataset_id and row_id and expected_source_id):
         raise MissingRequirementException("Cannot get expected sources without specifying id of dataset, row and expected source.")
@@ -660,26 +594,13 @@ get_dataset_row_expected_source_options = [
 
 
 def update_dataset_row_expected_source(option_list: list):
-    dataset_id = None
-    row_id = None
-    expected_source_id = None
-    name = None
-    value = None
-    extension = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
-        if option_flag.name == "expected_source_id":
-            expected_source_id = option_arg
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "value":
-            value = option_arg
-        if option_flag.name == "extension":
-            extension = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
+    expected_source_id = opts.get("expected_source_id")
+    name = opts.get("name")
+    value = opts.get("value")
+    extension = opts.get("extension")
 
     if not (dataset_id and row_id and expected_source_id):
         raise MissingRequirementException("Cannot update expected sources without specifying id of dataset, row and expected source.")
@@ -738,17 +659,10 @@ update_dataset_row_expected_source_options = [
 
 
 def delete_dataset_row_expected_source(option_list: list):
-    dataset_id = None
-    row_id = None
-    expected_source_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
-        if option_flag.name == "expected_source_id":
-            expected_source_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
+    expected_source_id = opts.get("expected_source_id")
 
     if not (dataset_id and row_id and expected_source_id):
         raise MissingRequirementException("Cannot delete expected sources without specifying id of dataset, row and expected source.")
@@ -785,26 +699,13 @@ delete_dataset_row_expected_source_options = [
 
 
 def create_dataset_row_filter_variable(option_list: list):
-    dataset_id = None
-    row_id = None
-    metadata_type = None
-    key = None
-    value = None
-    operator = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
-        if option_flag.name == "metadata_type":
-            metadata_type = option_arg
-        if option_flag.name == "key":
-            key = option_arg
-        if option_flag.name == "value":
-            value = option_arg
-        if option_flag.name == "operator":
-            operator = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
+    metadata_type = opts.get("metadata_type")
+    key = opts.get("key")
+    value = opts.get("value")
+    operator = opts.get("operator")
 
     if not (dataset_id and row_id):
         raise MissingRequirementException("Cannot create dataset row filter variable without specifying id of dataset and row.")
@@ -862,14 +763,9 @@ create_dataset_row_filter_variable_options = [
 
 
 def list_dataset_row_filter_variables(option_list: list):
-    dataset_id = None
-    row_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
 
     if not (dataset_id and row_id):
         raise MissingRequirementException("Cannot list dataset row filter variables without specifying id of dataset and row.")
@@ -899,17 +795,10 @@ list_dataset_row_filter_variables_options = [
 
 
 def get_dataset_row_filter_variable(option_list: list):
-    dataset_id = None
-    row_id = None
-    filter_variable_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
-        if option_flag.name == "filter_variable_id":
-            filter_variable_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
+    filter_variable_id = opts.get("filter_variable_id")
 
     if not (dataset_id and row_id and filter_variable_id):
         raise MissingRequirementException("Cannot get filter variables without specifying id of dataset, row and filter variable.")
@@ -946,29 +835,14 @@ get_dataset_row_filter_variable_options = [
 
 
 def update_dataset_row_filter_variable(option_list: list):
-    dataset_id = None
-    row_id = None
-    filter_variable_id = None
-    metadata_type = None
-    key = None
-    value = None
-    operator = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
-        if option_flag.name == "filter_variable_id":
-            filter_variable_id = option_arg
-        if option_flag.name == "metadata_type":
-            metadata_type = option_arg
-        if option_flag.name == "key":
-            key = option_arg
-        if option_flag.name == "value":
-            value = option_arg
-        if option_flag.name == "operator":
-            operator = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
+    filter_variable_id = opts.get("filter_variable_id")
+    metadata_type = opts.get("metadata_type")
+    key = opts.get("key")
+    value = opts.get("value")
+    operator = opts.get("operator")
 
     if not (dataset_id and row_id and filter_variable_id):
         raise MissingRequirementException("Cannot update filter variables without specifying id of dataset, row and filter variable.")
@@ -1033,17 +907,10 @@ update_dataset_row_filter_variable_options = [
 
 
 def delete_dataset_row_filter_variable(option_list: list):
-    dataset_id = None
-    row_id = None
-    filter_variable_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "row_id":
-            row_id = option_arg
-        if option_flag.name == "filter_variable_id":
-            filter_variable_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    row_id = opts.get("row_id")
+    filter_variable_id = opts.get("filter_variable_id")
 
     if not (dataset_id and row_id and filter_variable_id):
         raise MissingRequirementException("Cannot delete filter variables without specifying id of dataset, row and filter variable.")
@@ -1080,14 +947,9 @@ delete_dataset_row_filter_variable_options = [
 
 
 def update_dataset_rows_file(option_list: list):
-    dataset_id = None
-    dataset_rows_file = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
-        if option_flag.name == "dataset_rows_file":
-            dataset_rows_file = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    dataset_id = opts.get("dataset_id")
+    dataset_rows_file = opts.get("dataset_rows_file")
 
     if not (dataset_id and dataset_rows_file):
         raise MissingRequirementException("Cannot upload dataset rows file without specifying id of dataset, rows file")
@@ -1128,30 +990,17 @@ def list_evaluation_plans():
 
 
 def create_evaluation_plan(option_list: list):
-    evaluation_plan_name = None
-    evaluation_plan_type = None
-    evaluation_plan_assistant_id = None
-    evaluation_plan_assistant_name = None
-    evaluation_plan_assistant_revision = None
-    evaluation_plan_profile_name = None
-    dataset_id = None
-    system_metrics = list()
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_name = opts.get("evaluation_plan_name")
+    evaluation_plan_type = opts.get("evaluation_plan_type")
+    evaluation_plan_assistant_id = opts.get("evaluation_plan_assistant_id")
+    evaluation_plan_assistant_name = opts.get("evaluation_plan_assistant_name")
+    evaluation_plan_assistant_revision = opts.get("evaluation_plan_assistant_revision")
+    evaluation_plan_profile_name = opts.get("evaluation_plan_profile_name")
+    dataset_id = opts.get("dataset_id")
+    system_metrics = []
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_name":
-            evaluation_plan_name = option_arg
-        if option_flag.name == "evaluation_plan_type":
-            evaluation_plan_type = option_arg
-        if option_flag.name == "evaluation_plan_assistant_id":
-            evaluation_plan_assistant_id = option_arg
-        if option_flag.name == "evaluation_plan_assistant_name":
-            evaluation_plan_assistant_name = option_arg
-        if option_flag.name == "evaluation_plan_assistant_revision":
-            evaluation_plan_assistant_revision = option_arg
-        if option_flag.name == "evaluation_plan_profile_name":
-            evaluation_plan_profile_name = option_arg
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
         if option_flag.name == "system_metrics":
             try:
                 metrics_json = json.loads(option_arg)
@@ -1241,11 +1090,8 @@ create_evaluation_plan_options = [
 
 
 def get_evaluation_plan(option_list: list):
-    evaluation_plan_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
 
     if not evaluation_plan_id:
         raise MissingRequirementException("Cannot get evaluation plan without specifying id")
@@ -1268,33 +1114,18 @@ get_evaluation_plan_options = [
 
 
 def update_evaluation_plan(option_list: list):
-    evaluation_plan_id = None
-    evaluation_plan_name = None
-    evaluation_plan_type = None
-    evaluation_plan_assistant_id = None
-    evaluation_plan_assistant_name = None
-    evaluation_plan_assistant_revision = None
-    evaluation_plan_profile_name = None
-    dataset_id = None
-    system_metrics = list()
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
+    evaluation_plan_name = opts.get("evaluation_plan_name")
+    evaluation_plan_type = opts.get("evaluation_plan_type")
+    evaluation_plan_assistant_id = opts.get("evaluation_plan_assistant_id")
+    evaluation_plan_assistant_name = opts.get("evaluation_plan_assistant_name")
+    evaluation_plan_assistant_revision = opts.get("evaluation_plan_assistant_revision")
+    evaluation_plan_profile_name = opts.get("evaluation_plan_profile_name")
+    dataset_id = opts.get("dataset_id")
+    system_metrics = []
 
     for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
-        if option_flag.name == "evaluation_plan_name":
-            evaluation_plan_name = option_arg
-        if option_flag.name == "evaluation_plan_type":
-            evaluation_plan_type = option_arg
-        if option_flag.name == "evaluation_plan_assistant_id":
-            evaluation_plan_assistant_id = option_arg
-        if option_flag.name == "evaluation_plan_assistant_name":
-            evaluation_plan_assistant_name = option_arg
-        if option_flag.name == "evaluation_plan_assistant_revision":
-            evaluation_plan_assistant_revision = option_arg
-        if option_flag.name == "evaluation_plan_profile_name":
-            evaluation_plan_profile_name = option_arg
-        if option_flag.name == "dataset_id":
-            dataset_id = option_arg
         if option_flag.name == "system_metrics":
             try:
                 metrics_json = json.loads(option_arg)
@@ -1390,11 +1221,8 @@ update_evaluation_plan_options = [
 
 
 def delete_evaluation_plan(option_list: list):
-    evaluation_plan_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
 
     if not evaluation_plan_id:
         raise MissingRequirementException("Cannot delete evaluation plan without specifying id")
@@ -1417,11 +1245,8 @@ delete_evaluation_plan_options = [
 
 
 def list_evaluation_plan_system_metrics(option_list: list):
-    evaluation_plan_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
 
     if not evaluation_plan_id:
         raise MissingRequirementException("Cannot list evaluation plan's system metrics without specifying id")
@@ -1444,17 +1269,10 @@ list_evaluation_plan_system_metrics_options = [
 
 
 def add_evaluation_plan_system_metric(option_list: list):
-    evaluation_plan_id = None
-    system_metric_id = None
-    system_metric_weight = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
-        if option_flag.name == "system_metric_id":
-            system_metric_id = option_arg
-        if option_flag.name == "system_metric_weight":
-            system_metric_weight = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
+    system_metric_id = opts.get("system_metric_id")
+    system_metric_weight = opts.get("system_metric_weight")
 
     if not evaluation_plan_id:
         raise MissingRequirementException("Cannot add evaluation plan's system metrics without specifying id")
@@ -1492,14 +1310,9 @@ add_evaluation_plan_system_metric_options = [
 
 
 def get_evaluation_plan_system_metric(option_list: list):
-    evaluation_plan_id = None
-    system_metric_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
-        if option_flag.name == "system_metric_id":
-            system_metric_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
+    system_metric_id = opts.get("system_metric_id")
 
     if not (evaluation_plan_id and system_metric_id):
         raise MissingRequirementException("Cannot retrieve evaluation plan's system metric without specifying both ids")
@@ -1529,17 +1342,10 @@ get_evaluation_plan_system_metric_options = [
 
 
 def update_evaluation_plan_system_metric(option_list: list):
-    evaluation_plan_id = None
-    system_metric_id = None
-    system_metric_weight = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
-        if option_flag.name == "system_metric_id":
-            system_metric_id = option_arg
-        if option_flag.name == "system_metric_weight":
-            system_metric_weight = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
+    system_metric_id = opts.get("system_metric_id")
+    system_metric_weight = opts.get("system_metric_weight")
 
     if not evaluation_plan_id:
         raise MissingRequirementException("Cannot update evaluation plan's system metrics without specifying both ids and weight")
@@ -1577,14 +1383,9 @@ update_evaluation_plan_system_metric_options = [
 
 
 def delete_evaluation_plan_system_metric(option_list: list):
-    evaluation_plan_id = None
-    system_metric_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
-        if option_flag.name == "system_metric_id":
-            system_metric_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
+    system_metric_id = opts.get("system_metric_id")
 
     if not (evaluation_plan_id and system_metric_id):
         raise MissingRequirementException("Cannot delete evaluation plan's system metric without specifying both ids")
@@ -1620,11 +1421,8 @@ def list_system_metrics():
 
 
 def get_system_metric(option_list: list):
-    system_metric_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "system_metric_id":
-            system_metric_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    system_metric_id = opts.get("system_metric_id")
 
     if not system_metric_id:
         raise MissingRequirementException("Cannot retrieve system metric without specifying id")
@@ -1647,11 +1445,8 @@ get_system_metric_options = [
 
 
 def execute_evaluation_plan(option_list: list):
-    evaluation_plan_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
 
     if not evaluation_plan_id:
         raise MissingRequirementException("Cannot execute evaluation plan without specifying id")
@@ -1678,11 +1473,8 @@ execute_evaluation_plan_options = [
 
 
 def list_evaluation_results(option_list: list):
-    evaluation_plan_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_plan_id":
-            evaluation_plan_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_plan_id = opts.get("evaluation_plan_id")
 
     if not evaluation_plan_id:
         raise MissingRequirementException("Cannot list evaluation results without specifying id")
@@ -1705,11 +1497,8 @@ list_evaluation_results_options = [
 
 
 def get_evaluation_result(option_list: list):
-    evaluation_result_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "evaluation_result_id":
-            evaluation_result_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    evaluation_result_id = opts.get("evaluation_result_id")
 
     if not evaluation_result_id:
         raise MissingRequirementException("Cannot get evaluation results without specifying id")