pygeai 0.1.51b3__py3-none-any.whl → 0.6.0b15__py3-none-any.whl

pygeai/cli/commands/rag.py

@@ -1,15 +1,14 @@
 import json
-import sys
-from json import JSONDecodeError
 from pathlib import Path
 
 from pygeai.assistant.rag.clients import RAGAssistantClient
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
-from pygeai.cli.commands.common import get_messages, get_welcome_data, get_search_options, get_boolean_value, \
+from pygeai.cli.commands.common import get_welcome_data, get_search_options, get_boolean_value, \
     get_welcome_data_feature_list, get_welcome_data_example_prompt, get_index_options
 from pygeai.cli.texts.help import RAG_ASSISTANT_HELP_TEXT
 from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
+from pygeai.core.utils.console import Console
 
 
 def show_help():
@@ -17,13 +16,13 @@ def show_help():
     Displays help text in stdout
     """
     help_text = build_help_text(rag_commands, RAG_ASSISTANT_HELP_TEXT)
-    sys.stdout.write(help_text)
+    Console.write_stdout(help_text)
 
 
 def get_assistants_from_project():
     client = RAGAssistantClient()
     result = client.get_assistants_from_project()
-    sys.stdout.write(f"RAG Assistants in project: \n{result}\n")
+    Console.write_stdout(f"RAG Assistants in project: \n{result}")
 
 
 def get_assistant_detail(option_list: list):
@@ -37,7 +36,7 @@ def get_assistant_detail(option_list: list):
 
     client = RAGAssistantClient()
     result = client.get_assistant_data(name)
-    sys.stdout.write(f"Assistant detail: \n{result}\n")
+    Console.write_stdout(f"Assistant detail: \n{result}")
 
 
 assistant_detail_options = [
@@ -266,7 +265,7 @@ def create_assistant(option_list: list):
         index_options=index_options,
         welcome_data=welcome_data
     )
-    sys.stdout.write(f"New RAG Assistant: \n{result}\n")
+    Console.write_stdout(f"New RAG Assistant: \n{result}")
 
 
 create_assistant_options = [
@@ -687,7 +686,7 @@ def update_assistant(option_list: list):
         search_options=search_options,
         welcome_data=welcome_data
     )
-    sys.stdout.write(f"Updated RAG Assistant: \n{result}\n")
+    Console.write_stdout(f"Updated RAG Assistant: \n{result}")
 
 
 update_assistant_options = [
@@ -907,7 +906,7 @@ def delete_assistant(option_list: list):
 
     client = RAGAssistantClient()
     result = client.delete_assistant(name)
-    sys.stdout.write(f"Deleted assistant: \n{result}\n")
+    Console.write_stdout(f"Deleted assistant: \n{result}")
 
 
 delete_assistant_options = [
@@ -941,7 +940,7 @@ def list_documents(option_list: list):
         skip=skip,
         count=count
     )
-    sys.stdout.write(f"Assistant's documents: \n{result}\n")
+    Console.write_stdout(f"Assistant's documents: \n{result}")
 
 
 list_documents_options = [
@@ -979,7 +978,7 @@ def delete_all_documents(option_list: list):
     result = client.delete_all_documents(
         name=name,
     )
-    sys.stdout.write(f"Deleted documents: \n{result}\n")
+    Console.write_stdout(f"Deleted documents: \n{result}")
 
 
 delete_all_documents_options = [
@@ -1009,7 +1008,7 @@ def get_document_data(option_list: list):
         name=name,
         document_id=document_id
     )
-    sys.stdout.write(f"Document detail: \n{result}\n")
+    Console.write_stdout(f"Document detail: \n{result}")
 
 
 get_document_data_options = [
@@ -1064,7 +1063,7 @@ def upload_document(option_list: list):
         metadata=metadata,
         content_type=content_type
     )
-    sys.stdout.write(f"Uploaded: \n{result}\n")
+    Console.write_stdout(f"Uploaded: \n{result}")
 
 
 upload_document_options = [
@@ -1119,7 +1118,7 @@ def delete_document(option_list: list):
         name=name,
         document_id=document_id
     )
-    sys.stdout.write(f"Deleted document: \n{result}\n")
+    Console.write_stdout(f"Deleted document: \n{result}")
 
 
 delete_document_options = [

pygeai/cli/commands/rerank.py

@@ -1,12 +1,10 @@
 import json
-import sys
-
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
-from pygeai.cli.commands.common import get_messages, get_boolean_value, get_penalty_float_value
 from pygeai.cli.texts.help import RERANK_HELP_TEXT
 from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
 from pygeai.core.rerank.clients import RerankClient
+from pygeai.core.utils.console import Console
 
 
 def show_help():
@@ -14,7 +12,7 @@ def show_help():
     Displays help text in stdout
     """
     help_text = build_help_text(rerank_commands, RERANK_HELP_TEXT)
-    sys.stdout.write(help_text)
+    Console.write_stdout(help_text)
 
 
 def rerank_chunks(option_list: list):
@@ -55,7 +53,7 @@ def rerank_chunks(option_list: list):
         documents=documents,
         top_n=top_n
     )
-    sys.stdout.write(f"Rerank details: \n{result}\n")
+    Console.write_stdout(f"Rerank details: \n{result}")
 
 
 rerank_chunks_options = [

pygeai/cli/commands/secrets.py

@@ -1,12 +1,11 @@
 import json
-import sys
 
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
-from pygeai.cli.commands.common import get_messages, get_boolean_value, get_penalty_float_value
 from pygeai.cli.texts.help import SECRETS_HELP_TEXT
 from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
 from pygeai.core.secrets.clients import SecretClient
+from pygeai.core.utils.console import Console
 
 
 def show_help():
@@ -14,7 +13,7 @@ def show_help():
     Displays help text in stdout
     """
     help_text = build_help_text(secrets_commands, SECRETS_HELP_TEXT)
-    sys.stdout.write(help_text)
+    Console.write_stdout(help_text)
 
 
 def get_secret(option_list: list):
@@ -32,7 +31,7 @@ def get_secret(option_list: list):
 
     client = SecretClient()
     result = client.get_secret(secret_id=secret_id)
-    sys.stdout.write(f"Get secret result: \n{result}\n")
+    Console.write_stdout(f"Get secret result: \n{result}")
 
 
 get_secret_options = [
@@ -70,7 +69,7 @@ def create_secret(option_list: list):
         secret_string=secret_string,
         description=description
     )
-    sys.stdout.write(f"Create secret result: \n{result}\n")
+    Console.write_stdout(f"Create secret result: \n{result}")
 
 
 create_secret_options = [
@@ -124,7 +123,7 @@ def update_secret(option_list: list):
         secret_string=secret_string,
         description=description
     )
-    sys.stdout.write(f"Update secret result: \n{result}\n")
+    Console.write_stdout(f"Update secret result: \n{result}")
 
 
 update_secret_options = [
@@ -187,7 +186,7 @@ def list_secrets(option_list: list):
         start=start,
         count=count
     )
-    sys.stdout.write(f"List secrets result: \n{result}\n")
+    Console.write_stdout(f"List secrets result: \n{result}")
 
 
 list_secrets_options = [
@@ -244,7 +243,7 @@ def set_secret_accesses(option_list: list):
         secret_id=secret_id,
         access_list=access_list
     )
-    sys.stdout.write(f"Set secret accesses result: \n{result}\n")
+    Console.write_stdout(f"Set secret accesses result: \n{result}")
 
 
 set_secret_accesses_options = [
@@ -278,7 +277,7 @@ def get_secret_accesses(option_list: list):
 
     client = SecretClient()
     result = client.get_secret_accesses(secret_id=secret_id)
-    sys.stdout.write(f"Get secret accesses result: \n{result}\n")
+    Console.write_stdout(f"Get secret accesses result: \n{result}")
 
 
 get_secret_accesses_options = [

pygeai/cli/commands/usage_limits.py

@@ -1,13 +1,11 @@
-import sys
-
-from pygeai.cli.commands import Command, Option, ArgumentsEnum
+from pygeai.cli.commands import Command, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
 from pygeai.cli.commands.options import ORGANIZATION_OPTION, SUBSCRIPTION_TYPE_OPTION, USAGE_LIMIT_USAGE_UNIT_OPTION, \
     USAGE_LIMIT_SOFT_LIMIT_OPTION, USAGE_LIMIT_HARD_LIMIT_OPTION, USAGE_LIMIT_RENEWAL_STATUS_OPTION, \
     USAGE_LIMIT_ID_OPTION, PROJECT_OPTION
 from pygeai.cli.texts.help import USAGE_LIMIT_HELP_TEXT
 from pygeai.core.common.exceptions import MissingRequirementException
-from pygeai.organization.clients import OrganizationClient
+from pygeai.core.utils.console import Console
 from pygeai.organization.limits.clients import UsageLimitClient
 
 
@@ -16,7 +14,7 @@ def show_help():
     Displays help text in stdout
     """
     help_text = build_help_text(usage_limit_commands, USAGE_LIMIT_HELP_TEXT)
-    sys.stdout.write(help_text)
+    Console.write_stdout(help_text)
 
 
 def set_organization_usage_limit(option_list: list):
@@ -59,7 +57,7 @@ def set_organization_usage_limit(option_list: list):
         organization=organization,
         usage_limit=usage_limit
     )
-    sys.stdout.write(f"Organization usage limit: \n{result}\n")
+    Console.write_stdout(f"Organization usage limit: \n{result}")
 
 
 set_organization_usage_limit_options = [
@@ -86,7 +84,7 @@ def get_organization_latest_usage_limit(option_list: list):
     result = client.get_organization_latest_usage_limit(
         organization=organization,
     )
-    sys.stdout.write(f"Organization usage limit: \n{result}\n")
+    Console.write_stdout(f"Organization usage limit: \n{result}")
 
 
 get_organization_latest_usage_limit_options = [
@@ -108,7 +106,7 @@ def get_all_usage_limits_from_organization(option_list: list):
     result = client.get_all_usage_limits_from_organization(
         organization=organization,
     )
-    sys.stdout.write(f"Organization usage limits: \n{result}\n")
+    Console.write_stdout(f"Organization usage limits: \n{result}")
 
 
 get_all_usage_limits_from_organization_options = [
@@ -134,7 +132,7 @@ def delete_usage_limit_from_organization(option_list: list):
         organization=organization,
         limit_id=limit_id
     )
-    sys.stdout.write(f"Deleted usage limit: \n{result}\n")
+    Console.write_stdout(f"Deleted usage limit: \n{result}")
 
 
 delete_usage_limit_from_organization_options = [
@@ -195,7 +193,7 @@ def set_organization_hard_limit(organization, limit_id, hard_limit):
         limit_id=limit_id,
         hard_limit=hard_limit
     )
-    sys.stdout.write(f"Organization hard limit: \n{result}\n")
+    Console.write_stdout(f"Organization hard limit: \n{result}")
 
 
 def set_organization_soft_limit(organization, limit_id, soft_limit):
@@ -205,7 +203,7 @@ def set_organization_soft_limit(organization, limit_id, soft_limit):
         limit_id=limit_id,
         soft_limit=soft_limit
     )
-    sys.stdout.write(f"Organization soft limit: \n{result}\n")
+    Console.write_stdout(f"Organization soft limit: \n{result}")
 
 
 def set_organization_renewal_status(organization, limit_id, renewal_status):
@@ -215,7 +213,7 @@ def set_organization_renewal_status(organization, limit_id, renewal_status):
         limit_id=limit_id,
         renewal_status=renewal_status
     )
-    sys.stdout.write(f"Organization renewal status: \n{result}\n")
+    Console.write_stdout(f"Organization renewal status: \n{result}")
 
 
 def set_project_usage_limit(option_list: list):
@@ -263,7 +261,7 @@ def set_project_usage_limit(option_list: list):
         project=project,
         usage_limit=usage_limit
     )
-    sys.stdout.write(f"Project usage limit: \n{result}\n")
+    Console.write_stdout(f"Project usage limit: \n{result}")
 
 
 set_project_usage_limit_options = [
@@ -295,7 +293,7 @@ def get_all_usage_limits_from_project(option_list: list):
         organization=organization,
         project=project
     )
-    sys.stdout.write(f"Project usage limits: \n{result}\n")
+    Console.write_stdout(f"Project usage limits: \n{result}")
 
 
 get_all_usage_limits_from_project_options = [
@@ -322,7 +320,7 @@ def get_latest_usage_limit_from_project(option_list: list):
         organization=organization,
         project=project
     )
-    sys.stdout.write(f"Project's latest usage limit: \n{result}\n")
+    Console.write_stdout(f"Project's latest usage limit: \n{result}")
 
 
 get_latest_usage_limit_from_project_options = [
@@ -349,7 +347,7 @@ def get_active_usage_limit_from_project(option_list: list):
         organization=organization,
         project=project
     )
-    sys.stdout.write(f"Project's latest usage limit: \n{result}\n")
+    Console.write_stdout(f"Project's latest usage limit: \n{result}")
 
 
 get_active_usage_limit_from_project_options = [
@@ -380,7 +378,7 @@ def delete_usage_limit_from_project(option_list: list):
         project=project,
         limit_id=limit_id
     )
-    sys.stdout.write(f"Deleted usage limit: \n{result}\n")
+    Console.write_stdout(f"Deleted usage limit: \n{result}")
 
 
 delete_usage_limit_from_project_options = [
@@ -447,7 +445,7 @@ def set_project_hard_limit(organization, project, limit_id, hard_limit):
         limit_id=limit_id,
         hard_limit=hard_limit
     )
-    sys.stdout.write(f"Project hard limit: \n{result}\n")
+    Console.write_stdout(f"Project hard limit: \n{result}")
 
 
 def set_project_soft_limit(organization, project, limit_id, soft_limit):
@@ -458,7 +456,7 @@ def set_project_soft_limit(organization, project, limit_id, soft_limit):
         limit_id=limit_id,
         soft_limit=soft_limit
     )
-    sys.stdout.write(f"Project soft limit: \n{result}\n")
+    Console.write_stdout(f"Project soft limit: \n{result}")
 
 
 def set_project_renewal_status(organization, project, limit_id, renewal_status):
@@ -469,7 +467,7 @@ def set_project_renewal_status(organization, project, limit_id, renewal_status):
         limit_id=limit_id,
         renewal_status=renewal_status
     )
-    sys.stdout.write(f"Project renewal status: \n{result}\n")
+    Console.write_stdout(f"Project renewal status: \n{result}")
 
 
 usage_limit_commands = [

pygeai/cli/commands/validators.py

@@ -1,6 +1,8 @@
 from pathlib import Path
+from typing import Any, Dict, List, Optional, Union
+import json
 
-from pygeai.core.common.exceptions import WrongArgumentError
+from pygeai.core.common.exceptions import WrongArgumentError, ValidationError
 
 
 def validate_dataset_file(dataset_file: str):
@@ -64,3 +66,144 @@ def validate_system_metric(metric: dict):
 
     if not isinstance(metric["systemMetricWeight"], (int, float)) or not (0 <= metric["systemMetricWeight"] <= 1):
         raise WrongArgumentError('"systemMetricWeight" must be a number between 0 and 1 (inclusive).')
+
+
+def validate_json_input(
+    value: str, 
+    expected_type: type,
+    field_name: str,
+    example: Optional[str] = None
+) -> Union[Dict, List]:
+    """
+    Validates and parses JSON input with detailed error messages.
+
+    :param value: str - The JSON string to parse.
+    :param expected_type: type - Expected type (dict or list).
+    :param field_name: str - Name of the field being validated.
+    :param example: Optional[str] - Example of valid input.
+    :return: Union[Dict, List] - Parsed JSON object.
+    :raises ValidationError: If JSON is invalid or doesn't match expected type.
+    """
+    try:
+        parsed = json.loads(value)
+    except json.JSONDecodeError as e:
+        raise ValidationError(
+            f"Invalid JSON for '{field_name}'",
+            field=field_name,
+            expected="Valid JSON string",
+            received=value[:100] + "..." if len(value) > 100 else value,
+            example=example or '{"key": "value"}'
+        ) from e
+    
+    if not isinstance(parsed, expected_type):
+        raise ValidationError(
+            f"Wrong type for '{field_name}'",
+            field=field_name,
+            expected=expected_type.__name__,
+            received=type(parsed).__name__,
+            example=example
+        )
+    
+    return parsed
+
+
+def validate_numeric_range(
+    value: str,
+    field_name: str,
+    min_value: Optional[float] = None,
+    max_value: Optional[float] = None,
+    value_type: type = float
+) -> Union[int, float]:
+    """
+    Validates numeric input within a specified range.
+
+    :param value: str - The numeric string to validate.
+    :param field_name: str - Name of the field being validated.
+    :param min_value: Optional[float] - Minimum allowed value.
+    :param max_value: Optional[float] - Maximum allowed value.
+    :param value_type: type - Expected numeric type (int or float).
+    :return: Union[int, float] - Validated numeric value.
+    :raises ValidationError: If value is not numeric or out of range.
+    """
+    try:
+        numeric_value = value_type(value)
+    except ValueError as e:
+        raise ValidationError(
+            f"Invalid {value_type.__name__} for '{field_name}'",
+            field=field_name,
+            expected=f"{value_type.__name__}",
+            received=value
+        ) from e
+    
+    if min_value is not None and numeric_value < min_value:
+        raise ValidationError(
+            f"Value too low for '{field_name}'",
+            field=field_name,
+            expected=f">= {min_value}",
+            received=str(numeric_value)
+        )
+    
+    if max_value is not None and numeric_value > max_value:
+        raise ValidationError(
+            f"Value too high for '{field_name}'",
+            field=field_name,
+            expected=f"<= {max_value}",
+            received=str(numeric_value)
+        )
+    
+    return numeric_value
+
+
+def validate_choice(
+    value: str,
+    field_name: str,
+    choices: List[str],
+    case_sensitive: bool = True
+) -> str:
+    """
+    Validates that input is one of the allowed choices.
+
+    :param value: str - The value to validate.
+    :param field_name: str - Name of the field being validated.
+    :param choices: List[str] - List of allowed values.
+    :param case_sensitive: bool - Whether comparison is case-sensitive.
+    :return: str - Validated value.
+    :raises ValidationError: If value is not in choices.
+    """
+    compare_value = value if case_sensitive else value.lower()
+    compare_choices = choices if case_sensitive else [c.lower() for c in choices]
+    
+    if compare_value not in compare_choices:
+        raise ValidationError(
+            f"Invalid value for '{field_name}'",
+            field=field_name,
+            expected=f"One of: {', '.join(choices)}",
+            received=value
+        )
+    
+    return value
+
+
+def validate_boolean_value(value: str, field_name: str = "boolean option") -> bool:
+    """
+    Converts a string argument into a boolean value with flexible input formats.
+
+    :param value: str - A string representation of a boolean.
+    :param field_name: str - Name of the field being validated.
+    :return: bool - The boolean value corresponding to the input.
+    :raises ValidationError: If the input is not a valid boolean representation.
+    """
+    normalized = value.lower().strip()
+    
+    if normalized in ("0", "false", "no", "off"):
+        return False
+    elif normalized in ("1", "true", "yes", "on"):
+        return True
+    else:
+        raise ValidationError(
+            f"Invalid boolean value for '{field_name}'",
+            field=field_name,
+            expected="0/1, true/false, yes/no, on/off",
+            received=value,
+            example="1 or true"
+        )

pygeai/cli/commands/version.py

@@ -1,9 +1,9 @@
-import sys
-
 import requests
 import json
 from packaging.version import Version as LooseVersion
 
+from pygeai.core.utils.console import Console
+
 
 def get_latest_version(package_name):
     url = f"https://pypi.org/pypi/{package_name}/json"
@@ -13,8 +13,7 @@ def get_latest_version(package_name):
         data = json.loads(response.text)
         return data['info']['version']
     except requests.RequestException as e:
-        sys.stderr.write(f"An error occurred while fetching the latest version: {e}")
-        return None
+        Console.write_stderr(f"An error occurred while fetching the latest version: {e}")
 
 
 def get_installed_version(package_name):
@@ -25,7 +24,7 @@ def get_installed_version(package_name):
     except importlib.metadata.PackageNotFoundError:
         return "Not installed"
     except ModuleNotFoundError:
-        sys.stderr.write("This Python installation does not support importlib.metadata. Use Python 3.8+ or install importlib_metadata manually.")
+        Console.write_stderr("This Python installation does not support importlib.metadata. Use Python 3.8+ or install importlib_metadata manually.")
         return "Unknown"