From 8a5684e48c15f9299ac1b5417368e42573cbd062 Mon Sep 17 00:00:00 2001 From: Santiago Ramirez Ayuso Date: Thu, 20 Feb 2025 11:05:22 -0300 Subject: [PATCH] Fix style --- .../api/datasource/get_datasource_by_name.py | 3 ++- .../api/proxy/get_key_url.py | 3 ++- datasource_api_client/api/proxy/list_keys.py | 3 ++- datasource_api_client/api/proxy/log_metric.py | 3 ++- datasource_api_client/client.py | 23 ++++++------------- datasource_api_client/types.py | 11 ++------- domino_data/configuration_gen.py | 18 +-------------- 7 files changed, 18 insertions(+), 46 deletions(-) diff --git a/datasource_api_client/api/datasource/get_datasource_by_name.py b/datasource_api_client/api/datasource/get_datasource_by_name.py index 5489d10..fbd1e80 100644 --- a/datasource_api_client/api/datasource/get_datasource_by_name.py +++ b/datasource_api_client/api/datasource/get_datasource_by_name.py @@ -1,6 +1,7 @@ -from http import HTTPStatus from typing import Any, Dict, Optional, Union +from http import HTTPStatus + import httpx from ... import errors diff --git a/datasource_api_client/api/proxy/get_key_url.py b/datasource_api_client/api/proxy/get_key_url.py index 96cfd12..aeccf94 100644 --- a/datasource_api_client/api/proxy/get_key_url.py +++ b/datasource_api_client/api/proxy/get_key_url.py @@ -1,6 +1,7 @@ -from http import HTTPStatus from typing import Any, Dict, Optional, Union, cast +from http import HTTPStatus + import httpx from ... import errors diff --git a/datasource_api_client/api/proxy/list_keys.py b/datasource_api_client/api/proxy/list_keys.py index 8eaa150..483eaa1 100644 --- a/datasource_api_client/api/proxy/list_keys.py +++ b/datasource_api_client/api/proxy/list_keys.py @@ -1,6 +1,7 @@ -from http import HTTPStatus from typing import Any, Dict, List, Optional, Union, cast +from http import HTTPStatus + import httpx from ... import errors diff --git a/datasource_api_client/api/proxy/log_metric.py b/datasource_api_client/api/proxy/log_metric.py index f719cef..03b8f43 100644 --- a/datasource_api_client/api/proxy/log_metric.py +++ b/datasource_api_client/api/proxy/log_metric.py @@ -1,6 +1,7 @@ -from http import HTTPStatus from typing import Any, Dict, Optional, Union +from http import HTTPStatus + import httpx from ... import errors diff --git a/datasource_api_client/client.py b/datasource_api_client/client.py index eef9b71..55b3953 100644 --- a/datasource_api_client/client.py +++ b/datasource_api_client/client.py @@ -1,6 +1,7 @@ -import ssl from typing import Any, Dict, Optional, Union +import ssl + import httpx from attrs import define, evolve, field @@ -38,15 +39,11 @@ class Client: _base_url: str = field(alias="base_url") _cookies: Dict[str, str] = field(factory=dict, kw_only=True, alias="cookies") _headers: Dict[str, str] = field(factory=dict, kw_only=True, alias="headers") - _timeout: Optional[httpx.Timeout] = field( - default=None, kw_only=True, alias="timeout" - ) + _timeout: Optional[httpx.Timeout] = field(default=None, kw_only=True, alias="timeout") _verify_ssl: Union[str, bool, ssl.SSLContext] = field( default=True, kw_only=True, alias="verify_ssl" ) - _follow_redirects: bool = field( - default=False, kw_only=True, alias="follow_redirects" - ) + _follow_redirects: bool = field(default=False, kw_only=True, alias="follow_redirects") _httpx_args: Dict[str, Any] = field(factory=dict, kw_only=True, alias="httpx_args") _client: Optional[httpx.Client] = field(default=None, init=False) _async_client: Optional[httpx.AsyncClient] = field(default=None, init=False) @@ -174,15 +171,11 @@ class AuthenticatedClient: _base_url: str = field(alias="base_url") _cookies: Dict[str, str] = field(factory=dict, kw_only=True, alias="cookies") _headers: Dict[str, str] = field(factory=dict, kw_only=True, alias="headers") - _timeout: Optional[httpx.Timeout] = field( - default=None, kw_only=True, alias="timeout" - ) + _timeout: Optional[httpx.Timeout] = field(default=None, kw_only=True, alias="timeout") _verify_ssl: Union[str, bool, ssl.SSLContext] = field( default=True, kw_only=True, alias="verify_ssl" ) - _follow_redirects: bool = field( - default=False, kw_only=True, alias="follow_redirects" - ) + _follow_redirects: bool = field(default=False, kw_only=True, alias="follow_redirects") _httpx_args: Dict[str, Any] = field(factory=dict, kw_only=True, alias="httpx_args") _client: Optional[httpx.Client] = field(default=None, init=False) _async_client: Optional[httpx.AsyncClient] = field(default=None, init=False) @@ -249,9 +242,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None: """Exit a context manager for internal httpx.Client (see httpx docs)""" self.get_httpx_client().__exit__(*args, **kwargs) - def set_async_httpx_client( - self, async_client: httpx.AsyncClient - ) -> "AuthenticatedClient": + def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "AuthenticatedClient": """Manually the underlying httpx.AsyncClient **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout. diff --git a/datasource_api_client/types.py b/datasource_api_client/types.py index 05f5a22..9c1164d 100644 --- a/datasource_api_client/types.py +++ b/datasource_api_client/types.py @@ -1,15 +1,8 @@ """Contains some shared types for properties""" +from typing import BinaryIO, Generic, Literal, MutableMapping, Optional, Tuple, TypeVar + from http import HTTPStatus -from typing import ( - BinaryIO, - Generic, - Literal, - MutableMapping, - Optional, - Tuple, - TypeVar, -) from attrs import define diff --git a/domino_data/configuration_gen.py b/domino_data/configuration_gen.py index 5053499..3ebdbed 100644 --- a/domino_data/configuration_gen.py +++ b/domino_data/configuration_gen.py @@ -1,6 +1,7 @@ """Code generated by gen.py; DO NOT EDIT. This file was generated by robots at 2025-02-20 13:30:06.271414""" + from typing import Any, Dict, Optional, Union from enum import Enum @@ -150,7 +151,6 @@ class BigQueryConfig(Config): class ClickHouseConfig(Config): """ClickHouseConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -173,12 +173,10 @@ class DatasetConfig(Config): subfolder: Optional[str] = _config(elem=ConfigElem.SUBFOLDER) - @attr.s(auto_attribs=True) class DB2Config(Config): """DB2Config datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -187,7 +185,6 @@ class DB2Config(Config): class DruidConfig(Config): """DruidConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -205,7 +202,6 @@ class GCSConfig(Config): class GenericJDBCConfig(Config): """GenericJDBCConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -227,7 +223,6 @@ class GenericS3Config(Config): class GreenplumConfig(Config): """GreenplumConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -236,7 +231,6 @@ class GreenplumConfig(Config): class IgniteConfig(Config): """IgniteConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -245,7 +239,6 @@ class IgniteConfig(Config): class MariaDBConfig(Config): """MariaDBConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -254,7 +247,6 @@ class MariaDBConfig(Config): class MongoDBConfig(Config): """MongoDBConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -277,7 +269,6 @@ class MySQLConfig(Config): class NetezzaConfig(Config): """NetezzaConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -296,7 +287,6 @@ class OracleConfig(Config): class PalantirConfig(Config): """PalantirConfig datasource configuration.""" - client_id: Optional[str] = _cred(elem=CredElem.CLIENTID) client_secret: Optional[str] = _cred(elem=CredElem.CLIENTSECRET) o_auth_token: Optional[str] = _cred(elem=CredElem.OAUTHTOKEN) @@ -347,7 +337,6 @@ class S3Config(Config): class SAPHanaConfig(Config): """SAPHanaConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -356,7 +345,6 @@ class SAPHanaConfig(Config): class SingleStoreConfig(Config): """SingleStoreConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -389,7 +377,6 @@ class SnowflakeConfig(Config): class SynapseConfig(Config): """SynapseConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -402,12 +389,10 @@ class TabularS3GlueConfig(Config): region: Optional[str] = _config(elem=ConfigElem.REGION) - @attr.s(auto_attribs=True) class TeradataConfig(Config): """TeradataConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD) @@ -427,7 +412,6 @@ class TrinoConfig(Config): class VerticaConfig(Config): """VerticaConfig datasource configuration.""" - username: Optional[str] = _cred(elem=CredElem.USERNAME) password: Optional[str] = _cred(elem=CredElem.PASSWORD)