fix: sort ids on hashing job pop responses

Author: tazlin

horde_sdk/ai_horde_api/apimodels/alchemy/pop.py

@@ -206,7 +206,7 @@ def __hash__(self) -> int:
         if self.forms is None:
             return hash(self.skipped)
 
-        return hash((tuple([form.id_ for form in self.forms]), self.skipped))
+        return hash((tuple(sorted([form.id_ for form in self.forms])), self.skipped))
 
     @property
     def ids(self) -> list[GenerationID]:

horde_sdk/ai_horde_api/apimodels/generate/pop.py

@@ -464,7 +464,7 @@ def __hash__(self) -> int:
             return hash(ImageGenerateJobPopResponse.__name__) + hash(self.id_)
 
         if len(self.ids) > 0:
-            return hash(ImageGenerateJobPopResponse.__name__) + hash(tuple(self.ids))
+            return hash(ImageGenerateJobPopResponse.__name__) + hash(tuple(sorted(self.ids)))
 
         logger.warning("No ID or IDs found in response. This is a bug.")
         return hash(0)

horde_sdk/ai_horde_api/apimodels/generate/text/pop.py

@@ -151,7 +151,7 @@ def __eq__(self, value: object) -> bool:
 
     def __hash__(self) -> int:
         if self.ids:
-            return hash(tuple(self.ids))
+            return hash(tuple(sorted(self.ids)))
 
         return hash(self.id_)
 

tests/ai_horde_api/test_ai_horde_api_models.py

@@ -469,17 +469,20 @@ def test_ImageGenerateJobPopResponse() -> None:
     )
 
     assert test_response.ids_present
-    assert test_response.ids == [
-        GenerationID(root=UUID("00000000-0000-0000-0000-000000000000")),
-        GenerationID(root=UUID("00000000-0000-0000-0000-000000000001")),
-        GenerationID(root=UUID("00000000-0000-0000-0000-000000000002")),
-    ]
-    assert test_response.r2_uploads == [
+    assert GenerationID(root=UUID("00000000-0000-0000-0000-000000000000")) in test_response.ids
+    assert GenerationID(root=UUID("00000000-0000-0000-0000-000000000001")) in test_response.ids
+    assert GenerationID(root=UUID("00000000-0000-0000-0000-000000000002")) in test_response.ids
+
+    uploads = [
         "https://abbaabbaabbaabbaabbaabbaabbaabba.r2.cloudflarestorage.com/horde-transient/00000000-0000-0000-0000-000000000000.webp?AWSAccessKeyId=deadbeefdeadbeefdeadbeefdeadbeef&Signature=345567dfakes2ignature%3D&Expires=1727390285",
         "https://abbaabbaabbaabbaabbaabbaabbaabba.r2.cloudflarestorage.com/horde-transient/00000000-0000-0000-0000-000000000001.webp?AWSAccessKeyId=deadbeefdeadbeefdeadbeefdeadbeef&Signature=zxcbvfakesignature%3D&Expires=1727390285",
         "https://abbaabbaabbaabbaabbaabbaabbaabba.r2.cloudflarestorage.com/horde-transient/00000000-0000-0000-0000-000000000002.webp?AWSAccessKeyId=deadbeefdeadbeefdeadbeefdeadbeef&Signature=asdfg32fakesignature%3D&Expires=1727390285",
     ]
 
+    assert test_response.r2_uploads is not None
+    for upload in test_response.r2_uploads:
+        assert upload in uploads
+
 
 def test_ImageGenerateJobPopResponse_hashability() -> None:
     test_response_ids = ImageGenerateJobPopResponse(