qanswer_sdk 3.1212.0__py3-none-any.whl → 3.1244.0__py3-none-any.whl

qanswer_sdk/models/test_imap_connection_payload.py

@@ -0,0 +1,95 @@
+# coding: utf-8
+
+"""
+    QAnswer: Api Documentation
+
+    APIs provided by QAnswer
+
+    The version of the OpenAPI document: 1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, StrictBool, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class TestImapConnectionPayload(BaseModel):
+    """
+    TestImapConnectionPayload
+    """ # noqa: E501
+    imap_server: StrictStr
+    email: StrictStr
+    password: StrictStr
+    port: Optional[StrictInt] = None
+    use_ssl: Optional[StrictBool] = None
+    __properties: ClassVar[List[str]] = ["imap_server", "email", "password", "port", "use_ssl"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of TestImapConnectionPayload from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of TestImapConnectionPayload from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "imap_server": obj.get("imap_server"),
+            "email": obj.get("email"),
+            "password": obj.get("password"),
+            "port": obj.get("port"),
+            "use_ssl": obj.get("use_ssl")
+        })
+        return _obj
+
+

qanswer_sdk/models/text2_sparql_payload.py

@@ -32,9 +32,8 @@ class Text2SparqlPayload(BaseModel):
     dataset: StrictStr = Field(description="The dataset to be queried for information.")
     image_urls: Optional[List[StrictStr]] = Field(default=None, description="List of image URLs to be processed if provided.")
     parent_message_id: Optional[StrictStr] = Field(default=None, description="ID of the parent generation (message_id of parent response or question) if applicable; used for tracking multi-turn conversations.")
-    conversation_id: Optional[StrictStr] = Field(default=None, description="Unique identifier for the conversation.")
+    conversation_id: StrictStr = Field(description="Unique identifier for the conversation.")
     is_regenerate: Optional[StrictBool] = Field(default=None, description="Indicates if the user is asking for a regenerated response.")
-    auto_filters: Optional[StrictBool] = Field(default=None, description="Determines whether the auto filters should be used for the response.")
     origin: Optional[StrictStr] = Field(default=None, description="The username or IP address of the user making the request.")
     text_fragmentation: Optional[StrictBool] = Field(default=None, description="Detemines wether links for website sources should have text fragments.")
     interface_origin: Optional[StrictStr] = Field(default=None, description="The interface from which the request originated (search, chat, microsoft_teams, etc.).")
@@ -45,13 +44,14 @@ class Text2SparqlPayload(BaseModel):
     talk_to_web: Optional[StrictBool] = Field(default=None, description="Determines whether the response should be sent to the web interface.")
     original_question: Optional[StrictStr] = Field(default=None, description="The original question submitted to the model.")
     oauth_token: Optional[StrictStr] = Field(default=None, description="The oauth token")
+    auto_filters: Optional[StrictBool] = Field(default=None, description="Determines whether the auto filters should be used for the response.")
     filters: Optional[List[List[SearchMetadataFilter]]] = None
     index_hashes: Optional[List[Dict[str, Any]]] = Field(default=None, description="The hashes of the indexes to be used for the response.")
     agentic_chatbot_enabled: Optional[StrictBool] = Field(default=None, description="Whether the agentic chatbot is enabled.")
     conversation_has_clip: Optional[StrictBool] = Field(default=None, description="Indicates whether the conversation has a clip associated with it.")
     current_time: Optional[StrictStr] = Field(default=None, description="The current time to be used in the prompt, if applicable.")
     validate_sparql: Optional[StrictBool] = None
-    __properties: ClassVar[List[str]] = ["question", "username", "dataset", "image_urls", "parent_message_id", "conversation_id", "is_regenerate", "auto_filters", "origin", "text_fragmentation", "interface_origin", "system_prompt", "prompt", "additional_fields", "bypass_guardrail", "talk_to_web", "original_question", "oauth_token", "filters", "index_hashes", "agentic_chatbot_enabled", "conversation_has_clip", "current_time", "validate_sparql"]
+    __properties: ClassVar[List[str]] = ["question", "username", "dataset", "image_urls", "parent_message_id", "conversation_id", "is_regenerate", "origin", "text_fragmentation", "interface_origin", "system_prompt", "prompt", "additional_fields", "bypass_guardrail", "talk_to_web", "original_question", "oauth_token", "auto_filters", "filters", "index_hashes", "agentic_chatbot_enabled", "conversation_has_clip", "current_time", "validate_sparql"]
 
     @field_validator('interface_origin')
     def interface_origin_validate_enum(cls, value):
@@ -130,7 +130,6 @@ class Text2SparqlPayload(BaseModel):
             "parent_message_id": obj.get("parent_message_id"),
             "conversation_id": obj.get("conversation_id"),
             "is_regenerate": obj.get("is_regenerate"),
-            "auto_filters": obj.get("auto_filters"),
             "origin": obj.get("origin"),
             "text_fragmentation": obj.get("text_fragmentation"),
             "interface_origin": obj.get("interface_origin"),
@@ -141,6 +140,7 @@ class Text2SparqlPayload(BaseModel):
             "talk_to_web": obj.get("talk_to_web"),
             "original_question": obj.get("original_question"),
             "oauth_token": obj.get("oauth_token"),
+            "auto_filters": obj.get("auto_filters"),
             "filters": [
                     [SearchMetadataFilter.from_dict(_inner_item) for _inner_item in _item]
                     for _item in obj["filters"]

qanswer_sdk/models/text2_sparql_task_settings.py

@@ -17,9 +17,9 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictFloat, StrictInt, StrictStr, field_validator
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from qanswer_sdk.models.llm_details import LLMDetails
+from qanswer_sdk.models.llm_endpoint_read_output import LLMEndpointReadOutput
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -28,7 +28,6 @@ class Text2SparqlTaskSettings(BaseModel):
     Text2SparqlTaskSettings
     """ # noqa: E501
     prompt: Optional[StrictStr] = None
-    llm_choice: Optional[StrictStr] = None
     bot_seed: Optional[StrictInt] = None
     bot_temperature: Optional[Union[StrictFloat, StrictInt]] = None
     bot_answer_length: Optional[StrictStr] = None
@@ -36,10 +35,12 @@ class Text2SparqlTaskSettings(BaseModel):
     stream_speed: Optional[Union[StrictFloat, StrictInt]] = None
     context_window: Optional[StrictInt] = None
     max_tokens: Optional[StrictInt] = None
+    slots_values: Optional[Dict[str, StrictStr]] = None
     bot_name: Optional[StrictStr] = None
     bot_description: Optional[StrictStr] = None
-    llm_details: LLMDetails
-    __properties: ClassVar[List[str]] = ["prompt", "llm_choice", "bot_seed", "bot_temperature", "bot_answer_length", "number_of_references", "stream_speed", "context_window", "max_tokens", "bot_name", "bot_description", "llm_details"]
+    llm_id: Optional[StrictInt] = Field(default=None, description="The LLM ID. This field is populated based on the llm_choice.")
+    llm_endpoint: Optional[LLMEndpointReadOutput] = None
+    __properties: ClassVar[List[str]] = ["prompt", "bot_seed", "bot_temperature", "bot_answer_length", "number_of_references", "stream_speed", "context_window", "max_tokens", "slots_values", "bot_name", "bot_description", "llm_id", "llm_endpoint"]
 
     @field_validator('bot_answer_length')
     def bot_answer_length_validate_enum(cls, value):
@@ -90,9 +91,9 @@ class Text2SparqlTaskSettings(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of llm_details
-        if self.llm_details:
-            _dict['llm_details'] = self.llm_details.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of llm_endpoint
+        if self.llm_endpoint:
+            _dict['llm_endpoint'] = self.llm_endpoint.to_dict()
         return _dict
 
     @classmethod
@@ -106,7 +107,6 @@ class Text2SparqlTaskSettings(BaseModel):
 
         _obj = cls.model_validate({
             "prompt": obj.get("prompt"),
-            "llm_choice": obj.get("llm_choice"),
             "bot_seed": obj.get("bot_seed"),
             "bot_temperature": obj.get("bot_temperature"),
             "bot_answer_length": obj.get("bot_answer_length"),
@@ -114,9 +114,11 @@ class Text2SparqlTaskSettings(BaseModel):
             "stream_speed": obj.get("stream_speed"),
             "context_window": obj.get("context_window"),
             "max_tokens": obj.get("max_tokens"),
+            "slots_values": obj.get("slots_values"),
             "bot_name": obj.get("bot_name"),
             "bot_description": obj.get("bot_description"),
-            "llm_details": LLMDetails.from_dict(obj["llm_details"]) if obj.get("llm_details") is not None else None
+            "llm_id": obj.get("llm_id"),
+            "llm_endpoint": LLMEndpointReadOutput.from_dict(obj["llm_endpoint"]) if obj.get("llm_endpoint") is not None else None
         })
         return _obj
 

qanswer_sdk/models/text2_sparql_task_update.py

@@ -17,8 +17,9 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictFloat, StrictInt, StrictStr, field_validator
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
+from qanswer_sdk.models.llm_endpoint_read_input import LLMEndpointReadInput
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -27,7 +28,7 @@ class Text2SparqlTaskUpdate(BaseModel):
     Text2SparqlTaskUpdate
     """ # noqa: E501
     prompt: Optional[StrictStr] = None
-    llm_choice: Optional[StrictStr] = None
+    llm_choice: Optional[StrictStr] = Field(default=None, description="The LLM choice. If not provided, the system default will be used.")
     bot_seed: Optional[StrictInt] = None
     bot_temperature: Optional[Union[StrictFloat, StrictInt]] = None
     bot_answer_length: Optional[StrictStr] = None
@@ -35,9 +36,12 @@ class Text2SparqlTaskUpdate(BaseModel):
     stream_speed: Optional[Union[StrictFloat, StrictInt]] = None
     context_window: Optional[StrictInt] = None
     max_tokens: Optional[StrictInt] = None
+    slots_values: Optional[Dict[str, StrictStr]] = None
     bot_name: Optional[StrictStr] = None
     bot_description: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["prompt", "llm_choice", "bot_seed", "bot_temperature", "bot_answer_length", "number_of_references", "stream_speed", "context_window", "max_tokens", "bot_name", "bot_description"]
+    llm_id: Optional[StrictInt] = Field(default=None, description="The LLM ID. This field is populated based on the llm_choice.")
+    llm_endpoint: Optional[LLMEndpointReadInput] = None
+    __properties: ClassVar[List[str]] = ["prompt", "llm_choice", "bot_seed", "bot_temperature", "bot_answer_length", "number_of_references", "stream_speed", "context_window", "max_tokens", "slots_values", "bot_name", "bot_description", "llm_id", "llm_endpoint"]
 
     @field_validator('bot_answer_length')
     def bot_answer_length_validate_enum(cls, value):
@@ -88,6 +92,9 @@ class Text2SparqlTaskUpdate(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of llm_endpoint
+        if self.llm_endpoint:
+            _dict['llm_endpoint'] = self.llm_endpoint.to_dict()
         return _dict
 
     @classmethod
@@ -109,8 +116,11 @@ class Text2SparqlTaskUpdate(BaseModel):
             "stream_speed": obj.get("stream_speed"),
             "context_window": obj.get("context_window"),
             "max_tokens": obj.get("max_tokens"),
+            "slots_values": obj.get("slots_values"),
             "bot_name": obj.get("bot_name"),
-            "bot_description": obj.get("bot_description")
+            "bot_description": obj.get("bot_description"),
+            "llm_id": obj.get("llm_id"),
+            "llm_endpoint": LLMEndpointReadInput.from_dict(obj["llm_endpoint"]) if obj.get("llm_endpoint") is not None else None
         })
         return _obj
 

qanswer_sdk/models/{user_chatbot_setting_response.py → user_chatbot_setting.py}

@@ -17,20 +17,22 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from qanswer_sdk.models.llm_details import LLMDetails
+from qanswer_sdk.models.user import User
 from typing import Optional, Set
 from typing_extensions import Self
 
-class UserChatbotSettingResponse(BaseModel):
+class UserChatbotSetting(BaseModel):
     """
-    UserChatbotSettingResponse
+    UserChatbotSetting
     """ # noqa: E501
-    llm_choice: Optional[StrictStr] = Field(default=None, alias="llmChoice")
+    id: Optional[StrictInt] = None
+    system_message: Optional[StrictStr] = Field(default=None, alias="systemMessage")
+    llm: Optional[Llm] = None
     agentic_chatbot_enabled: Optional[StrictBool] = Field(default=None, alias="agenticChatbotEnabled")
-    llm_details: Optional[LLMDetails] = Field(default=None, alias="llmDetails")
-    __properties: ClassVar[List[str]] = ["llmChoice", "agenticChatbotEnabled", "llmDetails"]
+    user: Optional[User] = None
+    __properties: ClassVar[List[str]] = ["id", "systemMessage", "llm", "agenticChatbotEnabled", "user"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -50,7 +52,7 @@ class UserChatbotSettingResponse(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of UserChatbotSettingResponse from a JSON string"""
+        """Create an instance of UserChatbotSetting from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -71,24 +73,17 @@ class UserChatbotSettingResponse(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of llm_details
-        if self.llm_details:
-            _dict['llmDetails'] = self.llm_details.to_dict()
-        # set to None if llm_choice (nullable) is None
-        # and model_fields_set contains the field
-        if self.llm_choice is None and "llm_choice" in self.model_fields_set:
-            _dict['llmChoice'] = None
-
-        # set to None if agentic_chatbot_enabled (nullable) is None
-        # and model_fields_set contains the field
-        if self.agentic_chatbot_enabled is None and "agentic_chatbot_enabled" in self.model_fields_set:
-            _dict['agenticChatbotEnabled'] = None
-
+        # override the default output from pydantic by calling `to_dict()` of llm
+        if self.llm:
+            _dict['llm'] = self.llm.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of user
+        if self.user:
+            _dict['user'] = self.user.to_dict()
         return _dict
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of UserChatbotSettingResponse from a dict"""
+        """Create an instance of UserChatbotSetting from a dict"""
         if obj is None:
             return None
 
@@ -96,10 +91,15 @@ class UserChatbotSettingResponse(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "llmChoice": obj.get("llmChoice"),
+            "id": obj.get("id"),
+            "systemMessage": obj.get("systemMessage"),
+            "llm": Llm.from_dict(obj["llm"]) if obj.get("llm") is not None else None,
             "agenticChatbotEnabled": obj.get("agenticChatbotEnabled"),
-            "llmDetails": LLMDetails.from_dict(obj["llmDetails"]) if obj.get("llmDetails") is not None else None
+            "user": User.from_dict(obj["user"]) if obj.get("user") is not None else None
         })
         return _obj
 
+from qanswer_sdk.models.llm import Llm
+# TODO: Rewrite to not use raise_errors
+UserChatbotSetting.model_rebuild(raise_errors=False)
 

qanswer_sdk/models/user_dataset.py

@@ -20,6 +20,7 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
+from qanswer_sdk.models.entity_description import EntityDescription
 from qanswer_sdk.models.logo import Logo
 from qanswer_sdk.models.user import User
 from typing import Optional, Set
@@ -42,9 +43,13 @@ class UserDataset(BaseModel):
     created: Optional[datetime] = None
     index_type: Optional[StrictStr] = Field(default=None, alias="indexType")
     languages: Optional[List[StrictStr]] = None
+    shared_users: Optional[List[UserDatasetShared]] = Field(default=None, alias="sharedUsers")
+    shared_teams: Optional[List[SharedTeamAccess]] = Field(default=None, alias="sharedTeams")
     shared_organizations: Optional[List[SharedOrganizationAccess]] = Field(default=None, alias="sharedOrganizations")
+    entity_description: Optional[EntityDescription] = Field(default=None, alias="entityDescription")
     logo: Optional[Logo] = None
-    __properties: ClassVar[List[str]] = ["id", "dataset", "name", "description", "user", "uploaded", "indexed", "access", "accessType", "size", "created", "indexType", "languages", "sharedOrganizations", "logo"]
+    llm_consumptions: Optional[List[LlmConsumption]] = Field(default=None, alias="llmConsumptions")
+    __properties: ClassVar[List[str]] = ["id", "dataset", "name", "description", "user", "uploaded", "indexed", "access", "accessType", "size", "created", "indexType", "languages", "sharedUsers", "sharedTeams", "sharedOrganizations", "entityDescription", "logo", "llmConsumptions"]
 
     @field_validator('access_type')
     def access_type_validate_enum(cls, value):
@@ -98,6 +103,20 @@ class UserDataset(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of user
         if self.user:
             _dict['user'] = self.user.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of each item in shared_users (list)
+        _items = []
+        if self.shared_users:
+            for _item_shared_users in self.shared_users:
+                if _item_shared_users:
+                    _items.append(_item_shared_users.to_dict())
+            _dict['sharedUsers'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in shared_teams (list)
+        _items = []
+        if self.shared_teams:
+            for _item_shared_teams in self.shared_teams:
+                if _item_shared_teams:
+                    _items.append(_item_shared_teams.to_dict())
+            _dict['sharedTeams'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in shared_organizations (list)
         _items = []
         if self.shared_organizations:
@@ -105,9 +124,19 @@ class UserDataset(BaseModel):
                 if _item_shared_organizations:
                     _items.append(_item_shared_organizations.to_dict())
             _dict['sharedOrganizations'] = _items
+        # override the default output from pydantic by calling `to_dict()` of entity_description
+        if self.entity_description:
+            _dict['entityDescription'] = self.entity_description.to_dict()
         # override the default output from pydantic by calling `to_dict()` of logo
         if self.logo:
             _dict['logo'] = self.logo.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of each item in llm_consumptions (list)
+        _items = []
+        if self.llm_consumptions:
+            for _item_llm_consumptions in self.llm_consumptions:
+                if _item_llm_consumptions:
+                    _items.append(_item_llm_consumptions.to_dict())
+            _dict['llmConsumptions'] = _items
         return _dict
 
     @classmethod
@@ -133,12 +162,19 @@ class UserDataset(BaseModel):
             "created": obj.get("created"),
             "indexType": obj.get("indexType"),
             "languages": obj.get("languages"),
+            "sharedUsers": [UserDatasetShared.from_dict(_item) for _item in obj["sharedUsers"]] if obj.get("sharedUsers") is not None else None,
+            "sharedTeams": [SharedTeamAccess.from_dict(_item) for _item in obj["sharedTeams"]] if obj.get("sharedTeams") is not None else None,
             "sharedOrganizations": [SharedOrganizationAccess.from_dict(_item) for _item in obj["sharedOrganizations"]] if obj.get("sharedOrganizations") is not None else None,
-            "logo": Logo.from_dict(obj["logo"]) if obj.get("logo") is not None else None
+            "entityDescription": EntityDescription.from_dict(obj["entityDescription"]) if obj.get("entityDescription") is not None else None,
+            "logo": Logo.from_dict(obj["logo"]) if obj.get("logo") is not None else None,
+            "llmConsumptions": [LlmConsumption.from_dict(_item) for _item in obj["llmConsumptions"]] if obj.get("llmConsumptions") is not None else None
         })
         return _obj
 
+from qanswer_sdk.models.llm_consumption import LlmConsumption
 from qanswer_sdk.models.shared_organization_access import SharedOrganizationAccess
+from qanswer_sdk.models.shared_team_access import SharedTeamAccess
+from qanswer_sdk.models.user_dataset_shared import UserDatasetShared
 # TODO: Rewrite to not use raise_errors
 UserDataset.model_rebuild(raise_errors=False)
 

qanswer_sdk/models/{qa_metadata_payload.py → user_dataset_shared.py}

@@ -17,35 +17,24 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from qanswer_sdk.models.tag_payload import TagPayload
+from qanswer_sdk.models.user import User
 from typing import Optional, Set
 from typing_extensions import Self
 
-class QaMetadataPayload(BaseModel):
+class UserDatasetShared(BaseModel):
     """
-    QaMetadataPayload
+    UserDatasetShared
     """ # noqa: E501
-    dataset: Optional[StrictStr] = None
-    owner: Optional[StrictStr] = None
-    access_type_open: Optional[StrictStr] = Field(default=None, alias="accessTypeOpen")
-    access_type_shared: Optional[StrictStr] = Field(default=None, alias="accessTypeShared")
-    tags: Optional[List[TagPayload]] = None
-    __properties: ClassVar[List[str]] = ["dataset", "owner", "accessTypeOpen", "accessTypeShared", "tags"]
-
-    @field_validator('access_type_open')
-    def access_type_open_validate_enum(cls, value):
-        """Validates the enum"""
-        if value is None:
-            return value
-
-        if value not in set(['LoggedIn', 'Open', 'None']):
-            raise ValueError("must be one of enum values ('LoggedIn', 'Open', 'None')")
-        return value
-
-    @field_validator('access_type_shared')
-    def access_type_shared_validate_enum(cls, value):
+    id: Optional[StrictInt] = None
+    ai_assistant: Optional[UserDataset] = Field(default=None, alias="aiAssistant")
+    user: Optional[User] = None
+    access_type: Optional[StrictStr] = Field(default=None, alias="accessType")
+    __properties: ClassVar[List[str]] = ["id", "aiAssistant", "user", "accessType"]
+
+    @field_validator('access_type')
+    def access_type_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
@@ -72,7 +61,7 @@ class QaMetadataPayload(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of QaMetadataPayload from a JSON string"""
+        """Create an instance of UserDatasetShared from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -93,18 +82,17 @@ class QaMetadataPayload(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in tags (list)
-        _items = []
-        if self.tags:
-            for _item_tags in self.tags:
-                if _item_tags:
-                    _items.append(_item_tags.to_dict())
-            _dict['tags'] = _items
+        # override the default output from pydantic by calling `to_dict()` of ai_assistant
+        if self.ai_assistant:
+            _dict['aiAssistant'] = self.ai_assistant.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of user
+        if self.user:
+            _dict['user'] = self.user.to_dict()
         return _dict
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of QaMetadataPayload from a dict"""
+        """Create an instance of UserDatasetShared from a dict"""
         if obj is None:
             return None
 
@@ -112,12 +100,14 @@ class QaMetadataPayload(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "dataset": obj.get("dataset"),
-            "owner": obj.get("owner"),
-            "accessTypeOpen": obj.get("accessTypeOpen"),
-            "accessTypeShared": obj.get("accessTypeShared"),
-            "tags": [TagPayload.from_dict(_item) for _item in obj["tags"]] if obj.get("tags") is not None else None
+            "id": obj.get("id"),
+            "aiAssistant": UserDataset.from_dict(obj["aiAssistant"]) if obj.get("aiAssistant") is not None else None,
+            "user": User.from_dict(obj["user"]) if obj.get("user") is not None else None,
+            "accessType": obj.get("accessType")
         })
         return _obj
 
+from qanswer_sdk.models.user_dataset import UserDataset
+# TODO: Rewrite to not use raise_errors
+UserDatasetShared.model_rebuild(raise_errors=False)
 

qanswer_sdk/models/{user_filter.py → user_filter_dto.py}

@@ -22,9 +22,9 @@ from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
 
-class UserFilter(BaseModel):
+class UserFilterDto(BaseModel):
     """
-    UserFilter
+    UserFilterDto
     """ # noqa: E501
     search: Optional[StrictStr] = None
     user_id: Optional[StrictInt] = Field(default=None, alias="userId")
@@ -54,7 +54,7 @@ class UserFilter(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of UserFilter from a JSON string"""
+        """Create an instance of UserFilterDto from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -79,7 +79,7 @@ class UserFilter(BaseModel):
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of UserFilter from a dict"""
+        """Create an instance of UserFilterDto from a dict"""
         if obj is None:
             return None
 

qanswer_sdk/models/{user_profile.py → user_profile_dto.py}

@@ -20,15 +20,15 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from qanswer_sdk.models.organization import Organization
+from qanswer_sdk.models.organization_admin import OrganizationAdmin
 from qanswer_sdk.models.role import Role
-from qanswer_sdk.models.team import Team
+from qanswer_sdk.models.team_admin import TeamAdmin
 from typing import Optional, Set
 from typing_extensions import Self
 
-class UserProfile(BaseModel):
+class UserProfileDto(BaseModel):
     """
-    Contains all information about a user.
+    UserProfileDto
     """ # noqa: E501
     id: Optional[StrictInt] = None
     username: Optional[StrictStr] = None
@@ -53,8 +53,8 @@ class UserProfile(BaseModel):
     activated: Optional[StrictBool] = None
     blocked: Optional[StrictBool] = None
     language: Optional[StrictStr] = None
-    teams: Optional[List[Team]] = None
-    organizations: Optional[List[Organization]] = None
+    teams: Optional[List[TeamAdmin]] = None
+    organizations: Optional[List[OrganizationAdmin]] = None
     origin: Optional[StrictStr] = None
     email: Optional[StrictStr] = None
     __properties: ClassVar[List[str]] = ["id", "username", "name", "created", "lastLogin", "quotaDatasetNumber", "quotaDatasetNumberUsed", "quotaDatasetSpaceMb", "quotaDatasetSpaceMbUsed", "questionCreditsStart", "quotaQuestionCredits", "quotaQuestionCreditsUsed", "quotaInputTokens", "quotaOutputTokens", "inputTokensUsed", "outputTokensUsed", "role", "pricingPlan", "dataPackage", "pricingPlanSubscription", "activated", "blocked", "language", "teams", "organizations", "origin", "email"]
@@ -97,7 +97,7 @@ class UserProfile(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of UserProfile from a JSON string"""
+        """Create an instance of UserProfileDto from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -143,7 +143,7 @@ class UserProfile(BaseModel):
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of UserProfile from a dict"""
+        """Create an instance of UserProfileDto from a dict"""
         if obj is None:
             return None
 
@@ -174,8 +174,8 @@ class UserProfile(BaseModel):
             "activated": obj.get("activated"),
             "blocked": obj.get("blocked"),
             "language": obj.get("language"),
-            "teams": [Team.from_dict(_item) for _item in obj["teams"]] if obj.get("teams") is not None else None,
-            "organizations": [Organization.from_dict(_item) for _item in obj["organizations"]] if obj.get("organizations") is not None else None,
+            "teams": [TeamAdmin.from_dict(_item) for _item in obj["teams"]] if obj.get("teams") is not None else None,
+            "organizations": [OrganizationAdmin.from_dict(_item) for _item in obj["organizations"]] if obj.get("organizations") is not None else None,
             "origin": obj.get("origin"),
             "email": obj.get("email")
         })