tableauserverclient 0.26__tar.gz → 0.28__tar.gz

{tableauserverclient-0.26 → tableauserverclient-0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tableauserverclient
-Version: 0.26
+Version: 0.28
 Summary: A Python module for working with the Tableau Server REST API.
 Author-email: Tableau <github@tableau.com>
 License: The MIT License (MIT)
@@ -28,15 +28,28 @@ License: The MIT License (MIT)
 Project-URL: repository, https://github.com/tableau/server-client-python
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Provides-Extra: test
 License-File: LICENSE
 License-File: LICENSE.versioneer
+Requires-Dist: defusedxml>=0.7.1
+Requires-Dist: packaging>=23.1
+Requires-Dist: requests>=2.31
+Requires-Dist: urllib3==2.0.6
+Provides-Extra: test
+Requires-Dist: argparse; extra == "test"
+Requires-Dist: black==23.7; extra == "test"
+Requires-Dist: mock; extra == "test"
+Requires-Dist: mypy==1.4; extra == "test"
+Requires-Dist: pytest>=7.0; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-subtests; extra == "test"
+Requires-Dist: requests-mock<2.0,>=1.0; extra == "test"
 
 # Tableau Server Client (Python)
 

{tableauserverclient-0.26 → tableauserverclient-0.28}/README.md

@@ -19,4 +19,4 @@ For more information on installing and using TSC, see the documentation:
 
 
 ## License
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Ftableau%2Fserver-client-python.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Ftableau%2Fserver-client-python?ref=badge_large)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Ftableau%2Fserver-client-python.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Ftableau%2Fserver-client-python?ref=badge_large)

tableauserverclient-0.28/pyproject.toml

@@ -0,0 +1,53 @@
+[build-system]
+requires = ["setuptools>=68.0", "versioneer>=0.29", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name="tableauserverclient"
+
+dynamic = ["version"]
+description='A Python module for working with the Tableau Server REST API.'
+authors = [{name="Tableau", email="github@tableau.com"}]
+license = {file = "LICENSE"}
+readme = "README.md"
+
+dependencies = [
+    'defusedxml>=0.7.1',  # latest as at 7/31/23
+    'packaging>=23.1',   # latest as at 7/31/23
+    'requests>=2.31',  # latest as at 7/31/23
+    'urllib3==2.0.6',  # latest as at 7/31/23
+]
+requires-python = ">=3.7"
+classifiers = [
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12"
+]
+[project.urls]
+repository = "https://github.com/tableau/server-client-python"
+
+[project.optional-dependencies]
+test = ["argparse", "black==23.7", "mock", "mypy==1.4", "pytest>=7.0", "pytest-cov", "pytest-subtests",
+    "requests-mock>=1.0,<2.0"]
+
+[tool.black]
+line-length = 120
+target-version = ['py37', 'py38', 'py39', 'py310', 'py311', 'py312']
+
+[tool.mypy]
+check_untyped_defs = false
+disable_error_code = [
+    'misc',
+    # tableauserverclient\server\endpoint\datasources_endpoint.py:48: error: Cannot assign multiple types to name "FilePath" without an explicit "Type[...]" annotation  [misc]
+    'annotation-unchecked'  # can be removed when check_untyped_defs = true
+]
+files = ["tableauserverclient", "test"]
+show_error_codes = true
+ignore_missing_imports = true  # defusedxml library has no types
+[tool.pytest.ini_options]
+testpaths = ["test"]
+addopts = "--junitxml=./test.junit.xml"

tableauserverclient-0.28/samples/create_extract_task.py

@@ -0,0 +1,84 @@
+####
+# This script demonstrates how to create extract tasks in Tableau Cloud
+# using the Tableau Server Client.
+#
+# To run the script, you must have installed Python 3.7 or later.
+####
+
+
+import argparse
+import logging
+
+from datetime import time
+
+import tableauserverclient as TSC
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Creates sample extract refresh task.")
+    # Common options; please keep those in sync across all samples
+    parser.add_argument("--server", "-s", help="server address")
+    parser.add_argument("--site", "-S", help="site name")
+    parser.add_argument("--token-name", "-p", help="name of the personal access token used to sign into the server")
+    parser.add_argument("--token-value", "-v", help="value of the personal access token used to sign into the server")
+    parser.add_argument(
+        "--logging-level",
+        "-l",
+        choices=["debug", "info", "error"],
+        default="error",
+        help="desired logging level (set to error by default)",
+    )
+    # Options specific to this sample:
+    # This sample has no additional options, yet. If you add some, please add them here
+
+    args = parser.parse_args()
+
+    # Set logging level based on user input, or error by default
+    logging_level = getattr(logging, args.logging_level.upper())
+    logging.basicConfig(level=logging_level)
+
+    tableau_auth = TSC.PersonalAccessTokenAuth(args.token_name, args.token_value, site_id=args.site)
+    server = TSC.Server(args.server, use_server_version=False)
+    server.add_http_options({"verify": False})
+    server.use_server_version()
+    with server.auth.sign_in(tableau_auth):
+        # Monthly Schedule
+        # This schedule will run on the 15th of every month at 11:30PM
+        monthly_interval = TSC.MonthlyInterval(start_time=time(23, 30), interval_value=15)
+        monthly_schedule = TSC.ScheduleItem(
+            None,
+            None,
+            None,
+            None,
+            monthly_interval,
+        )
+
+        # Default to using first workbook found in server
+        all_workbook_items, pagination_item = server.workbooks.get()
+        my_workbook: TSC.WorkbookItem = all_workbook_items[0]
+
+        target_item = TSC.Target(
+            my_workbook.id,  # the id of the workbook or datasource
+            "workbook",  # alternatively can be "datasource"
+        )
+
+        extract_item = TSC.TaskItem(
+            None,
+            "FullRefresh",
+            None,
+            None,
+            None,
+            monthly_schedule,
+            None,
+            target_item,
+        )
+
+        try:
+            response = server.tasks.create(extract_item)
+            print(response)
+        except Exception as e:
+            print(e)
+
+
+if __name__ == "__main__":
+    main()

{tableauserverclient-0.26 → tableauserverclient-0.28}/samples/create_project.py

@@ -57,7 +57,14 @@ def main():
         server.use_server_version()
 
         # Without parent_id specified, projects are created at the top level.
-        top_level_project = TSC.ProjectItem(name="Top Level Project")
+        # With the publish-samples attribute, the project will be created with sample items
+        top_level_project = TSC.ProjectItem(
+            name="Top Level Project",
+            description="A sample tsc project",
+            content_permissions=None,
+            parent_id=None,
+            samples=True,
+        )
         top_level_project = create_project(server, top_level_project)
 
         # Specifying parent_id creates a nested projects.

{tableauserverclient-0.26 → tableauserverclient-0.28}/samples/explore_workbook.py

@@ -36,6 +36,9 @@ def main():
     parser.add_argument(
         "--preview-image", "-i", metavar="FILENAME", help="filename (a .png file) to save the preview image"
     )
+    parser.add_argument(
+        "--powerpoint", "-ppt", metavar="FILENAME", help="filename (a .ppt file) to save the powerpoint deck"
+    )
 
     args = parser.parse_args()
 
@@ -145,6 +148,13 @@ def main():
                 f.write(c.image)
             print("saved to " + filename)
 
+            if args.powerpoint:
+                # Populate workbook preview image
+                server.workbooks.populate_powerpoint(sample_workbook)
+                with open(args.powerpoint, "wb") as f:
+                    f.write(sample_workbook.powerpoint)
+                print("\nDownloaded powerpoint of workbook to {}".format(os.path.abspath(args.powerpoint)))
+
             if args.delete:
                 print("deleting {}".format(c.id))
                 unlucky = TSC.CustomViewItem(c.id)

tableauserverclient-0.28/samples/getting_started/1_hello_server.py

@@ -0,0 +1,21 @@
+####
+# Getting started Part One of Three
+# This script demonstrates how to use the Tableau Server Client to connect to a server
+# You don't need to have a site or any experience with Tableau to run it
+#
+####
+
+import tableauserverclient as TSC
+
+
+def main():
+    # This is the domain for Tableau's Developer Program
+    server_url = "https://10ax.online.tableau.com"
+    server = TSC.Server(server_url)
+    print("Connected to {}".format(server.server_info.baseurl))
+    print("Server information: {}".format(server.server_info))
+    print("Sign up for a test site at https://www.tableau.com/developer")
+
+
+if __name__ == "__main__":
+    main()

tableauserverclient-0.28/samples/getting_started/2_hello_site.py

@@ -0,0 +1,50 @@
+####
+# Getting started Part Two of Three
+# This script demonstrates how to use the Tableau Server Client to
+# view the content on an existing site on Tableau Server/Online
+# It assumes that you have already got a site and can visit it in a browser
+#
+####
+
+import getpass
+import tableauserverclient as TSC
+
+
+# 0 - launch your Tableau site in a web browser and look at the url to set the values below
+def main():
+    # 1 - replace with your server domain: stop at the slash
+    server_url = "https://10ax.online.tableau.com"
+
+    # 2 - optional - change to false **for testing only** if you get a certificate error
+    use_ssl = True
+
+    server = TSC.Server(server_url, use_server_version=True, http_options={"verify": use_ssl})
+    print("Connected to {}".format(server.server_info.baseurl))
+
+    # 3 - replace with your site name exactly as it looks in the url
+    # e.g https://my-server/#/site/this-is-your-site-url-name/not-this-part
+    site_url_name = ""  # leave empty if there is no site name in the url (you are on the default site)
+
+    # 4 - replace with your username.
+    # REMEMBER: if you are using Tableau Online, your username is the entire email address
+    username = "your-username-here"
+    password = getpass.getpass("Your password:")  # so you don't save it in this file
+    tableau_auth = TSC.TableauAuth(username, password, site_id=site_url_name)
+
+    # OR instead of username+password, uncomment this section to use a Personal Access Token
+    # token_name = "your-token-name"
+    # token_value = "your-token-value-long-random-string"
+    # tableau_auth = TSC.PersonalAccessTokenAuth(token_name, token_value, site_id=site_url_name)
+
+    with server.auth.sign_in(tableau_auth):
+        projects, pagination = server.projects.get()
+        if projects:
+            print("{} projects".format(pagination.total_available))
+            project = projects[0]
+            print(project.name)
+
+        print("Done")
+
+
+if __name__ == "__main__":
+    main()

tableauserverclient-0.28/samples/getting_started/3_hello_universe.py

@@ -0,0 +1,96 @@
+####
+# Getting Started Part Three of Three
+# This script demonstrates all the different types of 'content' a server contains
+#
+# To make it easy to run, it doesn't take any arguments - you need to edit the code with your info
+####
+
+import getpass
+import tableauserverclient as TSC
+
+
+def main():
+    # 1 - replace with your server url
+    server_url = "https://10ax.online.tableau.com"
+
+    # 2 - change to false **for testing only** if you get a certificate error
+    use_ssl = True
+    server = TSC.Server(server_url, use_server_version=True, http_options={"verify": use_ssl})
+
+    print("Connected to {}".format(server.server_info.baseurl))
+
+    # 3 - replace with your site name exactly as it looks in a url
+    # e.g https://my-server/#/this-is-your-site-url-name/
+    site_url_name = ""  # leave empty if there is no site name in the url (you are on the default site)
+
+    # 4
+    username = "your-username-here"
+    password = getpass.getpass("Your password:")  # so you don't save it in this file
+    tableau_auth = TSC.TableauAuth(username, password, site_id=site_url_name)
+
+    # OR instead of username+password, use a Personal Access Token (PAT) (required by Tableau Cloud)
+    # token_name = "your-token-name"
+    # token_value = "your-token-value-long-random-string"
+    # tableau_auth = TSC.PersonalAccessTokenAuth(token_name, token_value, site_id=site_url_name)
+
+    with server.auth.sign_in(tableau_auth):
+        projects, pagination = server.projects.get()
+        if projects:
+            print("{} projects".format(pagination.total_available))
+            for project in projects:
+                print(project.name)
+
+        workbooks, pagination = server.datasources.get()
+        if workbooks:
+            print("{} workbooks".format(pagination.total_available))
+            print(workbooks[0])
+
+        views, pagination = server.views.get()
+        if views:
+            print("{} views".format(pagination.total_available))
+            print(views[0])
+
+        datasources, pagination = server.datasources.get()
+        if datasources:
+            print("{} datasources".format(pagination.total_available))
+            print(datasources[0])
+
+        # I think all these other content types can go to a hello_universe script
+        # data alert, dqw, flow, ... do any of these require any add-ons?
+        jobs, pagination = server.jobs.get()
+        if jobs:
+            print("{} jobs".format(pagination.total_available))
+            print(jobs[0])
+
+        metrics, pagination = server.metrics.get()
+        if metrics:
+            print("{} metrics".format(pagination.total_available))
+            print(metrics[0])
+
+        schedules, pagination = server.schedules.get()
+        if schedules:
+            print("{} schedules".format(pagination.total_available))
+            print(schedules[0])
+
+        tasks, pagination = server.tasks.get()
+        if tasks:
+            print("{} tasks".format(pagination.total_available))
+            print(tasks[0])
+
+        webhooks, pagination = server.webhooks.get()
+        if webhooks:
+            print("{} webhooks".format(pagination.total_available))
+            print(webhooks[0])
+
+        users, pagination = server.metrics.get()
+        if users:
+            print("{} users".format(pagination.total_available))
+            print(users[0])
+
+        groups, pagination = server.groups.get()
+        if groups:
+            print("{} groups".format(pagination.total_available))
+            print(groups[0])
+
+    if __name__ == "__main__":
+        main()

tableauserverclient-0.28/tableauserverclient/__init__.py

@@ -0,0 +1,58 @@
+from ._version import get_versions
+from .namespace import NEW_NAMESPACE as DEFAULT_NAMESPACE
+from .models import (
+    BackgroundJobItem,
+    ColumnItem,
+    ConnectionCredentials,
+    ConnectionItem,
+    CustomViewItem,
+    DQWItem,
+    DailyInterval,
+    DataAlertItem,
+    DatabaseItem,
+    DatasourceItem,
+    FavoriteItem,
+    FlowItem,
+    FlowRunItem,
+    FileuploadItem,
+    GroupItem,
+    HourlyInterval,
+    IntervalItem,
+    JobItem,
+    JWTAuth,
+    MetricItem,
+    MonthlyInterval,
+    PaginationItem,
+    Permission,
+    PermissionsRule,
+    PersonalAccessTokenAuth,
+    ProjectItem,
+    RevisionItem,
+    ScheduleItem,
+    SiteItem,
+    ServerInfoItem,
+    SubscriptionItem,
+    TableItem,
+    TableauAuth,
+    Target,
+    TaskItem,
+    UserItem,
+    ViewItem,
+    WebhookItem,
+    WeeklyInterval,
+    WorkbookItem,
+)
+from .server import (
+    CSVRequestOptions,
+    ExcelRequestOptions,
+    ImageRequestOptions,
+    PDFRequestOptions,
+    RequestOptions,
+    MissingRequiredFieldError,
+    NotSignedInError,
+    ServerResponseError,
+    Filter,
+    Pager,
+    Server,
+    Sort,
+)

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/_version.py

@@ -1,5 +1,5 @@
 
-# This file was generated by 'versioneer.py' (0.28) from
+# This file was generated by 'versioneer.py' (0.29) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-04-24T13:08:23-0700",
+ "date": "2023-10-04T00:33:03-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "307d8a20a30f32c1ce615cca7c6a78b9b9bff081",
- "version": "0.26"
+ "full-revisionid": "72eb3c8500193e4f20defa20c8a6f8bbf34b2f43",
+ "version": "0.28"
 }
 '''  # END VERSION_JSON
 

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/helpers/logging.py

@@ -2,5 +2,3 @@ import logging
 
 # TODO change: this defaults to logging *everything* to stdout
 logger = logging.getLogger("TSC")
-logger.setLevel(logging.DEBUG)
-logger.addHandler(logging.StreamHandler())

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/__init__.py

@@ -31,7 +31,7 @@ from .server_info_item import ServerInfoItem
 from .site_item import SiteItem
 from .subscription_item import SubscriptionItem
 from .table_item import TableItem
-from .tableau_auth import Credentials, TableauAuth, PersonalAccessTokenAuth
+from .tableau_auth import Credentials, TableauAuth, PersonalAccessTokenAuth, JWTAuth
 from .tableau_types import Resource, TableauItem, plural_type
 from .tag_item import TagItem
 from .target import Target

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/column_item.py

@@ -9,6 +9,9 @@ class ColumnItem(object):
         self.description = description
         self.name = name
 
+    def __repr__(self):
+        return f"<{self.__class__.__name__} {self._id} {self.name} {self.description}>"
+
     @property
     def id(self):
         return self._id

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/connection_credentials.py

@@ -15,6 +15,13 @@ class ConnectionCredentials(object):
         self.embed = embed
         self.oauth = oauth
 
+    def __repr__(self):
+        if self.password:
+            print = "redacted"
+        else:
+            print = "None"
+        return f"<{self.__class__.__name__} name={self.name} password={print} embed={self.embed} oauth={self.oauth} >"
+
     @property
     def embed(self):
         return self._embed

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/custom_view_item.py

@@ -134,6 +134,7 @@ class CustomViewItem(object):
             cv_item._content_url = custom_view_xml.get("contentUrl", None)
             cv_item._id = custom_view_xml.get("id", None)
             cv_item._name = custom_view_xml.get("name", None)
+            cv_item._shared = string_to_bool(custom_view_xml.get("shared", None))
 
             if owner_elem is not None:
                 parsed_owners = UserItem.from_response_as_owner(tostring(custom_view_xml), ns)
@@ -154,3 +155,7 @@ class CustomViewItem(object):
 
             all_view_items.append(cv_item)
         return all_view_items
+
+
+def string_to_bool(s: Optional[str]) -> bool:
+    return (s or "").lower() == "true"

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/data_acceleration_report_item.py

@@ -46,6 +46,9 @@ class DataAccelerationReportItem(object):
     def __init__(self, comparison_records):
         self._comparison_records = comparison_records
 
+    def __repr__(self):
+        return f"<(deprecated)DataAccelerationReportItem site={self.site} sheet={sheet_uri}>"
+
     @property
     def comparison_records(self):
         return self._comparison_records

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/datasource_item.py

@@ -326,17 +326,8 @@ class DatasourceItem(object):
         updated_at = parse_datetime(datasource_xml.get("updatedAt", None))
         certification_note = datasource_xml.get("certificationNote", None)
         certified = str(datasource_xml.get("isCertified", None)).lower() == "true"
-        certification_note = datasource_xml.get("certificationNote", None)
-        certified = str(datasource_xml.get("isCertified", None)).lower() == "true"
-        content_url = datasource_xml.get("contentUrl", None)
-        created_at = parse_datetime(datasource_xml.get("createdAt", None))
-        datasource_type = datasource_xml.get("type", None)
-        description = datasource_xml.get("description", None)
         encrypt_extracts = datasource_xml.get("encryptExtracts", None)
         has_extracts = datasource_xml.get("hasExtracts", None)
-        id_ = datasource_xml.get("id", None)
-        name = datasource_xml.get("name", None)
-        updated_at = parse_datetime(datasource_xml.get("updatedAt", None))
         use_remote_query_agent = datasource_xml.get("useRemoteQueryAgent", None)
         webpage_url = datasource_xml.get("webpageUrl", None)
 

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/group_item.py

@@ -26,11 +26,9 @@ class GroupItem(object):
         self.name: Optional[str] = name
         self.domain_name: Optional[str] = domain_name
 
-    def __str__(self):
+    def __repr__(self):
         return "{}({!r})".format(self.__class__.__name__, self.__dict__)
 
-    __repr__ = __str__
-
     @property
     def domain_name(self) -> Optional[str]:
         return self._domain_name
@@ -48,7 +46,6 @@ class GroupItem(object):
         return self._name
 
     @name.setter
-    @property_not_empty
     def name(self, value: str) -> None:
         self._name = value
 

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/interval_item.py

@@ -31,6 +31,9 @@ class HourlyInterval(object):
         self.end_time = end_time
         self.interval = interval_value
 
+    def __repr__(self):
+        return f"<{self.__class__.__name__} start={self.start_time} end={self.end_time} interval={self.interval}>"
+
     @property
     def _frequency(self):
         return IntervalItem.Frequency.Hourly
@@ -86,6 +89,9 @@ class DailyInterval(object):
         self.start_time = start_time
         self.interval = interval_values
 
+    def __repr__(self):
+        return f"<{self.__class__.__name__} start={self.start_time} interval={self.interval}>"
+
     @property
     def _frequency(self):
         return IntervalItem.Frequency.Daily
@@ -114,6 +120,9 @@ class WeeklyInterval(object):
         self.start_time = start_time
         self.interval = interval_values
 
+    def __repr__(self):
+        return f"<{self.__class__.__name__} start={self.start_time} interval={self.interval}>"
+
     @property
     def _frequency(self):
         return IntervalItem.Frequency.Weekly
@@ -148,6 +157,9 @@ class MonthlyInterval(object):
         self.start_time = start_time
         self.interval = str(interval_value)
 
+    def __repr__(self):
+        return f"<{self.__class__.__name__} start={self.start_time} interval={self.interval}>"
+
     @property
     def _frequency(self):
         return IntervalItem.Frequency.Monthly

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/job_item.py

@@ -117,12 +117,15 @@ class JobItem(object):
     def updated_at(self) -> Optional[datetime.datetime]:
         return self._updated_at
 
-    def __repr__(self):
+    def __str__(self):
         return (
             "<Job#{_id} {_type} created_at({_created_at}) started_at({_started_at}) updated_at({_updated_at}) completed_at({_completed_at})"
             " progress ({_progress}) finish_code({_finish_code})>".format(**self.__dict__)
         )
 
+    def __repr__(self):
+        return self.__str__() + "  { " + ", ".join(" % s: % s" % item for item in vars(self).items()) + "}"
+
     @classmethod
     def from_response(cls, xml, ns) -> List["JobItem"]:
         parsed_response = fromstring(xml)
@@ -202,6 +205,12 @@ class BackgroundJobItem(object):
         self._title = title
         self._subtitle = subtitle
 
+    def __str__(self):
+        return f"<{self.__class__.name} {self._id} {self._type}>"
+
+    def __repr__(self):
+        return self.__str__() + "  { " + ", ".join(" % s: % s" % item for item in vars(self).items()) + "}"
+
     @property
     def id(self) -> str:
         return self._id

{tableauserverclient-0.26 → tableauserverclient-0.28}/tableauserverclient/models/metric_item.py

@@ -115,9 +115,12 @@ class MetricItem(object):
     def _set_permissions(self, permissions):
         self._permissions = permissions
 
-    def __repr__(self):
+    def __str__(self):
         return "<MetricItem# name={_name} id={_id} owner_id={_owner_id}>".format(**vars(self))
 
+    def __repr__(self):
+        return self.__str__() + "  { " + ", ".join(" % s: % s" % item for item in vars(self).items()) + "}"
+
     @classmethod
     def from_response(
         cls,