django-log-formatter-asim 0.0.0__tar.gz → 0.0.1__tar.gz

{django_log_formatter_asim-0.0.0 → django_log_formatter_asim-0.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-log-formatter-asim
-Version: 0.0.0
+Version: 0.0.1
 Summary: Formats Django logs in ASIM format.
 License: MIT
 Author: Department for Business and Trade Platform Team
@@ -12,8 +12,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: django (>=4.2.7,<5.0.0)
-Requires-Dist: django-ipware (>=5.0.2,<6.0.0)
+Requires-Dist: django (>=3,<5)
 Description-Content-Type: text/markdown
 
 # Django ASIM log formatter

{django_log_formatter_asim-0.0.0 → django_log_formatter_asim-0.0.1}/django_log_formatter_asim/__init__.py

@@ -22,7 +22,7 @@ class ASIMFormatterBase:
                 user.first_name = "{{FIRST_NAME}}"
                 user.last_name = "{{LAST_NAME}}"
 
-    def _get_log_dict_base(self):
+    def get_log_dict(self):
         record = self.record
         log_time = datetime.utcfromtimestamp(record.created).isoformat()
         log_dict = {
@@ -68,16 +68,12 @@ class ASIMFormatterBase:
 
 
 class ASIMSystemFormatter(ASIMFormatterBase):
-    def get_log_dict(self):
-        return self._get_log_dict_base()
+    pass
 
 
 class ASIMRequestFormatter(ASIMFormatterBase):
-    def __init__(self, record):
-        super().__init__(record)
-
     def get_log_dict(self):
-        log_dict = self._get_log_dict_base()
+        log_dict = super().get_log_dict()
 
         request = self.record.request
 
@@ -118,7 +114,7 @@ class ASIMRequestFormatter(ASIMFormatterBase):
         request = self.record.request
         http_user_agent = getattr(request, "user_agent", None)
         if not http_user_agent:
-            http_user_agent = getattr(request.headers, "user_agent", None)
+            http_user_agent = getattr(request.headers, "User-Agent", None)
         if not http_user_agent:
             http_user_agent = request.META.get("HTTP_USER_AGENT", None)
         return http_user_agent

{django_log_formatter_asim-0.0.0 → django_log_formatter_asim-0.0.1}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 100
 
 [tool.poetry]
 name = "django-log-formatter-asim"
-version = "0.0.0"
+version = "0.0.1"
 description = "Formats Django logs in ASIM format."
 authors = ["Department for Business and Trade Platform Team <sre-team@digital.trade.gov.uk>"]
 license = "MIT"
@@ -13,8 +13,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-django = "^4.2.7"
-django-ipware = "^5.0.2"
+django = ">=3,<5"
 python = ">=3.9,<4"
 
 [tool.poetry.group.dev.dependencies]