feldera 0.158.0__py3-none-any.whl → 0.160.0__py3-none-any.whl

feldera/rest/_helpers.py

@@ -1,3 +1,7 @@
+import logging
+import os
+
+
 def client_version() -> str:
     from importlib.metadata import version, PackageNotFoundError
 
@@ -7,3 +11,30 @@ def client_version() -> str:
         version = "unknown"
 
     return version
+
+
+def requests_verify_from_env() -> str | bool:
+    env_feldera_tls_insecure = os.environ.get("FELDERA_TLS_INSECURE")
+    FELDERA_HTTPS_TLS_CERT = os.environ.get("FELDERA_HTTPS_TLS_CERT")
+
+    if env_feldera_tls_insecure is not None and FELDERA_HTTPS_TLS_CERT is not None:
+        logging.warning(
+            "environment variables FELDERA_HTTPS_TLS_CERT and "
+            "FELDERA_TLS_INSECURE both are set."
+            "\nFELDERA_HTTPS_TLS_CERT takes priority."
+        )
+
+    if env_feldera_tls_insecure is None:
+        FELDERA_TLS_INSECURE = False
+    else:
+        FELDERA_TLS_INSECURE = env_feldera_tls_insecure.strip().lower() in (
+            "1",
+            "true",
+            "yes",
+        )
+
+    requests_verify = not FELDERA_TLS_INSECURE
+    if FELDERA_HTTPS_TLS_CERT is not None:
+        requests_verify = FELDERA_HTTPS_TLS_CERT
+
+    return requests_verify

feldera/rest/config.py

@@ -1,5 +1,7 @@
 from typing import Optional
 import os
+from feldera.rest._helpers import requests_verify_from_env
+import logging
 
 
 class Config:
@@ -14,7 +16,7 @@ class Config:
         version: Optional[str] = None,
         timeout: Optional[float] = None,
         connection_timeout: Optional[float] = None,
-        requests_verify: bool | str = True,
+        requests_verify: Optional[bool | str] = None,
     ) -> None:
         """
         :param url: The url to the Feldera API (ex: https://try.feldera.com)
@@ -23,7 +25,10 @@ class Config:
         :param timeout: The timeout for the HTTP requests
         :param connection_timeout: The connection timeout for the HTTP requests
         :param requests_verify: The `verify` parameter passed to the requests
-            library. `True` by default.
+            library. `True` by default. Can also be set using environment
+            variables `FELDERA_TLS_INSECURE` to disable TLS and
+            `FELDERA_HTTPS_TLS_CERT` to set the certificate path. The latter
+            takes priority.
         """
 
         BASE_URL = (
@@ -37,11 +42,10 @@ class Config:
         self.version: Optional[str] = version or "v0"
         self.timeout: Optional[float] = timeout
         self.connection_timeout: Optional[float] = connection_timeout
+        env_verify = requests_verify_from_env()
+        self.requests_verify: bool | str = (
+            requests_verify if requests_verify is not None else env_verify
+        )
 
-        FELDERA_TLS_INSECURE = True if os.environ.get("FELDERA_TLS_INSECURE") else False
-        FELDERA_HTTPS_TLS_CERT = os.environ.get("FELDERA_HTTPS_TLS_CERT")
-        requests_verify = not FELDERA_TLS_INSECURE
-        if requests_verify and FELDERA_HTTPS_TLS_CERT is not None:
-            requests_verify = FELDERA_HTTPS_TLS_CERT
-
-        self.requests_verify: bool | str = requests_verify
+        if self.requests_verify is False:
+            logging.warning("TLS verification is disabled.")

feldera/rest/feldera_client.py

@@ -49,7 +49,7 @@ class FelderaClient:
         api_key: Optional[str] = None,
         timeout: Optional[float] = None,
         connection_timeout: Optional[float] = None,
-        requests_verify: bool | str = True,
+        requests_verify: Optional[bool | str] = None,
     ) -> None:
         """
         :param url: The url to Feldera API (ex: https://try.feldera.com). If

feldera/testutils.py

@@ -13,6 +13,7 @@ from feldera.pipeline import Pipeline
 from feldera.pipeline_builder import PipelineBuilder
 from feldera.runtime_config import Resources, RuntimeConfig
 from feldera.rest import FelderaClient
+from feldera.rest._helpers import requests_verify_from_env
 
 API_KEY = os.environ.get("FELDERA_API_KEY")
 
@@ -46,12 +47,7 @@ KAFKA_SERVER = os.environ.get("FELDERA_KAFKA_SERVER", "localhost:19092")
 PIPELINE_TO_KAFKA_SERVER = os.environ.get(
     "FELDERA_PIPELINE_TO_KAFKA_SERVER", "redpanda:9092"
 )
-FELDERA_TLS_INSECURE = True if os.environ.get("FELDERA_TLS_INSECURE") else False
-FELDERA_HTTPS_TLS_CERT = os.environ.get("FELDERA_HTTPS_TLS_CERT")
-if not FELDERA_TLS_INSECURE and FELDERA_HTTPS_TLS_CERT is not None:
-    FELDERA_REQUESTS_VERIFY = FELDERA_HTTPS_TLS_CERT
-else:
-    FELDERA_REQUESTS_VERIFY = not FELDERA_TLS_INSECURE
+FELDERA_REQUESTS_VERIFY = requests_verify_from_env()
 
 
 class _LazyClient:

{feldera-0.158.0.dist-info → feldera-0.160.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: feldera
-Version: 0.158.0
+Version: 0.160.0
 Summary: The feldera python client
 Author-email: Feldera Team <dev@feldera.com>
 License: MIT

{feldera-0.158.0.dist-info → feldera-0.160.0.dist-info}/RECORD

@@ -7,20 +7,20 @@ feldera/pipeline.py,sha256=XNnqKXH2lCYBqm5ZNpXqcZX2ul3P__31OfOeR-96fuU,45668
 feldera/pipeline_builder.py,sha256=nOKoMyB47YxwrrvByKGn4CagO-dMQNFip3c5PK1DDhQ,4351
 feldera/runtime_config.py,sha256=DcJ44EN6Dt1X1wW-1kUvFbSkIDKDLi4-GqaDdUzPtTQ,4532
 feldera/stats.py,sha256=YeDQwE_CixTMb2DjBCgt5jTaJAZRsrHtG-3pYuuII-8,5256
-feldera/testutils.py,sha256=L0oGWSMREiFEhpBrvlk_hUz2EpQhnfmqbu8qKhAfNa4,12841
+feldera/testutils.py,sha256=z-efiWz8k6f1skAQ4fw21GJQzELaLrX1zYS7t1ffCVY,12624
 feldera/testutils_oidc.py,sha256=hv0IQAcVOt4uysWW3iE-5p46ZGfL1X7Vt7PjRefkXz8,12552
 feldera/rest/__init__.py,sha256=Eg-EKUU3RSTDcdxTR_7wNDnCly8VpXEzsZCQUmf-y2M,308
-feldera/rest/_helpers.py,sha256=q7jWInKp9IiIli8N5o31lDG3hNUbcsJqufZXYHG04ps,222
+feldera/rest/_helpers.py,sha256=IQ_Tv5dQSAQA1wdySmecpkd6kejMgpPYo2l3d9wEZVs,1125
 feldera/rest/_httprequests.py,sha256=4XXwfKtkUh3w15NGnSACR7190bWEWAmm25B23bPY7LY,8382
-feldera/rest/config.py,sha256=lZmka5cyFWNp9OxI_9nQ5EbPe4_HymaKulQ03B-wyUc,1824
+feldera/rest/config.py,sha256=VLZ0bZooM6CeoGD9HoH_IkG80Elwqrsar4rlX7lgN5o,2002
 feldera/rest/errors.py,sha256=wKWwlL5WI3SVXC8rQTy3rS3wQ9Hjjn_EY7iRHXZFIVE,2341
-feldera/rest/feldera_client.py,sha256=tyB1KysI3YjG7SR68y6zaZMqZ9e9TXqPaCILgFxbPtk,39094
+feldera/rest/feldera_client.py,sha256=LCqNrmKu9R3CZkd0GA8-gytwwgSuRERg1cVESL_NG88,39104
 feldera/rest/feldera_config.py,sha256=1pnGbLFMSLvp7Qh_OlPLALSKCSHIktNWKvx6gYU00U4,1374
 feldera/rest/pipeline.py,sha256=gzU1bEYV8D1lVGVQ4EjxKhQNvGAgd3eant6CLn5lbIg,3572
 feldera/rest/sql_table.py,sha256=qrw-YwMzx5T81zDefNO1KOx7EyypFz1vPwGBzSUB7kc,652
 feldera/rest/sql_view.py,sha256=hN12mPM0mvwLCIPYywpb12s9Hd2Ws31IlTMXPriMisw,644
 feldera/tests/test_datafusionize.py,sha256=NGriTaTWf_WnXFud1wmpFwLFa_-XGjfCh6La3dWc3QA,1337
-feldera-0.158.0.dist-info/METADATA,sha256=YBnLapgNuGzm3_mvKWU6z-DrRDJ3dFuvy8IXNxcHmGc,2306
-feldera-0.158.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-feldera-0.158.0.dist-info/top_level.txt,sha256=fB6yTqrQiO6RCbY1xP2T_mpPoTjDFtJvkJJodiee7d0,8
-feldera-0.158.0.dist-info/RECORD,,
+feldera-0.160.0.dist-info/METADATA,sha256=26vOMxsSDbloqxzJJgl7dwRr8ogYj85i5_dKOeMGn0Y,2306
+feldera-0.160.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+feldera-0.160.0.dist-info/top_level.txt,sha256=fB6yTqrQiO6RCbY1xP2T_mpPoTjDFtJvkJJodiee7d0,8
+feldera-0.160.0.dist-info/RECORD,,