Merge pull request #46 from Haidra-Org/operations-endspoints-fix

fix: bring inline with changes from API `operations` addition
Haidra-Org · Oct 23, 2023 · cd2f845 · cd2f845
2 parents 475cb37 + 0cf809a
commit cd2f845
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 4 deletions.
diff --git a/horde_sdk/ai_horde_api/apimodels/workers/_workers_all.py b/horde_sdk/ai_horde_api/apimodels/workers/_workers_all.py
@@ -56,6 +56,7 @@ class WorkerDetailItem(HordeAPIObject):
     info: str | None = None
     nsfw: bool | None = None
     owner: str | None = None
+    ipaddr: str | None = None
     trusted: bool | None = None
     flagged: bool | None = None
     suspicious: int | None = None

diff --git a/horde_sdk/generic_api/utils/swagger.py b/horde_sdk/generic_api/utils/swagger.py
@@ -866,7 +866,7 @@ def __init__(
                 response.raise_for_status()
                 self._swagger_json = response.json()
             except requests.exceptions.HTTPError as e:
-                raise RuntimeError(f"Failed to get swagger.json from server: {e.response.text}") from e
+                raise RuntimeError(f"Failed to get swagger.json from server: {e.response}") from e
 
     def get_swagger_doc(self) -> SwaggerDoc:
         """Get the swagger doc as a SwaggerDoc object."""

diff --git a/tests/test_data/ai_horde_api/example_payloads/_v2_generate_async_post.json b/tests/test_data/ai_horde_api/example_payloads/_v2_generate_async_post.json
@@ -11,7 +11,6 @@
         "post_processing": [
             "GFPGAN"
         ],
-        "post_processing_order": "facefixers_first",
         "karras": false,
         "tiling": false,
         "hires_fix": false,

diff --git a/..._data/ai_horde_api/example_payloads/_v2_operations_block_worker_ipaddr_worker_id_put.json b/..._data/ai_horde_api/example_payloads/_v2_operations_block_worker_ipaddr_worker_id_put.json
@@ -0,0 +1,3 @@
+{
+    "days": 7
+}
diff --git a/tests/test_data/ai_horde_api/example_payloads/_v2_operations_ipaddr_post.json b/tests/test_data/ai_horde_api/example_payloads/_v2_operations_ipaddr_post.json
@@ -0,0 +1,4 @@
+{
+    "ipaddr": "127.0.0.1",
+    "hours": 24
+}
diff --git a/tests/test_data/ai_horde_api/example_payloads/_v2_workers_worker_id_put.json b/tests/test_data/ai_horde_api/example_payloads/_v2_workers_worker_id_put.json
@@ -2,7 +2,7 @@
     "maintenance": false,
     "maintenance_msg": "",
     "paused": false,
-    "info": "aa",
+    "info": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
     "name": "aaaaa",
     "team": "0bed257b-e57c-4327-ac64-40cdfb1ac5e6"
 }
diff --git a/tests/test_data/ai_horde_api/example_responses/_v2_generate_pop_post_200.json b/tests/test_data/ai_horde_api/example_responses/_v2_generate_pop_post_200.json
@@ -10,7 +10,6 @@
         "post_processing": [
             "GFPGAN"
         ],
-        "post_processing_order": "facefixers_first",
         "karras": false,
         "tiling": false,
         "hires_fix": false,

diff --git a/..._horde_api/example_responses/_v2_operations_block_worker_ipaddr_worker_id_delete_200.json b/..._horde_api/example_responses/_v2_operations_block_worker_ipaddr_worker_id_delete_200.json
@@ -0,0 +1,3 @@
+{
+    "message": "OK"
+}
diff --git a/.../ai_horde_api/example_responses/_v2_operations_block_worker_ipaddr_worker_id_put_200.json b/.../ai_horde_api/example_responses/_v2_operations_block_worker_ipaddr_worker_id_put_200.json
@@ -0,0 +1,3 @@
+{
+    "message": "OK"
+}
diff --git a/tests/test_data/ai_horde_api/example_responses/_v2_operations_ipaddr_get_200.json b/tests/test_data/ai_horde_api/example_responses/_v2_operations_ipaddr_get_200.json
@@ -0,0 +1,6 @@
+[
+    {
+        "ipaddr": "127.0.0.1",
+        "seconds": 1440
+    }
+]
diff --git a/tests/test_data/ai_horde_api/example_responses/_v2_operations_ipaddr_ipaddr_get_200.json b/tests/test_data/ai_horde_api/example_responses/_v2_operations_ipaddr_ipaddr_get_200.json
@@ -0,0 +1,6 @@
+[
+    {
+        "ipaddr": "127.0.0.1",
+        "seconds": 1440
+    }
+]
diff --git a/tests/test_data/ai_horde_api/example_responses/_v2_operations_ipaddr_post_200.json b/tests/test_data/ai_horde_api/example_responses/_v2_operations_ipaddr_post_200.json
@@ -0,0 +1,3 @@
+{
+    "message": "OK"
+}
diff --git a/tests/test_data/ai_horde_api/example_responses/_v2_workers_get_200.json b/tests/test_data/ai_horde_api/example_responses/_v2_workers_get_200.json
@@ -18,6 +18,7 @@
         "info": "https://dbzer0.com",
         "nsfw": false,
         "owner": "username#1",
+        "ipaddr": "username#1",
         "trusted": false,
         "flagged": false,
         "suspicious": 0,

diff --git a/tests/test_data/ai_horde_api/example_responses/_v2_workers_worker_id_get_200.json b/tests/test_data/ai_horde_api/example_responses/_v2_workers_worker_id_get_200.json
@@ -17,6 +17,7 @@
     "info": "https://dbzer0.com",
     "nsfw": false,
     "owner": "username#1",
+    "ipaddr": "username#1",
     "trusted": false,
     "flagged": false,
     "suspicious": 0,