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

pygeai/cli/commands/llm.py

@@ -21,10 +21,8 @@ def get_provider_list():
 
 
 def get_provider_data(option_list: list):
-    provider_name = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "provider_name":
-            provider_name = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    provider_name = opts.get('provider_name')
 
     if not provider_name:
         raise MissingRequirementException("Cannot retrieve provider data without name")
@@ -45,10 +43,8 @@ get_provider_data_options = [
 
 
 def get_provider_models(option_list: list):
-    provider_name = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "provider_name":
-            provider_name = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    provider_name = opts.get('provider_name')
 
     if not provider_name:
         raise MissingRequirementException("Cannot retrieve provider models without name")
@@ -69,16 +65,11 @@ get_provider_models_options = [
 
 
 def get_model_data(option_list: list):
-    provider_name = None
-    model_name = None
-    model_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "provider_name":
-            provider_name = option_arg
-        if option_flag.name == "model_name":
-            model_name = option_arg
-        if option_flag.name == "model_id":
-            model_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    provider_name = opts.get('provider_name')
+    model_name = opts.get('model_name')
+    model_id = opts.get('model_id')
 
     if not (provider_name and (model_name or model_id)):
         raise MissingRequirementException("Cannot retrieve model data without provider name and model id or name.")

pygeai/cli/commands/migrate.py

@@ -7,7 +7,7 @@ from pygeai.core.common.exceptions import MissingRequirementException
 from pygeai.core.utils.console import Console
 from pygeai.lab.managers import AILabManager
 from pygeai.lab.models import FilterSettings
-from pygeai.assistant.managers import AssistantManager
+
 from pygeai.assistant.rag.clients import RAGAssistantClient
 from pygeai.assistant.rag.mappers import RAGAssistantMapper
 from pygeai.core.files.managers import FileManager
@@ -112,8 +112,8 @@ def prompt_resource_selection(
             
             selected_ids = [getattr(items[i-1], id_field) for i in indices]
             return ",".join(str(sid) for sid in selected_ids)
-        except (ValueError, IndexError) as e:
-            Console.write_stdout(f"Error: Invalid input format. Please enter comma-separated numbers.")
+        except (ValueError, IndexError):
+            Console.write_stdout("Error: Invalid input format. Please enter comma-separated numbers.")
             continue
 
 
@@ -606,102 +606,46 @@ def clone_project(option_list: list) -> None:
     
     :param option_list: List of (option_flag, option_value) tuples from CLI parsing
     """
-    interactive_mode = False
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "interactive":
-            interactive_mode = True
-            break
+    opts = {opt.name: arg for opt, arg in option_list}
     
-    if interactive_mode:
+    if 'interactive' in opts:
         clone_project_interactively()
         return
     
-    from_api_key = None
-    from_organization_api_key = None
-    from_instance = None
-    from_project_id = None
-    from_organization_id = None
-    to_api_key = None
-    to_organization_api_key = None
-    to_instance = None
-    to_project_id = None
-    to_organization_id = None
-    to_project_name = None
-    admin_email = None
-    
-    migrate_all = False
-    migrate_agents = False
-    migrate_tools = False
-    migrate_processes = False
-    migrate_tasks = False
-    migrate_usage_limits = False
-    migrate_rag_assistants = False
-    migrate_files = False
-    migrate_secrets = False
-    
-    agent_ids = None
-    tool_ids = None
-    process_ids = None
-    task_ids = None
-    assistant_names = None
-    file_ids = None
-    secret_ids = None
-    
-    stop_on_error = True
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "from_api_key":
-            from_api_key = option_arg
-        elif option_flag.name == "from_organization_api_key":
-            from_organization_api_key = option_arg
-        elif option_flag.name == "from_instance":
-            from_instance = option_arg
-        elif option_flag.name == "from_project_id":
-            from_project_id = option_arg
-        elif option_flag.name == "from_organization_id":
-            from_organization_id = option_arg
-        elif option_flag.name == "to_api_key":
-            to_api_key = option_arg
-        elif option_flag.name == "to_organization_api_key":
-            to_organization_api_key = option_arg
-        elif option_flag.name == "to_instance":
-            to_instance = option_arg
-        elif option_flag.name == "to_project_id":
-            to_project_id = option_arg
-        elif option_flag.name == "to_organization_id":
-            to_organization_id = option_arg
-        elif option_flag.name == "to_project_name":
-            to_project_name = option_arg
-        elif option_flag.name == "admin_email":
-            admin_email = option_arg
-        elif option_flag.name == "all":
-            migrate_all = True
-        elif option_flag.name == "agents":
-            migrate_agents = True
-            agent_ids = option_arg if option_arg else "all"
-        elif option_flag.name == "tools":
-            migrate_tools = True
-            tool_ids = option_arg if option_arg else "all"
-        elif option_flag.name == "agentic_processes":
-            migrate_processes = True
-            process_ids = option_arg if option_arg else "all"
-        elif option_flag.name == "tasks":
-            migrate_tasks = True
-            task_ids = option_arg if option_arg else "all"
-        elif option_flag.name == "usage_limits":
-            migrate_usage_limits = True
-        elif option_flag.name == "rag_assistants":
-            migrate_rag_assistants = True
-            assistant_names = option_arg if option_arg else "all"
-        elif option_flag.name == "files":
-            migrate_files = True
-            file_ids = option_arg if option_arg else "all"
-        elif option_flag.name == "secrets":
-            migrate_secrets = True
-            secret_ids = option_arg if option_arg else "all"
-        elif option_flag.name == "stop_on_error":
-            from pygeai.cli.commands.common import get_boolean_value
-            stop_on_error = get_boolean_value(option_arg)
+    from pygeai.cli.commands.common import get_boolean_value
+    
+    from_api_key = opts.get('from_api_key')
+    from_organization_api_key = opts.get('from_organization_api_key')
+    from_instance = opts.get('from_instance')
+    from_project_id = opts.get('from_project_id')
+    from_organization_id = opts.get('from_organization_id')
+    to_api_key = opts.get('to_api_key')
+    to_organization_api_key = opts.get('to_organization_api_key')
+    to_instance = opts.get('to_instance')
+    to_project_id = opts.get('to_project_id')
+    to_organization_id = opts.get('to_organization_id')
+    to_project_name = opts.get('to_project_name')
+    admin_email = opts.get('admin_email')
+    
+    migrate_all = 'all' in opts
+    migrate_agents = 'agents' in opts
+    migrate_tools = 'tools' in opts
+    migrate_processes = 'agentic_processes' in opts
+    migrate_tasks = 'tasks' in opts
+    migrate_usage_limits = 'usage_limits' in opts
+    migrate_rag_assistants = 'rag_assistants' in opts
+    migrate_files = 'files' in opts
+    migrate_secrets = 'secrets' in opts
+    
+    agent_ids = opts.get('agents', 'all') if migrate_agents else None
+    tool_ids = opts.get('tools', 'all') if migrate_tools else None
+    process_ids = opts.get('agentic_processes', 'all') if migrate_processes else None
+    task_ids = opts.get('tasks', 'all') if migrate_tasks else None
+    assistant_names = opts.get('rag_assistants', 'all') if migrate_rag_assistants else None
+    file_ids = opts.get('files', 'all') if migrate_files else None
+    secret_ids = opts.get('secrets', 'all') if migrate_secrets else None
+    
+    stop_on_error = get_boolean_value(opts.get('stop_on_error', '1'))
 
     if not all([from_api_key, from_instance, from_project_id]):
         raise MissingRequirementException("Source API key, instance, and project ID are required")
@@ -755,7 +699,7 @@ def clone_project(option_list: list) -> None:
         Console.write_stdout(f"Creating new project '{to_project_name}'...")
         
         org_key_to_use = to_organization_api_key or from_organization_api_key
-        logger.debug(f"DEBUG: Preparing to create project with organization API key")
+        logger.debug("DEBUG: Preparing to create project with organization API key")
         logger.debug(f"  - to_organization_api_key exists: {to_organization_api_key is not None}")
         logger.debug(f"  - from_organization_api_key exists: {from_organization_api_key is not None}")
         logger.debug(f"  - Using key (first 20 chars): {org_key_to_use[:20] if org_key_to_use else 'None'}...")
@@ -779,7 +723,7 @@ def clone_project(option_list: list) -> None:
         Console.write_stdout(f"Project '{to_project_name}' created successfully with ID: {to_project_id}")
         
         from pygeai.auth.clients import AuthClient
-        Console.write_stdout(f"Creating project API key for new project...")
+        Console.write_stdout("Creating project API key for new project...")
         
         org_key_for_token_creation = to_organization_api_key or from_organization_api_key
         auth_client = AuthClient(
@@ -797,10 +741,10 @@ def clone_project(option_list: list) -> None:
             raise ValueError("Failed to create project API key")
         
         to_api_key = token_response['id']
-        Console.write_stdout(f"Project API key created successfully")
+        Console.write_stdout("Project API key created successfully")
         
         if not to_organization_id:
-            Console.write_stdout(f"Retrieving destination organization ID...")
+            Console.write_stdout("Retrieving destination organization ID...")
             dest_admin_client = AdminClient(api_key=to_api_key, base_url=to_instance or from_instance)
             dest_token_info = dest_admin_client.validate_api_token()
             to_organization_id = dest_token_info.get("organizationId")