h2ogpte 1.6.54rc4__py3-none-any.whl → 1.7.0rc1__py3-none-any.whl

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, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from h2ogpte.rest_async.models.confluence_credentials import ConfluenceCredentials
 from typing import Optional, Set
@@ -29,9 +29,10 @@ 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", "credentials", "metadata"]
+    __properties: ClassVar[List[str]] = ["base_url", "page_ids", "include_attachments", "credentials", "metadata"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -89,6 +90,7 @@ 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_async/models/{create_topic_model_job_request.py → tag_filter.py}

@@ -17,17 +17,18 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictStr
-from typing import Any, ClassVar, Dict, List
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
 
-class CreateTopicModelJobRequest(BaseModel):
+class TagFilter(BaseModel):
     """
-    CreateTopicModelJobRequest
+    Filter for document tags supporting inclusion and exclusion.  Note: The exclude list takes priority over the include list. If a document has a tag that appears in both lists, the document will be excluded.  Examples:   - Include only documents with 'red' OR 'blue' tags: {\"include\": [\"red\", \"blue\"]}   - Exclude documents with 'red' OR 'blue' tags: {\"exclude\": [\"red\", \"blue\"]}   - Include documents with 'color' tag BUT exclude 'red' and 'blue': {\"include\": [\"color\"], \"exclude\": [\"red\", \"blue\"]} 
     """ # noqa: E501
-    collection_id: StrictStr
-    __properties: ClassVar[List[str]] = ["collection_id"]
+    include: Optional[List[StrictStr]] = Field(default=None, description="Include documents with ANY of these tags (OR operation).")
+    exclude: Optional[List[StrictStr]] = Field(default=None, description="Exclude documents with ANY of these tags (OR operation). Takes priority over include.")
+    __properties: ClassVar[List[str]] = ["include", "exclude"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -47,7 +48,7 @@ class CreateTopicModelJobRequest(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of CreateTopicModelJobRequest from a JSON string"""
+        """Create an instance of TagFilter from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -72,7 +73,7 @@ class CreateTopicModelJobRequest(BaseModel):
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of CreateTopicModelJobRequest from a dict"""
+        """Create an instance of TagFilter from a dict"""
         if obj is None:
             return None
 
@@ -80,7 +81,8 @@ class CreateTopicModelJobRequest(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "collection_id": obj.get("collection_id")
+            "include": obj.get("include"),
+            "exclude": obj.get("exclude")
         })
         return _obj
 

h2ogpte/rest_sync/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.6.54-dev4"
+__version__ = "1.7.0-dev1"
 
 # import apis into sdk package
 from h2ogpte.rest_sync.api.api_keys_api import APIKeysApi
@@ -69,6 +69,7 @@ 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
@@ -88,7 +89,6 @@ from h2ogpte.rest_sync.models.create_import_collection_to_collection_job_request
 from h2ogpte.rest_sync.models.create_insert_document_to_collection_job_request import CreateInsertDocumentToCollectionJobRequest
 from h2ogpte.rest_sync.models.create_secret201_response import CreateSecret201Response
 from h2ogpte.rest_sync.models.create_secret_request import CreateSecretRequest
-from h2ogpte.rest_sync.models.create_topic_model_job_request import CreateTopicModelJobRequest
 from h2ogpte.rest_sync.models.delete_chat_sessions_job_request import DeleteChatSessionsJobRequest
 from h2ogpte.rest_sync.models.delete_collections_job_request import DeleteCollectionsJobRequest
 from h2ogpte.rest_sync.models.delete_documents_job_request import DeleteDocumentsJobRequest
@@ -158,6 +158,7 @@ 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

h2ogpte/rest_sync/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
+from pydantic import Field, StrictBytes, StrictInt, StrictStr, field_validator
 from typing import List, Optional, Tuple, Union
 from typing_extensions import Annotated
 from h2ogpte.rest_sync.models.add_custom_agent_tool201_response_inner import AddCustomAgentTool201ResponseInner
@@ -54,11 +54,11 @@ class AgentsApi:
     @validate_call
     def add_custom_agent_tool(
         self,
-        tool_type: StrictStr,
-        tool_args: StrictStr,
-        file: Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]] = None,
+        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,
         custom_tool_path: Optional[StrictStr] = None,
-        filename: Optional[StrictStr] = None,
+        filename: Annotated[Optional[StrictStr], Field(description="Optional filename to use when storing the uploaded file")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -76,15 +76,15 @@ class AgentsApi:
 
         Add Custom Agent Tools
 
-        :param tool_type: (required)
+        :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)
         :type tool_type: str
-        :param tool_args: (required)
+        :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)
         :type tool_args: str
-        :param file:
+        :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 
         :type file: bytearray
         :param custom_tool_path:
         :type custom_tool_path: str
-        :param filename:
+        :param filename: Optional filename to use when storing the uploaded file
         :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
     def add_custom_agent_tool_with_http_info(
         self,
-        tool_type: StrictStr,
-        tool_args: StrictStr,
-        file: Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]] = None,
+        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,
         custom_tool_path: Optional[StrictStr] = None,
-        filename: Optional[StrictStr] = None,
+        filename: Annotated[Optional[StrictStr], Field(description="Optional filename to use when storing the uploaded file")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -160,15 +160,15 @@ class AgentsApi:
 
         Add Custom Agent Tools
 
-        :param tool_type: (required)
+        :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)
         :type tool_type: str
-        :param tool_args: (required)
+        :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)
         :type tool_args: str
-        :param file:
+        :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 
         :type file: bytearray
         :param custom_tool_path:
         :type custom_tool_path: str
-        :param filename:
+        :param filename: Optional filename to use when storing the uploaded file
         :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
     def add_custom_agent_tool_without_preload_content(
         self,
-        tool_type: StrictStr,
-        tool_args: StrictStr,
-        file: Optional[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]]] = None,
+        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,
         custom_tool_path: Optional[StrictStr] = None,
-        filename: Optional[StrictStr] = None,
+        filename: Annotated[Optional[StrictStr], Field(description="Optional filename to use when storing the uploaded file")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -244,15 +244,15 @@ class AgentsApi:
 
         Add Custom Agent Tools
 
-        :param tool_type: (required)
+        :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)
         :type tool_type: str
-        :param tool_args: (required)
+        :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)
         :type tool_args: str
-        :param file:
+        :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 
         :type file: bytearray
         :param custom_tool_path:
         :type custom_tool_path: str
-        :param filename:
+        :param filename: Optional filename to use when storing the uploaded file
         :type filename: str
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request