Merge https://github.com/algorithmiaio/algorithmia-python into Dev-325

Author: John-Bragg

.gitlab-ci.yml

@@ -4,12 +4,30 @@ stages:
   - python37
   - python38
   - python39
+  - deploy
 
 variables:
   PROJECT_NAME: algorithmia-python
   DOCKER_HOST: tcp://docker:2375/
   DOCKER_DRIVER: overlay2
   RUNNING_ON_BUILD_SERVER: "true"
+  TWINE_USERNAME: __token__
+  CLIENT_VERSION: $CI_COMMIT_TAG
+
+
+deploy:
+  stage: deploy
+  only:
+    - tags
+  image: python:3.7
+  script:
+#    - export CLIENT_VERSION=$(git describe --abbrev=0 2>/dev/null || echo '')
+    - echo $CLIENT_VERSION
+    - python -m pip install --upgrade pip
+    - pip install wheel twine setuptools
+    - python setup.py sdist bdist_wheel
+    - python3 setup.py sdist bdist_wheel --universal
+    - twine upload -r pypi dist/*
 
 test:
   stage: test

Algorithmia/CLI.py

@@ -287,6 +287,26 @@ def cp(self, src, dest, client):
                 else:
                     print("at least one of the operands must be a path to a remote data source data://")
 
+    def get_environment_by_language(self,language,client):
+        response = client.get_environment(language)
+        if "error" in response:
+            return json.dumps(response)
+        return json.dumps(response['environments'],indent=1)
+
+
+    def list_languages(self, client):
+        response = client.get_supported_languages()
+        return response
+
+
+    def getBuildLogs(self, user, algo, client):
+        api_response = client.algo(user+'/'+algo).build_logs()
+        
+        if "error" in api_response:
+            return json.dumps(api_response)
+        return json.dumps(api_response['results'], indent=1)
+
+
     def getconfigfile(self):
         if(os.name == "posix"):
             #if!windows
@@ -318,6 +338,10 @@ def getconfigfile(self):
 
         return key
 
+    def get_template(self,envid,dest,client):
+        response = client.get_template(envid,dest)
+        return response
+
     def getAPIkey(self,profile):
         key = self.getconfigfile()
         config_dict = toml.load(key)

Algorithmia/__main__.py

@@ -107,6 +107,26 @@ def main():
     parser_cat.add_argument('path', nargs = '*', help = 'file(s) to concatenate and print')
     parser_cat.add_argument('--profile', action = 'store', type = str, default = 'default')
 
+    #sub parser for getting environment template
+    parser_template = subparsers.add_parser('template',help='template <envid> <dest> downloads an environment template to the destination')
+    parser_template.add_argument('envid',help='environment specification id')
+    parser_template.add_argument('dest',help='destination for template download')
+
+    #sub parser for getting environment by language name
+    parser_env = subparsers.add_parser('environment', help = 'environment <language> gets environment info by language')
+    parser_env.add_argument('language', help='supported language name')
+
+
+    #sub parser for listing languages
+    subparsers.add_parser('languages', help = 'lists supported languages')
+
+    #sub parser for builds
+    parser_builds = subparsers.add_parser('builds', help = 'builds <user> <algo> gets build logs for algorithm')
+    parser_builds.add_argument('user')
+    parser_builds.add_argument('algo',help='algorithm name')
+
+    #sub parser for help
+
     subparsers.add_parser('help')
     parser.add_argument('--profile', action = 'store', type = str, default = 'default')
 
@@ -179,6 +199,23 @@ def main():
 
     elif args.cmd == 'cat':
         print(CLI().cat(args.path, client))
+        
+    elif args.cmd == 'languages':
+        response = CLI().list_languages(client)
+        print("{:<25} {:<35}".format('Name','Description'))
+        for lang in response:
+            print("{:<25} {:<35}".format(lang['name'],lang['display_name']))
+
+    elif args.cmd == 'template':
+        CLI().get_template(args.envid,args.dest,client)
+
+    elif args.cmd == 'environment':
+        response = CLI().get_environment_by_language(args.language,client)
+        print(response)
+
+    elif args.cmd == 'builds':
+        print(CLI().getBuildLogs(args.user, args.algo, client))
+
     else:
         parser.parse_args(['-h'])
 

Algorithmia/algorithm.py

@@ -112,6 +112,11 @@ def get_build_logs(self, build_id):
             error_message = json.loads(e.body)
             raise raiseAlgoApiError(error_message)
 
+    def build_logs(self):
+        url = '/v1/algorithms/'+self.username+'/'+self.algoname+'/builds'
+        response = json.loads(self.client.getHelper(url).content.decode('utf-8'))
+        return response
+
 
     def get_scm_status(self):
         try:

Algorithmia/client.py

@@ -10,6 +10,7 @@
 from tempfile import mkstemp
 import atexit
 import json, re, requests, six, certifi
+import tarfile
 import os
 
 
@@ -114,6 +115,50 @@ def invite_to_org(self,orgname,username):
         response = self.putHelper(url,data={})
         return response
 
+
+    def get_template(self,envid,dest,save_tar=False):
+        url = "/v1/algorithm-environments/edge/environment-specifications/"+envid+"/template"
+        filename="template.tar.gz"
+
+        if not os.path.exists(dest):
+            os.makedirs(dest)
+
+        filepath = os.path.join(dest, filename)
+        response = self.getStreamHelper(url)
+
+        if response.ok:
+            with open(filepath, 'wb') as f:
+                for chunk in response.iter_content(chunk_size=1024 * 8):
+                    if chunk:
+                        f.write(chunk)
+                        f.flush()
+                        os.fsync(f.fileno())
+
+            tar = tarfile.open(filepath, "r:gz")
+            tar.extractall(dest)
+            tar.close()
+
+            if not save_tar:
+                try:
+                    os.remove(filepath)
+                except OSError as e:
+                    print(e)
+            return response
+        else:  
+            return json.loads(response.content.decode("utf-8"))
+
+    def get_environment(self,language):
+        url = "/v1/algorithm-environments/edge/languages/"+language+"/environments"
+        response = self.getHelper(url)
+        return response.json()
+
+    def get_supported_languages(self):
+        url ="/v1/algorithm-environments/edge/languages"
+        response = self.getHelper(url)
+        return response.json()
+
+
+
     # Used to send insight data to Algorithm Queue Reader in cluster
     def report_insights(self, insights):
         return Insights(insights)
@@ -152,6 +197,12 @@ def getHelper(self, url, **query_parameters):
             headers['Authorization'] = self.apiKey
         return self.requestSession.get(self.apiAddress + url, headers=headers, params=query_parameters)
 
+    def getStreamHelper(self, url, **query_parameters):
+        headers = {}
+        if self.apiKey is not None:
+            headers['Authorization'] = self.apiKey
+        return self.requestSession.get(self.apiAddress + url, headers=headers, params=query_parameters, stream=True)
+
     def patchHelper(self, url, params):
         headers = {'content-type': 'application/json'}
         if self.apiKey is not None:

Test/CLI_test.py

@@ -5,9 +5,11 @@
 
 import unittest
 import os
+import json
 import Algorithmia
 from Algorithmia.CLI import CLI
 import argparse
+import shutil
 
 class CLITest(unittest.TestCase):
 	def setUp(self):
@@ -67,6 +69,15 @@ def test_cat(self):
 		result = CLI().cat([file],self.client)
 		self.assertEqual(result, fileContents)
 
+	def test_get_build_logs(self):
+		user=os.environ.get('ALGO_USER_NAME')
+		algo="Echo"
+		
+		result = json.loads(CLI().getBuildLogs(user,algo,self.client))
+		if "error" in result:
+			print(result)
+		self.assertTrue("error" not in result)
+
 
 #local to remote
 	def test_cp_L2R(self):
@@ -160,6 +171,20 @@ def test_auth_cert(self):
 		self.assertEqual(resultK, key)
 		self.assertEqual(resultA, address)
 		self.assertEqual(resultC, cacert)
+	
+	def test_get_environment(self):
+		result = CLI().get_environment_by_language("python2",self.client)
+		print(result)
+		if("error" in result):
+			print(result)
+		self.assertTrue(result is not None and "display_name" in result)
+
+	def test_list_languages(self):
+		result = CLI().list_languages(self.client)
+		if("error" in result):
+			print(result)
+		self.assertTrue(result is not None and "name" in result[0])
+
 
 	def test_rm(self):
 		localfile = "./TestFiles/testRM.txt"
@@ -180,6 +205,18 @@ def test_rm(self):
 
 		self.assertTrue("testRM.txt" in result1 and "testRM.txt" not in result2)
 
+	def test_get_template(self):
+		filename = "./temptest"
+		envid = "36fd467e-fbfe-4ea6-aa66-df3f403b7132"
+		response = CLI().get_template(envid,filename,self.client)
+		print(response)
+		self.assertTrue(response.ok)
+		try:
+			shutil.rmtree(filename)
+		except OSError as e:
+			print(e)
+		
+
 
 if __name__ == '__main__':
     unittest.main()

Test/client_test.py

@@ -1,4 +1,5 @@
 from datetime import datetime, time
+import shutil
 import sys
 import os
 from random import seed
@@ -38,6 +39,23 @@ def test_get_org(self):
         response = self.c.get_org("a_myOrg84")
         self.assertEqual("a_myOrg84",response['org_name'])
 
+    def test_get_environment(self):
+        client =Algorithmia.client(api_key=os.environ.get('ALGORITHMIA_API_KEY'))
+        response = client.get_environment("python2")
+        print(response)
+        if("error" in response):
+            print(response)
+        self.assertTrue(response is not None and "environments" in response)
+
+    def test_get_build_logs(self):
+        client = Algorithmia.client(api_key=os.environ.get('ALGORITHMIA_API_KEY'))
+        user = os.environ.get('ALGO_USER_NAME')
+        algo = "Echo"
+        result = client.algo(user+'/'+algo).build_logs()
+        if "error" in result:
+            print(result)
+        self.assertTrue("error" not in result)
+
 
     def test_edit_org(self):
         orgname="a_myOrg84"
@@ -57,6 +75,26 @@ def test_edit_org(self):
         response = self.c.edit_org(orgname,obj)
         self.assertEqual(204,response.status_code)
 
+    def test_get_template(self):
+        filename = "./temptest"
+        client =Algorithmia.client(api_key=os.environ.get('ALGORITHMIA_API_KEY'))
+        response = client.get_template("36fd467e-fbfe-4ea6-aa66-df3f403b7132",filename)
+        print(response)
+        self.assertTrue(response.ok)
+        try:
+            shutil.rmtree(filename)
+        except OSError as e:
+            print(e)
+
+    def test_get_supported_languages(self):
+        client = Algorithmia.client(api_key=os.environ.get('ALGORITHMIA_API_KEY'))
+        response = client.get_supported_languages()
+        language_found = any('anaconda3' in languages['name'] for languages in response)
+        if("error" in response):
+            print(response)
+        self.assertTrue(response is not None and language_found)
+
+
     def test_invite_to_org(self):
         response = self.c.invite_to_org("a_myOrg38","a_Mrtest4")
         self.assertEqual(200,response.status_code)

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='algorithmia',
-    version='1.8.2',
+    version=os.environ.get('CLIENT_VERSION', '0.0.0'),
     description='Algorithmia Python Client',
     long_description='Algorithmia Python Client is a client library for accessing Algorithmia from python code. This library also gets bundled with any Python algorithms in Algorithmia.',
     url='http://github.com/algorithmiaio/algorithmia-python',