tableauserverclient 0.32__py3-none-any.whl → 0.34__py3-none-any.whl

tableauserverclient/models/project_item.py

@@ -1,6 +1,6 @@
 import logging
 import xml.etree.ElementTree as ET
-from typing import List, Optional
+from typing import Optional
 
 from defusedxml.ElementTree import fromstring
 
@@ -8,14 +8,16 @@ from tableauserverclient.models.exceptions import UnpopulatedPropertyError
 from tableauserverclient.models.property_decorators import property_is_enum, property_not_empty
 
 
-class ProjectItem(object):
+class ProjectItem:
+    ERROR_MSG = "Project item must be populated with permissions first."
+
     class ContentPermissions:
         LockedToProject: str = "LockedToProject"
         ManagedByOwner: str = "ManagedByOwner"
         LockedToProjectWithoutNested: str = "LockedToProjectWithoutNested"
 
     def __repr__(self):
-        return "<Project {0} {1} parent={2} permissions={3}>".format(
+        return "<Project {} {} parent={} permissions={}>".format(
             self._id, self.name, self.parent_id or "None (Top level)", self.content_permissions or "Not Set"
         )
 
@@ -43,6 +45,9 @@ class ProjectItem(object):
         self._default_lens_permissions = None
         self._default_datarole_permissions = None
         self._default_metric_permissions = None
+        self._default_virtualconnection_permissions = None
+        self._default_database_permissions = None
+        self._default_table_permissions = None
 
     @property
     def content_permissions(self):
@@ -56,52 +61,63 @@ class ProjectItem(object):
     @property
     def permissions(self):
         if self._permissions is None:
-            error = "Project item must be populated with permissions first."
-            raise UnpopulatedPropertyError(error)
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
         return self._permissions()
 
     @property
     def default_datasource_permissions(self):
         if self._default_datasource_permissions is None:
-            error = "Project item must be populated with permissions first."
-            raise UnpopulatedPropertyError(error)
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
         return self._default_datasource_permissions()
 
     @property
     def default_workbook_permissions(self):
         if self._default_workbook_permissions is None:
-            error = "Project item must be populated with permissions first."
-            raise UnpopulatedPropertyError(error)
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
         return self._default_workbook_permissions()
 
     @property
     def default_flow_permissions(self):
         if self._default_flow_permissions is None:
-            error = "Project item must be populated with permissions first."
-            raise UnpopulatedPropertyError(error)
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
         return self._default_flow_permissions()
 
     @property
     def default_lens_permissions(self):
         if self._default_lens_permissions is None:
-            error = "Project item must be populated with permissions first."
-            raise UnpopulatedPropertyError(error)
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
         return self._default_lens_permissions()
 
     @property
     def default_datarole_permissions(self):
         if self._default_datarole_permissions is None:
-            error = "Project item must be populated with permissions first."
-            raise UnpopulatedPropertyError(error)
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
         return self._default_datarole_permissions()
 
     @property
     def default_metric_permissions(self):
         if self._default_metric_permissions is None:
-            error = "Project item must be populated with permissions first."
-            raise UnpopulatedPropertyError(error)
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
         return self._default_metric_permissions()
 
+    @property
+    def default_virtualconnection_permissions(self):
+        if self._default_virtualconnection_permissions is None:
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
+        return self._default_virtualconnection_permissions()
+
+    @property
+    def default_database_permissions(self):
+        if self._default_database_permissions is None:
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
+        return self._default_database_permissions()
+
+    @property
+    def default_table_permissions(self):
+        if self._default_table_permissions is None:
+            raise UnpopulatedPropertyError(self.ERROR_MSG)
+        return self._default_table_permissions()
+
     @property
     def id(self) -> Optional[str]:
         return self._id
@@ -158,7 +174,7 @@ class ProjectItem(object):
         self._permissions = permissions
 
     def _set_default_permissions(self, permissions, content_type):
-        attr = "_default_{content}_permissions".format(content=content_type)
+        attr = f"_default_{content_type}_permissions"
         setattr(
             self,
             attr,
@@ -166,7 +182,7 @@ class ProjectItem(object):
         )
 
     @classmethod
-    def from_response(cls, resp, ns) -> List["ProjectItem"]:
+    def from_response(cls, resp, ns) -> list["ProjectItem"]:
         all_project_items = list()
         parsed_response = fromstring(resp)
         all_project_xml = parsed_response.findall(".//t:project", namespaces=ns)

tableauserverclient/models/property_decorators.py

@@ -1,7 +1,8 @@
 import datetime
 import re
 from functools import wraps
-from typing import Any, Container, Optional, Tuple
+from typing import Any, Optional
+from collections.abc import Container
 
 from tableauserverclient.datetime_helpers import parse_datetime
 
@@ -11,7 +12,7 @@ def property_is_enum(enum_type):
         @wraps(func)
         def wrapper(self, value):
             if value is not None and not hasattr(enum_type, value):
-                error = "Invalid value: {0}. {1} must be of type {2}.".format(value, func.__name__, enum_type.__name__)
+                error = f"Invalid value: {value}. {func.__name__} must be of type {enum_type.__name__}."
                 raise ValueError(error)
             return func(self, value)
 
@@ -24,7 +25,7 @@ def property_is_boolean(func):
     @wraps(func)
     def wrapper(self, value):
         if not isinstance(value, bool):
-            error = "Boolean expected for {0} flag.".format(func.__name__)
+            error = f"Boolean expected for {func.__name__} flag."
             raise ValueError(error)
         return func(self, value)
 
@@ -35,7 +36,7 @@ def property_not_nullable(func):
     @wraps(func)
     def wrapper(self, value):
         if value is None:
-            error = "{0} must be defined.".format(func.__name__)
+            error = f"{func.__name__} must be defined."
             raise ValueError(error)
         return func(self, value)
 
@@ -46,7 +47,7 @@ def property_not_empty(func):
     @wraps(func)
     def wrapper(self, value):
         if not value:
-            error = "{0} must not be empty.".format(func.__name__)
+            error = f"{func.__name__} must not be empty."
             raise ValueError(error)
         return func(self, value)
 
@@ -66,7 +67,7 @@ def property_is_valid_time(func):
     return wrapper
 
 
-def property_is_int(range: Tuple[int, int], allowed: Optional[Container[Any]] = None):
+def property_is_int(range: tuple[int, int], allowed: Optional[Container[Any]] = None):
     """Takes a range of ints and a list of exemptions to check against
     when setting a property on a model. The range is a tuple of (min, max) and the
     allowed list (empty by default) allows values outside that range.
@@ -81,7 +82,7 @@ def property_is_int(range: Tuple[int, int], allowed: Optional[Container[Any]] =
     def property_type_decorator(func):
         @wraps(func)
         def wrapper(self, value):
-            error = "Invalid property defined: '{}'. Integer value expected.".format(value)
+            error = f"Invalid property defined: '{value}'. Integer value expected."
 
             if range is None:
                 if isinstance(value, int):
@@ -133,7 +134,7 @@ def property_is_datetime(func):
             return func(self, value)
         if not isinstance(value, str):
             raise ValueError(
-                "Cannot convert {} into a datetime, cannot update {}".format(value.__class__.__name__, func.__name__)
+                f"Cannot convert {value.__class__.__name__} into a datetime, cannot update {func.__name__}"
             )
 
         dt = parse_datetime(value)
@@ -146,11 +147,11 @@ def property_is_data_acceleration_config(func):
     @wraps(func)
     def wrapper(self, value):
         if not isinstance(value, dict):
-            raise ValueError("{} is not type 'dict', cannot update {})".format(value.__class__.__name__, func.__name__))
+            raise ValueError(f"{value.__class__.__name__} is not type 'dict', cannot update {func.__name__})")
         if len(value) < 2 or not all(attr in value.keys() for attr in ("acceleration_enabled", "accelerate_now")):
-            error = "{} should have 2 keys ".format(func.__name__)
+            error = f"{func.__name__} should have 2 keys "
             error += "'acceleration_enabled' and 'accelerate_now'"
-            error += "instead you have {}".format(value.keys())
+            error += f"instead you have {value.keys()}"
             raise ValueError(error)
         return func(self, value)
 

tableauserverclient/models/reference_item.py

@@ -1,10 +1,10 @@
-class ResourceReference(object):
+class ResourceReference:
     def __init__(self, id_, tag_name):
         self.id = id_
         self.tag_name = tag_name
 
     def __str__(self):
-        return "<ResourceReference id={} tag={}>".format(self._id, self._tag_name)
+        return f"<ResourceReference id={self._id} tag={self._tag_name}>"
 
     __repr__ = __str__
 

tableauserverclient/models/revision_item.py

@@ -1,12 +1,12 @@
 from datetime import datetime
-from typing import List, Optional
+from typing import Optional
 
 from defusedxml.ElementTree import fromstring
 
 from tableauserverclient.datetime_helpers import parse_datetime
 
 
-class RevisionItem(object):
+class RevisionItem:
     def __init__(self):
         self._resource_id: Optional[str] = None
         self._resource_name: Optional[str] = None
@@ -56,7 +56,7 @@ class RevisionItem(object):
         )
 
     @classmethod
-    def from_response(cls, resp: bytes, ns, resource_item) -> List["RevisionItem"]:
+    def from_response(cls, resp: bytes, ns, resource_item) -> list["RevisionItem"]:
         all_revision_items = list()
         parsed_response = fromstring(resp)
         all_revision_xml = parsed_response.findall(".//t:revision", namespaces=ns)

tableauserverclient/models/schedule_item.py

@@ -19,7 +19,7 @@ from .property_decorators import (
 Interval = Union[HourlyInterval, DailyInterval, WeeklyInterval, MonthlyInterval]
 
 
-class ScheduleItem(object):
+class ScheduleItem:
     class Type:
         Extract = "Extract"
         Flow = "Flow"
@@ -336,7 +336,7 @@ class ScheduleItem(object):
         all_task_xml = parsed_response.findall(".//t:task", namespaces=ns)
 
         error = (
-            "Status {}: {}".format(response.status_code, response.reason)
+            f"Status {response.status_code}: {response.reason}"
             if response.status_code < 200 or response.status_code >= 300
             else None
         )

tableauserverclient/models/server_info_item.py

@@ -6,7 +6,29 @@ from defusedxml.ElementTree import fromstring
 from tableauserverclient.helpers.logging import logger
 
 
-class ServerInfoItem(object):
+class ServerInfoItem:
+    """
+    The ServerInfoItem class contains the build and version information for
+    Tableau Server. The server information is accessed with the
+    server_info.get() method, which returns an instance of the ServerInfo class.
+
+    Attributes
+    ----------
+    product_version : str
+        Shows the version of the Tableau Server or Tableau Cloud
+        (for example, 10.2.0).
+
+    build_number : str
+        Shows the specific build number (for example, 10200.17.0329.1446).
+
+    rest_api_version : str
+        Shows the supported REST API version number. Note that this might be
+        different from the default value specified for the server, with the
+        Server.version attribute. To take advantage of new features, you should
+        query the server and set the Server.version to match the supported REST
+        API version number.
+    """
+
     def __init__(self, product_version, build_number, rest_api_version):
         self._product_version = product_version
         self._build_number = build_number
@@ -40,13 +62,11 @@ class ServerInfoItem(object):
         try:
             parsed_response = fromstring(resp)
         except xml.etree.ElementTree.ParseError as error:
-            logger.info("Unexpected response for ServerInfo: {}".format(resp))
-            logger.info(error)
+            logger.exception(f"Unexpected response for ServerInfo: {resp}")
             return cls("Unknown", "Unknown", "Unknown")
         except Exception as error:
-            logger.info("Unexpected response for ServerInfo: {}".format(resp))
-            logger.info(error)
-            return cls("Unknown", "Unknown", "Unknown")
+            logger.exception(f"Unexpected response for ServerInfo: {resp}")
+            raise error
 
         product_version_tag = parsed_response.find(".//t:productVersion", namespaces=ns)
         rest_api_version_tag = parsed_response.find(".//t:restApiVersion", namespaces=ns)

tableauserverclient/models/site_item.py

@@ -14,13 +14,79 @@ from .property_decorators import (
 
 VALID_CONTENT_URL_RE = r"^[a-zA-Z0-9_\-]*$"
 
-from typing import List, Optional, Union, TYPE_CHECKING
+from typing import Optional, Union, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from tableauserverclient.server import Server
 
 
-class SiteItem(object):
+class SiteItem:
+    """
+    The SiteItem class contains the members or attributes for the site resources
+    on Tableau Server or Tableau Cloud. The SiteItem class defines the
+    information you can request or query from Tableau Server or Tableau Cloud.
+    The class members correspond to the attributes of a server request or
+    response payload.
+
+    Attributes
+    ----------
+    name: str
+        The name of the site. The name of the default site is "".
+
+    content_url: str
+        The path to the site.
+
+    admin_mode: str
+        (Optional) For Tableau Server only. Specify ContentAndUsers to allow
+        site administrators to use the server interface and tabcmd commands to
+        add and remove users. (Specifying this option does not give site
+        administrators permissions to manage users using the REST API.) Specify
+        ContentOnly to prevent site administrators from adding or removing
+        users. (Server administrators can always add or remove users.)
+
+    user_quota: int
+        (Optional) Specifies the total number of users for the site. The number
+        can't exceed the number of licenses activated for the site; and if
+        tiered capacity attributes are set, then user_quota will equal the sum
+        of the tiered capacity values, and attempting to set user_quota will
+        cause an error.
+
+    tier_explorer_capacity: int
+    tier_creator_capacity: int
+    tier_viewer_capacity: int
+        (Optional) The maximum number of licenses for users with the Creator,
+        Explorer, or Viewer role, respectively, allowed on a site.
+
+    storage_quota: int
+        (Optional) Specifies the maximum amount of space for the new site, in
+        megabytes. If you set a quota and the site exceeds it, publishers will
+        be prevented from uploading new content until the site is under the
+        limit again.
+
+    disable_subscriptions: bool
+        (Optional) Specify true to prevent users from being able to subscribe
+        to workbooks on the specified site. The default is False.
+
+    subscribe_others_enabled: bool
+        (Optional) Specify false to prevent server administrators, site
+        administrators, and project or content owners from being able to
+        subscribe other users to workbooks on the specified site. The default
+        is True.
+
+    revision_history_enabled: bool
+        (Optional) Specify true to enable revision history for content resources
+        (workbooks and datasources). The default is False.
+
+    revision_limit: int
+        (Optional) Specifies the number of revisions of a content source
+        (workbook or data source) to allow. On Tableau Server, the default is
+        25.
+
+    state: str
+        Shows the current state of the site (Active or Suspended).
+
+    """
+
     _user_quota: Optional[int] = None
     _tier_creator_capacity: Optional[int] = None
     _tier_explorer_capacity: Optional[int] = None
@@ -873,7 +939,7 @@ class SiteItem(object):
             self.auto_suspend_refresh_inactivity_window = auto_suspend_refresh_inactivity_window
 
     @classmethod
-    def from_response(cls, resp, ns) -> List["SiteItem"]:
+    def from_response(cls, resp, ns) -> list["SiteItem"]:
         all_site_items = list()
         parsed_response = fromstring(resp)
         all_site_xml = parsed_response.findall(".//t:site", namespaces=ns)

tableauserverclient/models/subscription_item.py

@@ -1,4 +1,4 @@
-from typing import List, Type, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from defusedxml.ElementTree import fromstring
 
@@ -10,7 +10,7 @@ if TYPE_CHECKING:
     from .target import Target
 
 
-class SubscriptionItem(object):
+class SubscriptionItem:
     def __init__(self, subject: str, schedule_id: str, user_id: str, target: "Target") -> None:
         self._id = None
         self.attach_image = True
@@ -79,7 +79,7 @@ class SubscriptionItem(object):
         self._suspended = value
 
     @classmethod
-    def from_response(cls: Type, xml: bytes, ns) -> List["SubscriptionItem"]:
+    def from_response(cls: type, xml: bytes, ns) -> list["SubscriptionItem"]:
         parsed_response = fromstring(xml)
         all_subscriptions_xml = parsed_response.findall(".//t:subscription", namespaces=ns)
 

tableauserverclient/models/table_item.py

@@ -4,7 +4,7 @@ from .exceptions import UnpopulatedPropertyError
 from .property_decorators import property_not_empty, property_is_boolean
 
 
-class TableItem(object):
+class TableItem:
     def __init__(self, name, description=None):
         self._id = None
         self.description = description

tableauserverclient/models/tableau_auth.py

@@ -1,5 +1,5 @@
 import abc
-from typing import Dict, Optional
+from typing import Optional
 
 
 class Credentials(abc.ABC):
@@ -9,7 +9,7 @@ class Credentials(abc.ABC):
 
     @property
     @abc.abstractmethod
-    def credentials(self) -> Dict[str, str]:
+    def credentials(self) -> dict[str, str]:
         credentials = (
             "Credentials can be username/password, Personal Access Token, or JWT"
             "This method returns values to set as an attribute on the credentials element of the request"
@@ -32,6 +32,43 @@ def deprecate_site_attribute():
 
 # The traditional auth type: username/password
 class TableauAuth(Credentials):
+    """
+    The TableauAuth class defines the information you can set in a sign-in
+    request. The class members correspond to the attributes of a server request
+    or response payload. To use this class, create a new instance, supplying
+    user name, password, and site information if necessary, and pass the
+    request object to the Auth.sign_in method.
+
+    Parameters
+    ----------
+    username : str
+        The user name for the sign-in request.
+
+    password : str
+        The password for the sign-in request.
+
+    site_id : str, optional
+        This corresponds to the contentUrl attribute in the Tableau REST API.
+        The site_id is the portion of the URL that follows the /site/ in the
+        URL. For example, "MarketingTeam" is the site_id in the following URL
+        MyServer/#/site/MarketingTeam/projects. To specify the default site on
+        Tableau Server, you can use an empty string '' (single quotes, no
+        space). For Tableau Cloud, you must provide a value for the site_id.
+
+    user_id_to_impersonate : str, optional
+        Specifies the id (not the name) of the user to sign in as. This is not
+        available for Tableau Online.
+
+    Examples
+    --------
+    >>> import tableauserverclient as TSC
+
+    >>> tableau_auth = TSC.TableauAuth('USERNAME', 'PASSWORD', site_id='CONTENTURL')
+    >>> server = TSC.Server('https://SERVER_URL', use_server_version=True)
+    >>> server.auth.sign_in(tableau_auth)
+
+    """
+
     def __init__(
         self, username: str, password: str, site_id: Optional[str] = None, user_id_to_impersonate: Optional[str] = None
     ) -> None:
@@ -42,7 +79,7 @@ class TableauAuth(Credentials):
         self.username = username
 
     @property
-    def credentials(self) -> Dict[str, str]:
+    def credentials(self) -> dict[str, str]:
         return {"name": self.username, "password": self.password}
 
     def __repr__(self):
@@ -55,6 +92,43 @@ class TableauAuth(Credentials):
 
 # A Tableau-generated Personal Access Token
 class PersonalAccessTokenAuth(Credentials):
+    """
+    The PersonalAccessTokenAuth class defines the information you can set in a sign-in
+    request. The class members correspond to the attributes of a server request
+    or response payload. To use this class, create a new instance, supplying
+    token name, token secret, and site information if necessary, and pass the
+    request object to the Auth.sign_in method.
+
+    Parameters
+    ----------
+    token_name : str
+        The name of the personal access token.
+
+    personal_access_token : str
+        The personal access token secret for the sign in request.
+
+    site_id : str, optional
+        This corresponds to the contentUrl attribute in the Tableau REST API.
+        The site_id is the portion of the URL that follows the /site/ in the
+        URL. For example, "MarketingTeam" is the site_id in the following URL
+        MyServer/#/site/MarketingTeam/projects. To specify the default site on
+        Tableau Server, you can use an empty string '' (single quotes, no
+        space). For Tableau Cloud, you must provide a value for the site_id.
+
+    user_id_to_impersonate : str, optional
+        Specifies the id (not the name) of the user to sign in as. This is not
+        available for Tableau Online.
+
+    Examples
+    --------
+    >>> import tableauserverclient as TSC
+
+    >>> tableau_auth = TSC.PersonalAccessTokenAuth("token_name", "token_secret", site_id='CONTENTURL')
+    >>> server = TSC.Server('https://SERVER_URL', use_server_version=True)
+    >>> server.auth.sign_in(tableau_auth)
+
+    """
+
     def __init__(
         self,
         token_name: str,
@@ -69,7 +143,7 @@ class PersonalAccessTokenAuth(Credentials):
         self.personal_access_token = personal_access_token
 
     @property
-    def credentials(self) -> Dict[str, str]:
+    def credentials(self) -> dict[str, str]:
         return {
             "personalAccessTokenName": self.token_name,
             "personalAccessTokenSecret": self.personal_access_token,
@@ -88,6 +162,42 @@ class PersonalAccessTokenAuth(Credentials):
 
 # A standard JWT generated specifically for Tableau
 class JWTAuth(Credentials):
+    """
+    The JWTAuth class defines the information you can set in a sign-in
+    request. The class members correspond to the attributes of a server request
+    or response payload. To use this class, create a new instance, supplying
+    an encoded JSON Web Token, and site information if necessary, and pass the
+    request object to the Auth.sign_in method.
+
+    Parameters
+    ----------
+    token : str
+        The encoded JSON Web Token.
+
+    site_id : str, optional
+        This corresponds to the contentUrl attribute in the Tableau REST API.
+        The site_id is the portion of the URL that follows the /site/ in the
+        URL. For example, "MarketingTeam" is the site_id in the following URL
+        MyServer/#/site/MarketingTeam/projects. To specify the default site on
+        Tableau Server, you can use an empty string '' (single quotes, no
+        space). For Tableau Cloud, you must provide a value for the site_id.
+
+    user_id_to_impersonate : str, optional
+        Specifies the id (not the name) of the user to sign in as. This is not
+        available for Tableau Online.
+
+    Examples
+    --------
+    >>> import jwt
+    >>> import tableauserverclient as TSC
+
+    >>> jwt_token = jwt.encode(...)
+    >>> tableau_auth = TSC.JWTAuth(token, site_id='CONTENTURL')
+    >>> server = TSC.Server('https://SERVER_URL', use_server_version=True)
+    >>> server.auth.sign_in(tableau_auth)
+
+    """
+
     def __init__(self, jwt: str, site_id: Optional[str] = None, user_id_to_impersonate: Optional[str] = None) -> None:
         if jwt is None:
             raise TabError("Must provide a JWT token when using JWT authentication")
@@ -95,7 +205,7 @@ class JWTAuth(Credentials):
         self.jwt = jwt
 
     @property
-    def credentials(self) -> Dict[str, str]:
+    def credentials(self) -> dict[str, str]:
         return {"jwt": self.jwt}
 
     def __repr__(self):

tableauserverclient/models/tableau_types.py

@@ -1,11 +1,12 @@
 from typing import Union
 
-from .datasource_item import DatasourceItem
-from .flow_item import FlowItem
-from .project_item import ProjectItem
-from .view_item import ViewItem
-from .workbook_item import WorkbookItem
-from .metric_item import MetricItem
+from tableauserverclient.models.datasource_item import DatasourceItem
+from tableauserverclient.models.flow_item import FlowItem
+from tableauserverclient.models.project_item import ProjectItem
+from tableauserverclient.models.view_item import ViewItem
+from tableauserverclient.models.workbook_item import WorkbookItem
+from tableauserverclient.models.metric_item import MetricItem
+from tableauserverclient.models.virtual_connection_item import VirtualConnectionItem
 
 
 class Resource:
@@ -18,16 +19,17 @@ class Resource:
     Metric = "metric"
     Project = "project"
     View = "view"
+    VirtualConnection = "virtualConnection"
     Workbook = "workbook"
 
 
 # resource types that have permissions, can be renamed, etc
 # todo: refactoring: should actually define TableauItem as an interface and let all these implement it
-TableauItem = Union[DatasourceItem, FlowItem, MetricItem, ProjectItem, ViewItem, WorkbookItem]
+TableauItem = Union[DatasourceItem, FlowItem, MetricItem, ProjectItem, ViewItem, WorkbookItem, VirtualConnectionItem]
 
 
-def plural_type(content_type: Resource) -> str:
+def plural_type(content_type: Union[Resource, str]) -> str:
     if content_type == Resource.Lens:
         return "lenses"
     else:
-        return "{}s".format(content_type)
+        return f"{content_type}s"