drb-driver-http 1.3.1__tar.gz → 1.3.3__tar.gz

{drb-driver-http-1.3.1/drb_driver_http.egg-info → drb_driver_http-1.3.3}/PKG-INFO

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

{drb-driver-http-1.3.1 → drb_driver_http-1.3.3}/drb/drivers/http/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-09-14T16:16:21+0200",
+ "date": "2024-07-17T16:46:34+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "e8e3f8c3ce65c7a98575a78a465359b93985cd40",
- "version": "1.3.1"
+ "full-revisionid": "01ab0f4e348f4e8040b143a8b51ae258bb9c7662",
+ "version": "1.3.3"
 }
 '''  # END VERSION_JSON
 

{drb-driver-http-1.3.1 → drb_driver_http-1.3.3}/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,20 +249,30 @@ 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])
+                self.__imatmul__((x, res.headers[x]))
 
     @property
     def name(self) -> str:
@@ -297,6 +311,18 @@ class DrbHttpNode(AbstractNode):
     def __delitem__(self, key):
         raise NotImplementedError
 
+    def __matmul__(self, other):
+        new_other = other
+        if isinstance(other, str):
+            new_other = other.lower(), None
+        if isinstance(other, tuple):
+            new_other = (other[0].lower(), *other[1:])
+        return super().__matmul__(new_other)
+
+    def __imatmul__(self, other):
+        new_other = (other[0].lower(), *other[1:])
+        super().__imatmul__(new_other)
+
     @property
     def params(self):
         return self._params
@@ -314,20 +340,13 @@ class DrbHttpNode(AbstractNode):
                 reason='Usage of the @ operator is recommended')
     def attributes(self) -> Dict[Tuple[str | Any, None], Any]:
         self.__init_header()
-        attributes = {}
-        for k, v in self._attrs.items():
-            if k[0].lower() == 'content-type':
-                new_k = 'Content-Type'
-            else:
-                new_k = k[0]
-            attributes[(new_k, None)] = self @ k[0]
-        return attributes
+        return self._attrs.copy()
 
     @deprecated(version='1.2.0',
                 reason='Usage of the @ operator is recommended')
     def get_attribute(self, name: str, namespace_uri: str = None) -> Any:
         self.__init_header()
-        key = (name, namespace_uri)
+        key = (name.lower(), namespace_uri)
         if namespace_uri is None and key in self.attributes.keys():
             return self.attributes[key]
         raise DrbException(f'Attribute not found name: {name}, '
@@ -337,7 +356,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 +369,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 +387,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):

{drb-driver-http-1.3.1 → drb_driver_http-1.3.3/drb_driver_http.egg-info}/PKG-INFO

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

{drb-driver-http-1.3.1 → drb_driver_http-1.3.3}/tests/test_drb_impl_http.py

@@ -1,5 +1,6 @@
 import io
 import json
+import sys
 import unittest
 from multiprocessing import Process
 
@@ -101,18 +102,15 @@ class TestDrbHttp(unittest.TestCase):
             self.assertEqual('test', stream.read(4).decode())
 
     def test_impl_argument(self):
-        key = ('params', None)
-        self.assertEqual(
-            requests.head(self.url_ok,
-                          params={'key': 'value'}).headers[key[0]],
-            DrbHttpNode(self.url_ok,
-                        params={'key': 'value'}).attributes[key]
-        )
+        header_key = 'Content-Type'
+        header_value = requests.head(self.url_ok).headers[header_key]
+        node = DrbHttpNode(self.url_ok, params={"cookies": None})
+        self.assertEqual(header_value, node.get_attribute(header_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)
@@ -136,10 +134,22 @@ class TestDrbHttp(unittest.TestCase):
         self.assertIsNone(node.parent)
 
     def test_attributes(self):
-        key = ('Content-Type', None)
+        header_key = "Content-Type"
+        header_value = requests.head(self.url_ok).headers[header_key]
+        node = DrbHttpNode(self.url_ok)
+
         self.assertEqual(
-            requests.head(self.url_ok).headers[key[0]],
-            DrbHttpNode(self.url_ok).attributes[key])
+            header_value,
+            node.attributes[header_key.lower(), None]
+        )
+
+        self.assertEqual(header_value, node.get_attribute(header_key))
+        self.assertEqual(header_value, node.get_attribute(header_key.lower()))
+
+        self.assertEqual(header_value, node @ header_key)
+        self.assertEqual(header_value, node @ (header_key, None))
+        self.assertEqual(header_value, node @ header_key.lower())
+        self.assertEqual(header_value, node @ (header_key.lower(), None))
 
     def test_wrong_attributes(self):
         with self.assertRaises(DrbException):
@@ -197,4 +207,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)