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

pygeai/cli/commands/configuration.py

@@ -6,57 +6,66 @@ from pygeai.core.utils.console import Console
 def configure(option_list: list[str, str] = None):
     if not any(option_list):
         Console.write_stdout("# Configuring GEAI credentials...")
-        alias = str(input("-> Select an alias (Leave empty to use 'default'): "))
+        alias = str(input("-> Select an alias for this profile (Leave empty to use 'default'): ")).strip()
         if not alias:
             alias = "default"
 
-        api_key = str(input("-> Insert your GEAI API KEY (Leave empty to keep current value): "))
-        if api_key:
-            configure_api_key(api_key, alias)
+        auth_type = str(input("-> Which type of authentication will this profile use? \n1.API key \n2. Oauth2 \n(Type 'enter' for default (1): ")).strip()
+        if not auth_type or auth_type == "1":
+            api_key = str(input("-> Insert your GEAI API KEY (Leave empty to keep current value): ")).strip()
+            if api_key:
+                configure_api_key(api_key, alias)
+
+        elif auth_type == "2":
+            access_token = str(input("-> Insert your GEAI OAUTH2 ACCESS TOKEN (Leave empty to keep current value): ")).strip()
+            if access_token:
+                configure_access_token(access_token, alias)
 
-        base_url = str(input("-> Insert your GEAI API BASE URL (Leave empty to keep current value): "))
+        base_url = str(input("-> Insert your GEAI API BASE URL (Leave empty to keep current value): ")).strip()
         if base_url:
             configure_base_url(base_url, alias)
 
-        eval_url = str(input("-> Insert your GEAI API EVAL URL (Leave empty to keep current value): "))
+        eval_url = str(input("-> Insert your GEAI API EVAL URL (Leave empty to keep current value): ")).strip()
         if eval_url:
             configure_eval_url(eval_url, alias)
 
     else:
-        list_alias = False
-        remove_alias = False
-        api_key = None
-        base_url = None
-        eval_url = None
-        alias = "default"
-
-        for option_flag, option_arg in option_list:
-            if option_flag.name == "list":
-                list_alias = True
-            if option_flag.name == "profile_alias":
-                alias = option_arg
-            if option_flag.name == "api_key":
-                api_key = option_arg
-            if option_flag.name == "base_url":
-                base_url = option_arg
-            if option_flag.name == "eval_url":
-                eval_url = option_arg
-            if option_flag.name == "remove_alias":
-                alias = option_arg
-                remove_alias = True
-
+        opts = {opt.name: arg for opt, arg in option_list}
+        
+        list_alias = 'list' in opts
+        remove_alias = 'remove_alias' in opts
+        alias = opts.get('remove_alias') if remove_alias else opts.get('profile_alias', 'default')
+        api_key = opts.get('api_key')
+        base_url = opts.get('base_url')
+        eval_url = opts.get('eval_url')
+        access_token = opts.get('access_token')
+        project_id = opts.get('project_id')
+        organization_id = opts.get('organization_id')
 
         if list_alias:
             display_alias_list()
         elif remove_alias:
             remove_alias_from_config(alias)
         else:
+            if api_key and access_token:
+                Console.write_stdout(
+                    "WARNING: You're setting 2 different types of authentication for the same profile. "
+                    "This may cause unknown behaviors. Consider using separate profiles for different "
+                    "authentication types."
+                )
+
             if api_key:
                 configure_api_key(api_key=api_key, alias=alias)
             if base_url:
                 configure_base_url(base_url=base_url, alias=alias)
             if eval_url:
                 configure_eval_url(eval_url=eval_url, alias=alias)
+            if access_token:
+                configure_access_token(access_token=access_token, alias=alias)
+            if project_id:
+                configure_project_id(project_id=project_id, alias=alias)
+            if organization_id:
+                configure_organization_id(organization_id=organization_id, alias=alias)
 
 
 def configure_api_key(api_key: str, alias: str = "default"):
@@ -77,6 +86,24 @@ def configure_eval_url(eval_url: str, alias: str = "default"):
     Console.write_stdout(f"GEAI API EVAL URL for alias '{alias}' saved successfully!")
 
 
+def configure_access_token(access_token: str, alias: str = "default"):
+    settings = get_settings()
+    settings.set_access_token(access_token, alias)
+    Console.write_stdout(f"GEAI OAUTH2 ACCESS TOKEN for alias '{alias}' saved successfully!")
+
+
+def configure_project_id(project_id: str, alias: str = "default"):
+    settings = get_settings()
+    settings.set_project_id(project_id, alias)
+    Console.write_stdout(f"GEAI PROJECT ID for alias '{alias}' saved successfully!")
+
+
+def configure_organization_id(organization_id: str, alias: str = "default"):
+    settings = get_settings()
+    settings.set_organization_id(organization_id, alias)
+    Console.write_stdout(f"GEAI ORGANIZATION ID for alias '{alias}' saved successfully!")
+
+
 def display_alias_list():
     settings = get_settings()
     for alias, url in settings.list_aliases().items():
@@ -93,7 +120,6 @@ def remove_alias_from_config(alias: str):
         Console.write_stdout(f"Alias {alias} kept in configuration file.")
 
 
-
 configuration_options = (
     Option(
         "api_key",
@@ -113,6 +139,30 @@ configuration_options = (
         "Set GEAI API EVAL URL for the evaluation module",
         True
     ),
+    Option(
+        "eval_url",
+        ["--eval-url", "--eu"],
+        "Set GEAI API EVAL URL for the evaluation module",
+        True
+    ),
+    Option(
+        "access_token",
+        ["--access-token", "--at"],
+        "Set GEAI_OAUTH_ACCESS_TOKEN for Oauth2 authentication in requests",
+        True
+    ),
+    Option(
+        "project_id",
+        ["--project-id", "--pid"],
+        "Set GEAI_PROJECT_ID for header configuration in some requests",
+        True
+    ),
+    Option(
+        "organization_id",
+        ["--organization-id", "--oid"],
+        "Set GEAI_ORGANIZATION_ID for header configuration in some requests",
+        True
+    ),
     Option(
         "profile_alias",
         ["--profile-alias", "--pa"],

pygeai/cli/commands/docs.py

@@ -1,4 +1,3 @@
-import os
 import subprocess
 import webbrowser
 from pathlib import Path
@@ -8,6 +7,8 @@ from pygeai.cli.commands.builders import build_help_text
 from pygeai.cli.texts.help import DOCS_HELP_TEXT
 from pygeai.core.utils.console import Console
 
+from importlib import util
+
 
 def show_help():
     help_text = build_help_text(docs_commands, DOCS_HELP_TEXT)
@@ -15,9 +16,7 @@ def show_help():
 
 
 def open_documentation():
-    try:
-        import sphinx
-    except ImportError:
+    if not util.find_spec("sphinx"):
         Console.write_stdout(
             "Documentation dependencies (sphinx, sphinx-rtd-theme) are not installed.\n"
             "Would you like to install them now? [Y/n]: "

pygeai/cli/commands/embeddings.py

@@ -17,41 +17,35 @@ def show_help():
 
 
 def generate_embeddings(option_list: list):
-    model = None
-    encoding_format = None
+    input_list = []
     dimensions = None
-    user = None
-    input_type = None
     timeout = None
-    cache = None
     preview = True
-    input_list = list()
-
+    cache = None
+    
     for option_flag, option_arg in option_list:
-        if option_flag.name == "model":
-            model = option_arg
         if option_flag.name == "input":
             input_list.append(option_arg)
-        if option_flag.name == "encoding_format":
-            encoding_format = option_arg
-        if option_flag.name == "dimensions":
+        elif option_flag.name == "dimensions":
             try:
                 dimensions = int(option_arg)
             except (ValueError, TypeError):
                 raise WrongArgumentError("dimensions must be an integer")
-        if option_flag.name == "user":
-            user = option_arg
-        if option_flag.name == "input_type":
-            input_type = option_arg
-        if option_flag.name == "timeout":
+        elif option_flag.name == "timeout":
             try:
                 timeout = int(option_arg)
             except (ValueError, TypeError):
                 raise WrongArgumentError("timeout must be an integer")
-        if option_flag.name == "cache":
+        elif option_flag.name == "cache":
             cache = get_boolean_value(option_arg)
-        if option_flag.name == "preview":
+        elif option_flag.name == "preview":
             preview = get_boolean_value(option_arg)
+    
+    opts = {opt.name: arg for opt, arg in option_list}
+    model = opts.get('model')
+    encoding_format = opts.get('encoding_format')
+    user = opts.get('user')
+    input_type = opts.get('input_type')
 
     if not (model and any(input_list)):
         raise MissingRequirementException("Cannot generate embeddings without specifying model and at least one input")