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

pygeai/cli/commands/rag.py

@@ -26,10 +26,8 @@ def get_assistants_from_project():
 
 
 def get_assistant_detail(option_list: list):
-    name = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
 
     if not name:
         raise MissingRequirementException("Cannot retrieve assistant detail without name")
@@ -896,10 +894,8 @@ update_assistant_options = [
 
 
 def delete_assistant(option_list: list):
-    name = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
 
     if not name:
         raise MissingRequirementException("Cannot delete assistant detail without name")
@@ -920,16 +916,13 @@ delete_assistant_options = [
 
 
 def list_documents(option_list: list):
-    name = None
-    skip = 0
-    count = 10
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "skip":
-            skip = int(option_arg) if str(option_arg).isdigit() else 0
-        if option_flag.name == "count":
-            count = int(option_arg) if str(option_arg).isdigit() else 10
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
+    skip_arg = opts.get("skip", "0")
+    count_arg = opts.get("count", "10")
+    
+    skip = int(skip_arg) if str(skip_arg).isdigit() else 0
+    count = int(count_arg) if str(count_arg).isdigit() else 10
 
     if not name:
         raise MissingRequirementException("Cannot list documents without assistant name")
@@ -966,10 +959,8 @@ list_documents_options = [
 
 
 def delete_all_documents(option_list: list):
-    name = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
 
     if not name:
         raise MissingRequirementException("Cannot delete all documents without assistant name")
@@ -992,13 +983,9 @@ delete_all_documents_options = [
 
 
 def get_document_data(option_list: list):
-    name = None
-    document_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "document_id":
-            document_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
+    document_id = opts.get("document_id")
 
     if not (name and document_id):
         raise MissingRequirementException("Cannot retrieve document data without assistant name and id")
@@ -1028,29 +1015,23 @@ get_document_data_options = [
 
 
 def upload_document(option_list: list):
-    name = None
-    file_path = None
-    upload_type = 'multipart'
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
+    file_path = opts.get("file_path")
+    upload_type = opts.get("upload_type", 'multipart')
+    content_type = opts.get("content_type")
+    
     metadata = {}
-    content_type = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "file_path":
-            file_path = option_arg
-        if option_flag.name == "upload_type":
-            upload_type = option_arg
-        if option_flag.name == "metadata":
-            metadata_str = str(option_arg)
-            if not Path(metadata_str).is_file():
-                try:
-                    metadata = json.loads(metadata_str)
-                except Exception as e:
-                    raise WrongArgumentError(f"Metadata should be either a valid dictionary or a file path.")
-            else:
-                metadata = metadata_str
-        if option_flag.name == "content_type":
-            content_type = option_arg
+    metadata_arg = opts.get("metadata")
+    if metadata_arg:
+        metadata_str = str(metadata_arg)
+        if not Path(metadata_str).is_file():
+            try:
+                metadata = json.loads(metadata_str)
+            except Exception:
+                raise WrongArgumentError("Metadata should be either a valid dictionary or a file path.")
+        else:
+            metadata = metadata_str
 
     if not (name and file_path):
         raise MissingRequirementException("Cannot upload document without assistant name and file name")
@@ -1102,13 +1083,9 @@ upload_document_options = [
 
 
 def delete_document(option_list: list):
-    name = None
-    document_id = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
-        if option_flag.name == "document_id":
-            document_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
+    document_id = opts.get("document_id")
 
     if not (name and document_id):
         raise MissingRequirementException("Cannot delete document without assistant name and id")

pygeai/cli/commands/rerank.py

@@ -16,32 +16,28 @@ def show_help():
 
 
 def rerank_chunks(option_list: list):
-    query = None
-    model = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    query = opts.get('query')
+    model = opts.get('model')
+    top_n = opts.get('top_n', 3)
+    documents_arg = opts.get('documents')
+    
     documents = []
-    top_n = 3
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "query":
-            query = option_arg
-        if option_flag.name == "model":
-            model = option_arg
-        if option_flag.name == "documents":
-            if "[" not in option_arg:
-                documents.append(option_arg)
-            else:
-                try:
-                    documents_json = json.loads(option_arg)
-                    if not isinstance(documents_json, list):
-                        raise ValueError
+    if documents_arg:
+        if "[" not in documents_arg:
+            documents.append(documents_arg)
+        else:
+            try:
+                documents_json = json.loads(documents_arg)
+                if not isinstance(documents_json, list):
+                    raise ValueError
 
-                    documents = documents_json
-                except Exception as e:
-                    raise WrongArgumentError(
-                        "Documents must be a list of strings: '[\"text_chunk_1\", \"text_chunk_2\"]'. "
-                        "Each element in the list must be a string representing a text chunk.."
-                    )
-        if option_flag.name == "top_n":
-            top_n = option_arg
+                documents = documents_json
+            except Exception:
+                raise WrongArgumentError(
+                    "Documents must be a list of strings: '[\\\"text_chunk_1\\\", \\\"text_chunk_2\\\"]'. "
+                    "Each element in the list must be a string representing a text chunk.."
+                )
 
     if not (model and query and documents):
         raise MissingRequirementException("Cannot rerank chunks without model, query and documents")
@@ -53,7 +49,7 @@ def rerank_chunks(option_list: list):
         documents=documents,
         top_n=top_n
     )
-    Console.write_stdout(f"Rerank details: \n{result}")
+    Console.write_stdout(f"Rerank details: \\n{result}")
 
 
 rerank_chunks_options = [

pygeai/cli/commands/secrets.py

@@ -20,11 +20,8 @@ def get_secret(option_list: list):
     """
     Retrieves a secret by its ID.
     """
-    secret_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "secret_id":
-            secret_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    secret_id = opts.get("secret_id")
 
     if not secret_id:
         raise MissingRequirementException("Cannot retrieve secret without specifying secret-id")
@@ -48,17 +45,10 @@ def create_secret(option_list: list):
     """
     Creates a new secret with the specified details.
     """
-    name = None
-    secret_string = None
-    description = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
-        elif option_flag.name == "secret_string":
-            secret_string = option_arg
-        elif option_flag.name == "description":
-            description = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
+    secret_string = opts.get("secret_string")
+    description = opts.get("description")
 
     if not (name and secret_string):
         raise MissingRequirementException("Cannot create secret without specifying name and secret-string")
@@ -98,20 +88,11 @@ def update_secret(option_list: list):
     """
     Updates an existing secret by its ID.
     """
-    secret_id = None
-    name = None
-    secret_string = None
-    description = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "secret_id":
-            secret_id = option_arg
-        elif option_flag.name == "name":
-            name = option_arg
-        elif option_flag.name == "secret_string":
-            secret_string = option_arg
-        elif option_flag.name == "description":
-            description = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    secret_id = opts.get("secret_id")
+    name = opts.get("name")
+    secret_string = opts.get("secret_string")
+    description = opts.get("description")
 
     if not (secret_id and name and secret_string):
         raise MissingRequirementException("Cannot update secret without specifying secret-id, name, and secret-string")
@@ -158,26 +139,21 @@ def list_secrets(option_list: list):
     """
     Lists secrets with optional filtering and pagination.
     """
-    name = None
-    id = None
-    start = 0
-    count = 10
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "name":
-            name = option_arg
-        elif option_flag.name == "id":
-            id = option_arg
-        elif option_flag.name == "start":
-            try:
-                start = int(option_arg) if option_arg else 0
-            except ValueError:
-                raise WrongArgumentError("start must be an integer")
-        elif option_flag.name == "count":
-            try:
-                count = int(option_arg) if option_arg else 10
-            except ValueError:
-                raise WrongArgumentError("count must be an integer")
+    opts = {opt.name: arg for opt, arg in option_list}
+    name = opts.get("name")
+    id = opts.get("id")
+    start_arg = opts.get("start")
+    count_arg = opts.get("count")
+    
+    try:
+        start = int(start_arg) if start_arg else 0
+    except ValueError:
+        raise WrongArgumentError("start must be an integer")
+    
+    try:
+        count = int(count_arg) if count_arg else 10
+    except ValueError:
+        raise WrongArgumentError("count must be an integer")
 
     client = SecretClient()
     result = client.list_secrets(
@@ -221,19 +197,18 @@ def set_secret_accesses(option_list: list):
     """
     Sets access configurations for a secret by its ID.
     """
-    secret_id = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    secret_id = opts.get("secret_id")
+    access_list_arg = opts.get("access_list")
+    
     access_list = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "secret_id":
-            secret_id = option_arg
-        elif option_flag.name == "access_list":
-            try:
-                access_list = json.loads(option_arg) if option_arg else None
-                if not isinstance(access_list, list):
-                    raise WrongArgumentError("access-list must be a JSON array")
-            except json.JSONDecodeError:
-                raise WrongArgumentError("access-list must be a valid JSON array")
+    if access_list_arg:
+        try:
+            access_list = json.loads(access_list_arg)
+            if not isinstance(access_list, list):
+                raise WrongArgumentError("access-list must be a JSON array")
+        except json.JSONDecodeError:
+            raise WrongArgumentError("access-list must be a valid JSON array")
 
     if not (secret_id and access_list):
         raise MissingRequirementException("Cannot set secret accesses without specifying secret-id and access-list")
@@ -266,11 +241,8 @@ def get_secret_accesses(option_list: list):
     """
     Retrieves access configurations for a secret by its ID.
     """
-    secret_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "secret_id":
-            secret_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    secret_id = opts.get("secret_id")
 
     if not secret_id:
         raise MissingRequirementException("Cannot retrieve secret accesses without specifying secret-id")

pygeai/cli/commands/usage_limits.py

@@ -18,28 +18,15 @@ def show_help():
 
 
 def set_organization_usage_limit(option_list: list):
-    organization = None
-    subscription_type = None
-    usage_unit = None
-    soft_limit = None
-    hard_limit = None
-    renewal_status = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization = opts.get("organization")
+    subscription_type = opts.get("subscription_type")
+    usage_unit = opts.get("usage_unit")
+    soft_limit = opts.get("soft_limit")
+    hard_limit = opts.get("hard_limit")
+    renewal_status = opts.get("renewal_status")
+    
     usage_limit = {}
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
-        if option_flag.name == "subscription_type":
-            subscription_type = option_arg
-        if option_flag.name == "usage_unit":
-            usage_unit = option_arg
-        if option_flag.name == "soft_limit":
-            soft_limit = option_arg
-        if option_flag.name == "hard_limit":
-            hard_limit = option_arg
-        if option_flag.name == "renewal_status":
-            renewal_status = option_arg
-
     if subscription_type or usage_unit or soft_limit or hard_limit or renewal_status:
         usage_limit.update({
             "subscriptionType": subscription_type,
@@ -71,11 +58,8 @@ set_organization_usage_limit_options = [
 
 
 def get_organization_latest_usage_limit(option_list: list):
-    organization = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization = opts.get("organization")
 
     if not organization:
         raise MissingRequirementException("Cannot get latest usage limit for organization without organization ID")
@@ -93,11 +77,8 @@ get_organization_latest_usage_limit_options = [
 
 
 def get_all_usage_limits_from_organization(option_list: list):
-    organization = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization = opts.get("organization")
 
     if not organization:
         raise MissingRequirementException("Cannot get all usage limits for organization without organization ID")
@@ -115,14 +96,9 @@ get_all_usage_limits_from_organization_options = [
 
 
 def delete_usage_limit_from_organization(option_list: list):
-    organization = None
-    limit_id = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
-        if option_flag.name == "limit_id":
-            limit_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization = opts.get("organization")
+    limit_id = opts.get("limit_id")
 
     if not (organization and limit_id):
         raise MissingRequirementException("Cannot delete usage limit for organization without organization ID and limit ID")
@@ -142,23 +118,12 @@ delete_usage_limit_from_organization_options = [
 
 
 def update_organization_usage_limit(option_list: list):
-    organization = None
-    limit_id = None
-    hard_limit = None
-    soft_limit = None
-    renewal_status = None
-
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "organization":
-            organization = option_arg
-        if option_flag.name == "limit_id":
-            limit_id = option_arg
-        if option_flag.name == "hard_limit":
-            hard_limit = option_arg
-        if option_flag.name == "soft_limit":
-            soft_limit = option_arg
-        if option_flag.name == "renewal_status":
-            renewal_status = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization = opts.get("organization")
+    limit_id = opts.get("limit_id")
+    hard_limit = opts.get("hard_limit")
+    soft_limit = opts.get("soft_limit")
+    renewal_status = opts.get("renewal_status")
 
     if not (organization and limit_id):
         raise MissingRequirementException("Cannot update usage limit for organization without organization ID and limit ID")
@@ -217,32 +182,16 @@ def set_organization_renewal_status(organization, limit_id, renewal_status):
 
 
 def set_project_usage_limit(option_list: list):
-    organization = None
-    project = None
-    subscription_type = None
-    usage_unit = None
-    soft_limit = None
-    hard_limit = None
-    renewal_status = None
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization = opts.get("organization")
+    project = opts.get("project")
+    subscription_type = opts.get("subscription_type")
+    usage_unit = opts.get("usage_unit")
+    soft_limit = opts.get("soft_limit")
+    hard_limit = opts.get("hard_limit")
+    renewal_status = opts.get("renewal_status")
+    
     usage_limit = {}
-
-    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 == "subscription_type":
-            subscription_type = option_arg
-        if option_flag.name == "usage_unit":
-            usage_unit = option_arg
-        if option_flag.name == "soft_limit":
-            soft_limit = option_arg
-        if option_flag.name == "hard_limit":
-            hard_limit = option_arg
-        if option_flag.name == "renewal_status":
-            renewal_status = option_arg
-
     if subscription_type or usage_unit or soft_limit or hard_limit or renewal_status:
         usage_limit.update({
             "subscriptionType": subscription_type,
@@ -276,14 +225,9 @@ set_project_usage_limit_options = [
 
 
 def get_all_usage_limits_from_project(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 get usage limits for project without organization and project ID")
@@ -303,14 +247,9 @@ get_all_usage_limits_from_project_options = [
 
 
 def get_latest_usage_limit_from_project(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 get latest usage limit for project without organization and project ID")
@@ -330,14 +269,9 @@ get_latest_usage_limit_from_project_options = [
 
 
 def get_active_usage_limit_from_project(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 get active usage limit for project without organization and project ID")
@@ -357,17 +291,10 @@ get_active_usage_limit_from_project_options = [
 
 
 def delete_usage_limit_from_project(option_list: list):
-    organization = None
-    project = None
-    limit_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 == "limit_id":
-            limit_id = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization = opts.get("organization")
+    project = opts.get("project")
+    limit_id = opts.get("limit_id")
 
     if not (organization and project and limit_id):
         raise MissingRequirementException("Cannot delete usage limit for project without organization, project and limit ID")
@@ -389,26 +316,13 @@ delete_usage_limit_from_project_options = [
 
 
 def update_project_usage_limit(option_list: list):
-    organization = None
-    project = None
-    limit_id = None
-    hard_limit = None
-    soft_limit = None
-    renewal_status = 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 == "limit_id":
-            limit_id = option_arg
-        if option_flag.name == "hard_limit":
-            hard_limit = option_arg
-        if option_flag.name == "soft_limit":
-            soft_limit = option_arg
-        if option_flag.name == "renewal_status":
-            renewal_status = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    organization = opts.get("organization")
+    project = opts.get("project")
+    limit_id = opts.get("limit_id")
+    hard_limit = opts.get("hard_limit")
+    soft_limit = opts.get("soft_limit")
+    renewal_status = opts.get("renewal_status")
 
     if not (organization and project and limit_id):
         raise MissingRequirementException("Cannot update usage limit for project without organization ID, project ID and limit ID")

pygeai/cli/commands/validators.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
 import json
 
 from pygeai.core.common.exceptions import WrongArgumentError, ValidationError