qanswer_sdk 3.1509.0__py3-none-any.whl → 3.1511.0__py3-none-any.whl

qanswer_sdk/models/user_profile_dto.py

@@ -23,6 +23,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Union
 from qanswer_sdk.models.organization_admin import OrganizationAdmin
 from qanswer_sdk.models.role import Role
 from qanswer_sdk.models.team_admin import TeamAdmin
+from qanswer_sdk.models.user_credits_dto import UserCreditsDto
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -35,6 +36,8 @@ class UserProfileDto(BaseModel):
     name: Optional[StrictStr] = None
     created: Optional[datetime] = None
     last_login: Optional[datetime] = Field(default=None, alias="lastLogin")
+    selected_org: Optional[StrictInt] = Field(default=None, alias="selectedOrg")
+    can_unselect_org: Optional[StrictBool] = Field(default=None, alias="canUnselectOrg")
     quota_dataset_number: Optional[StrictInt] = Field(default=None, alias="quotaDatasetNumber")
     quota_dataset_number_used: Optional[StrictInt] = Field(default=None, alias="quotaDatasetNumberUsed")
     quota_dataset_space_mb: Optional[StrictInt] = Field(default=None, alias="quotaDatasetSpaceMb")
@@ -62,8 +65,10 @@ class UserProfileDto(BaseModel):
     position: Optional[StrictStr] = None
     country: Optional[StrictStr] = None
     phone: Optional[StrictStr] = None
+    oauth_logged: Optional[StrictBool] = Field(default=None, alias="oauthLogged")
     email: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["id", "username", "name", "created", "lastLogin", "quotaDatasetNumber", "quotaDatasetNumberUsed", "quotaDatasetSpaceMb", "quotaDatasetSpaceMbUsed", "questionCreditsStart", "quotaQuestionCredits", "quotaQuestionCreditsUsed", "creditCapacity", "creditUsage", "role", "pricingPlan", "dataPackage", "pricingPlanSubscription", "activated", "blocked", "language", "teams", "organizations", "origin", "enableEnhancedContextLength", "userProfileCompleted", "hasCustomerId", "canRemoveBranding", "company", "position", "country", "phone", "email"]
+    user_credits: Optional[UserCreditsDto] = Field(default=None, alias="userCredits")
+    __properties: ClassVar[List[str]] = ["id", "username", "name", "created", "lastLogin", "selectedOrg", "canUnselectOrg", "quotaDatasetNumber", "quotaDatasetNumberUsed", "quotaDatasetSpaceMb", "quotaDatasetSpaceMbUsed", "questionCreditsStart", "quotaQuestionCredits", "quotaQuestionCreditsUsed", "creditCapacity", "creditUsage", "role", "pricingPlan", "dataPackage", "pricingPlanSubscription", "activated", "blocked", "language", "teams", "organizations", "origin", "enableEnhancedContextLength", "userProfileCompleted", "hasCustomerId", "canRemoveBranding", "company", "position", "country", "phone", "oauthLogged", "email", "userCredits"]
 
     @field_validator('pricing_plan')
     def pricing_plan_validate_enum(cls, value):
@@ -71,8 +76,8 @@ class UserProfileDto(BaseModel):
         if value is None:
             return value
 
-        if value not in set(['NOT_LOGGED', 'FREE', 'BASIC', 'BASIC_DOLLAR', 'BASIC_ANNUAL', 'BASIC_ANNUAL_DOLLAR', 'PROFESSIONAL', 'PROFESSIONAL_DOLLAR', 'PROFESSIONAL_ANNUAL', 'PROFESSIONAL_ANNUAL_DOLLAR', 'CUSTOM', 'UNLIMITED']):
-            raise ValueError("must be one of enum values ('NOT_LOGGED', 'FREE', 'BASIC', 'BASIC_DOLLAR', 'BASIC_ANNUAL', 'BASIC_ANNUAL_DOLLAR', 'PROFESSIONAL', 'PROFESSIONAL_DOLLAR', 'PROFESSIONAL_ANNUAL', 'PROFESSIONAL_ANNUAL_DOLLAR', 'CUSTOM', 'UNLIMITED')")
+        if value not in set(['NOT_LOGGED', 'FREE', 'WORK', 'WORK_DOLLAR', 'WORK_ANNUAL', 'WORK_ANNUAL_DOLLAR', 'BASIC', 'BASIC_DOLLAR', 'BASIC_ANNUAL', 'BASIC_ANNUAL_DOLLAR', 'PROFESSIONAL', 'PROFESSIONAL_DOLLAR', 'PROFESSIONAL_ANNUAL', 'PROFESSIONAL_ANNUAL_DOLLAR', 'CUSTOM', 'UNLIMITED']):
+            raise ValueError("must be one of enum values ('NOT_LOGGED', 'FREE', 'WORK', 'WORK_DOLLAR', 'WORK_ANNUAL', 'WORK_ANNUAL_DOLLAR', 'BASIC', 'BASIC_DOLLAR', 'BASIC_ANNUAL', 'BASIC_ANNUAL_DOLLAR', 'PROFESSIONAL', 'PROFESSIONAL_DOLLAR', 'PROFESSIONAL_ANNUAL', 'PROFESSIONAL_ANNUAL_DOLLAR', 'CUSTOM', 'UNLIMITED')")
         return value
 
     @field_validator('language')
@@ -145,6 +150,9 @@ class UserProfileDto(BaseModel):
                 if _item_organizations:
                     _items.append(_item_organizations.to_dict())
             _dict['organizations'] = _items
+        # override the default output from pydantic by calling `to_dict()` of user_credits
+        if self.user_credits:
+            _dict['userCredits'] = self.user_credits.to_dict()
         return _dict
 
     @classmethod
@@ -162,6 +170,8 @@ class UserProfileDto(BaseModel):
             "name": obj.get("name"),
             "created": obj.get("created"),
             "lastLogin": obj.get("lastLogin"),
+            "selectedOrg": obj.get("selectedOrg"),
+            "canUnselectOrg": obj.get("canUnselectOrg"),
             "quotaDatasetNumber": obj.get("quotaDatasetNumber"),
             "quotaDatasetNumberUsed": obj.get("quotaDatasetNumberUsed"),
             "quotaDatasetSpaceMb": obj.get("quotaDatasetSpaceMb"),
@@ -189,7 +199,9 @@ class UserProfileDto(BaseModel):
             "position": obj.get("position"),
             "country": obj.get("country"),
             "phone": obj.get("phone"),
-            "email": obj.get("email")
+            "oauthLogged": obj.get("oauthLogged"),
+            "email": obj.get("email"),
+            "userCredits": UserCreditsDto.from_dict(obj["userCredits"]) if obj.get("userCredits") is not None else None
         })
         return _obj
 

qanswer_sdk/models/{value_model.py → websearch_scraping_site.py}

@@ -19,17 +19,17 @@ import json
 
 from pydantic import BaseModel, ConfigDict, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from qanswer_sdk.models.source import Source
 from typing import Optional, Set
 from typing_extensions import Self
 
-class ValueModel(BaseModel):
+class WebsearchScrapingSite(BaseModel):
     """
-    ValueModel
+    WebsearchScrapingSite
     """ # noqa: E501
-    content: StrictStr
-    sources: Optional[List[Source]] = None
-    __properties: ClassVar[List[str]] = ["content", "sources"]
+    url: StrictStr
+    title: Optional[StrictStr] = None
+    favicon: Optional[StrictStr] = None
+    __properties: ClassVar[List[str]] = ["url", "title", "favicon"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -49,7 +49,7 @@ class ValueModel(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of ValueModel from a JSON string"""
+        """Create an instance of WebsearchScrapingSite from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -70,18 +70,11 @@ class ValueModel(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in sources (list)
-        _items = []
-        if self.sources:
-            for _item_sources in self.sources:
-                if _item_sources:
-                    _items.append(_item_sources.to_dict())
-            _dict['sources'] = _items
         return _dict
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of ValueModel from a dict"""
+        """Create an instance of WebsearchScrapingSite from a dict"""
         if obj is None:
             return None
 
@@ -89,8 +82,9 @@ class ValueModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "content": obj.get("content"),
-            "sources": [Source.from_dict(_item) for _item in obj["sources"]] if obj.get("sources") is not None else None
+            "url": obj.get("url"),
+            "title": obj.get("title"),
+            "favicon": obj.get("favicon")
         })
         return _obj
 

qanswer_sdk/models/website_add_payload.py

@@ -33,7 +33,8 @@ class WebsiteAddPayload(BaseModel):
     links: Optional[List[StrictStr]] = Field(default=None, description="links to be indexed")
     link_weights: Optional[Dict[str, Union[StrictFloat, StrictInt]]] = Field(default=None, description="Weight of the links will be considered when searching")
     quota: Optional[Annotated[int, Field(strict=True, ge=-1)]] = Field(default=None, description="quota of the dataset")
-    __properties: ClassVar[List[str]] = ["username", "dataset", "connector_id", "links", "link_weights", "quota"]
+    additional_fields: Optional[Dict[str, Any]] = Field(default=None, description="Additional fields for the connector")
+    __properties: ClassVar[List[str]] = ["username", "dataset", "connector_id", "links", "link_weights", "quota", "additional_fields"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -91,7 +92,8 @@ class WebsiteAddPayload(BaseModel):
             "connector_id": obj.get("connector_id"),
             "links": obj.get("links"),
             "link_weights": obj.get("link_weights"),
-            "quota": obj.get("quota")
+            "quota": obj.get("quota"),
+            "additional_fields": obj.get("additional_fields")
         })
         return _obj
 

{qanswer_sdk-3.1509.0.dist-info → qanswer_sdk-3.1511.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qanswer_sdk
-Version: 3.1509.0
+Version: 3.1511.0
 Summary: QAnswer: Api Documentation
 Home-page: https://github.com/GIT_USER_ID/GIT_REPO_ID
 License: NoLicense
@@ -228,7 +228,7 @@ print(response.answer)
 ## 📌 Versioning
 
 This SDK follows the version of the QAnswer API.
-The current version is: `3.1509.0 (branch: main)`
+The current version is: `3.1511.0 (branch: main)`
 
 ---