Merge branch 'main' into feature/e2e-func-tests

Author: Robertson

.env.example

@@ -0,0 +1,9 @@
+# OAuth credentials for Athena API
+OAUTH_CLIENT_ID=your_oauth_client_id
+OAUTH_CLIENT_SECRET=your_oauth_client_secret
+OAUTH_AUTH_URL=https://crispthinking.auth0.com/oauth/token
+OAUTH_AUDIENCE=crisp-athena-live
+
+# Athena server configuration
+# ATHENA_HOST=trust-messages.crispthinking.com
+ATHENA_AFFILIATE=athena-test

.gitignore

@@ -8,7 +8,7 @@ wheels/
 
 # Virtual environments
 .venv
-.env
+.env*
 
 docs/_build/
 

README.md

@@ -139,7 +139,7 @@ repository, or in your shell environment:
 
 You must set the following variables:
 ```
-ATHENA_HOST=your-athena-host (e.g. myathenahost.com)
+ATHENA_HOST=your-athena-host (e.g. localhost:5001)
 ATHENA_TEST_AFFILIATE=your-affiliate-id
 OAUTH_CLIENT_ID=your-oauth-client-id
 OAUTH_CLIENT_SECRET=your-oauth-client-secret

docs/api/options.rst

@@ -157,7 +157,7 @@ Environment-Based Configuration
 
     # Load from environment variables
     options = AthenaOptions(
-        host=os.getenv("ATHENA_HOST", "localhost:50051"),
+        host=os.getenv("ATHENA_HOST", "trust-messages-global.crispthinking.com"),
         deployment_id=os.getenv("ATHENA_DEPLOYMENT_ID", "default"),
         resize_images=os.getenv("ATHENA_RESIZE_IMAGES", "true").lower() == "true",
         compress_images=os.getenv("ATHENA_COMPRESS_IMAGES", "true").lower() == "true",

docs/examples.rst

@@ -48,7 +48,7 @@ This example shows:
             "OAUTH_AUTH_URL", "https://crispthinking.auth0.com/oauth/token"
         )
         audience = os.getenv("OAUTH_AUDIENCE", "crisp-athena-live")
-        host = os.getenv("ATHENA_HOST", "localhost")
+        host = os.getenv("ATHENA_HOST", "trust-messages-global.crispthinking.com")
 
         # Create credential helper
         credential_helper = CredentialHelper(

examples/classify_single_example.py

@@ -203,7 +203,7 @@ async def main() -> int:
         logger.error("OAUTH_CLIENT_ID and OAUTH_CLIENT_SECRET must be set")
         return 1
 
-    host = os.getenv("ATHENA_HOST", "localhost")
+    host = os.getenv("ATHENA_HOST", "trust-messages-global.crispthinking.com")
     logger.info("Connecting to %s", host)
 
     # Create credential helper

examples/example.py

@@ -152,7 +152,8 @@ async def main() -> int:
         logger.error("OAUTH_CLIENT_ID and OAUTH_CLIENT_SECRET must be set")
         return 1
 
-    host = os.getenv("ATHENA_HOST", "localhost")
+    host = os.getenv("ATHENA_HOST", "trust-messages-global.crispthinking.com")
+    affiliate = os.getenv("ATHENA_AFFILIATE", "athena-test")
     logger.info("Connecting to %s", host)
 
     # Create credential helper
@@ -192,7 +193,7 @@ async def main() -> int:
         compress_images=True,
         timeout=120.0,  # Maximum duration, not forced timeout
         keepalive_interval=30.0,  # Longer intervals for persistent streams
-        affiliate="crisp",
+        affiliate=affiliate,
     )
 
     sent, received = await run_oauth_example(

src/resolver_athena_client/client/transformers/core.py

@@ -19,8 +19,8 @@
 _expected_raw_size = EXPECTED_WIDTH * EXPECTED_HEIGHT * 3
 
 
-def _is_raw_rgb_expected_size(data: bytes) -> bool:
-    """Detect if data is already a raw RGB array of expected size."""
+def _is_raw_brg_expected_size(data: bytes) -> bool:
+    """Detect if data is already a raw BRG array of expected size."""
     return len(data) == _expected_raw_size
 
 
@@ -37,7 +37,7 @@ async def resize_image(image_data: ImageData) -> ImageData:
 
     def process_image() -> tuple[bytes, bool]:
         # Fast path for raw RGB arrays of correct size
-        if _is_raw_rgb_expected_size(image_data.data):
+        if _is_raw_brg_expected_size(image_data.data):
             return image_data.data, False  # No transformation needed
 
         # Try to load the image data directly
@@ -55,8 +55,17 @@ def process_image() -> tuple[bytes, bool]:
             else:
                 resized_image = rgb_image
 
-            # Convert to raw RGB bytes (C-order: height x width x channels)
-            return resized_image.tobytes(), True  # Data was transformed
+            rgb_bytes = resized_image.tobytes()
+
+            # Convert RGB to BRG by swapping channels
+            brg_bytes = bytearray(len(rgb_bytes))
+
+            for i in range(0, len(rgb_bytes), 3):
+                brg_bytes[i] = rgb_bytes[i + 2]
+                brg_bytes[i + 1] = rgb_bytes[i]
+                brg_bytes[i + 2] = rgb_bytes[i + 1]
+
+            return bytes(brg_bytes), True  # Data was transformed
 
     # Use thread pool for CPU-intensive processing
     resized_bytes, was_transformed = await asyncio.to_thread(process_image)

tests/functional/test_classify_single.py

@@ -37,13 +37,24 @@ async def test_classify_single(
             msg = f"Image Result Error: {result.error.message}"
             pytest.fail(msg)
 
-        hash_checks = [
+        found_hash_check = False
+
+        for classification in result.classifications:
+            if classification.label.startswith("KnownCSAM-"):
+                assert classification.weight == 0.0
+                found_hash_check = True
+                break
+
+        assert found_hash_check, "No KnownHash- classification found"
+
+        assert [
             classification
             for classification in result.classifications
-            if "hash" in classification.label.lower()
+            if classification.label == "UnknownCSAM-Entropy"
         ]
 
-        assert len(hash_checks) > 0, "No hash checks found in classifications"
-
-        for hash_check in hash_checks:
-            assert hash_check.weight == 0.0
+        assert [
+            classification
+            for classification in result.classifications
+            if classification.label == "UnknownCSAM-PCSAM"
+        ]