refactor: split out image_generation file into separate module

Author: anna-singleton-resolver

common_utils/__init__.py

@@ -0,0 +1,5 @@
+"""Utility package for testing and examples.
+
+This package contains helper functions that are not core to the client library,
+but are shared across the examples and the tests.
+"""

…solver_athena_client/image_generation.py common_utils/image_generation.pysrc/resolver_athena_client/image_generation.py renamed to common_utils/image_generation.py src/resolver_athena_client/image_generation.py renamed to common_utils/image_generation.py

@@ -203,18 +203,7 @@ async def rate_limited_image_iter(
 def create_random_image_generator(
     max_images: int, rate_limit_min_interval_ms: int | None = None
 ) -> AsyncIterator[ImageData]:
-    """Generate a stream of random test images.
-
-    Args:
-    ----
-        max_images: Maximum number of images to generate
-        rate_limit_min_interval_ms: Minimum interval in ms between images
-
-    Yields:
-    ------
-        ImageData objects containing random image bytes
-
-    """
+    """Create an async generator for images with optional rate limiting."""
     if rate_limit_min_interval_ms is not None:
         return rate_limited_image_iter(rate_limit_min_interval_ms, max_images)
 

examples/classify_single_example.py

@@ -10,6 +10,7 @@
 
 from dotenv import load_dotenv
 
+from common_utils.image_generation import create_test_image
 from resolver_athena_client.client.athena_client import AthenaClient
 from resolver_athena_client.client.athena_options import AthenaOptions
 from resolver_athena_client.client.channel import (
@@ -18,7 +19,6 @@
 )
 from resolver_athena_client.client.consts import MAX_DEPLOYMENT_ID_LENGTH
 from resolver_athena_client.client.models import ImageData
-from resolver_athena_client.image_generation import create_test_image
 
 
 async def classify_single_image_example(

examples/example.py

@@ -10,6 +10,7 @@
 
 from dotenv import load_dotenv
 
+from common_utils.image_generation import iter_images
 from examples.utils.streaming_classify_utils import count_and_yield
 from resolver_athena_client.client.athena_client import AthenaClient
 from resolver_athena_client.client.athena_options import AthenaOptions
@@ -23,7 +24,6 @@
     has_output_errors,
     process_classification_outputs,
 )
-from resolver_athena_client.image_generation import iter_images
 
 # Constants
 INITIAL_PROGRESS_THRESHOLD = 10

tests/functional/test_classify_single.py

@@ -1,13 +1,13 @@
 import pytest
 
+from common_utils.image_generation import create_test_image
 from resolver_athena_client.client.athena_client import AthenaClient
 from resolver_athena_client.client.athena_options import AthenaOptions
 from resolver_athena_client.client.channel import (
     CredentialHelper,
     create_channel_with_credentials,
 )
 from resolver_athena_client.client.models import ImageData
-from resolver_athena_client.image_generation import create_test_image
 
 
 @pytest.mark.asyncio

tests/functional/test_classify_streaming.py

@@ -3,11 +3,9 @@
 
 import pytest
 
+from common_utils.image_generation import create_random_image_generator
 from resolver_athena_client.client.athena_options import AthenaOptions
 from resolver_athena_client.client.channel import CredentialHelper
-from resolver_athena_client.image_generation import (
-    create_random_image_generator,
-)
 from tests.utils.streaming_classify_utils import (
     classify_images,
     classify_images_break_on_first_result,

tests/functional/test_invalid_affiliate.py

@@ -3,6 +3,7 @@
 import pytest
 from dotenv import load_dotenv
 
+from common_utils.image_generation import create_test_image
 from resolver_athena_client.client.athena_client import AthenaClient
 from resolver_athena_client.client.athena_options import AthenaOptions
 from resolver_athena_client.client.channel import (
@@ -11,7 +12,6 @@
 )
 from resolver_athena_client.client.exceptions import AthenaError
 from resolver_athena_client.client.models import ImageData
-from resolver_athena_client.image_generation import create_test_image
 
 
 @pytest.mark.asyncio

tests/functional/test_invalid_image.py

@@ -3,6 +3,7 @@
 
 import pytest
 
+from common_utils.image_generation import create_test_image
 from resolver_athena_client.client.athena_client import AthenaClient
 from resolver_athena_client.client.athena_options import AthenaOptions
 from resolver_athena_client.client.channel import (
@@ -12,7 +13,6 @@
 from resolver_athena_client.client.consts import EXPECTED_HEIGHT, EXPECTED_WIDTH
 from resolver_athena_client.client.exceptions import AthenaError
 from resolver_athena_client.client.models import ImageData
-from resolver_athena_client.image_generation import create_test_image
 from tests.utils.streaming_classify_utils import classify_images
 
 

tests/functional/test_invalid_static_token_auth.py

@@ -5,10 +5,10 @@
 from dotenv import load_dotenv
 from grpc.aio import Channel
 
+from common_utils.image_generation import create_test_image
 from resolver_athena_client.client.athena_client import AthenaClient
 from resolver_athena_client.client.athena_options import AthenaOptions
 from resolver_athena_client.client.models.input_model import ImageData
-from resolver_athena_client.image_generation import create_test_image
 
 
 def create_channel(host: str, token: str) -> Channel:

tests/functional/test_list_deployments.py

@@ -1,13 +1,13 @@
 import pytest
 
+from common_utils.image_generation import iter_images
 from resolver_athena_client.client.athena_client import AthenaClient
 from resolver_athena_client.client.athena_options import AthenaOptions
 from resolver_athena_client.client.channel import (
     CredentialHelper,
     create_channel_with_credentials,
 )
 from resolver_athena_client.client.deployment_selector import DeploymentSelector
-from resolver_athena_client.image_generation import iter_images
 
 
 @pytest.mark.asyncio