tableauserverclient 0.36__py3-none-any.whl → 0.38__py3-none-any.whl

tableauserverclient/models/user_item.py

@@ -7,6 +7,7 @@ from typing import Optional, TYPE_CHECKING
 from defusedxml.ElementTree import fromstring
 
 from tableauserverclient.datetime_helpers import parse_datetime
+from tableauserverclient.models.site_item import SiteAuthConfiguration
 from .exceptions import UnpopulatedPropertyError
 from .property_decorators import (
     property_is_enum,
@@ -37,6 +38,49 @@ class UserItem:
     auth_setting: str
         Required attribute for Tableau Cloud. How the user autenticates to the
         server.
+
+    Attributes
+    ----------
+    domain_name: Optional[str]
+        The name of the Active Directory domain ("local" if local authentication
+        is used).
+
+    email: Optional[str]
+        The email address of the user.
+
+    external_auth_user_id: Optional[str]
+        The unique identifier for the user in the external authentication system.
+
+    id: Optional[str]
+        The unique identifier for the user.
+
+    favorites: dict[str, list]
+        The favorites of the user. Must be populated with a call to
+        `populate_favorites()`.
+
+    fullname: Optional[str]
+        The full name of the user.
+
+    groups: Pager
+        The groups the user belongs to. Must be populated with a call to
+        `populate_groups()`.
+
+    last_login: Optional[datetime]
+        The last time the user logged in.
+
+    locale: Optional[str]
+        The locale of the user.
+
+    language: Optional[str]
+        Language setting for the user.
+
+    idp_configuration_id: Optional[str]
+        The ID of the identity provider configuration.
+
+    workbooks: Pager
+        The workbooks owned by the user. Must be populated with a call to
+        `populate_workbooks()`.
+
     """
 
     tag_name: str = "user"
@@ -94,6 +138,9 @@ class UserItem:
         self.name: Optional[str] = name
         self.site_role: Optional[str] = site_role
         self.auth_setting: Optional[str] = auth_setting
+        self._locale: Optional[str] = None
+        self._language: Optional[str] = None
+        self._idp_configuration_id: Optional[str] = None
 
         return None
 
@@ -184,6 +231,26 @@ class UserItem:
             raise UnpopulatedPropertyError(error)
         return self._groups()
 
+    @property
+    def locale(self) -> Optional[str]:
+        return self._locale
+
+    @property
+    def language(self) -> Optional[str]:
+        return self._language
+
+    @property
+    def idp_configuration_id(self) -> Optional[str]:
+        """
+        IDP configuration id for the user. This is only available on Tableau
+        Cloud, 3.24 or later
+        """
+        return self._idp_configuration_id
+
+    @idp_configuration_id.setter
+    def idp_configuration_id(self, value: str) -> None:
+        self._idp_configuration_id = value
+
     def _set_workbooks(self, workbooks) -> None:
         self._workbooks = workbooks
 
@@ -204,8 +271,11 @@ class UserItem:
                 email,
                 auth_setting,
                 _,
+                _,
+                _,
+                _,
             ) = self._parse_element(user_xml, ns)
-            self._set_values(None, None, site_role, None, None, fullname, email, auth_setting, None)
+            self._set_values(None, None, site_role, None, None, fullname, email, auth_setting, None, None, None, None)
         return self
 
     def _set_values(
@@ -219,6 +289,9 @@ class UserItem:
         email,
         auth_setting,
         domain_name,
+        locale,
+        language,
+        idp_configuration_id,
     ):
         if id is not None:
             self._id = id
@@ -238,6 +311,12 @@ class UserItem:
             self._auth_setting = auth_setting
         if domain_name:
             self._domain_name = domain_name
+        if locale:
+            self._locale = locale
+        if language:
+            self._language = language
+        if idp_configuration_id:
+            self._idp_configuration_id = idp_configuration_id
 
     @classmethod
     def from_response(cls, resp, ns) -> list["UserItem"]:
@@ -249,6 +328,12 @@ class UserItem:
         element_name = ".//t:owner"
         return cls._parse_xml(element_name, resp, ns)
 
+    @classmethod
+    def from_xml(cls, xml: ET.Element, ns: Optional[dict] = None) -> "UserItem":
+        item = cls()
+        item._set_values(*cls._parse_element(xml, ns))
+        return item
+
     @classmethod
     def _parse_xml(cls, element_name, resp, ns):
         all_user_items = []
@@ -265,6 +350,9 @@ class UserItem:
                 email,
                 auth_setting,
                 domain_name,
+                locale,
+                language,
+                idp_configuration_id,
             ) = cls._parse_element(user_xml, ns)
             user_item = cls(name, site_role)
             user_item._set_values(
@@ -277,6 +365,9 @@ class UserItem:
                 email,
                 auth_setting,
                 domain_name,
+                locale,
+                language,
+                idp_configuration_id,
             )
             all_user_items.append(user_item)
         return all_user_items
@@ -295,6 +386,9 @@ class UserItem:
         fullname = user_xml.get("fullName", None)
         email = user_xml.get("email", None)
         auth_setting = user_xml.get("authSetting", None)
+        locale = user_xml.get("locale", None)
+        language = user_xml.get("language", None)
+        idp_configuration_id = user_xml.get("idpConfigurationId", None)
 
         domain_name = None
         domain_elem = user_xml.find(".//t:domain", namespaces=ns)
@@ -311,6 +405,9 @@ class UserItem:
             email,
             auth_setting,
             domain_name,
+            locale,
+            language,
+            idp_configuration_id,
         )
 
     class CSVImport:
@@ -361,6 +458,9 @@ class UserItem:
                     values[UserItem.CSVImport.ColumnType.EMAIL],
                     values[UserItem.CSVImport.ColumnType.AUTH],
                     None,
+                    None,
+                    None,
+                    None,
                 )
             return user
 

tableauserverclient/models/view_item.py

@@ -1,15 +1,21 @@
 import copy
 from datetime import datetime
 from requests import Response
-from typing import Callable, Optional
+from typing import TYPE_CHECKING, Callable, Optional, overload
 from collections.abc import Iterator
 
 from defusedxml.ElementTree import fromstring
 
 from tableauserverclient.datetime_helpers import parse_datetime
 from tableauserverclient.models.exceptions import UnpopulatedPropertyError
+from tableauserverclient.models.location_item import LocationItem
 from tableauserverclient.models.permissions_item import PermissionsRule
+from tableauserverclient.models.project_item import ProjectItem
 from tableauserverclient.models.tag_item import TagItem
+from tableauserverclient.models.user_item import UserItem
+
+if TYPE_CHECKING:
+    from tableauserverclient.models.workbook_item import WorkbookItem
 
 
 class ViewItem:
@@ -34,9 +40,16 @@ class ViewItem:
         The image of the view. You must first call the `views.populate_image`
         method to access the image.
 
+    location: Optional[LocationItem], default None
+        The location of the view. The location can be a personal space or a
+        project.
+
     name: Optional[str], default None
         The name of the view.
 
+    owner: Optional[UserItem], default None
+        The owner of the view.
+
     owner_id: Optional[str], default None
         The ID for the owner of the view.
 
@@ -48,6 +61,9 @@ class ViewItem:
         The preview image of the view. You must first call the
         `views.populate_preview_image` method to access the preview image.
 
+    project: Optional[ProjectItem], default None
+        The project that contains the view.
+
     project_id: Optional[str], default None
         The ID for the project that contains the view.
 
@@ -60,9 +76,11 @@ class ViewItem:
     updated_at: Optional[datetime], default None
         The date and time when the view was last updated.
 
+    workbook: Optional[WorkbookItem], default None
+        The workbook that contains the view.
+
     workbook_id: Optional[str], default None
         The ID for the workbook that contains the view.
-
     """
 
     def __init__(self) -> None:
@@ -84,11 +102,18 @@ class ViewItem:
         self._workbook_id: Optional[str] = None
         self._permissions: Optional[Callable[[], list[PermissionsRule]]] = None
         self.tags: set[str] = set()
+        self._favorites_total: Optional[int] = None
+        self._view_url_name: Optional[str] = None
         self._data_acceleration_config = {
             "acceleration_enabled": None,
             "acceleration_status": None,
         }
 
+        self._owner: Optional[UserItem] = None
+        self._project: Optional[ProjectItem] = None
+        self._workbook: Optional["WorkbookItem"] = None
+        self._location: Optional[LocationItem] = None
+
     def __str__(self):
         return "<ViewItem {} '{}' contentUrl='{}' project={}>".format(
             self._id, self.name, self.content_url, self.project_id
@@ -190,6 +215,14 @@ class ViewItem:
     def workbook_id(self) -> Optional[str]:
         return self._workbook_id
 
+    @property
+    def view_url_name(self) -> Optional[str]:
+        return self._view_url_name
+
+    @property
+    def favorites_total(self) -> Optional[int]:
+        return self._favorites_total
+
     @property
     def data_acceleration_config(self):
         return self._data_acceleration_config
@@ -198,6 +231,22 @@ class ViewItem:
     def data_acceleration_config(self, value):
         self._data_acceleration_config = value
 
+    @property
+    def project(self) -> Optional["ProjectItem"]:
+        return self._project
+
+    @property
+    def workbook(self) -> Optional["WorkbookItem"]:
+        return self._workbook
+
+    @property
+    def owner(self) -> Optional[UserItem]:
+        return self._owner
+
+    @property
+    def location(self) -> Optional[LocationItem]:
+        return self._location
+
     @property
     def permissions(self) -> list[PermissionsRule]:
         if self._permissions is None:
@@ -228,7 +277,7 @@ class ViewItem:
         workbook_elem = view_xml.find(".//t:workbook", namespaces=ns)
         owner_elem = view_xml.find(".//t:owner", namespaces=ns)
         project_elem = view_xml.find(".//t:project", namespaces=ns)
-        tags_elem = view_xml.find(".//t:tags", namespaces=ns)
+        tags_elem = view_xml.find("./t:tags", namespaces=ns)
         data_acceleration_config_elem = view_xml.find(".//t:dataAccelerationConfig", namespaces=ns)
         view_item._created_at = parse_datetime(view_xml.get("createdAt", None))
         view_item._updated_at = parse_datetime(view_xml.get("updatedAt", None))
@@ -236,22 +285,35 @@ class ViewItem:
         view_item._name = view_xml.get("name", None)
         view_item._content_url = view_xml.get("contentUrl", None)
         view_item._sheet_type = view_xml.get("sheetType", None)
+        view_item._favorites_total = string_to_int(view_xml.get("favoritesTotal", None))
+        view_item._view_url_name = view_xml.get("viewUrlName", None)
         if usage_elem is not None:
             total_view = usage_elem.get("totalViewCount", None)
             if total_view:
                 view_item._total_views = int(total_view)
         if owner_elem is not None:
+            user = UserItem.from_xml(owner_elem, ns)
+            view_item._owner = user
             view_item._owner_id = owner_elem.get("id", None)
         if project_elem is not None:
-            view_item._project_id = project_elem.get("id", None)
+            project_item = ProjectItem.from_xml(project_elem, ns)
+            view_item._project = project_item
+            view_item._project_id = project_item.id
         if workbook_id:
             view_item._workbook_id = workbook_id
         elif workbook_elem is not None:
-            view_item._workbook_id = workbook_elem.get("id", None)
+            from tableauserverclient.models.workbook_item import WorkbookItem
+
+            workbook_item = WorkbookItem.from_xml(workbook_elem, ns)
+            view_item._workbook = workbook_item
+            view_item._workbook_id = workbook_item.id
         if tags_elem is not None:
             tags = TagItem.from_xml_element(tags_elem, ns)
             view_item.tags = tags
             view_item._initial_tags = copy.copy(tags)
+        if (location_elem := view_xml.find(".//t:location", namespaces=ns)) is not None:
+            location = LocationItem.from_xml(location_elem, ns)
+            view_item._location = location
         if data_acceleration_config_elem is not None:
             data_acceleration_config = parse_data_acceleration_config(data_acceleration_config_elem)
             view_item.data_acceleration_config = data_acceleration_config
@@ -274,3 +336,15 @@ def parse_data_acceleration_config(data_acceleration_elem):
 
 def string_to_bool(s: str) -> bool:
     return s.lower() == "true"
+
+
+@overload
+def string_to_int(s: None) -> None: ...
+
+
+@overload
+def string_to_int(s: str) -> int: ...
+
+
+def string_to_int(s):
+    return int(s) if s is not None else None

tableauserverclient/models/workbook_item.py

@@ -2,11 +2,14 @@ import copy
 import datetime
 import uuid
 import xml.etree.ElementTree as ET
-from typing import Callable, Optional
+from typing import Callable, Optional, overload
 
 from defusedxml.ElementTree import fromstring
 
 from tableauserverclient.datetime_helpers import parse_datetime
+from tableauserverclient.models.location_item import LocationItem
+from tableauserverclient.models.project_item import ProjectItem
+from tableauserverclient.models.user_item import UserItem
 from .connection_item import ConnectionItem
 from .exceptions import UnpopulatedPropertyError
 from .permissions_item import PermissionsRule
@@ -51,13 +54,31 @@ class WorkbookItem:
     created_at : Optional[datetime.datetime]
         The date and time the workbook was created.
 
+    default_view_id : Optional[str]
+        The identifier for the default view of the workbook.
+
     description : Optional[str]
         User-defined description of the workbook.
 
+    encrypt_extracts : Optional[bool]
+        Indicates whether extracts are encrypted.
+
+    has_extracts : Optional[bool]
+        Indicates whether the workbook has extracts.
+
     id : Optional[str]
        The identifier for the workbook. You need this value to query a specific
        workbook or to delete a workbook with the get_by_id and delete methods.
 
+    last_published_at : Optional[datetime.datetime]
+        The date and time the workbook was last published.
+
+    location : Optional[LocationItem]
+        The location of the workbook, such as a personal space or project.
+
+    owner : Optional[UserItem]
+        The owner of the workbook.
+
     owner_id : Optional[str]
         The identifier for the owner (UserItem) of the workbook.
 
@@ -65,6 +86,9 @@ class WorkbookItem:
         The thumbnail image for the view. You must first call the
         workbooks.populate_preview_image method to access this data.
 
+    project: Optional[ProjectItem]
+        The project that contains the workbook.
+
     project_name : Optional[str]
         The name of the project that contains the workbook.
 
@@ -139,6 +163,15 @@ class WorkbookItem:
         self._permissions = None
         self.thumbnails_user_id = thumbnails_user_id
         self.thumbnails_group_id = thumbnails_group_id
+        self._sheet_count: Optional[int] = None
+        self._has_extracts: Optional[bool] = None
+        self._project: Optional[ProjectItem] = None
+        self._owner: Optional[UserItem] = None
+        self._location: Optional[LocationItem] = None
+        self._encrypt_extracts: Optional[bool] = None
+        self._default_view_id: Optional[str] = None
+        self._share_description: Optional[str] = None
+        self._last_published_at: Optional[datetime.datetime] = None
 
         return None
 
@@ -234,6 +267,14 @@ class WorkbookItem:
     def size(self):
         return self._size
 
+    @property
+    def sheet_count(self) -> Optional[int]:
+        return self._sheet_count
+
+    @property
+    def has_extracts(self) -> Optional[bool]:
+        return self._has_extracts
+
     @property
     def updated_at(self) -> Optional[datetime.datetime]:
         return self._updated_at
@@ -300,6 +341,34 @@ class WorkbookItem:
     def thumbnails_group_id(self, value: str):
         self._thumbnails_group_id = value
 
+    @property
+    def project(self) -> Optional[ProjectItem]:
+        return self._project
+
+    @property
+    def owner(self) -> Optional[UserItem]:
+        return self._owner
+
+    @property
+    def location(self) -> Optional[LocationItem]:
+        return self._location
+
+    @property
+    def encrypt_extracts(self) -> Optional[bool]:
+        return self._encrypt_extracts
+
+    @property
+    def default_view_id(self) -> Optional[str]:
+        return self._default_view_id
+
+    @property
+    def share_description(self) -> Optional[str]:
+        return self._share_description
+
+    @property
+    def last_published_at(self) -> Optional[datetime.datetime]:
+        return self._last_published_at
+
     def _set_connections(self, connections):
         self._connections = connections
 
@@ -342,6 +411,15 @@ class WorkbookItem:
                 views,
                 data_acceleration_config,
                 data_freshness_policy,
+                sheet_count,
+                has_extracts,
+                project,
+                owner,
+                location,
+                encrypt_extracts,
+                default_view_id,
+                share_description,
+                last_published_at,
             ) = self._parse_element(workbook_xml, ns)
 
             self._set_values(
@@ -361,6 +439,15 @@ class WorkbookItem:
                 views,
                 data_acceleration_config,
                 data_freshness_policy,
+                sheet_count,
+                has_extracts,
+                project,
+                owner,
+                location,
+                encrypt_extracts,
+                default_view_id,
+                share_description,
+                last_published_at,
             )
 
         return self
@@ -383,6 +470,15 @@ class WorkbookItem:
         views,
         data_acceleration_config,
         data_freshness_policy,
+        sheet_count,
+        has_extracts,
+        project,
+        owner,
+        location,
+        encrypt_extracts,
+        default_view_id,
+        share_description,
+        last_published_at,
     ):
         if id is not None:
             self._id = id
@@ -417,6 +513,24 @@ class WorkbookItem:
             self.data_acceleration_config = data_acceleration_config
         if data_freshness_policy is not None:
             self.data_freshness_policy = data_freshness_policy
+        if sheet_count is not None:
+            self._sheet_count = sheet_count
+        if has_extracts is not None:
+            self._has_extracts = has_extracts
+        if project:
+            self._project = project
+        if owner:
+            self._owner = owner
+        if location:
+            self._location = location
+        if encrypt_extracts is not None:
+            self._encrypt_extracts = encrypt_extracts
+        if default_view_id is not None:
+            self._default_view_id = default_view_id
+        if share_description is not None:
+            self._share_description = share_description
+        if last_published_at is not None:
+            self._last_published_at = last_published_at
 
     @classmethod
     def from_response(cls, resp: str, ns: dict[str, str]) -> list["WorkbookItem"]:
@@ -443,6 +557,12 @@ class WorkbookItem:
         created_at = parse_datetime(workbook_xml.get("createdAt", None))
         description = workbook_xml.get("description", None)
         updated_at = parse_datetime(workbook_xml.get("updatedAt", None))
+        sheet_count = string_to_int(workbook_xml.get("sheetCount", None))
+        has_extracts = string_to_bool(workbook_xml.get("hasExtracts", ""))
+        encrypt_extracts = string_to_bool(e) if (e := workbook_xml.get("encryptExtracts", None)) is not None else None
+        default_view_id = workbook_xml.get("defaultViewId", None)
+        share_description = workbook_xml.get("shareDescription", None)
+        last_published_at = parse_datetime(workbook_xml.get("lastPublishedAt", None))
 
         size = workbook_xml.get("size", None)
         if size:
@@ -452,14 +572,18 @@ class WorkbookItem:
 
         project_id = None
         project_name = None
+        project = None
         project_tag = workbook_xml.find(".//t:project", namespaces=ns)
         if project_tag is not None:
+            project = ProjectItem.from_xml(project_tag, ns)
             project_id = project_tag.get("id", None)
             project_name = project_tag.get("name", None)
 
         owner_id = None
+        owner = None
         owner_tag = workbook_xml.find(".//t:owner", namespaces=ns)
         if owner_tag is not None:
+            owner = UserItem.from_xml(owner_tag, ns)
             owner_id = owner_tag.get("id", None)
 
         tags = None
@@ -473,6 +597,11 @@ class WorkbookItem:
         if views_elem is not None:
             views = ViewItem.from_xml_element(views_elem, ns)
 
+        location = None
+        location_elem = workbook_xml.find(".//t:location", namespaces=ns)
+        if location_elem is not None:
+            location = LocationItem.from_xml(location_elem, ns)
+
         data_acceleration_config = {
             "acceleration_enabled": None,
             "accelerate_now": None,
@@ -505,6 +634,15 @@ class WorkbookItem:
             views,
             data_acceleration_config,
             data_freshness_policy,
+            sheet_count,
+            has_extracts,
+            project,
+            owner,
+            location,
+            encrypt_extracts,
+            default_view_id,
+            share_description,
+            last_published_at,
         )
 
 
@@ -535,3 +673,15 @@ def parse_data_acceleration_config(data_acceleration_elem):
 # Used to convert string represented boolean to a boolean type
 def string_to_bool(s: str) -> bool:
     return s.lower() == "true"
+
+
+@overload
+def string_to_int(s: None) -> None: ...
+
+
+@overload
+def string_to_int(s: str) -> int: ...
+
+
+def string_to_int(s):
+    return int(s) if s is not None else None

tableauserverclient/server/__init__.py

@@ -5,6 +5,7 @@ from tableauserverclient.server.request_options import (
     ExcelRequestOptions,
     ImageRequestOptions,
     PDFRequestOptions,
+    PPTXRequestOptions,
     RequestOptions,
 )
 from tableauserverclient.server.filter import Filter
@@ -52,6 +53,7 @@ __all__ = [
     "ExcelRequestOptions",
     "ImageRequestOptions",
     "PDFRequestOptions",
+    "PPTXRequestOptions",
     "RequestOptions",
     "Filter",
     "Sort",