Skip to content

Commit aeb05c7

Browse files
jacalatajacalata
committed
make all server code call models with full module name
1 parent a966468 commit aeb05c7

31 files changed

Lines changed: 75 additions & 129 deletions

‎requirements.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
tableauserverclient~=0.19.0.post0.dev1
2+
pytest~=7.0.1
3+
requests~=2.27.1
4+
defusedxml~=0.7.1
5+
setuptools~=57.0.0
6+
urllib3~=1.26.8

‎tableauserverclient/__init__.py‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,5 @@
11
from .namespace import NEW_NAMESPACE as DEFAULT_NAMESPACE
2-
from .models import (
3-
ConnectionCredentials,
4-
ConnectionItem,
5-
DataAlertItem,
6-
DatasourceItem,
7-
DQWItem,
8-
GroupItem,
9-
JobItem,
10-
BackgroundJobItem,
11-
PaginationItem,
12-
ProjectItem,
13-
ScheduleItem,
14-
SiteItem,
15-
TableauAuth,
16-
PersonalAccessTokenAuth,
17-
UserItem,
18-
ViewItem,
19-
WorkbookItem,
20-
UnpopulatedPropertyError,
21-
HourlyInterval,
22-
DailyInterval,
23-
WeeklyInterval,
24-
MonthlyInterval,
25-
IntervalItem,
26-
TaskItem,
27-
SubscriptionItem,
28-
Target,
29-
PermissionsRule,
30-
Permission,
31-
DatabaseItem,
32-
TableItem,
33-
ColumnItem,
34-
FlowItem,
35-
WebhookItem,
36-
PersonalAccessTokenAuth,
37-
FlowRunItem,
38-
RevisionItem,
39-
)
2+
from .models import *
403
from .server import (
414
RequestOptions,
425
CSVRequestOptions,

‎tableauserverclient/models/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from .favorites_item import FavoriteItem
1111
from .flow_item import FlowItem
1212
from .flow_run_item import FlowRunItem
13+
from .fileupload_item import FileuploadItem
1314
from .group_item import GroupItem
1415
from .interval_item import (
1516
IntervalItem,
@@ -31,6 +32,7 @@
3132
from .table_item import TableItem
3233
from .tableau_auth import Credentials, TableauAuth, PersonalAccessTokenAuth
3334
from .tableau_types import Resource, TableauItem, plural_type
35+
from .tag_item import TagItem
3436
from .target import Target
3537
from .task_item import TaskItem
3638
from .user_item import UserItem

‎tableauserverclient/server/endpoint/data_acceleration_report_endpoint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from .default_permissions_endpoint import _DefaultPermissionsEndpoint
44
from .endpoint import api, Endpoint
55
from .permissions_endpoint import _PermissionsEndpoint
6-
from ...models.data_acceleration_report_item import DataAccelerationReportItem
6+
from tableauserverclient.models import DataAccelerationReportItem
77

88
logger = logging.getLogger("tableau.endpoint.data_acceleration_report")
99

‎tableauserverclient/server/endpoint/data_alert_endpoint.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
from .endpoint import api, Endpoint
44
from .exceptions import MissingRequiredFieldError
5-
from .. import RequestFactory, DataAlertItem, PaginationItem, UserItem
5+
from .. import RequestFactory
6+
from tableauserverclient.models import DataAlertItem, PaginationItem, UserItem
67

78
logger = logging.getLogger("tableau.endpoint.dataAlerts")
89

‎tableauserverclient/server/endpoint/databases_endpoint.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from .endpoint import api, Endpoint
66
from .exceptions import MissingRequiredFieldError
77
from .permissions_endpoint import _PermissionsEndpoint
8-
from .. import RequestFactory, DatabaseItem, TableItem, PaginationItem, Resource
8+
from .. import RequestFactory
9+
from tableauserverclient.models import DatabaseItem, TableItem, PaginationItem, Resource
910

1011
logger = logging.getLogger("tableau.endpoint.databases")
1112

‎tableauserverclient/server/endpoint/datasources_endpoint.py‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,25 @@
55
import logging
66
import os
77
from contextlib import closing
8-
from pathlib import Path
9-
from typing import (
10-
List,
11-
Mapping,
12-
Optional,
13-
Sequence,
14-
Tuple,
15-
TYPE_CHECKING,
16-
Union,
17-
)
188

199
from .dqw_endpoint import _DataQualityWarningEndpoint
2010
from .endpoint import QuerysetEndpoint, api, parameter_added_in
2111
from .exceptions import InternalServerError, MissingRequiredFieldError
2212
from .permissions_endpoint import _PermissionsEndpoint
2313
from .resource_tagger import _ResourceTagger
24-
from .. import RequestFactory, DatasourceItem, PaginationItem, ConnectionItem, RequestOptions
25-
from ..query import QuerySet
26-
from ...filesys_helpers import (
14+
from tableauserverclient.server import RequestFactory, RequestOptions
15+
from tableauserverclient.filesys_helpers import (
2716
to_filename,
2817
make_download_path,
2918
get_file_type,
3019
get_file_object_size,
3120
)
32-
from ...models import ConnectionCredentials, RevisionItem
33-
from ...models.job_item import JobItem
34-
from ...models import ConnectionCredentials
21+
from tableauserverclient.models import RevisionItem, \
22+
ConnectionCredentials, \
23+
ConnectionItem, \
24+
DatasourceItem, \
25+
JobItem,\
26+
PaginationItem
3527

3628
io_types = (io.BytesIO, io.BufferedReader)
3729

‎tableauserverclient/server/endpoint/default_permissions_endpoint.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from .endpoint import Endpoint
44
from .exceptions import MissingRequiredFieldError
55
from .. import RequestFactory
6-
from ...models import DatabaseItem, PermissionsRule, ProjectItem, plural_type, Resource
6+
from tableauserverclient.models import DatabaseItem, PermissionsRule, ProjectItem, plural_type, Resource
77
from typing import TYPE_CHECKING, Callable, List, Optional, Sequence, Union
88

99
if TYPE_CHECKING:

‎tableauserverclient/server/endpoint/dqw_endpoint.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
from .endpoint import Endpoint
44
from .exceptions import MissingRequiredFieldError
5-
from .. import RequestFactory, DQWItem
5+
from .. import RequestFactory
6+
from tableauserverclient.models import DQWItem
67

78
logger = logging.getLogger(__name__)
89

‎tableauserverclient/server/endpoint/endpoint.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
)
1414
from ..query import QuerySet
1515
from ... import helpers
16+
from ... import _version
1617

1718
logger = logging.getLogger("tableau.endpoint")
1819

@@ -33,11 +34,12 @@ def __init__(self, parent_srv: "Server"):
3334
@staticmethod
3435
def _make_common_headers(auth_token, content_type):
3536
headers = {}
37+
version_string = _version.get_versions()['version']
3638
if auth_token is not None:
3739
headers["x-tableau-auth"] = auth_token
3840
if content_type is not None:
3941
headers["content-type"] = content_type
40-
headers["User-Agent"] = "Tableau Server Client {}".format(get_versions()['version'])
42+
headers["User-Agent"] = "Tableau Server Client {}".format(version_string)
4143
return headers
4244

4345
def _make_request(

0 commit comments

Comments
 (0)