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

pygeai/cli/commands/assistant.py

@@ -19,13 +19,9 @@ def show_help():
 
 
 def get_assistant_detail(option_list: list):
-    detail = "summary"
-    assistant_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "detail":
-            detail = option_arg
-        if option_flag.name == "assistant_id":
-            assistant_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    detail = opts.get("detail", "summary")
+    assistant_id = opts.get("assistant_id")
 
     if not assistant_id:
         raise MissingRequirementException("Cannot retrieve assistant detail without assistant_id")
@@ -52,58 +48,43 @@ assistant_detail_options = [
 
 
 def create_assistant(option_list: list):
-    assistant_type = "text"
-    name = None
-    description = None
-    prompt = None
-    provider_name = None
-    model_name = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    assistant_type = opts.get("type", "text")
+    name = opts.get("name")
+    description = opts.get("description")
+    prompt = opts.get("prompt")
+    provider_name = opts.get("provider_name")
+    model_name = opts.get("model_name")
+    max_tokens = opts.get("max_tokens")
+    welcome_data_title = opts.get("welcome_data_title")
+    welcome_data_description = opts.get("welcome_data_description")
+    
     temperature = None
-    max_tokens = None
-    llm_settings = {}
-    welcome_data = {}
-    welcome_data_title = None
-    welcome_data_description = None
+    temp_arg = opts.get("temperature")
+    if temp_arg:
+        try:
+            temperature = float(temp_arg)
+        except Exception:
+            raise WrongArgumentError("When defined, temperature must be a decimal numer. Example: 0.5")
+    
     feature_list = []
+    feature_arg = opts.get("welcome_data_feature")
+    if feature_arg:
+        feature_list = get_welcome_data_feature_list([], feature_arg)
+    
     examples_prompt_list = []
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "type":
-            assistant_type = option_arg
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "description":
-            description = option_arg
-        if option_flag.name == "prompt":
-            prompt = option_arg
-        if option_flag.name == "provider_name":
-            provider_name = option_arg
-        if option_flag.name == "model_name":
-            model_name = option_arg
-        if option_flag.name == "temperature":
-            if option_arg:
-                try:
-                    temperature = float(option_arg)
-                except Exception as e:
-                    raise WrongArgumentError("When defined, temperature must be a decimal numer. Example: 0.5")
-
-        if option_flag.name == "max_tokens":
-            max_tokens = option_arg
-        if option_flag.name == "welcome_data_title":
-            welcome_data_title = option_arg
-        if option_flag.name == "welcome_data_description":
-            welcome_data_description = option_arg
-        if option_flag.name == "welcome_data_feature":
-            feature_list = get_welcome_data_feature_list(feature_list, option_arg)
-        if option_flag.name == "welcome_data_example_prompt":
-            examples_prompt_list = get_welcome_data_example_prompt(examples_prompt_list, option_arg)
+    examples_arg = opts.get("welcome_data_example_prompt")
+    if examples_arg:
+        examples_prompt_list = get_welcome_data_example_prompt([], examples_arg)
 
     if not (assistant_type and name and prompt):
         raise MissingRequirementException("Cannot create new assistant without 'type', 'name' and 'prompt'")
 
+    llm_settings = {}
     if provider_name or model_name or temperature or max_tokens:
         llm_settings = get_llm_settings(provider_name, model_name, temperature, max_tokens)
 
+    welcome_data = {}
     if welcome_data_title or welcome_data_description:
         welcome_data = get_welcome_data(
             welcome_data_title,
@@ -205,60 +186,37 @@ create_assistant_options = [
 
 
 def update_assistant(option_list: list):
-    assistant_id = None
-    name = None
-    description = None
-    status = 1
-    action = "saveNewRevision"
-    revision_id = None
-    prompt = None
-    provider_name = None
-    model_name = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    assistant_id = opts.get("assistant_id")
+    name = opts.get("name")
+    description = opts.get("description")
+    status = opts.get("status", 1)
+    action = opts.get("action", "saveNewRevision")
+    revision_id = opts.get("revision_id")
+    prompt = opts.get("prompt")
+    provider_name = opts.get("provider_name")
+    model_name = opts.get("model_name")
+    max_tokens = opts.get("max_tokens")
+    welcome_data_title = opts.get("welcome_data_title")
+    welcome_data_description = opts.get("welcome_data_description")
+    
     temperature = None
-    max_tokens = None
-    llm_settings = {}
-    welcome_data = {}
-    welcome_data_title = None
-    welcome_data_description = None
+    temp_arg = opts.get("temperature")
+    if temp_arg:
+        try:
+            temperature = float(temp_arg)
+        except Exception:
+            raise WrongArgumentError("When defined, temperature must be a decimal numer. Example: 0.5")
+    
     feature_list = []
+    feature_arg = opts.get("welcome_data_feature")
+    if feature_arg:
+        feature_list = get_welcome_data_feature_list([], feature_arg)
+    
     examples_prompt_list = []
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "assistant_id":
-            assistant_id = option_arg
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "description":
-            description = option_arg
-        if option_flag.name == "status":
-            status = option_arg
-        if option_flag.name == "action":
-            action = option_arg
-        if option_flag.name == "revision_id":
-            revision_id = option_arg
-        if option_flag.name == "prompt":
-            prompt = option_arg
-        if option_flag.name == "provider_name":
-            provider_name = option_arg
-        if option_flag.name == "model_name":
-            model_name = option_arg
-        if option_flag.name == "temperature":
-            if option_arg:
-                try:
-                    temperature = float(option_arg)
-                except Exception as e:
-                    raise WrongArgumentError("When defined, temperature must be a decimal numer. Example: 0.5")
-
-        if option_flag.name == "max_tokens":
-            max_tokens = option_arg
-        if option_flag.name == "welcome_data_title":
-            welcome_data_title = option_arg
-        if option_flag.name == "welcome_data_description":
-            welcome_data_description = option_arg
-        if option_flag.name == "welcome_data_feature":
-            feature_list = get_welcome_data_feature_list(feature_list, option_arg)
-        if option_flag.name == "welcome_data_example_prompt":
-            examples_prompt_list = get_welcome_data_example_prompt(examples_prompt_list, option_arg)
+    examples_arg = opts.get("welcome_data_example_prompt")
+    if examples_arg:
+        examples_prompt_list = get_welcome_data_example_prompt([], examples_arg)
 
     if not assistant_id:
         raise MissingRequirementException("Cannot update existing assistant without 'assistant_id'")
@@ -269,9 +227,11 @@ def update_assistant(option_list: list):
     if ((action == "saveNewRevision" or action == "savePublishNewRevision") or revision_id) and not prompt:
         raise MissingRequirementException("Prompt must be defined if revisionId is specified or in case of actions saveNewRevision and savePublishNewRevision.")
 
+    llm_settings = {}
     if provider_name or model_name or temperature or max_tokens:
         llm_settings = get_llm_settings(provider_name, model_name, temperature, max_tokens)
 
+    welcome_data = {}
     if welcome_data_title or welcome_data_description:
         welcome_data = get_welcome_data(welcome_data_title, welcome_data_description, feature_list, examples_prompt_list)
 
@@ -389,10 +349,8 @@ update_assistant_options = [
 
 
 def delete_assistant(option_list: list):
-    assistant_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "assistant_id":
-            assistant_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    assistant_id = opts.get("assistant_id")
 
     if not assistant_id:
         raise MissingRequirementException("Cannot delete assistant without 'assistant_id'")
@@ -415,38 +373,30 @@ delete_assistant_options = [
 
 
 def send_chat_request(option_list: list):
-    assistant_name = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    assistant_name = opts.get("assistant_name")
+    revision = opts.get("revision")
+    revision_name = opts.get("revision_name")
+    
     message_list = []
-    revision = None
-    revision_name = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "assistant_name":
-            assistant_name = option_arg
-        if option_flag.name == "messages":
-            try:
-                message_json = json.loads(option_arg)
-                if isinstance(message_json, list):
-                    message_list = message_json
-                elif isinstance(message_json, dict):
-                    message_list.append(message_json)
-            except Exception as e:
-                raise WrongArgumentError(
-                    "Each message must be in json format: '{\"role\": \"user\", \"content\": \"message content\"}' "
-                    "It can be a dictionary or a list of dictionaries. Each dictionary must contain role and content")
-
-        if option_flag.name == "revision":
-            revision = option_arg
-        if option_flag.name == "revision_name":
-            revision_name = option_arg
+    messages_arg = opts.get("messages")
+    if messages_arg:
+        try:
+            message_json = json.loads(messages_arg)
+            if isinstance(message_json, list):
+                message_list = message_json
+            elif isinstance(message_json, dict):
+                message_list.append(message_json)
+        except Exception:
+            raise WrongArgumentError(
+                "Each message must be in json format: '{\"role\": \"user\", \"content\": \"message content\"}' "
+                "It can be a dictionary or a list of dictionaries. Each dictionary must contain role and content")
 
     if not assistant_name:
         raise MissingRequirementException("Cannot send chat request without specifying assistant name")
 
     messages = get_messages(message_list)
 
-    # TODO -> Add variables handling
-
     client = AssistantClient()
     result = client.send_chat_request(
         assistant_name=assistant_name,
@@ -480,7 +430,7 @@ send_chat_request_options = [
     Option(
         "revision_name",
         ["--revision-name"],
-        "string:	Name of the revision.",
+        "string:\tName of the revision.",
         True
     ),
     Option(
@@ -493,10 +443,8 @@ send_chat_request_options = [
 
 
 def get_request_status(option_list: list):
-    request_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "request_id":
-            request_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    request_id = opts.get("request_id")
 
     if not request_id:
         raise MissingRequirementException("Cannot retrieve status of request without request_id.")
@@ -517,10 +465,8 @@ request_status_options = [
 
 
 def cancel_request(option_list: list):
-    request_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "request_id":
-            request_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    request_id = opts.get("request_id")
 
     if not request_id:
         raise MissingRequirementException("Cannot cancel request without request_id.")

pygeai/cli/commands/auth.py

@@ -2,7 +2,7 @@ from pygeai.auth.clients import AuthClient
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
 from pygeai.cli.texts.help import AUTH_HELP_TEXT
-from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
+from pygeai.core.common.exceptions import MissingRequirementException
 from pygeai.core.utils.console import Console
 
 
@@ -15,19 +15,12 @@ def show_help():
 
 
 def get_oauth2_access_token(option_list: list):
-    client_id = None
-    username = None
-    password = None
-    scope = "gam_user_data gam_user_roles"
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "client_id":
-            client_id = option_arg
-        if option_flag.name == "username":
-            username = option_arg
-        if option_flag.name == "password":
-            password = option_arg
-        if option_flag.name == "scope":
-            scope = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    client_id = opts.get('client_id')
+    username = opts.get('username')
+    password = opts.get('password')
+    scope = opts.get('scope', "gam_user_data gam_user_roles")
 
     if not (client_id and username and password):
         raise MissingRequirementException("Cannot obtain Oauth2 access token without client_id, username and password")
@@ -72,10 +65,8 @@ get_oauth2_access_token_options = [
 
 
 def get_user_profile_information(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')
 
     client = AuthClient()
     result = client.get_user_profile_information(access_token=access_token)
@@ -93,16 +84,11 @@ get_user_profile_information_options = [
 
 
 def create_project_api_token(option_list: list):
-    project_id = None
-    name = None
-    description = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "project_id":
-            project_id = option_arg
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "description":
-            description = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    project_id = opts.get('project_id')
+    name = opts.get('name')
+    description = opts.get('description')
 
     if not (project_id and name):
         raise MissingRequirementException("Cannot create project API token without project-id and name")
@@ -139,10 +125,8 @@ create_project_api_token_options = [
 
 
 def delete_project_api_token(option_list: list):
-    api_token_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "api_token_id":
-            api_token_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    api_token_id = opts.get('api_token_id')
 
     if not api_token_id:
         raise MissingRequirementException("Cannot delete project API token without api-token-id")
@@ -163,16 +147,11 @@ delete_project_api_token_options = [
 
 
 def update_project_api_token(option_list: list):
-    api_token_id = None
-    description = None
-    status = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "api_token_id":
-            api_token_id = option_arg
-        if option_flag.name == "description":
-            description = option_arg
-        if option_flag.name == "status":
-            status = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    api_token_id = opts.get('api_token_id')
+    description = opts.get('description')
+    status = opts.get('status')
 
     if not api_token_id:
         raise MissingRequirementException("Cannot update project API token without api-token-id")
@@ -209,10 +188,8 @@ update_project_api_token_options = [
 
 
 def get_project_api_token(option_list: list):
-    api_token_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "api_token_id":
-            api_token_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    api_token_id = opts.get('api_token_id')
 
     if not api_token_id:
         raise MissingRequirementException("Cannot get project API token without api-token-id")

pygeai/cli/commands/base.py

@@ -6,7 +6,6 @@ from pygeai.cli.commands.auth import auth_commands
 from pygeai.cli.commands.builders import build_help_text
 from pygeai.cli.commands.chat import chat_commands
 from pygeai.cli.commands.configuration import configure, configuration_options
-from pygeai.cli.commands.docs import docs_commands
 from pygeai.cli.commands.embeddings import embeddings_commands
 from pygeai.cli.commands.evaluation import evaluation_commands
 from pygeai.cli.commands.feedback import feedback_commands