Split bulk_api/core into exceptions and helpers modules

h/services/bulk_api/__init__.py

@@ -1,3 +1,3 @@
 from h.services.bulk_api.annotation import BulkAnnotation, BulkAnnotationService
-from h.services.bulk_api.core import BadDateFilter
+from h.services.bulk_api.exceptions import BadDateFilter
 from h.services.bulk_api.group import BulkGroupService

h/services/bulk_api/core.py → h/services/bulk_api/_helpers.py

@@ -1,8 +1,6 @@
 import sqlalchemy as sa
 
-
-class BadDateFilter(Exception):
-    """There is something wrong with the date filter provided."""
+from h.services.bulk_api.exceptions import BadDateFilter
 
 
 def date_match(column: sa.Column, spec: dict):

h/services/bulk_api/annotation.py

@@ -6,7 +6,7 @@
 from sqlalchemy.sql import Select
 
 from h.models import AnnotationMetadata, AnnotationSlim, Group, GroupMembership, User
-from h.services.bulk_api.core import date_match
+from h.services.bulk_api._helpers import date_match
 
 
 @dataclass

h/services/bulk_api/exceptions.py

@@ -0,0 +1,2 @@
+class BadDateFilter(Exception):
+    """There is something wrong with the date filter provided."""

h/services/bulk_api/group.py

@@ -5,7 +5,7 @@
 from sqlalchemy.orm import Session
 
 from h.models import Annotation, Group
-from h.services.bulk_api.core import date_match
+from h.services.bulk_api._helpers import date_match
 
 
 @dataclass

tests/unit/h/services/bulk_api/core_test.py → tests/unit/h/services/bulk_api/_helpers_test.py

@@ -6,7 +6,8 @@
 from sqlalchemy import select
 
 from h.models import Annotation
-from h.services.bulk_api.core import BadDateFilter, date_match
+from h.services.bulk_api._helpers import date_match
+from h.services.bulk_api.exceptions import BadDateFilter
 
 
 class TestDateMatch:

tests/unit/h/views/api/bulk/annotation_test.py

@@ -3,7 +3,7 @@
 
 from h.schemas import ValidationError
 from h.services.bulk_api.annotation import BulkAnnotation
-from h.services.bulk_api.core import BadDateFilter
+from h.services.bulk_api.exceptions import BadDateFilter
 from h.views.api.bulk.annotation import BulkAnnotationSchema, bulk_annotation
 
 

tests/unit/h/views/api/bulk/group_test.py

@@ -2,7 +2,7 @@
 from h_matchers import Any
 
 from h.schemas import ValidationError
-from h.services.bulk_api.core import BadDateFilter
+from h.services.bulk_api.exceptions import BadDateFilter
 from h.services.bulk_api.group import BulkGroup
 from h.views.api.bulk.group import BulkGroupSchema, bulk_group