csu 2.5.3__tar.gz → 2.5.5__tar.gz

{csu-2.5.3 → csu-2.5.5}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.3
+current_version = 2.5.5
 commit = True
 tag = True
 

{csu-2.5.3 → csu-2.5.5}/.cookiecutterrc

@@ -41,7 +41,7 @@ default_context:
     sphinx_theme: furo
     test_matrix_separate_coverage: false
     tests_inside_package: true
-    version: 2.5.3
+    version: 2.5.5
     version_manager: bump2version
     website: https://blog.ionelmc.ro
     year_from: '2024'

{csu-2.5.3 → csu-2.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.5.3
+Version: 2.5.5
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -69,9 +69,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.3.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.5.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.5.3...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.5.5...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.5.3 → csu-2.5.5}/README.rst

@@ -34,9 +34,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.3.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.5.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.5.3...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.5.5...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.5.3 → csu-2.5.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csu"
-version = "2.5.3"
+version = "2.5.5"
 description = "Clean Slate Utils - bunch of utility code, mostly Django/DRF specific."
 requires-python = ">=3.14"
 license = "BSD-2-Clause"

{csu-2.5.3 → csu-2.5.5}/src/csu/__init__.py

@@ -2,4 +2,4 @@
 a.k.a Clean Slate Utils
 """
 
-__version__ = "2.5.3"
+__version__ = "2.5.5"

{csu-2.5.3 → csu-2.5.5}/src/csu/conf.py

@@ -24,13 +24,19 @@ else:
 LOGGING_AUTH_INFO_FIELDS = getattr(settings, "CSU_LOGGING_AUTH_INFO_FIELDS", ("_auth",))
 assert isinstance(LOGGING_AUTH_INFO_FIELDS, list | tuple), f"Expected CSU_LOGGING_AUTH_INFO_FIELDS={LOGGING_AUTH_INFO_FIELDS!r} to be a list or tuple."
 LOGGING_TB_LIMIT = getattr(settings, "CSU_LOGGING_TB_LIMIT", 5)
+LOGGING_SHOW_HEADERS = getattr(settings, "CSU_LOGGING_SHOW_HEADERS", False)
 LOGGING_AUTH_INFO_LIMIT = getattr(settings, "CSU_LOGGING_AUTH_INFO_LIMIT", 12)
-LOGGING_REQUEST_BODY_LIMIT = getattr(settings, "CSU_LOGGING_REQUEST_BODY_LIMIT", 102400)
+
 LOGGING_RESPONSE_TEXT_LIMIT = getattr(settings, "CSU_LOGGING_RESPONSE_TEXT_LIMIT", 102400)
 LOGGING_RESPONSE_BINARY_LIMIT = getattr(settings, "CSU_LOGGING_RESPONSE_BINARY_LIMIT", 64)
-LOGGING_SHOW_HEADERS = getattr(settings, "CSU_LOGGING_SHOW_HEADERS", False)
+LOGGING_RESPONSE_SHOW_HEADERS = getattr(settings, "CSU_LOGGING_RESPONSE_SHOW_HEADERS", LOGGING_SHOW_HEADERS)
+
+LOGGING_REQUEST_BODY_LIMIT = getattr(settings, "CSU_LOGGING_REQUEST_BODY_LIMIT", 102400)
+LOGGING_REQUEST_SHOW_HEADERS = getattr(settings, "CSU_LOGGING_REQUEST_SHOW_HEADERS", LOGGING_RESPONSE_SHOW_HEADERS)
+
 SERVICE_LOGGING_REQUEST_BODY_LIMIT = getattr(settings, "CSU_SERVICE_LOGGING_REQUEST_BODY_LIMIT", None)
 SERVICE_LOGGING_REQUEST_SHOW_HEADERS = getattr(settings, "CSU_SERVICE_LOGGING_REQUEST_SHOW_HEADERS", LOGGING_SHOW_HEADERS)
+
 SERVICE_LOGGING_RESPONSE_TEXT_LIMIT = getattr(settings, "CSU_SERVICE_LOGGING_RESPONSE_TEXT_LIMIT", LOGGING_RESPONSE_TEXT_LIMIT)
 SERVICE_LOGGING_RESPONSE_BINARY_LIMIT = getattr(settings, "CSU_SERVICE_LOGGING_RESPONSE_BINARY_LIMIT", LOGGING_RESPONSE_BINARY_LIMIT)
-SERVICE_LOGGING_RESPONSE_SHOW_HEADERS = getattr(settings, "CSU_SERVICE_LOGGING_RESPONSE_SHOW_HEADERS", False)
+SERVICE_LOGGING_RESPONSE_SHOW_HEADERS = getattr(settings, "CSU_SERVICE_LOGGING_RESPONSE_SHOW_HEADERS", SERVICE_LOGGING_REQUEST_SHOW_HEADERS)

{csu-2.5.3 → csu-2.5.5}/src/csu/logging.py

@@ -12,9 +12,10 @@ from rest_framework.response import Response
 
 from .conf import LOGGING_AUTH_INFO_LIMIT
 from .conf import LOGGING_REQUEST_BODY_LIMIT
+from .conf import LOGGING_REQUEST_SHOW_HEADERS
 from .conf import LOGGING_RESPONSE_BINARY_LIMIT
+from .conf import LOGGING_RESPONSE_SHOW_HEADERS
 from .conf import LOGGING_RESPONSE_TEXT_LIMIT
-from .conf import LOGGING_SHOW_HEADERS
 from .consts import LINE_LENGTH
 from .consts import REQUEST_DATA_LINE
 from .consts import RESPONSE_CONTENT_LINE
@@ -72,9 +73,11 @@ def get_request_line(environ, status_code, auth=None, *extra_auth):
     return format, arguments
 
 
-def trim_auth_info(auth_info):
-    if LOGGING_AUTH_INFO_LIMIT and (auth_size := len(auth_info)) > LOGGING_AUTH_INFO_LIMIT:
-        return f"{auth_info:.{LOGGING_AUTH_INFO_LIMIT}} +{auth_size - LOGGING_AUTH_INFO_LIMIT} more"
+def trim_auth_info(auth_info, limit: int | None = LOGGING_AUTH_INFO_LIMIT):
+    if limit and (auth_size := len(auth_info)) > limit:
+        prefix_limit = limit * 2 // 3
+        suffix_limit = limit - prefix_limit
+        return f"{auth_info[:prefix_limit]} ... +{auth_size - limit} more ... {auth_info[-suffix_limit:]}"
     else:
         return auth_info
 
@@ -120,7 +123,7 @@ def get_content_lines(request: Request | HttpRequest | ASGIRequest, response: Re
     if arguments:
         fa_append_repr(format, arguments, body, LOGGING_REQUEST_BODY_LIMIT)
 
-    if LOGGING_SHOW_HEADERS:
+    if LOGGING_REQUEST_SHOW_HEADERS:
         format.append("\n%s\n  %s")
         arguments += (
             " request headers ".center(LINE_LENGTH, "-"),
@@ -128,11 +131,12 @@ def get_content_lines(request: Request | HttpRequest | ASGIRequest, response: Re
         )
     if response:
         if response.headers:
-            format.append("\n%s\n  %s")
-            arguments += (
-                " response headers ".center(LINE_LENGTH, "-"),
-                "\n  ".join(f"{name}: {value}" for name, value in response.headers.items()),
-            )
+            if LOGGING_RESPONSE_SHOW_HEADERS:
+                format.append("\n%s\n  %s")
+                arguments += (
+                    " response headers ".center(LINE_LENGTH, "-"),
+                    "\n  ".join(f"{name}: {value}" for name, value in response.headers.items()),
+                )
             content_type = response.headers.get("content-type")
         else:
             content_type = None

{csu-2.5.3 → csu-2.5.5}/src/csu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.5.3
+Version: 2.5.5
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -69,9 +69,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.3.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.5.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.5.3...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.5.5...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.5.3 → csu-2.5.5}/src/csu.egg-info/SOURCES.txt

@@ -37,7 +37,6 @@ src/csu/service.py
 src/csu/test_consts.py
 src/csu/test_env.py
 src/csu/test_exceptions.py
-src/csu/test_logging.py
 src/csu/test_management.py
 src/csu/test_service.py
 src/csu/test_timezones.py
@@ -84,6 +83,7 @@ src/csu/worker/registry.py
 tests/conftest.py
 tests/exampleworker.py
 tests/test_exampleworker.py
+tests/test_logging.py
 tests/test_models.py
 tests/test_service.py
 tests/test_service_auth.py

csu-2.5.5/tests/test_logging.py

@@ -0,0 +1,32 @@
+from inline_snapshot import snapshot
+
+from csu.logging import fa_append_repr
+from csu.logging import trim_auth_info
+
+
+def test_fa_append_repr():
+    a = []
+    b = []
+    assert fa_append_repr(a, b, "123456", 3) is None
+    assert a == snapshot(["%s\n   ... %s more characters"])
+    assert b == snapshot(["'12", 5])
+
+
+def test_trim_auth_info():
+    assert [
+        trim_auth_info("12_123456_123456789-abcdefg", 12),
+        trim_auth_info("12_123456_123456789-abcdefg", 13),
+        trim_auth_info("12_123456_123456789-abcdefg", 14),
+        trim_auth_info("12_123456_123456789-abcdefg", 15),
+        trim_auth_info("12_123456_123456789-abcdefg", 16),
+        trim_auth_info("12_123456_123456789-abcdefg", 17),
+    ] == snapshot(
+        [
+            "12_12345 ... +15 more ... defg",
+            "12_12345 ... +14 more ... cdefg",
+            "12_123456 ... +13 more ... cdefg",
+            "12_123456_ ... +12 more ... cdefg",
+            "12_123456_ ... +11 more ... bcdefg",
+            "12_123456_1 ... +10 more ... bcdefg",
+        ]
+    )

csu-2.5.3/src/csu/test_logging.py

@@ -1,9 +0,0 @@
-from .logging import fa_append_repr
-
-
-def test_fa_append_repr():
-    a = []
-    b = []
-    assert fa_append_repr(a, b, "123456", 3) is None
-    assert a == ["%s\n   ... %s more characters"]
-    assert b == ["'12", 5]