Skip to content

Commit 5158c2c

Browse files
Merge pull request #22 from thoughtspot/v.1.6.1
V.1.6.1
2 parents 5bab6b9 + b22cb26 commit 5158c2c

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = thoughtspot_rest_api_v1
3-
version = 1.6.0
3+
version = 1.6.1
44
description = Library implementing the ThoughtSpot V1 REST API
55
long_description = file: README.md
66
long_description_content_type = text/markdown
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.6.0'
1+
__version__ = '1.6.1'

src/thoughtspot_rest_api_v1/tsrestapiv2.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ def bearer_token(self, bearer_token):
8282
#
8383
def auth_session_login(self, username: Optional[str] = None, password: Optional[str] = None,
8484
remember_me: bool = True,
85-
bearer_token: Optional[str] = None) -> requests.Session:
85+
bearer_token: Optional[str] = None,
86+
org_identifier: Optional[int] = None) -> requests.Session:
8687
endpoint = 'auth/session/login'
8788

8889
url = self.base_url + endpoint
@@ -97,6 +98,8 @@ def auth_session_login(self, username: Optional[str] = None, password: Optional
9798
'password': password,
9899
'remember_me': str(remember_me).lower()
99100
}
101+
if org_identifier is not None:
102+
json_post_data["org_identifier"] = org_identifier
100103
response = self.requests_session.post(url=url, json=json_post_data)
101104
else:
102105
raise Exception("If using username/password, must include both")
@@ -367,8 +370,6 @@ def orgs_delete(self, org_identifier: str):
367370
#
368371
def tags_search(self, tag_identifier: Optional[str] = None, color: Optional[str] = None):
369372
endpoint = 'tags/search'
370-
if tag_identifier is None and color is None:
371-
raise Exception("Must provide tag_identifier or color")
372373
request = {}
373374
if tag_identifier is not None:
374375
request['tag_identifier'] = tag_identifier
@@ -471,8 +472,9 @@ def metadata_tml_export(self, metadata_ids: List[str], export_associated: bool =
471472
'export_fqn': export_fqn
472473
}
473474
# These are left as optionals / defaults because they may have been added after 9.5
474-
if edoc_format.upper() == 'YAML':
475-
request['edoc_format'] = 'YAML'
475+
if edoc_format is not None:
476+
if edoc_format.upper() == 'YAML':
477+
request['edoc_format'] = 'YAML'
476478
if export_schema_version is not None:
477479
request['export_schema_version'] = export_schema_version
478480
if metadata_request is not None:

0 commit comments

Comments
 (0)