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

pygeai/_docs/source/pygeai.tests.auth.rst

@@ -4,6 +4,22 @@ pygeai.tests.auth package
 Submodules
 ----------
 
+pygeai.tests.auth.test\_cli\_configuration module
+-------------------------------------------------
+
+.. automodule:: pygeai.tests.auth.test_cli_configuration
+   :members:
+   :show-inheritance:
+   :undoc-members:
+
+pygeai.tests.auth.test\_client\_initialization module
+-----------------------------------------------------
+
+.. automodule:: pygeai.tests.auth.test_client_initialization
+   :members:
+   :show-inheritance:
+   :undoc-members:
+
 pygeai.tests.auth.test\_clients module
 --------------------------------------
 
@@ -12,6 +28,22 @@ pygeai.tests.auth.test\_clients module
    :show-inheritance:
    :undoc-members:
 
+pygeai.tests.auth.test\_config\_manager module
+----------------------------------------------
+
+.. automodule:: pygeai.tests.auth.test_config_manager
+   :members:
+   :show-inheritance:
+   :undoc-members:
+
+pygeai.tests.auth.test\_header\_injection module
+------------------------------------------------
+
+.. automodule:: pygeai.tests.auth.test_header_injection
+   :members:
+   :show-inheritance:
+   :undoc-members:
+
 pygeai.tests.auth.test\_oauth module
 ------------------------------------
 
@@ -20,6 +52,30 @@ pygeai.tests.auth.test\_oauth module
    :show-inheritance:
    :undoc-members:
 
+pygeai.tests.auth.test\_session\_logging module
+-----------------------------------------------
+
+.. automodule:: pygeai.tests.auth.test_session_logging
+   :members:
+   :show-inheritance:
+   :undoc-members:
+
+pygeai.tests.auth.test\_session\_validation module
+--------------------------------------------------
+
+.. automodule:: pygeai.tests.auth.test_session_validation
+   :members:
+   :show-inheritance:
+   :undoc-members:
+
+pygeai.tests.auth.test\_singleton\_reset module
+-----------------------------------------------
+
+.. automodule:: pygeai.tests.auth.test_singleton_reset
+   :members:
+   :show-inheritance:
+   :undoc-members:
+
 Module contents
 ---------------
 

pygeai/_docs/source/pygeai.tests.cli.rst

@@ -13,6 +13,14 @@ Subpackages
 Submodules
 ----------
 
+pygeai.tests.cli.test\_credentials\_flag module
+-----------------------------------------------
+
+.. automodule:: pygeai.tests.cli.test_credentials_flag
+   :members:
+   :show-inheritance:
+   :undoc-members:
+
 pygeai.tests.cli.test\_error\_handler module
 --------------------------------------------
 

pygeai/admin/clients.py

@@ -1,9 +1,7 @@
-
-from pygeai import logger
 from pygeai.admin.endpoints import GET_API_TOKEN_VALIDATION_V1, GET_AUTHORIZED_ORGANIZATIONS_V1, \
     GET_AUTHORIZED_PROJECTS_V1, GET_PROJECT_VISIBILITY_V1, GET_PROJECT_API_TOKEN_V1
 from pygeai.core.base.clients import BaseClient
-from pygeai.core.common.exceptions import InvalidAPIResponseException
+
 from pygeai.core.utils.validators import validate_status_code
 from pygeai.core.utils.parsers import parse_json_response
 

pygeai/analytics/clients.py

@@ -53,7 +53,7 @@ class AnalyticsClient(BaseClient):
 
     def __build_headers(self):
         return {
-            "Authorization": self.api_service.token,
+            "Authorization": f"Bearer {self.api_service.token}",
             "OrganizationId": self.organization_id,
             "ProjectId": self.project_id
         }

pygeai/assistant/clients.py

@@ -1,11 +1,6 @@
-
-from pygeai import logger
-from pygeai.assistant.endpoints import GET_ASSISTANT_DATA_V1, CREATE_ASSISTANT_V1, UPDATE_ASSISTANT_V1, BEGIN_CONVERSATION_V1, \
-    SEND_TEXT_PROMPT_V1, SEND_CHAT_REQUEST_V1, GET_REQUEST_STATUS_V1, CANCEL_REQUEST_V1
-from pygeai.assistant.data_analyst.endpoints import GET_DATA_ANALYST_STATUS_V1, EXTEND_DATA_ANALYST_DATASET_V1
+from pygeai.assistant.endpoints import GET_ASSISTANT_DATA_V1, CREATE_ASSISTANT_V1, UPDATE_ASSISTANT_V1, \
+    SEND_CHAT_REQUEST_V1, GET_REQUEST_STATUS_V1, CANCEL_REQUEST_V1
 from pygeai.core.base.clients import BaseClient
-from pygeai.core.common.decorators import handler_server_error
-from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.utils.validators import validate_status_code
 from pygeai.core.utils.parsers import parse_json_response
 

pygeai/assistant/data/clients.py

@@ -1,12 +1,4 @@
-import json
-
 from pygeai.assistant.clients import AssistantClient
-from pygeai.assistant.endpoints import GET_ASSISTANT_DATA_V1, CREATE_ASSISTANT_V1, UPDATE_ASSISTANT_V1, BEGIN_CONVERSATION_V1, \
-    SEND_TEXT_PROMPT_V1, SEND_CHAT_REQUEST_V1, GET_REQUEST_STATUS_V1, CANCEL_REQUEST_V1
-from pygeai.assistant.data_analyst.endpoints import GET_DATA_ANALYST_STATUS_V1, EXTEND_DATA_ANALYST_DATASET_V1
-from pygeai.core.base.clients import BaseClient
-from pygeai.core.common.decorators import handler_server_error
-from pygeai.core.utils.validators import validate_status_code
 
 
 class ChatWithDataAssistantClient(AssistantClient):

pygeai/assistant/data_analyst/clients.py

@@ -1,9 +1,7 @@
 from pathlib import Path
 
-from pygeai import logger
 from pygeai.assistant.clients import AssistantClient
 from pygeai.assistant.data_analyst.endpoints import GET_DATA_ANALYST_STATUS_V1, EXTEND_DATA_ANALYST_DATASET_V1
-from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.utils.validators import validate_status_code
 from pygeai.core.utils.parsers import parse_json_response
 

pygeai/assistant/managers.py

@@ -4,7 +4,7 @@ from pygeai.assistant.clients import AssistantClient
 from pygeai.assistant.rag.clients import RAGAssistantClient
 from pygeai.assistant.rag.mappers import RAGAssistantMapper
 from pygeai.assistant.rag.responses import DocumentListResponse
-from pygeai.core.base.mappers import ErrorMapper, ResponseMapper
+from pygeai.core.base.mappers import ResponseMapper
 from pygeai.core.handlers import ErrorHandler
 from pygeai.core.models import Assistant, TextAssistant, ChatAssistant, ChatMessageList, AssistantRevision, \
     ChatVariableList, LlmSettings, ChatWithDataAssistant, ChatToolList, ToolChoice

pygeai/assistant/rag/clients.py

@@ -3,14 +3,12 @@ import logging
 from pathlib import Path
 from typing import Any
 
-from pygeai import logger
 from pygeai.assistant.rag.endpoints import GET_ASSISTANTS_FROM_PROJECT_V1, GET_ASSISTANT_V1, CREATE_ASSISTANT_V1, \
     UPDATE_ASSISTANT_V1, DELETE_ASSISTANT_V1, GET_DOCUMENTS_V1, DELETE_ALL_DOCUMENTS_V1, RETRIEVE_DOCUMENT_V1, \
     UPLOAD_DOCUMENT_V1, DELETE_DOCUMENT_V1, EXECUTE_QUERY_V1
 from pygeai.core.base.clients import BaseClient
 import urllib.parse
 
-from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.utils.validators import validate_status_code
 from pygeai.core.utils.parsers import parse_json_response
 

pygeai/assistant/rag/mappers.py

@@ -186,14 +186,13 @@ class RAGAssistantMapper(ModelMapper):
 
     @classmethod
     def map_to_document_list(cls, data: dict) -> list[Document]:
-        document_list = list()
-        documents = data.get("documents")
+        documents = data.get('documents')
+
         if documents is not None and any(documents):
-            for document_data in documents:
-                document = cls.map_to_document(document_data)
-                document_list.append(document)
 
-        return document_list
+            return [cls.map_to_document(document_data) for document_data in documents]
+
+        return []
 
     @classmethod
     def map_to_document(cls, data: dict) -> Document:
@@ -211,14 +210,13 @@ class RAGAssistantMapper(ModelMapper):
 
     @classmethod
     def map_to_document_metadata_list(cls, data: dict) -> List[DocumentMetadata]:
-        metadata_list = list()
         metadata = data.get('metadata')
+
         if metadata is not None and any(metadata):
-            for metadata_data in metadata:
-                new_metadata = cls.map_to_document_metadata(metadata_data)
-                metadata_list.append(new_metadata)
 
-        return metadata_list
+            return [cls.map_to_metadata(metadata_data) for metadata_data in metadata]
+
+        return []
 
     @classmethod
     def map_to_document_metadata(cls, data: dict) -> DocumentMetadata:

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,13 +55,9 @@ 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 or not end_date:
         start_date, end_date = get_default_date_range()
@@ -76,16 +72,10 @@ 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
+    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()
@@ -93,7 +83,7 @@ def get_total_requests_per_day(option_list: list):
 
     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)")
 
@@ -102,13 +92,9 @@ 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 or not end_date:
         start_date, end_date = get_default_date_range()
@@ -123,13 +109,9 @@ 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 or not end_date:
         start_date, end_date = get_default_date_range()
@@ -144,13 +126,9 @@ 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 or not end_date:
         start_date, end_date = get_default_date_range()
@@ -165,13 +143,9 @@ 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 or not end_date:
         start_date, end_date = get_default_date_range()
@@ -186,13 +160,9 @@ 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 or not end_date:
         start_date, end_date = get_default_date_range()
@@ -209,13 +179,9 @@ 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 or not end_date:
         start_date, end_date = get_default_date_range()
@@ -230,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()