Change client_tags from List to Set to match trino-cli

Author: hashhar

tests/integration/test_dbapi_integration.py

@@ -1502,19 +1502,19 @@ def test_info_uri(trino_connection):
 def test_client_tags_single_tag(run_trino):
     client_tags = ["foo"]
     query_client_tags = retrieve_client_tags_from_query(run_trino, client_tags)
-    assert query_client_tags == client_tags
+    assert set(query_client_tags) == set(client_tags)
 
 
 def test_client_tags_multiple_tags(run_trino):
     client_tags = ["foo", "bar"]
     query_client_tags = retrieve_client_tags_from_query(run_trino, client_tags)
-    assert query_client_tags == client_tags
+    assert set(query_client_tags) == set(client_tags)
 
 
 def test_client_tags_special_characters(run_trino):
     client_tags = ["foo %20", "bar=test"]
     query_client_tags = retrieve_client_tags_from_query(run_trino, client_tags)
-    assert query_client_tags == client_tags
+    assert set(query_client_tags) == set(client_tags)
 
 
 def retrieve_client_tags_from_query(run_trino, client_tags):

tests/unit/test_client.py

@@ -250,7 +250,7 @@ def test_request_client_tags_headers(mock_get_and_post):
     )
 
     def assert_headers(headers):
-        assert headers[constants.HEADER_CLIENT_TAGS] == "tag1,tag2"
+        assert set(headers[constants.HEADER_CLIENT_TAGS].split(",")) == {"tag1", "tag2"}
 
     req.post("URL")
     _, post_kwargs = post.call_args

tests/unit/test_client_session.py

@@ -69,7 +69,7 @@ def test_client_session_extra_credential() -> None:
 
 def test_client_session_extra_client_tags() -> None:
     session = ClientSession(user="user")
-    assert session.client_tags == []
+    assert session.client_tags == set()
 
 
 def test_client_session_client_info() -> None:

trino/client.py

@@ -47,6 +47,7 @@
 import warnings
 from abc import abstractmethod
 from collections.abc import Iterator
+from collections.abc import Sequence
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
 from datetime import datetime
@@ -59,6 +60,7 @@
 from typing import List
 from typing import Literal
 from typing import Optional
+from typing import Set
 from typing import Tuple
 from typing import TypedDict
 from typing import Union
@@ -189,7 +191,7 @@ def __init__(
         headers: Optional[Dict[str, str]] = None,
         transaction_id: Optional[str] = None,
         extra_credential: Optional[List[Tuple[str, str]]] = None,
-        client_tags: Optional[List[str]] = None,
+        client_tags: Optional[Sequence[str]] = None,
         client_info: Optional[str] = None,
         trace_token: Optional[str] = None,
         sql_path: Optional[str] = None,
@@ -210,7 +212,7 @@ def __init__(
         self._headers = headers.copy() if headers is not None else {}
         self._transaction_id = transaction_id
         self._extra_credential = extra_credential
-        self._client_tags = client_tags.copy() if client_tags is not None else list()
+        self._client_tags = set(client_tags) if client_tags is not None else set()
         self._client_info = client_info
         self._trace_token = trace_token
         self._sql_path = sql_path
@@ -291,7 +293,7 @@ def extra_credential(self) -> Optional[List[Tuple[str, str]]]:
         return self._extra_credential
 
     @property
-    def client_tags(self) -> List[str]:
+    def client_tags(self) -> Set[str]:
         return self._client_tags
 
     @property

trino/sqlalchemy/util.py

@@ -89,7 +89,7 @@ def _url(
         trino_url += f"&extra_credential={quote_plus(json.dumps(extra_credential))}"
 
     if client_tags is not None:
-        trino_url += f"&client_tags={quote_plus(json.dumps(client_tags))}"
+        trino_url += f"&client_tags={quote_plus(json.dumps(sorted(client_tags)))}"
 
     if client_info is not None:
         trino_url += f"&client_info={quote_plus(client_info)}"