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

pygeai/auth/clients.py

@@ -2,7 +2,6 @@ from pygeai import logger
 from pygeai.auth.endpoints import GET_USER_PROFILE_INFO, GET_OAUTH2_ACCESS_TOKEN, \
     CREATE_PROJECT_API_TOKEN_V2, DELETE_PROJECT_API_TOKEN_V2, UPDATE_PROJECT_API_TOKEN_V2, GET_PROJECT_API_TOKEN_V2
 from pygeai.core.base.clients import BaseClient
-from pygeai.core.common.exceptions import InvalidAPIResponseException, APIResponseError
 from pygeai.core.utils.validators import validate_status_code
 from pygeai.core.utils.parsers import parse_json_response
 
@@ -37,15 +36,35 @@ class AuthClient(BaseClient):
         validate_status_code(response)
         return parse_json_response(response, "obtain Oauth2 access token")
 
-    def get_user_profile_information(self, access_token: str) -> dict:
+    def get_user_profile_information(self, access_token: str, project_id: str = None) -> dict:
         """
-        Get user profile information
-
-        :param access_token: str - Token obtained in the POST to /oauth/access_token
+        Get user profile information using an OAuth access token.
+        
+        This method creates a temporary API service to avoid mutating the session state.
+        
+        :param access_token: str - OAuth 2.0 access token
+        :param project_id: str - Project ID for OAuth context (optional, uses session project_id if available)
         :return: dict - The API response containing the user profile information
+        :raises: MissingRequirementException - If project_id is not provided and not in session
         """
-        self.api_service.token = access_token
-        response = self.api_service.get(endpoint=GET_USER_PROFILE_INFO)
+        # Determine project_id to use
+        effective_project_id = project_id or self.session.project_id
+        
+        if not effective_project_id:
+            logger.warning(
+                "No project_id provided for get_user_profile_information. "
+                "This may cause authentication issues."
+            )
+        
+        # Create a temporary API service without mutating session
+        from pygeai.core.services.rest import GEAIApiService
+        temp_service = GEAIApiService(
+            base_url=self.session.base_url,
+            token=access_token,
+            project_id=effective_project_id
+        )
+        
+        response = temp_service.get(endpoint=GET_USER_PROFILE_INFO)
         validate_status_code(response)
         return parse_json_response(response, "retrieve user profile information")
 

pygeai/auth/endpoints.py

@@ -1,4 +1,5 @@
-GET_OAUTH2_ACCESS_TOKEN = "/oauth/access_token"      # POST -> Obtain an OAuth 2.0 access token
+# GET_OAUTH2_ACCESS_TOKEN = "/oauth/access_token"      # POST -> Obtain an OAuth 2.0 access token
+GET_OAUTH2_ACCESS_TOKEN = "/oauth/gam/v2.0/access_token"      # POST -> Obtain an OAuth 2.0 access token
 GET_USER_PROFILE_INFO = "/openid/userinfo"          # GET -> Retrieve user profile information
 CREATE_PROJECT_API_TOKEN_V2 = "v2/projects/tokens"          # POST -> Create a new API token for a project
 DELETE_PROJECT_API_TOKEN_V2 = "v2/projects/tokens/{id}"     # DELETE -> Revoke an API token

pygeai/chat/clients.py

@@ -197,7 +197,7 @@ class ChatClient(BaseClient):
                         ):
                             content = json_data["choices"][0]["delta"]["content"]
                             yield content
-                    except JSONDecodeError as e:
+                    except JSONDecodeError:
                         continue
         except Exception as e:
             raise InvalidAPIResponseException(f"Unable to process streaming chat response: {e}")
@@ -225,7 +225,7 @@ class ChatClient(BaseClient):
                         ):
                             content = json_data["choices"][0]["delta"]["content"]
                             yield content
-                    except JSONDecodeError as e:
+                    except JSONDecodeError:
                         continue
         except Exception as e:
             raise InvalidAPIResponseException(f"Unable to process streaming response: {e}")

pygeai/chat/managers.py

@@ -5,7 +5,7 @@ from pygeai.core.models import ChatMessageList, \
     ChatVariableList, LlmSettings, ChatToolList, ToolChoice
 from pygeai.assistant.mappers import AssistantResponseMapper
 from pygeai.chat.clients import ChatClient
-from pygeai.core.responses import ChatResponse, ProviderResponse
+from pygeai.core.responses import ProviderResponse
 
 
 class ChatManager:

pygeai/cli/commands/admin.py

@@ -2,7 +2,7 @@ from pygeai.admin.clients import AdminClient
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
 from pygeai.cli.texts.help import ADMIN_HELP_TEXT
-from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
+from pygeai.core.common.exceptions import MissingRequirementException
 from pygeai.core.utils.console import Console
 
 
@@ -27,10 +27,8 @@ def get_authorized_organizations():
 
 
 def get_authorized_projects_by_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 authorized projects within organization without organization id")
@@ -53,16 +51,11 @@ authorized_projects_by_organization_options = [
 
 
 def get_project_visibility(option_list: list):
-    organization = None
-    project = None
-    access_token = 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 == "access_token":
-            access_token = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    organization = opts.get('organization')
+    project = opts.get('project')
+    access_token = opts.get('access_token')
 
     if not (organization and project and access_token):
         raise MissingRequirementException("Cannot get project visibility for access token without specifying "
@@ -100,16 +93,11 @@ project_visibility_options = [
 
 
 def get_project_api_token(option_list: list):
-    organization = None
-    project = None
-    access_token = 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 == "access_token":
-            access_token = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    
+    organization = opts.get('organization')
+    project = opts.get('project')
+    access_token = opts.get('access_token')
 
     if not (organization and project and access_token):
         raise MissingRequirementException("Cannot get project API Token without specifying "

pygeai/cli/commands/analytics.py

@@ -1,7 +1,7 @@
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.commands.builders import build_help_text
 from pygeai.cli.texts.help import ANALYTICS_HELP_TEXT
-from pygeai.core.common.exceptions import MissingRequirementException
+
 from pygeai.core.utils.console import Console
 from pygeai.analytics.managers import AnalyticsManager
 import csv
@@ -55,16 +55,13 @@ CSV_EXPORT_OPTION = Option(
 
 
 def get_agents_created_and_modified(option_list: list):
-    start_date = None
-    end_date = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
 
-    if not (start_date and end_date):
-        raise MissingRequirementException("Cannot retrieve agents created and modified without start-date and end-date")
+    if not start_date or not end_date:
+        start_date, end_date = get_default_date_range()
+        Console.write_stdout(f"Using default date range: {start_date} to {end_date}")
 
     manager = AnalyticsManager()
     result = manager.get_agents_created_and_modified(start_date, end_date)
@@ -75,23 +72,18 @@ agents_created_options = [START_DATE_OPTION, END_DATE_OPTION]
 
 
 def get_total_requests_per_day(option_list: list):
-    start_date = None
-    end_date = None
-    agent_name = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
-        if option_flag.name == "agent_name":
-            agent_name = option_arg
-
-    if not (start_date and end_date):
-        raise MissingRequirementException("Cannot retrieve total requests per day without start-date and end-date")
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
+    agent_name = opts.get("agent_name")
+
+    if not start_date or not end_date:
+        start_date, end_date = get_default_date_range()
+        Console.write_stdout(f"Using default date range: {start_date} to {end_date}")
 
     manager = AnalyticsManager()
     result = manager.get_total_requests_per_day(start_date, end_date, agent_name)
-    Console.write_stdout(f"Total requests per day:")
+    Console.write_stdout("Total requests per day:")
     for item in result.requestsPerDay:
         Console.write_stdout(f"  {item.date}: {item.totalRequests} requests ({item.totalRequestsWithError} errors)")
 
@@ -100,16 +92,13 @@ total_requests_per_day_options = [START_DATE_OPTION, END_DATE_OPTION, AGENT_NAME
 
 
 def get_total_cost(option_list: list):
-    start_date = None
-    end_date = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
 
-    if not (start_date and end_date):
-        raise MissingRequirementException("Cannot retrieve total cost without start-date and end-date")
+    if not start_date or not end_date:
+        start_date, end_date = get_default_date_range()
+        Console.write_stdout(f"Using default date range: {start_date} to {end_date}")
 
     manager = AnalyticsManager()
     result = manager.get_total_cost(start_date, end_date)
@@ -120,16 +109,13 @@ total_cost_options = [START_DATE_OPTION, END_DATE_OPTION]
 
 
 def get_average_cost_per_request(option_list: list):
-    start_date = None
-    end_date = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
 
-    if not (start_date and end_date):
-        raise MissingRequirementException("Cannot retrieve average cost per request without start-date and end-date")
+    if not start_date or not end_date:
+        start_date, end_date = get_default_date_range()
+        Console.write_stdout(f"Using default date range: {start_date} to {end_date}")
 
     manager = AnalyticsManager()
     result = manager.get_average_cost_per_request(start_date, end_date)
@@ -140,16 +126,13 @@ average_cost_per_request_options = [START_DATE_OPTION, END_DATE_OPTION]
 
 
 def get_total_tokens(option_list: list):
-    start_date = None
-    end_date = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
 
-    if not (start_date and end_date):
-        raise MissingRequirementException("Cannot retrieve total tokens without start-date and end-date")
+    if not start_date or not end_date:
+        start_date, end_date = get_default_date_range()
+        Console.write_stdout(f"Using default date range: {start_date} to {end_date}")
 
     manager = AnalyticsManager()
     result = manager.get_total_tokens(start_date, end_date)
@@ -160,16 +143,13 @@ total_tokens_options = [START_DATE_OPTION, END_DATE_OPTION]
 
 
 def get_overall_error_rate(option_list: list):
-    start_date = None
-    end_date = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
 
-    if not (start_date and end_date):
-        raise MissingRequirementException("Cannot retrieve overall error rate without start-date and end-date")
+    if not start_date or not end_date:
+        start_date, end_date = get_default_date_range()
+        Console.write_stdout(f"Using default date range: {start_date} to {end_date}")
 
     manager = AnalyticsManager()
     result = manager.get_overall_error_rate(start_date, end_date)
@@ -180,16 +160,13 @@ error_rate_options = [START_DATE_OPTION, END_DATE_OPTION]
 
 
 def get_top_agents_by_requests(option_list: list):
-    start_date = None
-    end_date = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
 
-    if not (start_date and end_date):
-        raise MissingRequirementException("Cannot retrieve top agents by requests without start-date and end-date")
+    if not start_date or not end_date:
+        start_date, end_date = get_default_date_range()
+        Console.write_stdout(f"Using default date range: {start_date} to {end_date}")
 
     manager = AnalyticsManager()
     result = manager.get_top_10_agents_by_requests(start_date, end_date)
@@ -202,16 +179,13 @@ top_agents_options = [START_DATE_OPTION, END_DATE_OPTION]
 
 
 def get_total_active_users(option_list: list):
-    start_date = None
-    end_date = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
 
-    if not (start_date and end_date):
-        raise MissingRequirementException("Cannot retrieve total active users without start-date and end-date")
+    if not start_date or not end_date:
+        start_date, end_date = get_default_date_range()
+        Console.write_stdout(f"Using default date range: {start_date} to {end_date}")
 
     manager = AnalyticsManager()
     result = manager.get_total_active_users(start_date, end_date)
@@ -222,16 +196,10 @@ active_users_options = [START_DATE_OPTION, END_DATE_OPTION]
 
 
 def get_full_report(option_list: list):
-    start_date = None
-    end_date = None
-    csv_file = None
-    for option_flag, option_arg in option_list:
-        if option_flag.name == "start_date":
-            start_date = option_arg
-        if option_flag.name == "end_date":
-            end_date = option_arg
-        if option_flag.name == "csv_file":
-            csv_file = option_arg
+    opts = {opt.name: arg for opt, arg in option_list}
+    start_date = opts.get("start_date")
+    end_date = opts.get("end_date")
+    csv_file = opts.get("csv_file")
 
     if not start_date or not end_date:
         start_date, end_date = get_default_date_range()