h2ogpte 1.6.42__py3-none-any.whl → 1.6.43rc1__py3-none-any.whl

h2ogpte/h2ogpte_sync_base.py

@@ -288,13 +288,20 @@ class H2OGPTESyncBase:
         response = self._post("/rpc/crawl/func", marshal([name, kwargs]))
         return response
 
-    def _wait_for_completion(self, job_id: str, timeout: Optional[float] = None) -> Job:
+    def _wait_for_completion(
+        self,
+        job_id: str,
+        timeout: Optional[float] = None,
+        callback: Optional[Callable[[Job], None]] = None,
+    ) -> Job:
         if timeout is None:
             timeout = 86400
         dt = H2OGPTEAsync.INITIAL_WAIT_INTERVAL
         last_job: Optional[Job] = None
         while True:
             job = self.get_job(job_id)
+            if callback:
+                callback(job)
             if job.completed or job.canceled:
                 break
             if last_job is not None and last_job.progress == job.progress:

h2ogpte/rest_async/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.6.42"
+__version__ = "1.6.43-dev1"
 
 # import apis into sdk package
 from h2ogpte.rest_async.api.api_keys_api import APIKeysApi
@@ -82,6 +82,7 @@ from h2ogpte.rest_async.models.count_with_queue_details import CountWithQueueDet
 from h2ogpte.rest_async.models.create_agent_key_request import CreateAgentKeyRequest
 from h2ogpte.rest_async.models.create_agent_tool_key_associations_request import CreateAgentToolKeyAssociationsRequest
 from h2ogpte.rest_async.models.create_agent_tool_request import CreateAgentToolRequest
+from h2ogpte.rest_async.models.create_chat_session_request import CreateChatSessionRequest
 from h2ogpte.rest_async.models.create_import_collection_to_collection_job_request import CreateImportCollectionToCollectionJobRequest
 from h2ogpte.rest_async.models.create_insert_document_to_collection_job_request import CreateInsertDocumentToCollectionJobRequest
 from h2ogpte.rest_async.models.create_secret201_response import CreateSecret201Response
@@ -137,8 +138,8 @@ from h2ogpte.rest_async.models.prompt_template_create_request import PromptTempl
 from h2ogpte.rest_async.models.qa_feedback import QAFeedback
 from h2ogpte.rest_async.models.question_request import QuestionRequest
 from h2ogpte.rest_async.models.queue_details import QueueDetails
-from h2ogpte.rest_async.models.reset_and_share_prompt_template_request import ResetAndSharePromptTemplateRequest
-from h2ogpte.rest_async.models.reset_and_share_prompt_template_with_groups_request import ResetAndSharePromptTemplateWithGroupsRequest
+from h2ogpte.rest_async.models.reset_and_share_request import ResetAndShareRequest
+from h2ogpte.rest_async.models.reset_and_share_with_groups_request import ResetAndShareWithGroupsRequest
 from h2ogpte.rest_async.models.role_create_request import RoleCreateRequest
 from h2ogpte.rest_async.models.role_info import RoleInfo
 from h2ogpte.rest_async.models.roles_reset_request import RolesResetRequest
@@ -161,9 +162,11 @@ from h2ogpte.rest_async.models.update_agent_tool_preference_request import Updat
 from h2ogpte.rest_async.models.update_collection_expiry_date_request import UpdateCollectionExpiryDateRequest
 from h2ogpte.rest_async.models.update_collection_inactivity_interval_request import UpdateCollectionInactivityIntervalRequest
 from h2ogpte.rest_async.models.update_collection_privacy_request import UpdateCollectionPrivacyRequest
+from h2ogpte.rest_async.models.update_collection_workspace_request import UpdateCollectionWorkspaceRequest
 from h2ogpte.rest_async.models.update_custom_agent_tool200_response import UpdateCustomAgentTool200Response
 from h2ogpte.rest_async.models.update_custom_agent_tool_request import UpdateCustomAgentToolRequest
 from h2ogpte.rest_async.models.update_default_prompt_template_visibility_request import UpdateDefaultPromptTemplateVisibilityRequest
+from h2ogpte.rest_async.models.update_extractor_privacy_request import UpdateExtractorPrivacyRequest
 from h2ogpte.rest_async.models.update_prompt_template_privacy_request import UpdatePromptTemplatePrivacyRequest
 from h2ogpte.rest_async.models.update_qa_feedback_request import UpdateQAFeedbackRequest
 from h2ogpte.rest_async.models.update_secret_request import UpdateSecretRequest

h2ogpte/rest_async/api/chat_api.py

@@ -30,6 +30,7 @@ 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.collection_change_request import CollectionChangeRequest
 from h2ogpte.rest_async.models.count import Count
+from h2ogpte.rest_async.models.create_chat_session_request import CreateChatSessionRequest
 from h2ogpte.rest_async.models.delete_chat_sessions_job_request import DeleteChatSessionsJobRequest
 from h2ogpte.rest_async.models.job_details import JobDetails
 from h2ogpte.rest_async.models.message_vote_update_request import MessageVoteUpdateRequest
@@ -60,6 +61,7 @@ class ChatApi:
     async def create_chat_session(
         self,
         collection_id: Annotated[Optional[StrictStr], Field(description="Id of collection")] = None,
+        create_chat_session_request: Optional[CreateChatSessionRequest] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -79,6 +81,8 @@ class ChatApi:
 
         :param collection_id: Id of collection
         :type collection_id: str
+        :param create_chat_session_request:
+        :type create_chat_session_request: CreateChatSessionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -103,6 +107,7 @@ class ChatApi:
 
         _param = self._create_chat_session_serialize(
             collection_id=collection_id,
+            create_chat_session_request=create_chat_session_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -128,6 +133,7 @@ class ChatApi:
     async def create_chat_session_with_http_info(
         self,
         collection_id: Annotated[Optional[StrictStr], Field(description="Id of collection")] = None,
+        create_chat_session_request: Optional[CreateChatSessionRequest] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -147,6 +153,8 @@ class ChatApi:
 
         :param collection_id: Id of collection
         :type collection_id: str
+        :param create_chat_session_request:
+        :type create_chat_session_request: CreateChatSessionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -171,6 +179,7 @@ class ChatApi:
 
         _param = self._create_chat_session_serialize(
             collection_id=collection_id,
+            create_chat_session_request=create_chat_session_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -196,6 +205,7 @@ class ChatApi:
     async def create_chat_session_without_preload_content(
         self,
         collection_id: Annotated[Optional[StrictStr], Field(description="Id of collection")] = None,
+        create_chat_session_request: Optional[CreateChatSessionRequest] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -215,6 +225,8 @@ class ChatApi:
 
         :param collection_id: Id of collection
         :type collection_id: str
+        :param create_chat_session_request:
+        :type create_chat_session_request: CreateChatSessionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -239,6 +251,7 @@ class ChatApi:
 
         _param = self._create_chat_session_serialize(
             collection_id=collection_id,
+            create_chat_session_request=create_chat_session_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -259,6 +272,7 @@ class ChatApi:
     def _create_chat_session_serialize(
         self,
         collection_id,
+        create_chat_session_request,
         _request_auth,
         _content_type,
         _headers,
@@ -288,6 +302,8 @@ class ChatApi:
         # process the header parameters
         # process the form parameters
         # process the body parameter
+        if create_chat_session_request is not None:
+            _body_params = create_chat_session_request
 
 
         # set the HTTP header `Accept`
@@ -298,6 +314,19 @@ class ChatApi:
                 ]
             )
 
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'application/json'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
 
         # authentication setting
         _auth_settings: List[str] = [

h2ogpte/rest_async/api/collections_api.py

@@ -45,6 +45,7 @@ from h2ogpte.rest_async.models.suggested_question import SuggestedQuestion
 from h2ogpte.rest_async.models.update_collection_expiry_date_request import UpdateCollectionExpiryDateRequest
 from h2ogpte.rest_async.models.update_collection_inactivity_interval_request import UpdateCollectionInactivityIntervalRequest
 from h2ogpte.rest_async.models.update_collection_privacy_request import UpdateCollectionPrivacyRequest
+from h2ogpte.rest_async.models.update_collection_workspace_request import UpdateCollectionWorkspaceRequest
 
 from h2ogpte.rest_async.api_client import ApiClient, RequestSerialized
 from h2ogpte.rest_async.api_response import ApiResponse
@@ -14773,3 +14774,295 @@ class CollectionsApi:
         )
 
 
+
+
+    @validate_call
+    async def update_collection_workspace(
+        self,
+        collection_id: Annotated[StrictStr, Field(description="Id of the collection")],
+        update_collection_workspace_request: UpdateCollectionWorkspaceRequest,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> None:
+        """Updates the workspace associated with a collection.
+
+        Updates the workspace associated with a collection as well as the chats belonging to the collection.
+
+        :param collection_id: Id of the collection (required)
+        :type collection_id: str
+        :param update_collection_workspace_request: (required)
+        :type update_collection_workspace_request: UpdateCollectionWorkspaceRequest
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._update_collection_workspace_serialize(
+            collection_id=collection_id,
+            update_collection_workspace_request=update_collection_workspace_request,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '204': None,
+            '401': "EndpointError",
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    async def update_collection_workspace_with_http_info(
+        self,
+        collection_id: Annotated[StrictStr, Field(description="Id of the collection")],
+        update_collection_workspace_request: UpdateCollectionWorkspaceRequest,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[None]:
+        """Updates the workspace associated with a collection.
+
+        Updates the workspace associated with a collection as well as the chats belonging to the collection.
+
+        :param collection_id: Id of the collection (required)
+        :type collection_id: str
+        :param update_collection_workspace_request: (required)
+        :type update_collection_workspace_request: UpdateCollectionWorkspaceRequest
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._update_collection_workspace_serialize(
+            collection_id=collection_id,
+            update_collection_workspace_request=update_collection_workspace_request,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '204': None,
+            '401': "EndpointError",
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    async def update_collection_workspace_without_preload_content(
+        self,
+        collection_id: Annotated[StrictStr, Field(description="Id of the collection")],
+        update_collection_workspace_request: UpdateCollectionWorkspaceRequest,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Updates the workspace associated with a collection.
+
+        Updates the workspace associated with a collection as well as the chats belonging to the collection.
+
+        :param collection_id: Id of the collection (required)
+        :type collection_id: str
+        :param update_collection_workspace_request: (required)
+        :type update_collection_workspace_request: UpdateCollectionWorkspaceRequest
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._update_collection_workspace_serialize(
+            collection_id=collection_id,
+            update_collection_workspace_request=update_collection_workspace_request,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '204': None,
+            '401': "EndpointError",
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _update_collection_workspace_serialize(
+        self,
+        collection_id,
+        update_collection_workspace_request,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[
+            str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
+        ] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if collection_id is not None:
+            _path_params['collection_id'] = collection_id
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+        if update_collection_workspace_request is not None:
+            _body_params = update_collection_workspace_request
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'application/json'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'bearerAuth'
+        ]
+
+        return self.api_client.param_serialize(
+            method='PUT',
+            resource_path='/collections/{collection_id}/workspace',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+