h2ogpte 1.6.53rc2__py3-none-any.whl → 1.6.54__py3-none-any.whl

h2ogpte/__init__.py

@@ -3,7 +3,7 @@ from h2ogpte.h2ogpte import H2OGPTE
 from h2ogpte.h2ogpte_async import H2OGPTEAsync
 from h2ogpte.session_async import SessionAsync
 
-__version__ = "1.6.53rc2"
+__version__ = "1.6.54"
 
 __all__ = [
     "H2OGPTE",

h2ogpte/h2ogpte.py

@@ -2496,7 +2496,6 @@ class H2OGPTE(H2OGPTESyncBase):
         base_url: str,
         page_id: Union[str, List[str]],
         credentials: ConfluenceCredential,
-        include_attachments: Union[bool, None] = None,
         gen_doc_summaries: Union[bool, None] = None,
         gen_doc_questions: Union[bool, None] = None,
         audio_input_language: Union[str, None] = None,
@@ -2520,8 +2519,6 @@ class H2OGPTE(H2OGPTESyncBase):
                 The page id or ids of pages to be ingested.
             credentials:
                 The object with Confluence credentials.
-            include_attachments:
-                A flag indicating whether to also ingest attachments with the page.
             gen_doc_summaries:
                 Whether to auto-generate document summaries (uses LLM)
             gen_doc_questions:
@@ -2563,7 +2560,6 @@ class H2OGPTE(H2OGPTESyncBase):
                         page_ids=[page_id] if isinstance(page_id, str) else page_id,
                         credentials=rest.ConfluenceCredentials(**credentials.__dict__),
                         metadata=metadata,
-                        include_attachments=include_attachments,
                     ),
                     gen_doc_summaries=gen_doc_summaries,
                     gen_doc_questions=gen_doc_questions,
@@ -2745,20 +2741,7 @@ class H2OGPTE(H2OGPTESyncBase):
             handwriting_check:
                 Check pages for handwriting. Will use specialized models if handwriting is found.
             metadata:
-                Dictionary mapping upload_ids to their metadata. Each key must be an upload_id
-                from the upload_ids list, and each value is a dictionary of metadata key-value
-                pairs to associate with that document.
-
-                Example::
-
-                    # Single document
-                    metadata = {upload_id: {"category": "reports", "year": "2024"}}
-
-                    # Multiple documents
-                    metadata = {
-                        upload_id_1: {"category": "reports"},
-                        upload_id_2: {"category": "invoices"}
-                    }
+                Metadata to be associated with the document.
             timeout:
                 Timeout in seconds.
             ingest_mode:
@@ -4531,8 +4514,6 @@ class H2OGPTE(H2OGPTESyncBase):
                         Requires 1 LLM or Agent call.
                     :code:`"agent_only"` Agent Only - Answer the query with only original files passed to agent.
                         Requires 1 Agent call.
-                    :code:`"agentic_rag"` Agentic RAG - Agent with RAG tool that retrieves and answers from collection.
-                        Requires 1 Agent call with RAG tool execution.
                     :code:`"rag"` RAG (Retrieval Augmented Generation) - Use supporting document contexts
                         to answer the query. Requires 1 LLM or Agent call.
                     :code:`"hyde1"` LLM Only + RAG composite - HyDE RAG (Hypothetical Document Embedding).
@@ -7151,41 +7132,6 @@ class H2OGPTE(H2OGPTESyncBase):
     def add_custom_agent_tool(
         self, tool_type: str, tool_args: dict, custom_tool_path: Optional[str] = None
     ) -> list:
-        """Adds a custom agent tool.
-
-        Args:
-            tool_type: The type of custom tool being added. Valid values:
-                - 'local_mcp': Model Context Protocol server running locally
-                - 'remote_mcp': Model Context Protocol server running remotely
-                - 'browser_action': Custom browser automation actions
-                - 'general_code': General purpose code execution tools
-
-            tool_args: Dictionary containing tool-specific arguments. Structure varies by tool_type:
-
-                For 'remote_mcp':
-                {
-                    "mcp_config_json": "JSON string with MCP server configuration",
-                    "enable_by_default": True/False (optional, defaults to True)
-                }
-
-                For 'local_mcp', 'browser_action', and 'general_code':
-                {
-                    "tool_name": "string (optional, defaults to filename without extension)",
-                    "description": "string (optional, tool description)",
-                    "enable_by_default": True/False (optional, defaults to True),
-                    "should_unzip": True/False (optional, for general_code .zip files only),
-                    "tool_usage_mode": ["runner", "creator"] (optional list of strings, for remote_mcp)
-                }
-
-            custom_tool_path: Path to the tool file to upload (optional). Requirements vary by tool_type:
-                - 'local_mcp': .zip file containing MCP server code
-                - 'remote_mcp': Optional .json file with MCP configuration
-                - 'browser_action': .py file (must start with 'browser_') or .zip containing browser action scripts
-                - 'general_code': .py or .zip file with custom code
-
-        Returns:
-            list: List of created custom agent tool IDs
-        """
         header = self._get_auth_header()
         custom_tool_path = str(custom_tool_path) if custom_tool_path else None
         with self._RESTClient(self) as rest_client:

h2ogpte/h2ogpte_async.py

@@ -2698,7 +2698,6 @@ class H2OGPTEAsync:
         base_url: str,
         page_id: Union[str, List[str]],
         credentials: ConfluenceCredential,
-        include_attachments: Union[bool, None] = None,
         gen_doc_summaries: Union[bool, None] = None,
         gen_doc_questions: Union[bool, None] = None,
         audio_input_language: Union[str, None] = None,
@@ -2722,8 +2721,6 @@ class H2OGPTEAsync:
                 The page id or ids of pages to be ingested.
             credentials:
                 The object with Confluence credentials.
-            include_attachments:
-                A flag indicating whether to also ingest attachments with the page.
             gen_doc_summaries:
                 Whether to auto-generate document summaries (uses LLM)
             gen_doc_questions:
@@ -2765,7 +2762,6 @@ class H2OGPTEAsync:
                         page_ids=[page_id] if isinstance(page_id, str) else page_id,
                         credentials=rest.ConfluenceCredentials(**credentials.__dict__),
                         metadata=metadata,
-                        include_attachments=include_attachments,
                     ),
                     gen_doc_summaries=gen_doc_summaries,
                     gen_doc_questions=gen_doc_questions,
@@ -2943,20 +2939,7 @@ class H2OGPTEAsync:
             handwriting_check:
                 Check pages for handwriting. Will use specialized models if handwriting is found.
             metadata:
-                Dictionary mapping upload_ids to their metadata. Each key must be an upload_id
-                from the upload_ids list, and each value is a dictionary of metadata key-value
-                pairs to associate with that document.
-
-                Example::
-
-                    # Single document
-                    metadata = {upload_id: {"category": "reports", "year": "2024"}}
-
-                    # Multiple documents
-                    metadata = {
-                        upload_id_1: {"category": "reports"},
-                        upload_id_2: {"category": "invoices"}
-                    }
+                Metadata to be associated with the document.
             timeout:
                 Timeout in seconds.
             ingest_mode:
@@ -4739,8 +4722,6 @@ class H2OGPTEAsync:
                         Requires 1 LLM or Agent call.
                     :code:`"agent_only"` Agent Only - Answer the query with only original files passed to agent.
                         Requires 1 Agent call.
-                    :code:`"agentic_rag"` Agentic RAG - Agent with RAG tool that retrieves and answers from collection.
-                        Requires 1 Agent call with RAG tool execution.
                     :code:`"rag"` RAG (Retrieval Augmented Generation) - Use supporting document contexts
                         to answer the query. Requires 1 LLM or Agent call.
                     :code:`"hyde1"` LLM Only + RAG composite - HyDE RAG (Hypothetical Document Embedding).
@@ -7406,41 +7387,6 @@ class H2OGPTEAsync:
     async def add_custom_agent_tool(
         self, tool_type: str, tool_args: dict, custom_tool_path: Optional[str] = None
     ) -> list:
-        """Adds a custom agent tool.
-
-        Args:
-            tool_type: The type of custom tool being added. Valid values:
-                - 'local_mcp': Model Context Protocol server running locally
-                - 'remote_mcp': Model Context Protocol server running remotely
-                - 'browser_action': Custom browser automation actions
-                - 'general_code': General purpose code execution tools
-
-            tool_args: Dictionary containing tool-specific arguments. Structure varies by tool_type:
-
-                For 'remote_mcp':
-                {
-                    "mcp_config_json": "JSON string with MCP server configuration",
-                    "enable_by_default": True/False (optional, defaults to True)
-                }
-
-                For 'local_mcp', 'browser_action', and 'general_code':
-                {
-                    "tool_name": "string (optional, defaults to filename without extension)",
-                    "description": "string (optional, tool description)",
-                    "enable_by_default": True/False (optional, defaults to True),
-                    "should_unzip": True/False (optional, for general_code .zip files only),
-                    "tool_usage_mode": ["runner", "creator"] (optional list of strings, for remote_mcp)
-                }
-
-            custom_tool_path: Path to the tool file to upload (optional). Requirements vary by tool_type:
-                - 'local_mcp': .zip file containing MCP server code
-                - 'remote_mcp': Optional .json file with MCP configuration
-                - 'browser_action': .py file (must start with 'browser_') or .zip containing browser action scripts
-                - 'general_code': .py or .zip file with custom code
-
-        Returns:
-            list: List of created custom agent tool IDs
-        """
         header = await self._get_auth_header()
         custom_tool_path = str(custom_tool_path) if custom_tool_path else None
         async with self._RESTClient(self) as rest_client:

h2ogpte/rest_async/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.6.53-dev2"
+__version__ = "1.6.54"
 
 # import apis into sdk package
 from h2ogpte.rest_async.api.api_keys_api import APIKeysApi
@@ -69,7 +69,6 @@ from h2ogpte.rest_async.models.chat_message_reference import ChatMessageReferenc
 from h2ogpte.rest_async.models.chat_session import ChatSession
 from h2ogpte.rest_async.models.chat_session_update_request import ChatSessionUpdateRequest
 from h2ogpte.rest_async.models.chat_settings import ChatSettings
-from h2ogpte.rest_async.models.chat_settings_tags import ChatSettingsTags
 from h2ogpte.rest_async.models.chunk import Chunk
 from h2ogpte.rest_async.models.chunk_search_result import ChunkSearchResult
 from h2ogpte.rest_async.models.collection import Collection
@@ -159,7 +158,6 @@ from h2ogpte.rest_async.models.suggested_question import SuggestedQuestion
 from h2ogpte.rest_async.models.summarize_request import SummarizeRequest
 from h2ogpte.rest_async.models.tag import Tag
 from h2ogpte.rest_async.models.tag_create_request import TagCreateRequest
-from h2ogpte.rest_async.models.tag_filter import TagFilter
 from h2ogpte.rest_async.models.tag_update_request import TagUpdateRequest
 from h2ogpte.rest_async.models.update_agent_key_request import UpdateAgentKeyRequest
 from h2ogpte.rest_async.models.update_agent_tool_preference_request import UpdateAgentToolPreferenceRequest

h2ogpte/rest_async/api/agents_api.py

@@ -16,7 +16,7 @@ from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator
+from pydantic import Field, StrictBytes, StrictInt, StrictStr
 from typing import List, Optional, Tuple, Union
 from typing_extensions import Annotated
 from h2ogpte.rest_async.models.add_custom_agent_tool201_response_inner import AddCustomAgentTool201ResponseInner
@@ -54,11 +54,11 @@ class AgentsApi:
     @validate_call
     async def add_custom_agent_tool(
         self,
-        tool_type: Annotated[StrictStr, Field(description="The type of custom tool being added: - local_mcp: Model Context Protocol server running locally - remote_mcp: Model Context Protocol server running remotely - browser_action: Custom browser automation actions - general_code: General purpose code execution tools ")],
-        tool_args: Annotated[StrictStr, Field(description="JSON string containing tool-specific arguments. The structure varies by tool_type:  For remote_mcp: {   \\\"mcp_config_json\\\": \\\"JSON string with MCP server configuration\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true) }  For local_mcp, browser_action, and general_code: {   \\\"tool_name\\\": \\\"string (optional, defaults to filename without extension)\\\",   \\\"description\\\": \\\"string (optional, tool description)\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true),   \\\"should_unzip\\\": true/false (optional, for general_code .zip files only),   \\\"tool_usage_mode\\\": [\\\"runner\\\", \\\"creator\\\"] (optional list of strings) } ")],
-        file: Annotated[Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]], Field(description="The tool file to upload. Requirements vary by tool_type: - local_mcp: .zip file containing MCP server code - remote_mcp: Optional .json file with MCP configuration - browser_action: .py file (must start with 'browser_') or .zip containing browser action scripts - general_code: .py or .zip file with custom code ")] = None,
+        tool_type: StrictStr,
+        tool_args: StrictStr,
+        file: Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]] = None,
         custom_tool_path: Optional[StrictStr] = None,
-        filename: Annotated[Optional[StrictStr], Field(description="Optional filename to use when storing the uploaded file")] = None,
+        filename: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -76,15 +76,15 @@ class AgentsApi:
 
         Add Custom Agent Tools
 
-        :param tool_type: The type of custom tool being added: - local_mcp: Model Context Protocol server running locally - remote_mcp: Model Context Protocol server running remotely - browser_action: Custom browser automation actions - general_code: General purpose code execution tools  (required)
+        :param tool_type: (required)
         :type tool_type: str
-        :param tool_args: JSON string containing tool-specific arguments. The structure varies by tool_type:  For remote_mcp: {   \\\"mcp_config_json\\\": \\\"JSON string with MCP server configuration\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true) }  For local_mcp, browser_action, and general_code: {   \\\"tool_name\\\": \\\"string (optional, defaults to filename without extension)\\\",   \\\"description\\\": \\\"string (optional, tool description)\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true),   \\\"should_unzip\\\": true/false (optional, for general_code .zip files only),   \\\"tool_usage_mode\\\": [\\\"runner\\\", \\\"creator\\\"] (optional list of strings) }  (required)
+        :param tool_args: (required)
         :type tool_args: str
-        :param file: The tool file to upload. Requirements vary by tool_type: - local_mcp: .zip file containing MCP server code - remote_mcp: Optional .json file with MCP configuration - browser_action: .py file (must start with 'browser_') or .zip containing browser action scripts - general_code: .py or .zip file with custom code 
+        :param file:
         :type file: bytearray
         :param custom_tool_path:
         :type custom_tool_path: str
-        :param filename: Optional filename to use when storing the uploaded file
+        :param filename:
         :type filename: str
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
@@ -138,11 +138,11 @@ class AgentsApi:
     @validate_call
     async def add_custom_agent_tool_with_http_info(
         self,
-        tool_type: Annotated[StrictStr, Field(description="The type of custom tool being added: - local_mcp: Model Context Protocol server running locally - remote_mcp: Model Context Protocol server running remotely - browser_action: Custom browser automation actions - general_code: General purpose code execution tools ")],
-        tool_args: Annotated[StrictStr, Field(description="JSON string containing tool-specific arguments. The structure varies by tool_type:  For remote_mcp: {   \\\"mcp_config_json\\\": \\\"JSON string with MCP server configuration\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true) }  For local_mcp, browser_action, and general_code: {   \\\"tool_name\\\": \\\"string (optional, defaults to filename without extension)\\\",   \\\"description\\\": \\\"string (optional, tool description)\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true),   \\\"should_unzip\\\": true/false (optional, for general_code .zip files only),   \\\"tool_usage_mode\\\": [\\\"runner\\\", \\\"creator\\\"] (optional list of strings) } ")],
-        file: Annotated[Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]], Field(description="The tool file to upload. Requirements vary by tool_type: - local_mcp: .zip file containing MCP server code - remote_mcp: Optional .json file with MCP configuration - browser_action: .py file (must start with 'browser_') or .zip containing browser action scripts - general_code: .py or .zip file with custom code ")] = None,
+        tool_type: StrictStr,
+        tool_args: StrictStr,
+        file: Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]] = None,
         custom_tool_path: Optional[StrictStr] = None,
-        filename: Annotated[Optional[StrictStr], Field(description="Optional filename to use when storing the uploaded file")] = None,
+        filename: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -160,15 +160,15 @@ class AgentsApi:
 
         Add Custom Agent Tools
 
-        :param tool_type: The type of custom tool being added: - local_mcp: Model Context Protocol server running locally - remote_mcp: Model Context Protocol server running remotely - browser_action: Custom browser automation actions - general_code: General purpose code execution tools  (required)
+        :param tool_type: (required)
         :type tool_type: str
-        :param tool_args: JSON string containing tool-specific arguments. The structure varies by tool_type:  For remote_mcp: {   \\\"mcp_config_json\\\": \\\"JSON string with MCP server configuration\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true) }  For local_mcp, browser_action, and general_code: {   \\\"tool_name\\\": \\\"string (optional, defaults to filename without extension)\\\",   \\\"description\\\": \\\"string (optional, tool description)\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true),   \\\"should_unzip\\\": true/false (optional, for general_code .zip files only),   \\\"tool_usage_mode\\\": [\\\"runner\\\", \\\"creator\\\"] (optional list of strings) }  (required)
+        :param tool_args: (required)
         :type tool_args: str
-        :param file: The tool file to upload. Requirements vary by tool_type: - local_mcp: .zip file containing MCP server code - remote_mcp: Optional .json file with MCP configuration - browser_action: .py file (must start with 'browser_') or .zip containing browser action scripts - general_code: .py or .zip file with custom code 
+        :param file:
         :type file: bytearray
         :param custom_tool_path:
         :type custom_tool_path: str
-        :param filename: Optional filename to use when storing the uploaded file
+        :param filename:
         :type filename: str
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
@@ -222,11 +222,11 @@ class AgentsApi:
     @validate_call
     async def add_custom_agent_tool_without_preload_content(
         self,
-        tool_type: Annotated[StrictStr, Field(description="The type of custom tool being added: - local_mcp: Model Context Protocol server running locally - remote_mcp: Model Context Protocol server running remotely - browser_action: Custom browser automation actions - general_code: General purpose code execution tools ")],
-        tool_args: Annotated[StrictStr, Field(description="JSON string containing tool-specific arguments. The structure varies by tool_type:  For remote_mcp: {   \\\"mcp_config_json\\\": \\\"JSON string with MCP server configuration\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true) }  For local_mcp, browser_action, and general_code: {   \\\"tool_name\\\": \\\"string (optional, defaults to filename without extension)\\\",   \\\"description\\\": \\\"string (optional, tool description)\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true),   \\\"should_unzip\\\": true/false (optional, for general_code .zip files only),   \\\"tool_usage_mode\\\": [\\\"runner\\\", \\\"creator\\\"] (optional list of strings) } ")],
-        file: Annotated[Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]], Field(description="The tool file to upload. Requirements vary by tool_type: - local_mcp: .zip file containing MCP server code - remote_mcp: Optional .json file with MCP configuration - browser_action: .py file (must start with 'browser_') or .zip containing browser action scripts - general_code: .py or .zip file with custom code ")] = None,
+        tool_type: StrictStr,
+        tool_args: StrictStr,
+        file: Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]] = None,
         custom_tool_path: Optional[StrictStr] = None,
-        filename: Annotated[Optional[StrictStr], Field(description="Optional filename to use when storing the uploaded file")] = None,
+        filename: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -244,15 +244,15 @@ class AgentsApi:
 
         Add Custom Agent Tools
 
-        :param tool_type: The type of custom tool being added: - local_mcp: Model Context Protocol server running locally - remote_mcp: Model Context Protocol server running remotely - browser_action: Custom browser automation actions - general_code: General purpose code execution tools  (required)
+        :param tool_type: (required)
         :type tool_type: str
-        :param tool_args: JSON string containing tool-specific arguments. The structure varies by tool_type:  For remote_mcp: {   \\\"mcp_config_json\\\": \\\"JSON string with MCP server configuration\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true) }  For local_mcp, browser_action, and general_code: {   \\\"tool_name\\\": \\\"string (optional, defaults to filename without extension)\\\",   \\\"description\\\": \\\"string (optional, tool description)\\\",   \\\"enable_by_default\\\": true/false (optional, defaults to true),   \\\"should_unzip\\\": true/false (optional, for general_code .zip files only),   \\\"tool_usage_mode\\\": [\\\"runner\\\", \\\"creator\\\"] (optional list of strings) }  (required)
+        :param tool_args: (required)
         :type tool_args: str
-        :param file: The tool file to upload. Requirements vary by tool_type: - local_mcp: .zip file containing MCP server code - remote_mcp: Optional .json file with MCP configuration - browser_action: .py file (must start with 'browser_') or .zip containing browser action scripts - general_code: .py or .zip file with custom code 
+        :param file:
         :type file: bytearray
         :param custom_tool_path:
         :type custom_tool_path: str
-        :param filename: Optional filename to use when storing the uploaded file
+        :param filename:
         :type filename: str
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request

h2ogpte/rest_async/api_client.py

@@ -90,7 +90,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.6.53-dev2/python'
+        self.user_agent = 'OpenAPI-Generator/1.6.54/python'
         self.client_side_validation = configuration.client_side_validation
 
     async def __aenter__(self):

h2ogpte/rest_async/configuration.py

@@ -499,7 +499,7 @@ class Configuration:
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v1.0.0\n"\
-               "SDK Package Version: 1.6.53-dev2".\
+               "SDK Package Version: 1.6.54".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:

h2ogpte/rest_async/models/__init__.py

@@ -38,7 +38,6 @@ from h2ogpte.rest_async.models.chat_message_reference import ChatMessageReferenc
 from h2ogpte.rest_async.models.chat_session import ChatSession
 from h2ogpte.rest_async.models.chat_session_update_request import ChatSessionUpdateRequest
 from h2ogpte.rest_async.models.chat_settings import ChatSettings
-from h2ogpte.rest_async.models.chat_settings_tags import ChatSettingsTags
 from h2ogpte.rest_async.models.chunk import Chunk
 from h2ogpte.rest_async.models.chunk_search_result import ChunkSearchResult
 from h2ogpte.rest_async.models.collection import Collection
@@ -128,7 +127,6 @@ from h2ogpte.rest_async.models.suggested_question import SuggestedQuestion
 from h2ogpte.rest_async.models.summarize_request import SummarizeRequest
 from h2ogpte.rest_async.models.tag import Tag
 from h2ogpte.rest_async.models.tag_create_request import TagCreateRequest
-from h2ogpte.rest_async.models.tag_filter import TagFilter
 from h2ogpte.rest_async.models.tag_update_request import TagUpdateRequest
 from h2ogpte.rest_async.models.update_agent_key_request import UpdateAgentKeyRequest
 from h2ogpte.rest_async.models.update_agent_tool_preference_request import UpdateAgentToolPreferenceRequest

h2ogpte/rest_async/models/chat_completion_request.py

@@ -19,7 +19,6 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from h2ogpte.rest_async.models.chat_settings_tags import ChatSettingsTags
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -38,7 +37,7 @@ class ChatCompletionRequest(BaseModel):
     self_reflection_config: Optional[Dict[str, Any]] = Field(default=None, description="A map with self reflection settings:   * `llm_reflection` **(type=string, example=gpt-4-0613)**   * `prompt_reflection` **(type=string, example=\\\"\\\"\\\"Prompt:\\\\\\\\n%s\\\\\\\\n\\\"\\\"\\\"\\\\\\\\n\\\\\\\\n\\\"\\\"\\\")**   * `system_prompt_reflection` **(type=string)**   * `llm_args_reflection` **(type=string, example={})** ")
     rag_config: Optional[Dict[str, Any]] = Field(default=None, description="A map with arguments to control RAG (retrieval-augmented-generation) types.:   * `rag_type` **(type=enum[auto, llm_only, rag, hyde1, hyde2, rag+, all_data])** RAG type options:     * `auto` - Automatically select the best rag_type.     * `llm_only` LLM Only - Answer the query without any supporting document contexts.        Requires 1 LLM call.     * `rag` RAG (Retrieval Augmented Generation) - Use supporting document contexts        to answer the query. Requires 1 LLM call.     * `hyde1` LLM Only + RAG composite - HyDE RAG (Hypothetical Document Embedding).        Use 'LLM Only' response to find relevant contexts from a collection for generating        a response. Requires 2 LLM calls.     * `hyde2` HyDE + RAG composite - Use the 'HyDE RAG' response to find relevant        contexts from a collection for generating a response. Requires 3 LLM calls.     * `rag+` Summary RAG - Like RAG, but uses more context and recursive        summarization to overcome LLM context limits. Keeps all retrieved chunks, puts        them in order, adds neighboring chunks, then uses the summary API to get the        answer. Can require several LLM calls.     * `all_data` All Data RAG - Like Summary RAG, but includes all document        chunks. Uses recursive summarization to overcome LLM context limits.        Can require several LLM calls.   * `hyde_no_rag_llm_prompt_extension` **(type=string, example=\\\\\\\\nKeep the answer brief, and list the 5 most relevant key words at the end.)** -     Add this prompt to every user's prompt, when generating answers to be used for subsequent retrieval during HyDE.     Only used when rag_type is `hyde1` or `hyde2`.   * `num_neighbor_chunks_to_include` **(type=integer, default=1)** - A number of neighboring chunks to include      for every retrieved relevant chunk. It helps to keep surrounding context together. Only enabled for rag_type `rag+`.   * `meta_data_to_include` **(type=map)** - A map with flags that indicate whether each piece of document metadata      is to be included as part of the context for a chat with a collection.     * `name` **(type: boolean, default=True)**     * `text` **(type: boolean, default=True)**     * `page` **(type: boolean, default=True)**     * `captions` **(type: boolean, default=True)**     * `uri` **(type: boolean, default=False)**     * `connector` **(type: boolean, default=False)**     * `original_mtime` **(type: boolean, default=False)**     * `age` **(type: boolean, default=False)**     * `score` **(type: boolean, default=False)**   * `rag_max_chunks` **(type=integer, default=-1)** - Maximum number of document chunks to retrieve for RAG.     Actual number depends on rag_type and admin configuration. Set to >0 values to enable.      Can be combined with rag_min_chunk_score.   * `rag_min_chunk_score` **(type=double, default=0.0)** - Minimum score of document chunks to retrieve for RAG.     Set to >0 values to enable. Can be combined with rag_max_chunks. ")
     include_chat_history: Optional[StrictStr] = Field(default=None, description="Whether to include chat history. Includes previous questions and answers for the current chat session for each new chat request. Disable if require deterministic answers for a given question.")
-    tags: Optional[ChatSettingsTags] = None
+    tags: Optional[List[StrictStr]] = Field(default=None, description="A list of tags from which to pull the context for RAG.")
     __properties: ClassVar[List[str]] = ["message", "system_prompt", "pre_prompt_query", "prompt_query", "image_batch_final_prompt", "image_batch_image_prompt", "llm", "llm_args", "self_reflection_config", "rag_config", "include_chat_history", "tags"]
 
     @field_validator('include_chat_history')
@@ -90,9 +89,6 @@ class ChatCompletionRequest(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of tags
-        if self.tags:
-            _dict['tags'] = self.tags.to_dict()
         return _dict
 
     @classmethod
@@ -116,7 +112,7 @@ class ChatCompletionRequest(BaseModel):
             "self_reflection_config": obj.get("self_reflection_config"),
             "rag_config": obj.get("rag_config"),
             "include_chat_history": obj.get("include_chat_history"),
-            "tags": ChatSettingsTags.from_dict(obj["tags"]) if obj.get("tags") is not None else None,
+            "tags": obj.get("tags"),
         })
         return _obj
 

h2ogpte/rest_async/models/chat_settings.py

@@ -19,7 +19,6 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from h2ogpte.rest_async.models.chat_settings_tags import ChatSettingsTags
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -32,7 +31,7 @@ class ChatSettings(BaseModel):
     self_reflection_config: Optional[Dict[str, Any]] = Field(default=None, description="A map with self reflection settings:   * `llm_reflection` **(type=string, example=gpt-4-0613)**   * `prompt_reflection` **(type=string, example=\\\"\\\"\\\"Prompt:\\\\\\\\n%s\\\\\\\\n\\\"\\\"\\\"\\\\\\\\n\\\\\\\\n\\\"\\\"\\\")**   * `system_prompt_reflection` **(type=string)**   * `llm_args_reflection` **(type=string, example={})** ")
     rag_config: Optional[Dict[str, Any]] = Field(default=None, description="A map with arguments to control RAG (retrieval-augmented-generation) types.:   * `rag_type` **(type=enum[auto, llm_only, rag, hyde1, hyde2, rag+, all_data])** RAG type options:     * `auto` - Automatically select the best rag_type.     * `llm_only` LLM Only - Answer the query without any supporting document contexts.        Requires 1 LLM call.     * `rag` RAG (Retrieval Augmented Generation) - Use supporting document contexts        to answer the query. Requires 1 LLM call.     * `hyde1` LLM Only + RAG composite - HyDE RAG (Hypothetical Document Embedding).        Use 'LLM Only' response to find relevant contexts from a collection for generating        a response. Requires 2 LLM calls.     * `hyde2` HyDE + RAG composite - Use the 'HyDE RAG' response to find relevant        contexts from a collection for generating a response. Requires 3 LLM calls.     * `rag+` Summary RAG - Like RAG, but uses more context and recursive        summarization to overcome LLM context limits. Keeps all retrieved chunks, puts        them in order, adds neighboring chunks, then uses the summary API to get the        answer. Can require several LLM calls.     * `all_data` All Data RAG - Like Summary RAG, but includes all document        chunks. Uses recursive summarization to overcome LLM context limits.        Can require several LLM calls.   * `hyde_no_rag_llm_prompt_extension` **(type=string, example=\\\\\\\\nKeep the answer brief, and list the 5 most relevant key words at the end.)** -     Add this prompt to every user's prompt, when generating answers to be used for subsequent retrieval during HyDE.     Only used when rag_type is `hyde1` or `hyde2`.   * `num_neighbor_chunks_to_include` **(type=integer, default=1)** - A number of neighboring chunks to include      for every retrieved relevant chunk. It helps to keep surrounding context together. Only enabled for rag_type `rag+`.   * `meta_data_to_include` **(type=map)** - A map with flags that indicate whether each piece of document metadata      is to be included as part of the context for a chat with a collection.     * `name` **(type: boolean, default=True)**     * `text` **(type: boolean, default=True)**     * `page` **(type: boolean, default=True)**     * `captions` **(type: boolean, default=True)**     * `uri` **(type: boolean, default=False)**     * `connector` **(type: boolean, default=False)**     * `original_mtime` **(type: boolean, default=False)**     * `age` **(type: boolean, default=False)**     * `score` **(type: boolean, default=False)**   * `rag_max_chunks` **(type=integer, default=-1)** - Maximum number of document chunks to retrieve for RAG.     Actual number depends on rag_type and admin configuration. Set to >0 values to enable.      Can be combined with rag_min_chunk_score.   * `rag_min_chunk_score` **(type=double, default=0.0)** - Minimum score of document chunks to retrieve for RAG.     Set to >0 values to enable. Can be combined with rag_max_chunks. ")
     include_chat_history: Optional[StrictStr] = Field(default=None, description="Whether to include chat history. Includes previous questions and answers for the current chat session for each new chat request. Disable if require deterministic answers for a given question.")
-    tags: Optional[ChatSettingsTags] = None
+    tags: Optional[List[StrictStr]] = Field(default=None, description="A list of tags from which to pull the context for RAG.")
     __properties: ClassVar[List[str]] = ["llm", "llm_args", "self_reflection_config", "rag_config", "include_chat_history", "tags"]
 
     @field_validator('include_chat_history')
@@ -84,9 +83,6 @@ class ChatSettings(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of tags
-        if self.tags:
-            _dict['tags'] = self.tags.to_dict()
         return _dict
 
     @classmethod
@@ -104,7 +100,7 @@ class ChatSettings(BaseModel):
             "self_reflection_config": obj.get("self_reflection_config"),
             "rag_config": obj.get("rag_config"),
             "include_chat_history": obj.get("include_chat_history"),
-            "tags": ChatSettingsTags.from_dict(obj["tags"]) if obj.get("tags") is not None else None
+            "tags": obj.get("tags")
         })
         return _obj
 

h2ogpte/rest_async/models/ingest_from_confluence_body.py

@@ -17,7 +17,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from h2ogpte.rest_async.models.confluence_credentials import ConfluenceCredentials
 from typing import Optional, Set
@@ -29,10 +29,9 @@ class IngestFromConfluenceBody(BaseModel):
     """ # noqa: E501
     base_url: StrictStr = Field(description="Base url of the confluence instance.")
     page_ids: List[StrictStr] = Field(description="Ids of pages to be ingested.")
-    include_attachments: Optional[StrictBool] = Field(default=False, description="A flag indicating whether to also ingest attachments with the page.")
     credentials: ConfluenceCredentials
     metadata: Optional[Dict[str, Any]] = Field(default=None, description="Metadata for the documents.")
-    __properties: ClassVar[List[str]] = ["base_url", "page_ids", "include_attachments", "credentials", "metadata"]
+    __properties: ClassVar[List[str]] = ["base_url", "page_ids", "credentials", "metadata"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -90,7 +89,6 @@ class IngestFromConfluenceBody(BaseModel):
         _obj = cls.model_validate({
             "base_url": obj.get("base_url"),
             "page_ids": obj.get("page_ids"),
-            "include_attachments": obj.get("include_attachments") if obj.get("include_attachments") is not None else False,
             "credentials": ConfluenceCredentials.from_dict(obj["credentials"]) if obj.get("credentials") is not None else None,
             "metadata": obj.get("metadata")
         })

h2ogpte/rest_sync/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.6.53-dev2"
+__version__ = "1.6.54"
 
 # import apis into sdk package
 from h2ogpte.rest_sync.api.api_keys_api import APIKeysApi
@@ -69,7 +69,6 @@ from h2ogpte.rest_sync.models.chat_message_reference import ChatMessageReference
 from h2ogpte.rest_sync.models.chat_session import ChatSession
 from h2ogpte.rest_sync.models.chat_session_update_request import ChatSessionUpdateRequest
 from h2ogpte.rest_sync.models.chat_settings import ChatSettings
-from h2ogpte.rest_sync.models.chat_settings_tags import ChatSettingsTags
 from h2ogpte.rest_sync.models.chunk import Chunk
 from h2ogpte.rest_sync.models.chunk_search_result import ChunkSearchResult
 from h2ogpte.rest_sync.models.collection import Collection
@@ -159,7 +158,6 @@ from h2ogpte.rest_sync.models.suggested_question import SuggestedQuestion
 from h2ogpte.rest_sync.models.summarize_request import SummarizeRequest
 from h2ogpte.rest_sync.models.tag import Tag
 from h2ogpte.rest_sync.models.tag_create_request import TagCreateRequest
-from h2ogpte.rest_sync.models.tag_filter import TagFilter
 from h2ogpte.rest_sync.models.tag_update_request import TagUpdateRequest
 from h2ogpte.rest_sync.models.update_agent_key_request import UpdateAgentKeyRequest
 from h2ogpte.rest_sync.models.update_agent_tool_preference_request import UpdateAgentToolPreferenceRequest