From f911e556fdf631ab82599f35275e4ce848cbe654 Mon Sep 17 00:00:00 2001
From: James Sutton <1892175+zeryx@users.noreply.github.com>
Date: Tue, 1 Mar 2022 12:39:21 -0400
Subject: [PATCH 1/2] improvement for systemic errors (#122)

* added a better message when errors are not caused by Algorithms

* make failure test compliant with other testcase components
---
 Algorithmia/errors.py     |  2 +-
 Test/algo_failure_test.py | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Algorithmia/errors.py b/Algorithmia/errors.py
index 9356e24..f23662a 100644
--- a/Algorithmia/errors.py
+++ b/Algorithmia/errors.py
@@ -47,4 +47,4 @@ def raiseAlgoApiError(result):
             stacktrace = None
         return AlgorithmException(message=message, stack_trace=stacktrace, error_type=err_type)
     else:
-        return Exception(result)
+        return Exception("Non-Algorithm related Failure: " + str(result))
diff --git a/Test/algo_failure_test.py b/Test/algo_failure_test.py
index 1e65234..7defcc2 100644
--- a/Test/algo_failure_test.py
+++ b/Test/algo_failure_test.py
@@ -14,22 +14,14 @@
     from Test.api import app
 
 
-    def start_webserver():
-        uvicorn.run(app, host="127.0.0.1", port=8080, log_level="debug")
-
-
     class AlgoTest(unittest.TestCase):
         error_500 = Response()
         error_500.status_code = 500
+        error_message = "Non-Algorithm related Failure: " + str(error_500)
 
-        def setUp(self):
-            self.client = Algorithmia.client(api_address="http://localhost:8080/")
-            self.uvi_p = Process(target=start_webserver)
-            self.uvi_p.start()
-            time.sleep(1)
-
-        def tearDown(self):
-            self.uvi_p.terminate()
+        @classmethod
+        def setUpClass(cls):
+            cls.client = Algorithmia.client(api_address="http://localhost:8080/", api_key="simabcd123")
 
         def test_throw_500_error_HTTP_response_on_algo_request(self):
             try:
@@ -37,4 +29,4 @@ def test_throw_500_error_HTTP_response_on_algo_request(self):
             except Exception as e:
                 result = e
                 pass
-            self.assertEqual(str(self.error_500), str(result))
+            self.assertEqual(str(self.error_message), str(result))

From d3e73cb89a575bbb462a0de42f39cfbd15f898eb Mon Sep 17 00:00:00 2001
From: James Sutton <1892175+zeryx@users.noreply.github.com>
Date: Wed, 2 Mar 2022 13:38:02 -0400
Subject: [PATCH 2/2] update requirements to satisfy actual ADK dependency
 versions (#123)

---
 requirements.txt   | 2 +-
 requirements27.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f12c984..f52fe4f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ enum-compat
 toml
 argparse
 algorithmia-api-client==1.5.1
-algorithmia-adk>=1.1,<1.2
+algorithmia-adk>=1.2,<1.3
 numpy<2
 uvicorn==0.14.0
 fastapi==0.65.2
diff --git a/requirements27.txt b/requirements27.txt
index 3d2b39c..9668467 100644
--- a/requirements27.txt
+++ b/requirements27.txt
@@ -4,5 +4,5 @@ enum-compat
 toml
 argparse
 algorithmia-api-client==1.5.1
-algorithmia-adk>=1.1,<1.2
+algorithmia-adk>=1.2,<1.3
 numpy<2