edq-utils 0.1.1__tar.gz → 0.1.3__tar.gz

{edq_utils-0.1.1 → edq_utils-0.1.3}/.pylintrc

@@ -104,10 +104,6 @@ recursive=no
 # source root.
 source-roots=
 
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages.
-suggestion-mode=yes
-
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no

{edq_utils-0.1.1 → edq_utils-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edq-utils
-Version: 0.1.1
+Version: 0.1.3
 Summary: Common utilities used by EduLinq Python projects.
 Author-email: Eriq Augustine <eriq@edulinq.org>
 License: MIT License

{edq_utils-0.1.1 → edq_utils-0.1.3}/edq/__init__.py

@@ -2,4 +2,4 @@
 General Python tools used by several EduLinq projects.
 """
 
-__version__ = '0.1.1'
+__version__ = '0.1.3'

{edq_utils-0.1.1 → edq_utils-0.1.3}/edq/testing/cli.py

@@ -35,6 +35,7 @@ import edq.util.json
 import edq.util.pyimport
 
 TEST_CASE_SEP: str = '---'
+OUTPUT_SEP: str = '+++'
 DATA_DIR_ID: str = '__DATA_DIR__'
 ABS_DATA_DIR_ID: str = '__ABS_DATA_DIR__'
 TEMP_DIR_ID: str = '__TEMP_DIR__'
@@ -149,7 +150,7 @@ class CLITestInfo:
         """
         Split stdout and stderr into different strings for testing.
         By default, these two will be combined.
-        If both are non-empty, then they will be joined like: f"{stdout}\n{TEST_CASE_SEP}\n{stderr}".
+        If both are non-empty, then they will be joined like: f"{stdout}\n{OUTPUT_SEP}\n{stderr}".
         Otherwise, only the non-empty one will be present with no separator.
         Any stdout assertions will be applied to the combined text.
         """
@@ -293,7 +294,7 @@ def _get_test_method(test_name: str, path: str, data_dir: str) -> typing.Callabl
 
         if (not test_info.split_stdout_stderr):
             if ((len(stdout_text) > 0) and (len(stderr_text) > 0)):
-                stdout_text = f"{stdout_text}\n{TEST_CASE_SEP}\n{stderr_text}"
+                stdout_text = f"{stdout_text}\n{OUTPUT_SEP}\n{stderr_text}"
             elif (len(stderr_text) > 0):
                 stdout_text = stderr_text
 

edq_utils-0.1.3/edq/testing/testdata/cli/tests/help_base.txt

@@ -0,0 +1,9 @@
+{
+    "cli": "edq.cli.version",
+    "arguments": [
+        '--help'
+    ],
+    "error": true
+}
+---
+builtins.SystemExit: 0

{edq_utils-0.1.1 → edq_utils-0.1.3}/edq/testing/unittest.py

@@ -14,6 +14,20 @@ class BaseTest(unittest.TestCase):
     maxDiff = None
     """ Don't limit the size of diffs. """
 
+    def assertJSONEqual(self, a: typing.Any, b: typing.Any, message: typing.Union[str, None] = None) -> None:  # pylint: disable=invalid-name
+        """
+        Like unittest.TestCase.assertEqual(),
+        but uses a default assertion message containing the full JSON representation of the arguments.
+        """
+
+        a_json = edq.util.json.dumps(a, indent = 4)
+        b_json = edq.util.json.dumps(b, indent = 4)
+
+        if (message is None):
+            message = FORMAT_STR % (a_json, b_json)
+
+        super().assertEqual(a, b, msg = message)
+
     def assertJSONDictEqual(self, a: typing.Any, b: typing.Any, message: typing.Union[str, None] = None) -> None:  # pylint: disable=invalid-name
         """
         Like unittest.TestCase.assertDictEqual(),

edq_utils-0.1.3/edq/util/hash.py

@@ -0,0 +1,38 @@
+import hashlib
+import typing
+
+import edq.util.dirent
+
+DEFAULT_CLIP_HASH_LENGTH: int = 8
+
+def sha256_hex(payload: typing.Any, encoding: str = edq.util.dirent.DEFAULT_ENCODING) -> str:
+    """ Compute and return the hex string of the SHA3-256 encoding of the payload. """
+
+    digest = hashlib.new('sha256')
+    digest.update(payload.encode(encoding))
+    return digest.hexdigest()
+
+def clip_text(text: str, max_length: int, hash_length: int = DEFAULT_CLIP_HASH_LENGTH) -> str:
+    """
+    Return a clipped version of the input text that is no longer than the specified length.
+    If the base text is found to be too long,
+    then enough if the tail of the text will be removed to insert a note about the clipping
+    and the first |hash_length| characters of the hash from sha256_hex().
+
+    Note that the max length is actually a soft cap.
+    Longer strings can be generated if the original text is shorter than the notification
+    that will be inserted into the clipped text.
+    """
+
+    if (len(text) <= max_length):
+        return text
+
+    hash_hex = sha256_hex(text)
+    notification = f"[text clipped {hash_hex[0:hash_length]}]"
+
+    # Don't clip the text if the final string would be longer.
+    if (len(notification) >= len(text)):
+        return text
+
+    keep_length = max(0, max_length - len(notification))
+    return text[0:keep_length] + notification

edq_utils-0.1.3/edq/util/hash_test.py

@@ -0,0 +1,89 @@
+import edq.testing.unittest
+import edq.util.hash
+
+class TestHash(edq.testing.unittest.BaseTest):
+    """ Test hash-based operations. """
+
+    def test_sha256_hex_base(self):
+        """ Test the base sha256 hash. """
+
+        # [(input, expected), ...]
+        test_cases = [
+            ('foo', '2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae'),
+            ('abcdefghijklmnopqrstuvwxyz1234567890', '77d721c817f9d216c1fb783bcad9cdc20aaa2427402683f1f75dd6dfbe657470'),
+            ('', 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'),
+        ]
+
+        for (i, test_case) in enumerate(test_cases):
+            (text, expected) = test_case
+
+            with self.subTest(msg = f"Case {i} ('{text}'):"):
+                actual = edq.util.hash.sha256_hex(text)
+                self.assertEqual(expected, actual)
+
+    def test_clip_text_base(self):
+        """ Test the base functionality of clip_text(). """
+
+        # [(text, max length, kwargs, expected), ...]
+        test_cases = [
+            # No Clip
+            (
+                'abcdefghijklmnopqrstuvwxyz1234567890',
+                100,
+                {},
+                'abcdefghijklmnopqrstuvwxyz1234567890',
+            ),
+
+            # Base Clip
+            (
+                'abcdefghijklmnopqrstuvwxyz1234567890',
+                30,
+                {},
+                'abcdefg[text clipped 77d721c8]',
+            ),
+
+            # Full Clip
+            (
+                'abcdefghijklmnopqrstuvwxyz1234567890',
+                23,
+                {},
+                '[text clipped 77d721c8]',
+            ),
+
+            # Over Clip
+            (
+                'abcdefghijklmnopqrstuvwxyz1234567890',
+                10,
+                {},
+                '[text clipped 77d721c8]',
+            ),
+
+            # Different Hash Length
+            (
+                'abcdefghijklmnopqrstuvwxyz1234567890',
+                30,
+                {'hash_length': 10},
+                'abcde[text clipped 77d721c817]',
+            ),
+
+            # Notification Longer Than Text
+            (
+                'abc',
+                1,
+                {},
+                'abc',
+            ),
+            (
+                'abcdefghijklmnopqrstuvwxyz1234567890',
+                10,
+                {'hash_length': 64},
+                'abcdefghijklmnopqrstuvwxyz1234567890',
+            ),
+        ]
+
+        for (i, test_case) in enumerate(test_cases):
+            (text, max_length, kwargs, expected) = test_case
+
+            with self.subTest(msg = f"Case {i} ('{text}'):"):
+                actual = edq.util.hash.clip_text(text, max_length, **kwargs)
+                self.assertEqual(expected, actual)

{edq_utils-0.1.1 → edq_utils-0.1.3}/edq/util/net.py

@@ -19,6 +19,7 @@ import requests
 import requests_toolbelt.multipart.decoder
 
 import edq.util.dirent
+import edq.util.hash
 import edq.util.json
 import edq.util.pyimport
 
@@ -30,6 +31,9 @@ DEFAULT_REQUEST_TIMEOUT_SECS: float = 10.0
 
 DEFAULT_HTTP_EXCHANGE_EXTENSION: str= '.httpex.json'
 
+QUERY_CLIP_LENGTH: int = 100
+""" If the query portion of an HTTPExhange being saved is longer than this, then clip the name. """
+
 ANCHOR_HEADER_KEY: str = 'edq-anchor'
 """
 By default, requests made via make_request() will send a header with this key that includes the anchor component of the URL.
@@ -729,8 +733,11 @@ def make_request(method: str, url: str,
 
         query = urllib.parse.urlencode(exchange.parameters)
         if (query != ''):
+            # The query can get very long, so we may have to clip it.
+            query_text = edq.util.hash.clip_text(query, QUERY_CLIP_LENGTH)
+
             # Note that the '?' is URL encoded.
-            path += f"%3F{query}"
+            path += f"%3F{query_text}"
 
         path += f"_{method}{http_exchange_extension}"
 

{edq_utils-0.1.1 → edq_utils-0.1.3}/edq_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edq-utils
-Version: 0.1.1
+Version: 0.1.3
 Summary: Common utilities used by EduLinq Python projects.
 Author-email: Eriq Augustine <eriq@edulinq.org>
 License: MIT License

{edq_utils-0.1.1 → edq_utils-0.1.3}/edq_utils.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ edq/testing/testdata/cli/data/configs/empty/edq-config.json
 edq/testing/testdata/cli/data/configs/simple-1/edq-config.json
 edq/testing/testdata/cli/data/configs/simple-2/edq-config.json
 edq/testing/testdata/cli/data/configs/value-number/edq-config.json
+edq/testing/testdata/cli/tests/help_base.txt
 edq/testing/testdata/cli/tests/platform_skip.txt
 edq/testing/testdata/cli/tests/version_base.txt
 edq/testing/testdata/cli/tests/config/list/config_list_base.txt
@@ -72,6 +73,8 @@ edq/testing/testdata/http/files/tiny.png
 edq/util/__init__.py
 edq/util/dirent.py
 edq/util/dirent_test.py
+edq/util/hash.py
+edq/util/hash_test.py
 edq/util/json.py
 edq/util/json_test.py
 edq/util/net.py