Convert require()/reject() to assert

Author: nadove-ucsc

src/azul/indexer/__init__.py

@@ -29,7 +29,6 @@
 from azul import (
     R,
     config,
-    reject,
 )
 from azul.attrs import (
     SerializableAttrs,
@@ -185,8 +184,8 @@ def __attrs_post_init__(self):
         # partition_prefix is a valid UUID prefix, we restrict the number of
         # characters from the concatenation to be within the first
         # dash-seperated group.
-        reject(len(self.common) + self.partition > 8,
-               'Invalid common prefix and partition length', self)
+        assert len(self.common) + self.partition <= 8, R(
+            'Invalid common prefix and partition length', self)
 
     @classmethod
     def parse(cls, prefix: str) -> Self:
@@ -202,13 +201,13 @@ def parse(cls, prefix: str) -> Self:
         >>> Prefix.parse('aa/')
         Traceback (most recent call last):
         ...
-        azul.RequirementError: ('Prefix source cannot end in a delimiter', 'aa/', '/')
+        AssertionError: R('Prefix source cannot end in a delimiter', 'aa/', '/')
 
         >>> Prefix.parse('8f538f53/1').partition_prefixes() # doctest: +NORMALIZE_WHITESPACE
         Traceback (most recent call last):
         ...
-        azul.RequirementError: ('Invalid common prefix and partition length',
-                                Prefix(common='8f538f53', partition=1))
+        AssertionError: R('Invalid common prefix and partition length',
+                          Prefix(common='8f538f53', partition=1))
 
         >>> list(Prefix.parse('8f538f53/0').partition_prefixes())
         ['8f538f53']
@@ -221,12 +220,12 @@ def parse(cls, prefix: str) -> Self:
         >>> Prefix.parse('')
         Traceback (most recent call last):
         ...
-        azul.RequirementError: Cannot parse an empty prefix source
+        AssertionError: R('Cannot parse an empty prefix source')
         """
         source_delimiter = '/'
-        reject(prefix == '', 'Cannot parse an empty prefix source')
-        reject(prefix.endswith(source_delimiter),
-               'Prefix source cannot end in a delimiter', prefix, source_delimiter)
+        assert prefix != '', R('Cannot parse an empty prefix source')
+        assert not prefix.endswith(source_delimiter), R(
+            'Prefix source cannot end in a delimiter', prefix, source_delimiter)
         partition: str | int
         try:
             entry, partition = prefix.split(source_delimiter)
@@ -378,7 +377,7 @@ def parse(cls, spec: str) -> Self:
     @classmethod
     def _parse(cls, spec: str) -> tuple[str, Prefix | None]:
         rest, sep, prefix = spec.rpartition(':')
-        reject(sep == '', 'Invalid source specification', spec)
+        assert sep != '', R('Invalid source specification', spec)
         prefix = Prefix.parse(prefix) if prefix else None
         return rest, prefix
 
@@ -421,7 +420,7 @@ def parse(cls, spec: str) -> 'SimpleSourceSpec':
         >>> SimpleSourceSpec.parse('foo')
         Traceback (most recent call last):
         ...
-        azul.RequirementError: ('Invalid source specification', 'foo')
+        AssertionError: R('Invalid source specification', 'foo')
 
         >>> SimpleSourceSpec.parse('foo:8F53/0')
         Traceback (most recent call last):
@@ -641,4 +640,4 @@ def __attrs_post_init__(self):
         # Most bits in a v4 or v5 UUID are pseudo-random, including the leading
         # 32 bits but those are followed by a couple of deterministic ones.
         # For simplicity, we'll limit ourselves to 2 ** 32 leaf partitions.
-        reject(self.prefix_length > 32)
+        assert self.prefix_length <= 32, R('Too many partitions', self.prefix_length)

src/azul/service/avro_pfb.py

@@ -34,8 +34,8 @@
 )
 
 from azul import (
+    R,
     config,
-    reject,
 )
 from azul.indexer.field import (
     ClosedRange,
@@ -157,7 +157,7 @@ def entities(self) -> Iterable[JSON]:
 
 def _reversible_join(joiner: str, parts: Iterable[str]) -> str:
     parts = list(parts)
-    reject(any(joiner in part for part in parts), parts)
+    assert all(joiner not in part for part in parts), R('Found joiner in', parts)
     return joiner.join(parts)
 
 
@@ -173,7 +173,7 @@ class PFBEntity:
     namespace_uuid: ClassVar[UUID] = UUID('bc93372b-9218-4f0e-b64e-6f3b339687d6')
 
     def __attrs_post_init__(self):
-        reject(len(self.id) > 254, 'Terra requires IDs be no longer than 254 chars', )
+        assert len(self.id) <= 254, R('Terra requires IDs be no longer than 254 chars')
 
     @classmethod
     def for_aggregate(cls,

src/azul/service/manifest_service.py

@@ -80,7 +80,7 @@
 
 from azul import (
     CatalogName,
-    RequirementError,
+    R,
     cached_property,
     config,
     mutable_furl,
@@ -1547,19 +1547,19 @@ def _sanitize_path(cls, path: str) -> str:
         >>> f('foo/bar/\\x1F/file') # doctest: +NORMALIZE_WHITESPACE
         Traceback (most recent call last):
         ...
-        azul.RequirementError: ('Invalid file path', 'foo/bar/\\x1f/file',
-                                'Control character or backslash at position', 8)
+        AssertionError: R('Invalid file path', 'foo/bar/\\x1f/file',
+                          'Control character or backslash at position', 8)
 
         >>> f('foo/bar/COM6/file') # doctest: +NORMALIZE_WHITESPACE
         Traceback (most recent call last):
         ...
-        azul.RequirementError: ('Invalid file path', 'foo/bar/COM6/file',
-                                'Use of reserved path component for Windows', {'COM6'})
+        AssertionError: R('Invalid file path', 'foo/bar/COM6/file',
+                          'Use of reserved path component for Windows', {'COM6'})
 
         >>> f('foo/bar/ / baz/file') # doctest: +NORMALIZE_WHITESPACE
         Traceback (most recent call last):
         ...
-        azul.RequirementError: ('Invalid file path', 'foo/bar/ / baz/file')
+        AssertionError: R('Invalid file path', 'foo/bar/ / baz/file')
 
         Substitutions:
 
@@ -1590,19 +1590,16 @@ def _sanitize_path(cls, path: str) -> str:
         True
         """
         match = cls._malicious_chars.search(path)
-        if match is not None:
-            raise RequirementError('Invalid file path', path,
-                                   'Control character or backslash at position', match.start())
+        assert match is None, R('Invalid file path', path,
+                                'Control character or backslash at position', match.start())
 
         path = cls._problematic_chars.sub('_', path)
 
-        if cls._valid_path.fullmatch(path) is None:
-            raise RequirementError('Invalid file path', path)
+        assert cls._valid_path.fullmatch(path) is not None, R('Invalid file path', path)
 
         components = set(path.split('/')) & cls.special_dos_files
-        if components:
-            raise RequirementError('Invalid file path', path,
-                                   'Use of reserved path component for Windows', components)
+        assert not components, R('Invalid file path', path,
+                                 'Use of reserved path component for Windows', components)
 
         return path
 

test/service/test_manifest.py

@@ -61,7 +61,7 @@
 )
 
 from azul import (
-    RequirementError,
+    R,
     cache,
     config,
 )
@@ -2230,5 +2230,6 @@ def test_pfb_metadata_object(self):
     def test_pfb_entity_id(self):
         # Terra limits ID's 254 chars
         avro_pfb.PFBEntity(id='a' * 254, name='foo', object={})
-        with self.assertRaises(RequirementError):
+        with self.assertRaises(AssertionError) as e:
             avro_pfb.PFBEntity(id='a' * 255, name='foo', object={})
+        self.assertTrue(R.caused(e.exception))