feldera 0.158.0__tar.gz → 0.160.0__tar.gz

{feldera-0.158.0 → feldera-0.160.0}/PKG-INFO

@@ -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.160.0/feldera/rest/_helpers.py

@@ -0,0 +1,40 @@
+import logging
+import os
+
+
+def client_version() -> str:
+    from importlib.metadata import version, PackageNotFoundError
+
+    try:
+        version = version("feldera")
+    except PackageNotFoundError:
+        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-0.158.0 → feldera-0.160.0}/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-0.158.0 → feldera-0.160.0}/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-0.158.0 → feldera-0.160.0}/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 → feldera-0.160.0}/feldera.egg-info/PKG-INFO

@@ -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 → feldera-0.160.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "feldera"
 readme = "README.md"
 description = "The feldera python client"
-version = "0.158.0"
+version = "0.160.0"
 license = { text = "MIT" }
 requires-python = ">=3.10"
 authors = [

feldera-0.158.0/feldera/rest/_helpers.py

@@ -1,9 +0,0 @@
-def client_version() -> str:
-    from importlib.metadata import version, PackageNotFoundError
-
-    try:
-        version = version("feldera")
-    except PackageNotFoundError:
-        version = "unknown"
-
-    return version