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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drb-driver-http
-Version: 1.3.0
+Version: 1.3.2
 Summary: DRB Http driver
 Author: GAEL Systems
 Author-email: drb-python@gael.fr

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-09-12T17:43:20+0200",
+ "date": "2023-12-11T14:19:01+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "38308644bfd44c075f46f5b42c6f3c2daca93a1e",
- "version": "1.3.0"
+ "full-revisionid": "fb65d1f92910d9d6874fa59b58719538fd74f5d5",
+ "version": "1.3.2"
 }
 '''  # END VERSION_JSON
 

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

@@ -6,9 +6,9 @@ import re
 import keyring
 from deprecated import deprecated
 from drb.core import DrbNode, ParsedPath, DrbFactory
-from drb.exceptions.core import DrbException, DrbNotImplementationException
+from drb.exceptions.core import DrbException
 from drb.nodes.abstract_node import AbstractNode
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Tuple
 from urllib.parse import urlparse
 
 import requests
@@ -27,9 +27,9 @@ from drb.exceptions.http import DrbHttpServerException, \
 @retry(stop=(stop_after_delay(120) | stop_after_attempt(5)),
        wait=wait_fixed(15),
        retry=retry_if_exception_type(DrbHttpNodeException))
-def get(path: str, auth: AuthBase, headers, params: Dict[str, str]):
-    return requests.get(path, stream=True, auth=auth,
-                        headers=headers, params=params)
+def get(path: str, auth: AuthBase, redirect, headers, params: Dict[str, Any]):
+    return requests.get(path, stream=True, auth=auth, allow_redirects=redirect,
+                        headers=headers, **params)
 
 
 @retry(stop=stop_after_attempt(5),
@@ -38,11 +38,12 @@ def get(path: str, auth: AuthBase, headers, params: Dict[str, str]):
 @retry(stop=(stop_after_delay(120) | stop_after_attempt(5)),
        wait=wait_fixed(15),
        retry=retry_if_exception_type(DrbHttpNodeException))
-def head(path: str, auth: AuthBase, params: Dict[str, str]):
+def head(path: str, auth: AuthBase, redirect, params: Dict[str, Any]):
     return requests.head(
         path,
         auth=auth,
-        params=params
+        allow_redirects=redirect,
+        **params
     )
 
 
@@ -80,6 +81,7 @@ class Download(io.BytesIO):
                  params: Dict[str, str],
                  headers,
                  chunk_size: int,
+                 redirect=True
                  ):
         self.__res = None
         self._chunk_size = chunk_size
@@ -91,6 +93,7 @@ class Download(io.BytesIO):
         self._buff = bytearray(0)
         self._pos = 0
         self._seekable = True
+        self._redirect = redirect
         self.content_length = -1
         super().__init__()
 
@@ -169,6 +172,7 @@ class Download(io.BytesIO):
             self.__res = get(
                 self._path,
                 self._auth,
+                self._redirect,
                 heads,
                 self._params
             )
@@ -245,17 +249,27 @@ class DrbHttpNode(AbstractNode):
     """
 
     def __init__(self, path, auth: AuthBase = None,
-                 params: Dict[str, str] = None):
+                 redirect=True,
+                 params: Dict[str, Any] = {}):
         super().__init__()
         self._path = path
         self._auth = auth
         self._params = params
         self._children = []
+        self._redirect = redirect
         self.add_impl(io.BytesIO, _to_stream)
 
     def __init_header(self):
         if len(self._attrs) == 0:
-            res = head(self._path, self.auth, self._params)
+            res = head(self._path, self.auth, self._redirect, self._params)
+            if res.status_code == 405:
+                headers = {"Range": "bytes=0-0"}
+                res = get(path=self._path,
+                          auth=self.auth,
+                          redirect=self._redirect,
+                          params=self._params,
+                          headers=headers
+                          )
             check_response(res)
             for x in res.headers:
                 self @= (x, res.headers[x])
@@ -337,7 +351,8 @@ class DrbHttpNode(AbstractNode):
     def post(url: str,
              headers: dict = None,
              data: dict = None,
-             auth: AuthBase = None
+             auth: AuthBase = None,
+             redirect=True
              ) -> DrbNode:
         """
             Send a post request with the headers and
@@ -349,10 +364,12 @@ class DrbHttpNode(AbstractNode):
                     object to send in the body.
                 data (dict): json data to send in the body.
                 auth (AuthBase)
+                redirect (Bool)
         """
         response = requests.post(url=url,
                                  headers=headers,
                                  json=data,
+                                 allow_redirects=redirect,
                                  auth=auth)
         return DrbHttpResponse(path=url, response=response)
 
@@ -365,7 +382,8 @@ def _to_stream(node: DrbHttpNode, **kwargs):
         else:
             headers = (kwargs.get('start'),)
     return Download(node.path.name, node.auth, node.params, headers,
-                    kwargs.get('chunk_size', 4 * 1048576))
+                    kwargs.get('chunk_size', 4 * 1048576),
+                    kwargs.get('redirect', True))
 
 
 class DrbHttpResponse(DrbHttpNode):
@@ -377,6 +395,12 @@ class DrbHttpResponse(DrbHttpNode):
             (k, None): v for k, v in self._resp.headers.items()
         }
         self.value = response.content
+        self.add_impl(io.BytesIO, self._to_stream)
+
+    @staticmethod
+    def _to_stream(node: DrbNode, **kwargs):
+        if isinstance(node, DrbHttpResponse):
+            return io.BytesIO(node.value)
 
 
 class DrbHttpFactory(DrbFactory):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drb-driver-http
-Version: 1.3.0
+Version: 1.3.2
 Summary: DRB Http driver
 Author: GAEL Systems
 Author-email: drb-python@gael.fr

{drb-driver-http-1.3.0 → drb-driver-http-1.3.2}/tests/test_drb_impl_http.py

@@ -101,18 +101,18 @@ class TestDrbHttp(unittest.TestCase):
             self.assertEqual('test', stream.read(4).decode())
 
     def test_impl_argument(self):
-        key = ('params', None)
+        key = ('Content-Type', None)
         self.assertEqual(
             requests.head(self.url_ok,
-                          params={'key': 'value'}).headers[key[0]],
+                          params={"cookies": None}).headers[key[0]],
             DrbHttpNode(self.url_ok,
-                        params={'key': 'value'}).attributes[key]
+                        params={"cookies": None}).attributes[key]
         )
 
     def test_impl_none_argument(self):
         key = ('params', None)
         with self.assertRaises(KeyError):
-            DrbHttpNode(self.url_ok, params=None).attributes[key]
+            DrbHttpNode(self.url_ok, params={}).attributes[key]
 
     def test_impl_no_argument(self):
         key = ('params', None)
@@ -197,4 +197,5 @@ class TestDrbHttp(unittest.TestCase):
             url='http://localhost:8756/resources/test.txt',
             headers={'Content-Type': 'application/json'},
             json='{"test1": "value1", "test2": "value2"}',
+            allow_redirects=True,
             auth=None)