Merge branch 'master' into schedules-multiple-intervals

Author: jacalata

.github/workflows/code-coverage.yml

@@ -30,9 +30,10 @@ jobs:
 
     #  https://github.com/marketplace/actions/pytest-coverage-comment
     - name: Generate coverage report
-      run: pytest --junitxml=pytest.xml --cov=tableauserverclient tests/ | tee pytest-coverage.txt
+      run: pytest --junitxml=pytest.xml --cov=tableauserverclient test/ | tee pytest-coverage.txt
 
     - name: Comment on pull request with coverage
+      continue-on-error: true
       uses: MishaKav/pytest-coverage-comment@main
       with:
         pytest-coverage-path: ./pytest-coverage.txt

.github/workflows/publish-pypi.yml

@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.9
       - name: Build dist files
         run: |
           python -m pip install --upgrade pip

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)

pyproject.toml

@@ -15,7 +15,7 @@ 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.4',  # latest as at 7/31/23
+    'urllib3==2.0.7',  # latest as at 7/31/23
 ]
 requires-python = ">=3.7"
 classifiers = [
@@ -31,7 +31,8 @@ classifiers = [
 repository = "https://github.com/tableau/server-client-python"
 
 [project.optional-dependencies]
-test = ["argparse", "black==23.7", "mock", "mypy==1.4", "pytest>=7.0", "pytest-subtests", "requests-mock>=1.0,<2.0"]
+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

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/__init__.py

@@ -1,6 +1,47 @@
 from ._version import get_versions
 from .namespace import NEW_NAMESPACE as DEFAULT_NAMESPACE
-from .models import *
+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,

tableauserverclient/models/__init__.py

@@ -31,7 +31,7 @@
 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/models/column_item.py

@@ -9,6 +9,9 @@ def __init__(self, name, description=None):
         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/models/connection_credentials.py

@@ -15,6 +15,13 @@ def __init__(self, name, password, embed=True, oauth=False):
         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/models/custom_view_item.py

@@ -134,6 +134,7 @@ def from_xml_element(cls, parsed_response, ns, workbook_id="") -> List["CustomVi
             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 @@ def from_xml_element(cls, parsed_response, ns, workbook_id="") -> List["CustomVi
 
             all_view_items.append(cv_item)
         return all_view_items
+
+
+def string_to_bool(s: Optional[str]) -> bool:
+    return (s or "").lower() == "true"