csu 2.4.2__tar.gz → 2.5.0__tar.gz

{csu-2.4.2 → csu-2.5.0}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.2
+current_version = 2.5.0
 commit = True
 tag = True
 

{csu-2.4.2 → csu-2.5.0}/.cookiecutterrc

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

{csu-2.4.2 → csu-2.5.0}/.pre-commit-config.yaml

@@ -6,19 +6,19 @@ exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
 # Note the order is intentional to avoid multiple passes of the hooks
 repos:
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.30.0
+    rev: 1.32.0
     hooks:
       - id: django-upgrade
         args: [ --target-version, "5.2" ]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.17
+    rev: v0.16.6
     hooks:
       - id: ruff
         # Using --unsafe-fixes can change code behavior
         args: [--fix, --exit-non-zero-on-fix, --show-fixes, --unsafe-fixes]
       - id: ruff-format
   - repo: https://github.com/tombi-toml/tombi-pre-commit
-    rev: v1.1.2
+    rev: v1.5.1
     hooks:
       - id: tombi-format
         # args: [ "--offline" ]

{csu-2.4.2 → csu-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.4.2
+Version: 2.5.0
 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.4.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.4.2...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.5.0...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.4.2 → csu-2.5.0}/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.4.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.4.2...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.5.0...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.4.2 → csu-2.5.0}/pyproject.toml

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

{csu-2.4.2 → csu-2.5.0}/src/csu/__init__.py

@@ -2,4 +2,4 @@
 a.k.a Clean Slate Utils
 """
 
-__version__ = "2.4.2"
+__version__ = "2.5.0"

{csu-2.4.2 → csu-2.5.0}/src/csu/conf.py

@@ -25,10 +25,12 @@ LOGGING_AUTH_INFO_FIELDS = getattr(settings, "CSU_LOGGING_AUTH_INFO_FIELDS", ("_
 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_REQUEST_BODY_LIMIT = getattr(settings, "CSU_LOGGING_REQUEST_BODY_LIMIT", 102400)
-LOGGING_RESPONSE_BODY_LIMIT = getattr(settings, "CSU_LOGGING_RESPONSE_BODY_LIMIT", 102400)
+LOGGING_RESPONSE_TEXT_LIMIT = getattr(settings, "LOGGING_RESPONSE_TEXT_LIMIT", 102400)
+LOGGING_RESPONSE_BINARY_LIMIT = getattr(settings, "LOGGING_RESPONSE_BINARY_LIMIT", 64)
 LOGGING_SHOW_HEADERS = getattr(settings, "CSU_LOGGING_SHOW_HEADERS", False)
 
-SERVICE_REQUEST_CONTENT_LOG_LIMIT = getattr(settings, "CSU_SERVICE_REQUEST_CONTENT_LOG_LIMIT", None)
-SERVICE_REQUEST_SHOW_HEADERS = getattr(settings, "CSU_SERVICE_REQUEST_SHOW_HEADERS", False)
-SERVICE_RESPONSE_CONTENT_LOG_LIMIT = getattr(settings, "CSU_SERVICE_RESPONSE_CONTENT_LOG_LIMIT", 10240)
-SERVICE_RESPONSE_SHOW_HEADERS = getattr(settings, "CSU_SERVICE_RESPONSE_SHOW_HEADERS", False)
+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", False)
+SERVICE_LOGGING_RESPONSE_TEXT_LIMIT = getattr(settings, "CSU_SERVICE_LOGGING_RESPONSE_TEXT_LIMIT", 102400)
+SERVICE_LOGGING_RESPONSE_BINARY_LIMIT = getattr(settings, "CSU_SERVICE_LOGGING_RESPONSE_BINARY_LIMIT", 64)
+SERVICE_LOGGING_RESPONSE_SHOW_HEADERS = getattr(settings, "CSU_SERVICE_LOGGING_RESPONSE_SHOW_HEADERS", False)

{csu-2.4.2 → csu-2.5.0}/src/csu/forms/fields.py

@@ -34,17 +34,12 @@ class OpaqueField(forms.MultiValueField, forms.FileField):
     value_widget: type
     value_field: type
 
-    def __init__(self, required=UNSPECIFIED, widget=UNSPECIFIED, disabled=UNSPECIFIED, **kwargs):
-        if not (required is UNSPECIFIED or required):
-            raise TypeError("Cannot make this field not mandatory.")
+    def __init__(self, widget=UNSPECIFIED, **kwargs):
         if widget is not UNSPECIFIED:
             raise TypeError("Cannot override widget.")
-        if not (disabled is UNSPECIFIED or not disabled):
-            raise TypeError("Cannot disable this field.")
         super().__init__(
             fields=[forms.CharField(required=False), self.value_field(required=False)],
             widget=OpaqueWidget(self.value_widget, self.display_value),
-            required=False,
             require_all_fields=False,
             **kwargs,
         )

{csu-2.4.2 → csu-2.5.0}/src/csu/logging.py

@@ -11,7 +11,8 @@ from rest_framework.request import Request
 from rest_framework.response import Response
 
 from .conf import LOGGING_REQUEST_BODY_LIMIT
-from .conf import LOGGING_RESPONSE_BODY_LIMIT
+from .conf import LOGGING_RESPONSE_BINARY_LIMIT
+from .conf import LOGGING_RESPONSE_TEXT_LIMIT
 from .conf import LOGGING_SHOW_HEADERS
 from .consts import LINE_LENGTH
 from .consts import REQUEST_DATA_LINE
@@ -24,6 +25,12 @@ from .consts import THICK_LINE
 default_logger = getLogger("csu")
 
 
+def is_text_content_type(content_type: str) -> bool:
+    return (
+        content_type.startswith("text/") or content_type.endswith(("json", "plain", "xml")) or any(part in content_type for part in ("json", "script", "xml"))
+    )
+
+
 def get_remote_addresses(environ, placeholder=None):
     remote_addr = [environ.get("REMOTE_ADDR", placeholder)]
     forwarded_for = environ.get("HTTP_X_FORWARDED_FOR", "").split(",")
@@ -63,7 +70,7 @@ def get_request_line(environ, status_code, auth=None, *extra_auth):
     return format, arguments
 
 
-def fa_append_repr(format: list[str], arguments: list, value, limit: None | int):
+def fa_append_repr(format: list[str], arguments: list, value, limit: int | None):
     value = repr(value)
     if limit and (size := len(value)) > limit:
         format.append("%s\n   ... %s more characters")
@@ -111,19 +118,30 @@ def get_content_lines(request: Request | HttpRequest | ASGIRequest, response: Re
             "\n  ".join(f"{name}: {value}" for name, value in request.headers.items()),
         )
     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()),
+            )
+            content_type = response.headers.get("content-type")
+        else:
+            content_type = None
+
+        is_text = is_text_content_type(content_type or "text/")
         try:
             if getattr(response, "is_rendered", True) and response.content:
                 format.append("\n%s\n  ")
                 arguments.append(RESPONSE_CONTENT_LINE)
-                fa_append_repr(format, arguments, response.content, LOGGING_RESPONSE_BODY_LIMIT)
+                fa_append_repr(format, arguments, response.content, LOGGING_RESPONSE_TEXT_LIMIT if is_text else LOGGING_RESPONSE_BINARY_LIMIT)
             elif hasattr(response, "data") and response.data is not None:
                 format.append("\n%s\n  ")
                 arguments.append(RESPONSE_DATA_LINE)
-                fa_append_repr(format, arguments, response.data, LOGGING_RESPONSE_BODY_LIMIT)
+                fa_append_repr(format, arguments, response.data, LOGGING_RESPONSE_TEXT_LIMIT if is_text else LOGGING_RESPONSE_BINARY_LIMIT)
             else:
                 format.append("\n%s\n  ")
                 arguments.append(RESPONSE_LINE)
-                fa_append_repr(format, arguments, response, LOGGING_RESPONSE_BODY_LIMIT)
+                fa_append_repr(format, arguments, response, LOGGING_RESPONSE_TEXT_LIMIT if is_text else LOGGING_RESPONSE_BINARY_LIMIT)
         except Exception as exc:
             format.append("\n%s\n  Failed to get response: %s")
             arguments += (

{csu-2.4.2 → csu-2.5.0}/src/csu/service.py

@@ -19,10 +19,11 @@ from niquests.exceptions import ConnectionError
 from niquests.typing import TLSClientCertType
 from niquests.typing import TLSVerifyType
 
-from .conf import SERVICE_REQUEST_CONTENT_LOG_LIMIT
-from .conf import SERVICE_REQUEST_SHOW_HEADERS
-from .conf import SERVICE_RESPONSE_CONTENT_LOG_LIMIT
-from .conf import SERVICE_RESPONSE_SHOW_HEADERS
+from .conf import SERVICE_LOGGING_REQUEST_BODY_LIMIT
+from .conf import SERVICE_LOGGING_REQUEST_SHOW_HEADERS
+from .conf import SERVICE_LOGGING_RESPONSE_BINARY_LIMIT
+from .conf import SERVICE_LOGGING_RESPONSE_SHOW_HEADERS
+from .conf import SERVICE_LOGGING_RESPONSE_TEXT_LIMIT
 from .consts import LINE_LENGTH
 from .consts import THICK_LINE
 from .exceptions import DecodeError
@@ -33,13 +34,14 @@ from .exceptions import RetryableError
 from .exceptions import RetryableStatusError
 from .exceptions import UnexpectedStatusError
 from .exceptions import get_event_id
+from .logging import is_text_content_type
 
 
 class HTTPServiceResponse:
     status: int
     http_response: Response | AsyncResponse
     event_id: str
-    json: None | list | dict = None
+    json: list | dict | None = None
     text: str
     content: bytes
 
@@ -89,8 +91,11 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
     client_class = Session
     client: Session
     logger: Logger
-    request_content_log_limit = SERVICE_REQUEST_CONTENT_LOG_LIMIT
-    response_content_log_limit = SERVICE_RESPONSE_CONTENT_LOG_LIMIT
+    log_request_body_limit = SERVICE_LOGGING_REQUEST_BODY_LIMIT
+    log_request_show_headers = SERVICE_LOGGING_REQUEST_SHOW_HEADERS
+    log_response_text_limit = SERVICE_LOGGING_RESPONSE_TEXT_LIMIT
+    log_response_binary_limit = SERVICE_LOGGING_RESPONSE_BINARY_LIMIT
+    log_response_show_headers = SERVICE_LOGGING_RESPONSE_SHOW_HEADERS
 
     def __init__(self, service: HTTPService[Self], event_id=None, auth=None, proxy=None, **kwargs):
         if auth is None:
@@ -123,14 +128,14 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
         self.handle_log_request(request)
 
     def handle_log_request(self, request: PreparedRequest):
-        if SERVICE_REQUEST_SHOW_HEADERS:
+        if self.log_request_show_headers:
             header = " request headers ".center(LINE_LENGTH, "-"), "\n  ".join(f"{k}: {v!r}" for k, v in sorted(request.headers.items()))
         else:
             header = (request.headers.get("authorization", ""),)
 
         if request.body:
             size = len(request.body)
-            limit = self.request_content_log_limit
+            limit = self.log_request_body_limit
             if limit and size > limit:
                 content = f"{request.body!r:.{limit}}\n   ... {size - limit} more bytes"
             else:
@@ -142,12 +147,12 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
             content = request_line = None
 
         if content is None:
-            if SERVICE_REQUEST_SHOW_HEADERS:
+            if self.log_request_show_headers:
                 self.logger.info("[%s] %s %s\n%s\n  %s", self.short_id, request.method, request.url, *header)
             else:
                 self.logger.info("[%s] %s %s +[%s]", self.short_id, request.method, request.url, *header)
         else:
-            if SERVICE_REQUEST_SHOW_HEADERS:
+            if self.log_request_show_headers:
                 self.logger.info(
                     "[%s] %s %s\n%s\n  %s\n%s\n   %s\n%s",
                     self.short_id,
@@ -176,14 +181,15 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
     def handle_log_response(self, response: Response | AsyncResponse, content):
         size = len(content) if content else 0
         content_type = response.headers.get("content-type")
+        is_text = is_text_content_type(content_type or "text/")
         content_type = "no content-type" if content_type is None else repr(content_type)
         response_line = f" response body ({content_type} - {size} bytes) ".center(LINE_LENGTH, "-")
-        limit = self.response_content_log_limit
+        limit = self.log_response_text_limit if is_text else self.log_response_binary_limit
         if limit and size > limit:
             content = f"{content!r:.{limit}}\n   ... {size - limit} more bytes"
         else:
             content = f"{content!r}"
-        if SERVICE_RESPONSE_SHOW_HEADERS:
+        if self.log_response_show_headers:
             headers_line = " response headers ".center(LINE_LENGTH, "-")
             headers = "\n  ".join(f"{k}: {v!r}" for k, v in sorted(response.headers.items()))
             self.logger.info(

{csu-2.4.2 → csu-2.5.0}/src/csu/xml.py

@@ -91,13 +91,13 @@ def replace_ns(value: str, replacement: tuple[str, str]) -> str:
 class XML:
     element: Element
 
-    def __init__(self, element, namespaces: None | dict = None):
+    def __init__(self, element, namespaces: dict | None = None):
         assert isinstance(element, Element), "Expected an Element instance. Perhaps you wanted to use XML.fromstring?"
         self.element = element
         self.namespaces = namespaces or {}
 
     @classmethod
-    def fromstring(cls, xml: str, namespaces: None | dict = None) -> Self:
+    def fromstring(cls, xml: str, namespaces: dict | None = None) -> Self:
         try:
             return cls(
                 fromstring(xml, forbid_dtd=True, forbid_entities=True, forbid_external=True),

{csu-2.4.2 → csu-2.5.0}/src/csu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.4.2
+Version: 2.5.0
 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.4.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.4.2...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.5.0...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.4.2 → csu-2.5.0}/tests/test_service.py

@@ -260,7 +260,7 @@ json.decoder.JSONDecodeError: Expecting value: line 2 column 5 (char 5)
 During handling of the above exception, another exception occurred:
 
 Traceback (most recent call last):
-  File "[&SERVICE_PATH]", line 230, in handle_process_response
+  File "[&SERVICE_PATH]", line 236, in handle_process_response
     json = response.json(parse_float=Decimal)
   File "[&MODELS_PATH]", line 1529, in json
     raise RequestsJSONDecodeError(e.msg, e.doc, e.pos)
@@ -275,10 +275,10 @@ Traceback (most recent call last):
   File "[&TEST_PATH]", line 78, in json
     return ctx.request("GET", "status/418", accept_statuses=[418]).json
            ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "[&SERVICE_PATH]", line 308, in request
+  File "[&SERVICE_PATH]", line 314, in request
     return self.handle_process_response(response, expect_json=expect_json)
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "[&SERVICE_PATH]", line 232, in handle_process_response
+  File "[&SERVICE_PATH]", line 238, in handle_process_response
     raise DecodeError(response, exc, event_id=self.event_id) from exc
 csu.exceptions.DecodeError: DecodeError(JSONDecodeError('Expecting value: line 2 column 5 (char 5)'), response=<Response Dummy [418]>)
 (418, b'\\n    -=[ teapot ]=-\\n\\n       _...._\\n     .\\'  _ _ `.\\n    | ."` ^ `". _,\\n    \\\\_;`"---"`|//\\n      |       ;/\\n      \\\\_     _/\\n        `"""`\\n')
@@ -340,7 +340,7 @@ Traceback (most recent call last):
   File "[&TEST_PATH]", line 47, in error
     return ctx.request("GET", "status/599", expect_json=False)
            ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "[&SERVICE_PATH]", line 307, in request
+  File "[&SERVICE_PATH]", line 313, in request
     raise UnexpectedStatusError(response, accept_statuses, event_id=self.event_id)
 csu.exceptions.UnexpectedStatusError: UnexpectedStatusError(<Response Dummy [599]>, accept_statuses=[200])
 (599, b'')
@@ -540,7 +540,7 @@ INFO    | [01:000000.00] POST [&HTTPBIN]/anything?foo=bar&accept_statuses=%7B999
             """\
 ERROR   | [01:000000.00] POST [&HTTPBIN]/anything?foo=bar&accept_statuses=%7B999%7D&expect_json=true&follow_redirects=false&retries_left=3&retry_count=0&retry_statuses=%7B200%7D !> RetryableStatusError('200 not in [999] but in [200]', 200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"3","retry_count":"0","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=3&retry_count=0&retry_statuses={200}"}\\n', event_id=241212:01:000000.00) (will retry 3 more times)
 Traceback (most recent call last):
-  File "[&SERVICE_PATH]", line 305, in request
+  File "[&SERVICE_PATH]", line 311, in request
     raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
 csu.exceptions.RetryableStatusError: RetryableStatusError(<Response Dummy [200]>, accept_statuses=[999], retry_statuses=[200])
 (200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"3","retry_count":"0","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=3&retry_count=0&retry_statuses={200}"}\\n')
@@ -574,7 +574,7 @@ INFO    | [01:000000.00] POST [&HTTPBIN]/anything?foo=bar&accept_statuses=%7B999
             """\
 ERROR   | [01:000000.00] POST [&HTTPBIN]/anything?foo=bar&accept_statuses=%7B999%7D&expect_json=true&follow_redirects=false&retries_left=2&retry_count=1&retry_statuses=%7B200%7D !> RetryableStatusError('200 not in [999] but in [200]', 200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"2","retry_count":"1","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=2&retry_count=1&retry_statuses={200}"}\\n', event_id=241212:01:000000.00) (will retry 2 more times)
 Traceback (most recent call last):
-  File "[&SERVICE_PATH]", line 305, in request
+  File "[&SERVICE_PATH]", line 311, in request
     raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
 csu.exceptions.RetryableStatusError: RetryableStatusError(<Response Dummy [200]>, accept_statuses=[999], retry_statuses=[200])
 (200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"2","retry_count":"1","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=2&retry_count=1&retry_statuses={200}"}\\n')
@@ -608,7 +608,7 @@ INFO    | [01:000000.00] POST [&HTTPBIN]/anything?foo=bar&accept_statuses=%7B999
             """\
 ERROR   | [01:000000.00] POST [&HTTPBIN]/anything?foo=bar&accept_statuses=%7B999%7D&expect_json=true&follow_redirects=false&retries_left=1&retry_count=2&retry_statuses=%7B200%7D !> RetryableStatusError('200 not in [999] but in [200]', 200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"1","retry_count":"2","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=1&retry_count=2&retry_statuses={200}"}\\n', event_id=241212:01:000000.00) (will retry 1 more times)
 Traceback (most recent call last):
-  File "[&SERVICE_PATH]", line 305, in request
+  File "[&SERVICE_PATH]", line 311, in request
     raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
 csu.exceptions.RetryableStatusError: RetryableStatusError(<Response Dummy [200]>, accept_statuses=[999], retry_statuses=[200])
 (200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"1","retry_count":"2","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=1&retry_count=2&retry_statuses={200}"}\\n')
@@ -656,31 +656,31 @@ ERROR   |  (renderer: NoneType)
   |     ...<6 lines>...
   |         accept_statuses=[999],
   |     )
-  |   File "[&SERVICE_PATH]", line 319, in request
+  |   File "[&SERVICE_PATH]", line 325, in request
   |     raise ExhaustedRetriesError(retry_budget, retry_failures, event_id=self.event_id)
   | csu.exceptions.ExhaustedRetriesError: ExhaustedRetriesError(3)
   | ([RetryableStatusError('200 not in [999] but in [200]', 200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"3","retry_count":"0","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=3&retry_count=0&retry_statuses={200}"}\\n', event_id=241212:01:000000.00), RetryableStatusError('200 not in [999] but in [200]', 200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"2","retry_count":"1","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=2&retry_count=1&retry_statuses={200}"}\\n', event_id=241212:01:000000.00), RetryableStatusError('200 not in [999] but in [200]', 200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"1","retry_count":"2","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=1&retry_count=2&retry_statuses={200}"}\\n', event_id=241212:01:000000.00), RetryableStatusError('200 not in [999] but in [200]', 200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"0","retry_count":"3","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=0&retry_count=3&retry_statuses={200}"}\\n', event_id=241212:01:000000.00)],)
   +-+---------------- 1 ----------------
     | Traceback (most recent call last):
-    |   File "[&SERVICE_PATH]", line 305, in request
+    |   File "[&SERVICE_PATH]", line 311, in request
     |     raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
     | csu.exceptions.RetryableStatusError: RetryableStatusError(<Response Dummy [200]>, accept_statuses=[999], retry_statuses=[200])
     | (200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"3","retry_count":"0","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=3&retry_count=0&retry_statuses={200}"}\\n')
     +---------------- 2 ----------------
     | Traceback (most recent call last):
-    |   File "[&SERVICE_PATH]", line 305, in request
+    |   File "[&SERVICE_PATH]", line 311, in request
     |     raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
     | csu.exceptions.RetryableStatusError: RetryableStatusError(<Response Dummy [200]>, accept_statuses=[999], retry_statuses=[200])
     | (200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"2","retry_count":"1","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=2&retry_count=1&retry_statuses={200}"}\\n')
     +---------------- 3 ----------------
     | Traceback (most recent call last):
-    |   File "[&SERVICE_PATH]", line 305, in request
+    |   File "[&SERVICE_PATH]", line 311, in request
     |     raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
     | csu.exceptions.RetryableStatusError: RetryableStatusError(<Response Dummy [200]>, accept_statuses=[999], retry_statuses=[200])
     | (200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"1","retry_count":"2","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=1&retry_count=2&retry_statuses={200}"}\\n')
     +---------------- 4 ----------------
     | Traceback (most recent call last):
-    |   File "[&SERVICE_PATH]", line 305, in request
+    |   File "[&SERVICE_PATH]", line 311, in request
     |     raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
     | csu.exceptions.RetryableStatusError: RetryableStatusError(<Response Dummy [200]>, accept_statuses=[999], retry_statuses=[200])
     | (200, b'{"args":{"accept_statuses":"{999}","expect_json":"true","follow_redirects":"false","foo":"bar","retries_left":"0","retry_count":"3","retry_statuses":"{200}"},"data":"config={\\'custom\\': \\'config\\'}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"27","Host":"127.0.0.1:12345","User-Agent":"python-httpx/0.X.X"},"json":null,"method":"POST","origin":"127.0.0.1","url":"http://127.0.0.1:12345/anything?foo=bar&accept_statuses={999}&expect_json=true&follow_redirects=false&retries_left=0&retry_count=3&retry_statuses={200}"}\\n')

{csu-2.4.2 → csu-2.5.0}/tests/testproject/settings.py

@@ -1,5 +1,6 @@
-CSU_SERVICE_RESPONSE_SHOW_HEADERS = True
-CSU_SERVICE_REQUEST_SHOW_HEADERS = True
+CSU_LOGGING_SHOW_HEADERS = True
+CSU_SERVICE_LOGGING_REQUEST_SHOW_HEADERS = True
+CSU_SERVICE_LOGGING_RESPONSE_SHOW_HEADERS = True
 ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
 DATABASES = {
     "default": {