Merge pull request #2 from algorithmiaio/review

Minor reviews

Author: aslisabanci

adk/ADK.py

@@ -9,17 +9,14 @@
 
 
 class ADK(object):
-
     def __init__(self, apply_func, load_func=None):
         """
         Creates the adk object
         :param apply_func: A required function that can have an arity of 1-2, depending on if loading occurs
         :param load_func: An optional supplier function used if load time events are required, has an arity of 0.
         """
         self.FIFO_PATH = "/tmp/algoout"
-        apply_args, _, _, apply_defaults, _, _, _ = inspect.getfullargspec(apply_func)
-        # apply_args, _, _, apply_defaults = inspect.getargspec(apply_func)
-        # j = inspect.getfullargspec(apply_func)
+        apply_args, _, _, _, _, _, _ = inspect.getfullargspec(apply_func)
         if load_func:
             load_args, _, _, _, _, _, _ = inspect.getfullargspec(load_func)
             if len(load_args) > 0:
@@ -38,16 +35,16 @@ def load(self):
         if self.is_local:
             print("loading complete")
         else:
-            print('PIPE_INIT_COMPLETE')
+            print("PIPE_INIT_COMPLETE")
             sys.stdout.flush()
 
     def format_data(self, request):
-        if request['content_type'] in ['text', 'json']:
-            data = request['data']
-        elif request['content_type'] == 'binary':
-            data = self.wrap_binary_data(request['data'])
+        if request["content_type"] in ["text", "json"]:
+            data = request["data"]
+        elif request["content_type"] == "binary":
+            data = self.wrap_binary_data(request["data"])
         else:
-            raise Exception("Invalid content_type: {}".format(request['content_type']))
+            raise Exception("Invalid content_type: {}".format(request["content_type"]))
         return data
 
     def is_binary(self, arg):
@@ -64,20 +61,20 @@ def wrap_binary_data(self, data):
 
     def format_response(self, response):
         if self.is_binary(response):
-            content_type = 'binary'
-            response = base64.b64encode(response)
-            if not isinstance(response, six.string_types):
-                response = str(response, 'utf-8')
+            content_type = "binary"
+            response = str(base64.b64encode(response), "utf-8")
         elif isinstance(response, six.string_types) or isinstance(response, six.text_type):
-            content_type = 'text'
+            content_type = "text"
         else:
-            content_type = 'json'
-        response_string = json.dumps({
-            'result': response,
-            'metadata': {
-                'content_type': content_type
+            content_type = "json"
+        response_string = json.dumps(
+            {
+                "result": response,
+                "metadata": {
+                    "content_type": content_type
+                }
             }
-        })
+        )
         return response_string
 
     def write_to_pipe(self, payload):
@@ -88,23 +85,23 @@ def write_to_pipe(self, payload):
                 print(payload)
         else:
             if os.name == "posix":
-                with open(self.FIFO_PATH, 'w') as f:
+                with open(self.FIFO_PATH, "w") as f:
                     f.write(payload)
-                    f.write('\n')
+                    f.write("\n")
                 sys.stdout.flush()
             if os.name == "nt":
                 sys.stdin = payload
 
     def create_exception(self, exception):
-        if hasattr(exception, 'error_type'):
+        if hasattr(exception, "error_type"):
             error_type = exception.error_type
         else:
-            error_type = 'AlgorithmError'
+            error_type = "AlgorithmError"
         response = {
-            'error': {
-                'message': str(exception),
-                'stacktrace': traceback.format_exc(),
-                'error_type': error_type
+            "error": {
+                "message": str(exception),
+                "stacktrace": traceback.format_exc(),
+                "error_type": error_type,
             }
         }
         return response

examples/loaded_state_hello_world/src/Algorithm.py

@@ -15,6 +15,7 @@ def load():
     # The return object from this function can be passed directly as input to your apply function.
     # A great example would be any model files that need to be available to this algorithm
     # during runtime.
+
     # Any variables returned here, will be passed as the secondary argument to your 'algorithm' function
     globals = {}
     globals['payload'] = "Loading has been completed."

setup.py

@@ -5,8 +5,9 @@
 setup(
     name='algorithmia-adk',
     version=os.environ.get('ADK_VERSION', '0.0.0'),
-    description='adk python ADK client',
-    long_description='adk Development Kit code used for creating Python algorithms on adk. Built into the Algorithmia client',
+    description='Algorithmia Python ADK client',
+    long_description='Algorithm Development Kit code used for creating Python algorithms on Algorithmia. '
+                     'Used by the Algorithmia client',
     url='http://github.com/algorithmiaio/algorithmia-adk-python',
     license='MIT',
     author='Algorithmia',
@@ -17,18 +18,18 @@
     ],
     include_package_data=True,
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Topic :: Software Development :: Libraries :: Python Modules',
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Natural Language :: English",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Topic :: Software Development :: Libraries :: Python Modules",
     ],
 )