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

pygeai/cli/commands/chat.py

@@ -3,7 +3,7 @@ import platform
 import os
 import subprocess
 import sys
-from importlib import resources
+from importlib import resources, util
 from pathlib import Path
 
 from pygeai import logger
@@ -32,12 +32,14 @@ def show_help():
 
 
 def get_chat_completion(option_list: list):
-    model = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    model = opts.get('model')
     message_list = []
     stream = False
     temperature = None
     max_tokens = None
-    thread_id = None
+    thread_id = opts.get('thread_id')
     frequency_penalty = None
     presence_penalty = None
     top_p = None
@@ -51,82 +53,103 @@ def get_chat_completion(option_list: list):
     stream_options = None
     store = None
     metadata = None
-    user = None
-    reasoning_effort = None
+    user = opts.get('user')
+    reasoning_effort = opts.get('reasoning_effort')
 
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "model":
-            model = 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 == "stream":
-            if option_arg:
-                stream = get_boolean_value(option_arg)
-        if option_flag.name == "temperature":
-            temperature = float(option_arg) if option_arg is not None else None
-        if option_flag.name == "max_tokens":
-            max_tokens = int(option_arg) if option_arg is not None else None
-        if option_flag.name == "thread_id":
-            thread_id = option_arg
-        if option_flag.name == "frequency_penalty":
-            if option_arg:
-                frequency_penalty = get_penalty_float_value(option_arg)
-        if option_flag.name == "presence_penalty":
-            if option_arg:
-                presence_penalty = get_penalty_float_value(option_arg)
-        if option_flag.name == "top_p":
-            top_p = float(option_arg) if option_arg else None
-        if option_flag.name == "stop":
-            try:
-                stop = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                stop = option_arg
-        if option_flag.name == "response_format":
-            try:
-                response_format = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                raise WrongArgumentError("response_format must be a valid JSON object")
-        if option_flag.name == "tools":
-            try:
-                tools = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                raise WrongArgumentError("tools must be a valid JSON array")
-        if option_flag.name == "tool_choice":
-            try:
-                tool_choice = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                tool_choice = option_arg
-        if option_flag.name == "logprobs":
-            logprobs = get_boolean_value(option_arg) if option_arg else None
-        if option_flag.name == "top_logprobs":
-            top_logprobs = int(option_arg) if option_arg else None
-        if option_flag.name == "seed":
-            seed = int(option_arg) if option_arg else None
-        if option_flag.name == "stream_options":
-            try:
-                stream_options = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                raise WrongArgumentError("stream_options must be a valid JSON object")
-        if option_flag.name == "store":
-            store = get_boolean_value(option_arg) if option_arg else None
-        if option_flag.name == "metadata":
-            try:
-                metadata = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                raise WrongArgumentError("metadata must be a valid JSON object")
-        if option_flag.name == "user":
-            user = option_arg
-        if option_flag.name == "reasoning_effort":
-            reasoning_effort = 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")
+    
+    stream_arg = opts.get('stream')
+    if stream_arg:
+        stream = get_boolean_value(stream_arg)
+    
+    temperature_arg = opts.get('temperature')
+    if temperature_arg is not None:
+        temperature = float(temperature_arg)
+    
+    max_tokens_arg = opts.get('max_tokens')
+    if max_tokens_arg is not None:
+        max_tokens = int(max_tokens_arg)
+    
+    frequency_penalty_arg = opts.get('frequency_penalty')
+    if frequency_penalty_arg:
+        frequency_penalty = get_penalty_float_value(frequency_penalty_arg)
+    
+    presence_penalty_arg = opts.get('presence_penalty')
+    if presence_penalty_arg:
+        presence_penalty = get_penalty_float_value(presence_penalty_arg)
+    
+    top_p_arg = opts.get('top_p')
+    if top_p_arg:
+        top_p = float(top_p_arg)
+    
+    stop_arg = opts.get('stop')
+    if stop_arg:
+        try:
+            stop = json.loads(stop_arg)
+        except json.JSONDecodeError:
+            stop = stop_arg
+    
+    response_format_arg = opts.get('response_format')
+    if response_format_arg:
+        try:
+            response_format = json.loads(response_format_arg)
+        except json.JSONDecodeError:
+            raise WrongArgumentError("response_format must be a valid JSON object")
+    
+    tools_arg = opts.get('tools')
+    if tools_arg:
+        try:
+            tools = json.loads(tools_arg)
+        except json.JSONDecodeError:
+            raise WrongArgumentError("tools must be a valid JSON array")
+    
+    tool_choice_arg = opts.get('tool_choice')
+    if tool_choice_arg:
+        try:
+            tool_choice = json.loads(tool_choice_arg)
+        except json.JSONDecodeError:
+            tool_choice = tool_choice_arg
+    
+    logprobs_arg = opts.get('logprobs')
+    if logprobs_arg:
+        logprobs = get_boolean_value(logprobs_arg)
+    
+    top_logprobs_arg = opts.get('top_logprobs')
+    if top_logprobs_arg:
+        top_logprobs = int(top_logprobs_arg)
+    
+    seed_arg = opts.get('seed')
+    if seed_arg:
+        seed = int(seed_arg)
+    
+    stream_options_arg = opts.get('stream_options')
+    if stream_options_arg:
+        try:
+            stream_options = json.loads(stream_options_arg)
+        except json.JSONDecodeError:
+            raise WrongArgumentError("stream_options must be a valid JSON object")
+    
+    store_arg = opts.get('store')
+    if store_arg:
+        store = get_boolean_value(store_arg)
+    
+    metadata_arg = opts.get('metadata')
+    if metadata_arg:
+        try:
+            metadata = json.loads(metadata_arg)
+        except json.JSONDecodeError:
+            raise WrongArgumentError("metadata must be a valid JSON object")
 
     messages = get_messages(message_list)
 
@@ -312,15 +335,15 @@ chat_completion_options = [
 
 def chat_with_iris():
     iris = Iris()
-    messages = list()
+    messages = []
 
     history = InMemoryHistory()
     session = PromptSession(">> Ask Iris: ", history=history)
 
-    Console.write_stdout(f"#=================================================#")
-    Console.write_stdout(f"#--------------------- IRIS ----------------------#")
-    Console.write_stdout(f"#=================================================#")
-    Console.write_stdout(f"# This is the start of your conversation with Iris. Type 'exit' or press Ctrl+C to close the chat.\n")
+    Console.write_stdout("#=================================================#")
+    Console.write_stdout("#--------------------- IRIS ----------------------#")
+    Console.write_stdout("#=================================================#")
+    Console.write_stdout("# This is the start of your conversation with Iris. Type 'exit' or press Ctrl+C to close the chat.\n")
     Console.write_stdout("""- Iris: Hello! I'm Iris. I'll guide you step by step to create your agent.
 First, we need to define some key details for your agent. You can specify its role and purpose or give it a name, and I'll help you set up the rest. Once we have that, we'll refine its knowledge and behavior.""")
     try:
@@ -356,22 +379,15 @@ First, we need to define some key details for your agent. You can specify its ro
 
 
 def chat_with_agent(option_list: list):
-    agent_name = None
-    use_gui = False
-    save_session_file = None
-    restore_session_file = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "agent_name":
-            agent_name = option_arg
-        if option_flag.name == "gui":
-            use_gui = True
-        if option_flag.name == "save_session":
-            save_session_file = option_arg
-        if option_flag.name == "restore_session":
-            restore_session_file = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    agent_name = opts.get('agent_name')
+    use_gui = 'gui' in opts
+    save_session_file = opts.get('save_session')
+    restore_session_file = opts.get('restore_session')
 
     if not agent_name:
-        raise MissingRequirementException(f"Agent name must be specified.")
+        raise MissingRequirementException("Agent name must be specified.")
 
     project_id = get_project_id()
     agent_data = AgentClient(project_id=project_id).get_agent(agent_id=agent_name)
@@ -379,9 +395,7 @@ def chat_with_agent(option_list: list):
         raise InvalidAgentException(f"There is no agent with that name: {agent_data.get('errors')}")
 
     if use_gui:
-        try:
-            import streamlit
-        except ImportError:
+        if not util.find_spec("streamlit"):
             logger.error("Streamlit not installed")
             Console.write_stderr("Streamlit is required for GUI mode. Install it with 'pip install streamlit'.")
             sys.exit(1)
@@ -436,7 +450,7 @@ def chat_with_agent(option_list: list):
             sys.exit(1)
     else:
         chat_session = AgentChatSession(agent_name)
-        messages = list()
+        messages = []
 
         # Restore session if specified
         if restore_session_file:
@@ -447,9 +461,9 @@ def chat_with_agent(option_list: list):
                         messages = restored_data
                         Console.write_stdout(f"Restored conversation from {restore_session_file}")
                         # Display restored conversation history
-                        Console.write_stdout(f"#=================================================#")
+                        Console.write_stdout("#=================================================#")
                         Console.write_stdout(f"#    CHAT SESSION WITH {agent_name}               ")
-                        Console.write_stdout(f"#=================================================#")
+                        Console.write_stdout("#=================================================#")
                         for msg in messages:
                             role = msg.get("role", "unknown")
                             content = msg.get("content", "")
@@ -480,9 +494,9 @@ def chat_with_agent(option_list: list):
                 raise WrongArgumentError(
                     "The specified agent doesn't seem to exist. Please review the name and try again.")
 
-            Console.write_stdout(f"#=================================================#")
+            Console.write_stdout("#=================================================#")
             Console.write_stdout(f"#    CHAT SESSION WITH {agent_name}               ")
-            Console.write_stdout(f"#=================================================#")
+            Console.write_stdout("#=================================================#")
             Console.write_stdout(introduction_message)
             messages.append({"role": "assistant", "content": introduction_message})
 
@@ -576,31 +590,23 @@ chat_with_agent_options = [
 
 
 def get_generate_image(option_list: list):
-    model = None
-    prompt = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    model = opts.get('model')
+    prompt = opts.get('prompt')
     n = None
-    quality = None
-    size = None
-    aspect_ratio = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "model":
-            model = option_arg
-        if option_flag.name == "prompt":
-            prompt = option_arg
-        if option_flag.name == "n":
-            try:
-                n = int(option_arg)
-                if n < 1 or n > 10:
-                    raise WrongArgumentError("n must be an integer between 1 and 10.")
-            except ValueError:
-                raise WrongArgumentError("n must be a valid integer.")
-        if option_flag.name == "quality":
-            quality = option_arg
-        if option_flag.name == "size":
-            size = option_arg
-        if option_flag.name == "aspect_ratio":
-            aspect_ratio = option_arg
+    quality = opts.get('quality')
+    size = opts.get('size')
+    aspect_ratio = opts.get('aspect_ratio')
+
+    n_arg = opts.get('n')
+    if n_arg:
+        try:
+            n = int(n_arg)
+            if n < 1 or n > 10:
+                raise WrongArgumentError("n must be an integer between 1 and 10.")
+        except ValueError:
+            raise WrongArgumentError("n must be a valid integer.")
 
     if not (model and prompt and n is not None and quality and size):
         raise MissingRequirementException("Cannot generate image without specifying model, prompt, n, quality, and size.")
@@ -662,31 +668,23 @@ generate_image_options = [
 
 
 def get_edit_image(option_list: list):
-    model = None
-    prompt = None
-    image = None
-    size = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    model = opts.get('model')
+    prompt = opts.get('prompt')
+    image = opts.get('image')
+    size = opts.get('size')
     n = 1
-    quality = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "model":
-            model = option_arg
-        if option_flag.name == "prompt":
-            prompt = option_arg
-        if option_flag.name == "image":
-            image = option_arg
-        if option_flag.name == "size":
-            size = option_arg
-        if option_flag.name == "n":
-            try:
-                n = int(option_arg)
-                if n < 1 or n > 10:
-                    raise WrongArgumentError("n must be an integer between 1 and 10.")
-            except ValueError:
-                raise WrongArgumentError("n must be a valid integer.")
-        if option_flag.name == "quality":
-            quality = option_arg
+    quality = opts.get('quality')
+
+    n_arg = opts.get('n')
+    if n_arg:
+        try:
+            n = int(n_arg)
+            if n < 1 or n > 10:
+                raise WrongArgumentError("n must be an integer between 1 and 10.")
+        except ValueError:
+            raise WrongArgumentError("n must be a valid integer.")
 
     if not (model and prompt and image and size):
         raise MissingRequirementException("Cannot edit image without specifying model, prompt, image, and size.")
@@ -748,8 +746,10 @@ edit_image_options = [
 
 
 def get_response(option_list: list):
-    model = None
-    input_text = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    model = opts.get('model')
+    input_text = opts.get('input')
     files = None
     tools = None
     tool_choice = None
@@ -757,65 +757,74 @@ def get_response(option_list: list):
     max_output_tokens = None
     top_p = None
     metadata = None
-    user = None
-    instructions = None
+    user = opts.get('user')
+    instructions = opts.get('instructions')
     reasoning = None
-    truncation = None
+    truncation = opts.get('truncation')
     parallel_tool_calls = None
     store = None
     stream = False
 
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "model":
-            model = option_arg
-        if option_flag.name == "input":
-            input_text = option_arg
-        if option_flag.name == "files":
-            try:
-                files = json.loads(option_arg) if option_arg else None
-                if files and not isinstance(files, list):
-                    raise WrongArgumentError("files must be a JSON array of file paths")
-            except json.JSONDecodeError:
-                raise WrongArgumentError("files must be a valid JSON array")
-        if option_flag.name == "tools":
-            try:
-                tools = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                raise WrongArgumentError("tools must be a valid JSON array")
-        if option_flag.name == "tool_choice":
-            try:
-                tool_choice = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                tool_choice = option_arg
-        if option_flag.name == "temperature":
-            temperature = float(option_arg) if option_arg is not None else None
-        if option_flag.name == "max_output_tokens":
-            max_output_tokens = int(option_arg) if option_arg is not None else None
-        if option_flag.name == "top_p":
-            top_p = float(option_arg) if option_arg else None
-        if option_flag.name == "metadata":
-            try:
-                metadata = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                raise WrongArgumentError("metadata must be a valid JSON object")
-        if option_flag.name == "user":
-            user = option_arg
-        if option_flag.name == "instructions":
-            instructions = option_arg
-        if option_flag.name == "reasoning":
-            try:
-                reasoning = json.loads(option_arg) if option_arg else None
-            except json.JSONDecodeError:
-                raise WrongArgumentError("reasoning must be a valid JSON object")
-        if option_flag.name == "truncation":
-            truncation = option_arg
-        if option_flag.name == "parallel_tool_calls":
-            parallel_tool_calls = get_boolean_value(option_arg) if option_arg else None
-        if option_flag.name == "store":
-            store = get_boolean_value(option_arg) if option_arg else None
-        if option_flag.name == "stream":
-            if option_arg:
-                stream = get_boolean_value(option_arg)
+    files_arg = opts.get('files')
+    if files_arg:
+        try:
+            files = json.loads(files_arg)
+            if files and not isinstance(files, list):
+                raise WrongArgumentError("files must be a JSON array of file paths")
+        except json.JSONDecodeError:
+            raise WrongArgumentError("files must be a valid JSON array")
+    
+    tools_arg = opts.get('tools')
+    if tools_arg:
+        try:
+            tools = json.loads(tools_arg)
+        except json.JSONDecodeError:
+            raise WrongArgumentError("tools must be a valid JSON array")
+    
+    tool_choice_arg = opts.get('tool_choice')
+    if tool_choice_arg:
+        try:
+            tool_choice = json.loads(tool_choice_arg)
+        except json.JSONDecodeError:
+            tool_choice = tool_choice_arg
+    
+    temperature_arg = opts.get('temperature')
+    if temperature_arg is not None:
+        temperature = float(temperature_arg)
+    
+    max_output_tokens_arg = opts.get('max_output_tokens')
+    if max_output_tokens_arg is not None:
+        max_output_tokens = int(max_output_tokens_arg)
+    
+    top_p_arg = opts.get('top_p')
+    if top_p_arg:
+        top_p = float(top_p_arg)
+    
+    metadata_arg = opts.get('metadata')
+    if metadata_arg:
+        try:
+            metadata = json.loads(metadata_arg)
+        except json.JSONDecodeError:
+            raise WrongArgumentError("metadata must be a valid JSON object")
+    
+    reasoning_arg = opts.get('reasoning')
+    if reasoning_arg:
+        try:
+            reasoning = json.loads(reasoning_arg)
+        except json.JSONDecodeError:
+            raise WrongArgumentError("reasoning must be a valid JSON object")
+    
+    parallel_tool_calls_arg = opts.get('parallel_tool_calls')
+    if parallel_tool_calls_arg:
+        parallel_tool_calls = get_boolean_value(parallel_tool_calls_arg)
+    
+    store_arg = opts.get('store')
+    if store_arg:
+        store = get_boolean_value(store_arg)
+    
+    stream_arg = opts.get('stream')
+    if stream_arg:
+        stream = get_boolean_value(stream_arg)
 
     if not (model and input_text):
         raise MissingRequirementException("Cannot get response without specifying model and input")

pygeai/cli/commands/common.py

@@ -59,7 +59,7 @@ def get_welcome_data(
                     "title": feature_dict['title'],
                     "description": feature_dict['description']
                 })
-        except ValueError as e:
+        except ValueError:
             raise WrongArgumentError(
                 "Each feature must have exactly two keys: \"title\" and \"description\"")
 
@@ -71,7 +71,7 @@ def get_welcome_data(
                     "description": example['description'],
                     "promptText": example['prompt_text']
                 })
-        except ValueError as e:
+        except ValueError:
             raise WrongArgumentError(
                 "Each example prompt must have exactly three keys: \"title\", \"description\", and \"prompt_text\"")
 
@@ -101,7 +101,7 @@ def get_messages(message_list: list):
                     "role": message_dict['role'],
                     "content": message_dict['content']
                 })
-        except ValueError as e:
+        except ValueError:
             raise WrongArgumentError(
                 "Each message must be in JSON format: '{\"role\": \"user\", \"content\": \"message content\"}' "
                 "Each dictionary must contain role and content")
@@ -384,7 +384,7 @@ def get_welcome_data_feature_list(feature_list: list, option_arg: str):
             feature_list = feature_json
         elif isinstance(feature_json, dict):
             feature_list.append(feature_json)
-    except Exception as e:
+    except Exception:
         raise WrongArgumentError(
             "Features must be a JSON string. It can be either a dictionary or a list or dictionaries. "
             "Each feature must be a dictionary with exactly two keys: 'title' and 'description'")
@@ -399,7 +399,7 @@ def get_welcome_data_example_prompt(examples_prompt_list: list, option_arg: str)
             examples_prompt_list = examples_prompt_json
         elif isinstance(examples_prompt_json, dict):
             examples_prompt_list.append(examples_prompt_json)
-    except Exception as e:
+    except Exception:
         raise WrongArgumentError(
             "Example prompt text must be a JSON string. It can be either a dictionary or a list or dictionaries. "
             "Each example_prompt must be a dictionary with exactly three keys: 'title', 'description' and 'prompt_text'")