fixes

Signed-off-by: Dmitriy Kunitskiy <dkunitskiy@lyft.com>

amundsen_common/log/http_header_caller_retrieval.py

@@ -12,4 +12,4 @@
 class HttpHeaderCallerRetrieval(BaseCallerRetriever):
     def get_caller(self) -> str:
         header_key = flask_app.config.get(CALLER_HEADER_KEY, 'user-agent')
-        return request.headers.get(header_key, 'UNKNOWN')
+        return request.headers.get(header_key) or 'UNKNOWN'

amundsen_common/models/user.py

@@ -57,7 +57,7 @@ def _str_no_value(self, s: Optional[str]) -> bool:
         return False
 
     @pre_load
-    def preprocess_data(self, data: Dict[str, Any], **kwargs) -> Dict[str, Any]:
+    def preprocess_data(self, data: Dict[str, Any], **kwargs: Any) -> Dict[str, Any]:
         if self._str_no_value(data.get('user_id')):
             data['user_id'] = data.get('email')
 
@@ -81,7 +81,7 @@ def preprocess_data(self, data: Dict[str, Any], **kwargs) -> Dict[str, Any]:
         return data
 
     @validates_schema
-    def validate_user(self, data: Dict[str, Any], **kwargs) -> None:
+    def validate_user(self, data: Dict[str, Any], **kwargs: Any) -> None:
         if self._str_no_value(data.get('display_name')):
             raise ValidationError('"display_name", "full_name", or "email" must be provided')
 

setup.py

@@ -42,7 +42,7 @@
         'Flask>=1.0.2',
         'attrs>=19.0.0',
         'marshmallow>=3.0,<=3.6',
-        'marshmallow-annotations @ git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bdef36555082df990ed9bef#egg=marshmallow-annotations'
+        'marshmallow-annotations @ git+https://www.github.com/hilearn/marshmallow-annotations.git@a7a2dc96932430369bdef36555082df990ed9bef#egg=marshmallow-annotations'  # noqa
     ],
     python_requires=">=3.6",
     package_data={'amundsen_common': ['py.typed']},

tests/unit/log/test_http_header_caller_retrieval.py

@@ -5,6 +5,7 @@
 
 import flask
 from mock import patch
+from mock import MagicMock
 
 from amundsen_common.log import http_header_caller_retrieval
 from amundsen_common.log.http_header_caller_retrieval import HttpHeaderCallerRetrieval
@@ -13,12 +14,11 @@
 
 
 class ActionLogTest(unittest.TestCase):
-
     def test(self) -> None:
-        with app.test_request_context(), patch.object(http_header_caller_retrieval, 'request') as mock_request:
+        with app.test_request_context(), \
+                patch.object(http_header_caller_retrieval, 'request', new=MagicMock()) as mock_request:
             mock_request.headers.get.return_value = 'foo'
             actual = HttpHeaderCallerRetrieval().get_caller()
-
             self.assertEqual(actual, 'foo')