odsbox 1.0.16rc476.post1__py3-none-any.whl → 1.0.16rc479.post1__py3-none-any.whl

odsbox/__init__.py

@@ -16,7 +16,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-__version__ = "1.0.16""-rc476-post1"
+__version__ = "1.0.16""-rc479-post1"
 
 if TYPE_CHECKING:
     from .con_i import ConI

odsbox/con_i.py

@@ -58,13 +58,14 @@ class ConI:
     def __init__(
         self,
         url: str = "http://localhost:8080/api",
-        auth: requests.auth.AuthBase | tuple[str, str] = ("sa", "sa"),
+        auth: requests.auth.AuthBase | tuple[str, str] | None = ("sa", "sa"),
         context_variables: ods.ContextVariables | dict | None = None,
         verify_certificate: bool = True,
         load_model: bool = True,
         allow_redirects: bool = False,
         connection_timeout: float = 60.0,
         request_timeout: float = 600.0,
+        custom_session: requests.Session | None = None,
     ) -> None:
         """
         Create a session object keeping track of ASAM ODS session URL named `conI`.
@@ -101,16 +102,20 @@ class ConI:
 
 
         :param str url: base url of the ASAM ODS API of a given server. An example is "http://localhost:8080/api".
-        :param requests.auth.AuthBase auth: An auth object to be used for the used requests package.
-            For basic auth `("USER", "PASSWORD")` can be used.
+        :param requests.auth.AuthBase | tuple[str, str] | None auth: An auth object to be used for the used
+            requests package. For basic auth `("USER", "PASSWORD")` can be used.
+            Ignored if `custom_session` is provided.
         :param ods.ContextVariables | dict | None context_variables: If context variables are necessary for the
             connection they are passed here. It defaults to None.
         :param bool verify_certificate: If no certificate is provided for https insecure access can be enabled.
-            It defaults to True.
+            It defaults to True. Ignored if `custom_session` is provided.
         :param bool load_model: If the model should be read after connection is established. It defaults to True.
         :param bool allow_redirects: If redirects should be allowed in requests calls. It defaults to False.
         :param float connection_timeout: Timeout in seconds for establishing connections. It defaults to 60.0.
         :param float request_timeout: Timeout in seconds for individual requests. It defaults to 600.0.
+        :param requests.Session | None custom_session: If a preconfigured requests.Session should be used.
+            If provided `auth` and `verify_certificate` parameters are ignored. It defaults to None.
+            e.g. Some OAuth packages provide custom `requests.Session` implementations.
         :raises requests.HTTPError: If connection to ASAM ODS server fails.
         """
         self.__session: requests.Session | None = None
@@ -122,9 +127,11 @@ class ConI:
         self.__connection_timeout: float = connection_timeout
         self.__request_timeout: float = request_timeout
 
-        session = requests.Session()
-        session.auth = auth
-        session.verify = verify_certificate
+        session = custom_session
+        if session is None:
+            session = requests.Session()
+            session.auth = auth
+            session.verify = verify_certificate
 
         _context_variables = None
         if isinstance(context_variables, ods.ContextVariables):

{odsbox-1.0.16rc476.post1.dist-info → odsbox-1.0.16rc479.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odsbox
-Version: 1.0.16rc476.post1
+Version: 1.0.16rc479.post1
 Summary: Toolbox for accessing ASAM ODS servers using the HTTP API
 Keywords: asam,ods,measurement,data access,data science,data analysis
 Author-email: Andreas Krantz <a.krantz@peak-solution.de>

{odsbox-1.0.16rc476.post1.dist-info → odsbox-1.0.16rc479.post1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-odsbox/__init__.py,sha256=GtCirEqknBTH9vsemu8OWPgqiO4I9tpj6jHinzfd01o,919
+odsbox/__init__.py,sha256=pcz2LTzVnnhhnKPgqDFPQEisxPyEeJNjcYxgdO1wMOE,919
 odsbox/asam_time.py,sha256=Nv367IB6aOUIIfQk388nY3Br6VSqiayQLlEsb8JWelU,2844
 odsbox/bulk_reader.py,sha256=_NEf65vGdCHPWYJeNFj4M5KWxU7LEHmMsRXiQ3lEg6g,20296
-odsbox/con_i.py,sha256=VJpq493vurU1LWqQi7fGqa0f4wvm58lE9x5CRKtxOIQ,38334
+odsbox/con_i.py,sha256=EyuNhxPMMUvGdXpeU30f1xPV4KMd1wSg5O5Fli53o_U,38885
 odsbox/datamatrices_to_pandas.py,sha256=8Bzf3Dcz2sgZrr0tugLPb46odlnx1KWgDjeHit9Xzp0,14501
 odsbox/jaquel.py,sha256=JG6zdi11BSvOJJFGQx5eOdF3f8ii1WfAirUg-1Vl6_4,38948
 odsbox/jaquel_conversion_result.py,sha256=FR0ilSNAAxnefcTypjqT481yRs1ZGncSPSIJGKbPrbk,2734
@@ -24,7 +24,7 @@ odsbox/proto/ods_pb2.py,sha256=Y9xq6NCaa49QORQll9JM9allilqEIMXuPrllmcUQTmQ,32955
 odsbox/proto/ods_pb2.pyi,sha256=GePovXXMLHaPfMzJDLYEZle61k1CoeEKag3uuLU4POo,58064
 odsbox/proto/ods_security_pb2.py,sha256=qW0oDYCYJg9BcfSzzgatalD--J3stBgf9uwocf5VqYk,4755
 odsbox/proto/ods_security_pb2.pyi,sha256=wRCRfZqgXw2Mojbq1qJj7gNybWlkd3IPH5srFZ5VlWo,6051
-odsbox-1.0.16rc476.post1.dist-info/licenses/LICENSE,sha256=uVaF5FulCvEj-4fhJv3DiM2KyjqLeeHNh1agjmaOS1s,1133
-odsbox-1.0.16rc476.post1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-odsbox-1.0.16rc476.post1.dist-info/METADATA,sha256=WuSc5lEcva3sV311RR5zhDTy934WAfJjyeF-W5NhFy4,7107
-odsbox-1.0.16rc476.post1.dist-info/RECORD,,
+odsbox-1.0.16rc479.post1.dist-info/licenses/LICENSE,sha256=uVaF5FulCvEj-4fhJv3DiM2KyjqLeeHNh1agjmaOS1s,1133
+odsbox-1.0.16rc479.post1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+odsbox-1.0.16rc479.post1.dist-info/METADATA,sha256=MzB9mknylJ4Eqw6WHcB9xUTe--SrFfFBXaBeZCKkv0c,7107
+odsbox-1.0.16rc479.post1.dist-info/RECORD,,