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

pygeai/cli/commands/feedback.py

@@ -1,7 +1,7 @@
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
 from pygeai.cli.texts.help import FEEDBACK_HELP_TEXT
-from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
+from pygeai.core.common.exceptions import MissingRequirementException
 from pygeai.core.feedback.clients import FeedbackClient
 from pygeai.core.utils.console import Console
 
@@ -15,20 +15,12 @@ def show_help():
 
 
 def send_feedback(option_list: list):
-    request_id = None
-    origin = "user-feedback"
-    answer_score = None
-    comments = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "request_id":
-            request_id = option_arg
-        if option_flag.name == "origin":
-            origin = option_arg
-        if option_flag.name == "answer_score":
-            answer_score = option_arg
-        if option_flag.name == "comments":
-            comments = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    request_id = opts.get('request_id')
+    origin = opts.get('origin', 'user-feedback')
+    answer_score = opts.get('answer_score')
+    comments = opts.get('comments')
 
     if not (request_id and answer_score and answer_score):
         raise MissingRequirementException("Cannot send feedback without specifying request_id and answer_score")

pygeai/cli/commands/files.py

@@ -15,22 +15,13 @@ def show_help():
 
 
 def upload_file(option_list: list):
-    organization = None
-    project = None
-    file_name = None
-    file_path = None
-    folder = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
-        if option_flag.name == "project":
-            project = option_arg
-        if option_flag.name == "file_name":
-            file_name = option_arg
-        if option_flag.name == "file_path":
-            file_path = option_arg
-        if option_flag.name == "folder":
-            folder = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    organization = opts.get('organization')
+    project = opts.get('project')
+    file_name = opts.get('file_name')
+    file_path = opts.get('file_path')
+    folder = opts.get('folder')
 
     if not (organization and project and file_path):
         raise MissingRequirementException("Organization ID, Project ID and File path are mandatory parameters in order "
@@ -82,16 +73,11 @@ upload_file_options = [
 
 
 def get_file(option_list: list):
-    organization = None
-    project = None
-    file_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
-        if option_flag.name == "project":
-            project = option_arg
-        if option_flag.name == "file_id":
-            file_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    organization = opts.get('organization')
+    project = opts.get('project')
+    file_id = opts.get('file_id')
 
     if not (organization and project and file_id):
         raise MissingRequirementException("Cannot get file without organization, project and file_id.")
@@ -128,16 +114,11 @@ get_file_options = [
 
 
 def delete_file(option_list: list):
-    organization = None
-    project = None
-    file_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
-        if option_flag.name == "project":
-            project = option_arg
-        if option_flag.name == "file_id":
-            file_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    organization = opts.get('organization')
+    project = opts.get('project')
+    file_id = opts.get('file_id')
 
     if not (organization and project and file_id):
         raise MissingRequirementException("Cannot delete file without organization, project and file_id.")
@@ -174,16 +155,11 @@ delete_file_options = [
 
 
 def get_file_content(option_list: list):
-    organization = None
-    project = None
-    file_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
-        if option_flag.name == "project":
-            project = option_arg
-        if option_flag.name == "file_id":
-            file_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    organization = opts.get('organization')
+    project = opts.get('project')
+    file_id = opts.get('file_id')
 
     if not (organization and project and file_id):
         raise MissingRequirementException("Cannot get file content without organization, project and file_id.")
@@ -220,13 +196,10 @@ get_file_content_options = [
 
 
 def get_file_list(option_list: list):
-    organization = None
-    project = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
-        if option_flag.name == "project":
-            project = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    organization = opts.get('organization')
+    project = opts.get('project')
 
     if not (organization and project):
         raise MissingRequirementException("Cannot file list without organization and project id.")

pygeai/cli/commands/gam.py

@@ -1,7 +1,7 @@
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
 from pygeai.cli.texts.help import GAM_HELP_TEXT
-from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
+from pygeai.core.common.exceptions import MissingRequirementException
 from pygeai.core.utils.console import Console
 from pygeai.gam.clients import GAMClient
 
@@ -15,23 +15,13 @@ def show_help():
 
 
 def generate_signin_url(option_list: list):
-    client_id = None
-    redirect_uri = None
-    scope = "gam_user_data"
-    state = None
-    response_type = "code"
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "client_id":
-            client_id = option_arg
-        if option_flag.name == "redirect_uri":
-            redirect_uri = option_arg
-        if option_flag.name == "scope":
-            scope = option_arg
-        if option_flag.name == "state":
-            state = option_arg
-        if option_flag.name == "response_type":
-            response_type = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    client_id = opts.get('client_id')
+    redirect_uri = opts.get('redirect_uri')
+    scope = opts.get('scope', "gam_user_data")
+    state = opts.get('state')
+    response_type = opts.get('response_type', "code")
 
     if not all([client_id, redirect_uri, state]):
         raise MissingRequirementException("client_id, redirect_uri, and state are required for generating signin URL")
@@ -82,38 +72,18 @@ generate_signin_url_options = [
 
 
 def get_access_token(option_list: list):
-    client_id = None
-    client_secret = None
-    grant_type = "password"
-    authentication_type_name = "local"
-    scope = "gam_user_data"
-    username = None
-    password = None
-    initial_properties = None
-    repository = None
-    request_token_type = "OAuth"
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "client_id":
-            client_id = option_arg
-        if option_flag.name == "client_secret":
-            client_secret = option_arg
-        if option_flag.name == "grant_type":
-            grant_type = option_arg
-        if option_flag.name == "authentication_type_name":
-            authentication_type_name = option_arg
-        if option_flag.name == "scope":
-            scope = option_arg
-        if option_flag.name == "username":
-            username = option_arg
-        if option_flag.name == "password":
-            password = option_arg
-        if option_flag.name == "initial_properties":
-            initial_properties = option_arg
-        if option_flag.name == "repository":
-            repository = option_arg
-        if option_flag.name == "request_token_type":
-            request_token_type = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    client_id = opts.get('client_id')
+    client_secret = opts.get('client_secret')
+    grant_type = opts.get('grant_type', "password")
+    authentication_type_name = opts.get('authentication_type_name', "local")
+    scope = opts.get('scope', "gam_user_data")
+    username = opts.get('username')
+    password = opts.get('password')
+    initial_properties = opts.get('initial_properties')
+    repository = opts.get('repository')
+    request_token_type = opts.get('request_token_type', "OAuth")
 
     if not ((client_id and client_secret) or (username and password)):
         raise MissingRequirementException("Cannot get access token without specifying valid credentials")
@@ -201,11 +171,8 @@ get_access_token_options = [
 
 
 def get_user_info(option_list: list):
-    access_token = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "access_token":
-            access_token = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    access_token = opts.get('access_token')
 
     if not access_token:
         raise MissingRequirementException("Cannot get user info without the access token")
@@ -228,20 +195,12 @@ get_user_info_options = [
 
 
 def refresh_access_token(option_list: list):
-    client_id = None
-    client_secret = None
-    grant_type = "refresh_token"
-    refresh_token = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "client_id":
-            client_id = option_arg
-        if option_flag.name == "client_secret":
-            client_secret = option_arg
-        if option_flag.name == "grant_type":
-            grant_type = option_arg
-        if option_flag.name == "refresh_token":
-            refresh_token = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    client_id = opts.get('client_id')
+    client_secret = opts.get('client_secret')
+    grant_type = opts.get('grant_type', "refresh_token")
+    refresh_token = opts.get('refresh_token')
 
     if not ((client_id and client_secret) or refresh_token):
         raise MissingRequirementException("Cannot refresh access token without specifying valid credentials")