drb-driver-http 1.2.0__tar.gz → 1.3.0__tar.gz

{drb-driver-http-1.2.0/drb_driver_http.egg-info → drb-driver-http-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drb-driver-http
-Version: 1.2.0
+Version: 1.3.0
 Summary: DRB Http driver
 Author: GAEL Systems
 Author-email: drb-python@gael.fr
@@ -13,6 +13,8 @@ Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGP
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENCE.txt
+Requires-Dist: drb~=2.2.0
+Requires-Dist: tenacity==8.0.1
 
 # Http & Https Implementation
 This drb-driver-http module implements http and https protocol access with DRB data model.

{drb-driver-http-1.2.0 → drb-driver-http-1.3.0}/drb/drivers/http/_version.py

@@ -1,5 +1,5 @@
 
-# This file was generated by 'versioneer.py' (0.28) from
+# This file was generated by 'versioneer.py' (0.29) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-03-31T11:29:21+0200",
+ "date": "2023-09-12T17:43:20+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "f279acfe6c19a5daa445c7c9209f0ae5d4cc4b70",
- "version": "1.2.0"
+ "full-revisionid": "38308644bfd44c075f46f5b42c6f3c2daca93a1e",
+ "version": "1.3.0"
 }
 '''  # END VERSION_JSON
 

{drb-driver-http-1.2.0 → drb-driver-http-1.3.0}/drb/drivers/http/http.py

@@ -251,7 +251,7 @@ class DrbHttpNode(AbstractNode):
         self._auth = auth
         self._params = params
         self._children = []
-        self._available_impl.append(io.BytesIO)
+        self.add_impl(io.BytesIO, _to_stream)
 
     def __init_header(self):
         if len(self._attrs) == 0:
@@ -279,18 +279,17 @@ class DrbHttpNode(AbstractNode):
 
     @property
     def auth(self) -> AuthBase:
-        if self._auth is not None:
-            if isinstance(self._auth, HTTPBasicAuth):
-                credential = keyring.get_credential(
-                    self.path.path,
-                    self._auth.username
+        if self._auth is None:
+            credential = keyring.get_credential(
+                service_name=self.path.path,
+                username=None
+            )
+            if credential is not None:
+                self._auth = HTTPBasicAuth(
+                    credential.username,
+                    credential.password
                 )
-                if credential is not None:
-                    return HTTPBasicAuth(
-                        credential.username,
-                        credential.password
-                    )
-            return self._auth
+        return self._auth
 
     def __setitem__(self, key, value):
         raise NotImplementedError
@@ -334,43 +333,6 @@ class DrbHttpNode(AbstractNode):
         raise DrbException(f'Attribute not found name: {name}, '
                            f'namespace: {namespace_uri}')
 
-    def get_impl(self, impl: type, **kwargs) -> Any:
-        """
-          This operation returns a reference to an object implementing a
-          specific interface. This method authorizes a specific and/or direct
-          API instead of using the DrbNode interface. The provided object is
-          independent of this node and shall be released/closed by the caller
-          when interface requires such finally operations.
-
-          Parameters:
-              impl (type): the implementation type expected
-
-          Keyword Arguments:
-              start (int): The first byte to be downloaded.
-              end (int): The last byte to be downloaded.
-
-          Return:
-              Any: the expected implementation.
-          Raises:
-              DrbNotImplementedException: if `impl` is not supported by the
-                                          current node
-        """
-        if self.has_impl(impl):
-            headers = None
-            if 'start' in kwargs:
-                if 'end' in kwargs:
-                    headers = (kwargs.get('start'), kwargs.get('end'))
-                else:
-                    headers = (kwargs.get('start'),)
-            return Download(self.path.name,
-                            self.auth,
-                            self.params,
-                            headers,
-                            kwargs.get('chunk_size', 4 * 1048576)
-                            )
-        raise DrbNotImplementationException(
-            f'no {impl} implementation found')
-
     @staticmethod
     def post(url: str,
              headers: dict = None,
@@ -394,8 +356,16 @@ class DrbHttpNode(AbstractNode):
                                  auth=auth)
         return DrbHttpResponse(path=url, response=response)
 
-    def close(self) -> None:
-        pass
+
+def _to_stream(node: DrbHttpNode, **kwargs):
+    headers = None
+    if 'start' in kwargs:
+        if 'end' in kwargs:
+            headers = (kwargs.get('start'), kwargs.get('end'))
+        else:
+            headers = (kwargs.get('start'),)
+    return Download(node.path.name, node.auth, node.params, headers,
+                    kwargs.get('chunk_size', 4 * 1048576))
 
 
 class DrbHttpResponse(DrbHttpNode):
@@ -407,10 +377,6 @@ class DrbHttpResponse(DrbHttpNode):
             (k, None): v for k, v in self._resp.headers.items()
         }
         self.value = response.content
-        self._available_impl.append(io.BytesIO)
-
-    def get_impl(self, impl: type, **kwargs) -> Any:
-        return io.BytesIO(self._resp.content)
 
 
 class DrbHttpFactory(DrbFactory):

{drb-driver-http-1.2.0 → drb-driver-http-1.3.0/drb_driver_http.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drb-driver-http
-Version: 1.2.0
+Version: 1.3.0
 Summary: DRB Http driver
 Author: GAEL Systems
 Author-email: drb-python@gael.fr
@@ -13,6 +13,8 @@ Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGP
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENCE.txt
+Requires-Dist: drb~=2.2.0
+Requires-Dist: tenacity==8.0.1
 
 # Http & Https Implementation
 This drb-driver-http module implements http and https protocol access with DRB data model.

{drb-driver-http-1.2.0 → drb-driver-http-1.3.0}/drb_driver_http.egg-info/requires.txt

@@ -1,2 +1,2 @@
-drb~=2.1.3
+drb~=2.2.0
 tenacity==8.0.1

{drb-driver-http-1.2.0 → drb-driver-http-1.3.0}/requirements.txt

@@ -1,2 +1,2 @@
-drb~=2.1.3
+drb~=2.2.0
 tenacity==8.0.1

{drb-driver-http-1.2.0 → drb-driver-http-1.3.0}/tests/test_drb_http_keyring.py

@@ -4,7 +4,6 @@ from unittest.mock import patch
 from multiprocessing import Process
 
 from keyring.credentials import SimpleCredential
-from requests.auth import HTTPBasicAuth
 
 from drb.drivers.http import DrbHttpNode
 from tests.utility import start_auth_serve, PORT, PATH
@@ -12,7 +11,7 @@ from tests.utility import start_auth_serve, PORT, PATH
 process = Process(target=start_auth_serve)
 
 
-def my_credential(usr, pwd):
+def my_credential(service_name, username):
     return SimpleCredential('user', 'pwd123456')
 
 
@@ -29,7 +28,7 @@ class TestBitwardenKeyring(unittest.TestCase):
 
     @patch(target="keyring.get_credential", new=my_credential)
     def test_keyring_auth(self):
-        node = DrbHttpNode(path=self.url_ok, auth=HTTPBasicAuth('usr', 'pwd'))
+        node = DrbHttpNode(path=self.url_ok)
 
         self.assertEqual('{"path": "/resources/test.txt"}',
                          node.get_impl(io.BytesIO).getvalue().decode())