#3287: Update puppet5 + python3

README.md

@@ -82,7 +82,7 @@ Both the web-interface, and the programmatic-api, have corresponding
 ### Web Interface
 
 The [web-interface](https://github.com/jeff1evesque/machine-learning/blob/master/interface/templates/index.html),
- can be accessed within the browser on `https://192.168.99.101:8080`:
+ can be accessed within the browser on `https://192.168.99.101:8585`:
 
 ![web-interface](https://user-images.githubusercontent.com/2907085/39499223-97b96fce-4d7a-11e8-96e2-c4e31f6b8e09.JPG 'web-interface')
 
@@ -135,7 +135,7 @@ A post request, can be implemented in python, as follows:
 ```python
 import requests
 
-endpoint = 'https://192.168.99.101:9090/load-data'
+endpoint = 'https://192.168.99.101:9595/load-data'
 headers = {
     'Authorization': 'Bearer ' + token,
     'Content-Type': 'application/json'
@@ -151,6 +151,6 @@ requests.post(endpoint, headers=headers, data=json_string_here)
 
 It is important to remember that the [`docker-compose.development.yml`](https://github.com/jeff1evesque/machine-learning/blob/3889788a8343a4b7cef2cf84166f9bd35d83021c/docker-compose.development.yml#L33-L43),
  has defined two port forwards, each assigned to its corresponding reverse
- proxy. This allows port `8080` on the host, to map into the `webserver-web`
- container. A similar case for the programmatic-api, uses port `9090` on the
+ proxy. This allows port `8585` on the host, to map into the `webserver-web`
+ container. A similar case for the programmatic-api, uses port `9595` on the
  host.

brain/cache/hset.py

@@ -9,15 +9,13 @@
 from brain.cache.query import Query
 
 
-class Hset(object):
+class Hset:
     '''
 
     This class provides an interface to cache, and uncache the redis hash
     data structure.  Specifically, necessary data components is passed into the
     corresponding class method.
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self):
@@ -36,7 +34,7 @@ def __init__(self):
         # start redis client
         try:
             self.myRedis.start_redis()
-        except Exception, error:
+        except Exception as error:
             self.list_error.append(str(error))
 
     def cache(self, hash_name, key, value):
@@ -48,9 +46,9 @@ def cache(self, hash_name, key, value):
 
         try:
             self.myRedis.hset(hash_name, key, value)
-        except Exception, error:
+        except Exception as error:
             self.list_error.append(str(error))
-            print self.list_error
+            print(self.list_error)
 
     def uncache(self, hash_name, key):
         '''
@@ -61,6 +59,6 @@ def uncache(self, hash_name, key):
 
         try:
             return {'result': self.myRedis.hget(hash_name, key), 'error': None}
-        except Exception, error:
+        except Exception as error:
             self.list_error.append(str(error))
             return {'result': None, 'error': self.list_error}

brain/cache/model.py

@@ -10,16 +10,14 @@
 from brain.converter.model import Model as Converter
 
 
-class Model(object):
+class Model:
     '''
 
     This class provides an interface to cache, and uncache the redis hash
     data structure.  Specifically, necessary data components is passed into the
     corresponding class method, which allow computed model(s) to be stored into
     a NoSQL datastore.
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self, model=None):
@@ -39,7 +37,7 @@ def __init__(self, model=None):
         # start redis client
         try:
             self.myRedis.start_redis()
-        except Exception, error:
+        except Exception as error:
             self.list_error.append(str(error))
 
     def cache(self, hash_name, key):
@@ -53,9 +51,9 @@ def cache(self, hash_name, key):
         try:
             serialized = Converter(self.model).serialize()
             self.myRedis.hset(hash_name, key, serialized)
-        except Exception, error:
+        except Exception as error:
             self.list_error.append(str(error))
-            print self.list_error
+            print(self.list_error)
 
     def uncache(self, hash_name, key):
         '''
@@ -96,6 +94,6 @@ def get_all_titles(self, name):
                     'error': 'no previous model found in cache'
                 }
 
-        except Exception, error:
+        except Exception as error:
             self.list_error.append(str(error))
             return {'result': None, 'error': self.list_error}

brain/cache/query.py

@@ -10,7 +10,7 @@
 from brain.cache.settings import Settings
 
 
-class Query(object):
+class Query:
     '''
 
     This class provides an interface to various Redis data structures.
@@ -32,8 +32,6 @@ class Query(object):
           concept to 'lists'. Also, the above included redis data structures,
           provides enough flexibility to accomplish most requirements.
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self, db_num=0, host=None, port=None):

brain/cache/settings.py

@@ -9,14 +9,12 @@
 from flask import current_app
 
 
-class Settings(object):
+class Settings:
     '''
 
     This class provides an interface to get, or set the redis host, or redis
     port.
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self):

brain/converter/model.py

@@ -10,14 +10,12 @@
 from sklearn import svm, preprocessing
 
 
-class Model(object):
+class Model:
     '''
 
     This class provides an interface to serialize, and deserialize an SVM
     object.
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self, model):

brain/converter/operation.py

@@ -9,15 +9,13 @@
 '''
 
 
-class Operation(object):
+class Operation:
     '''
 
     This class provides an interface to restructure the supplied data into a
     consistent structure, which allows successive parsers to implement
     corresponding logic.
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self, settings, dataset=None):

brain/converter/settings.py

@@ -9,15 +9,13 @@
 '''
 
 
-class Settings(object):
+class Settings:
     '''
 
     This class provides an interface to restructure the supplied data into a
     consistent structure, which allows successive parsers to implement
     corresponding logic.
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self, settings, dataset=None):

brain/database/account.py

@@ -10,13 +10,11 @@
 from brain.database.query import SQL
 
 
-class Account(object):
+class Account:
     '''
 
     This class provides an interface to the users account.
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self):
@@ -71,7 +69,7 @@ def check_username(self, username):
         sql_statement = 'SELECT * '\
             'FROM tbl_user '\
             'WHERE username=%s'
-        args = (username)
+        args = (username,)
         response = self.sql.execute('select', sql_statement, args)
 
         # retrieve any error(s)
@@ -95,7 +93,7 @@ def check_email(self, email):
         sql_statement = 'SELECT * '\
             'FROM tbl_user '\
             'WHERE email=%s'
-        args = (email)
+        args = (email,)
         response = self.sql.execute('select', sql_statement, args)
 
         # retrieve any error(s)
@@ -119,7 +117,7 @@ def get_password(self, username):
         sql_statement = 'SELECT password '\
             'FROM tbl_user '\
             'WHERE username=%s'
-        args = (username)
+        args = (username,)
         response = self.sql.execute('select', sql_statement, args)
 
         # retrieve any error(s)
@@ -143,7 +141,7 @@ def get_uid(self, username):
         sql_statement = 'SELECT id_user '\
             'FROM tbl_user '\
             'WHERE username=%s'
-        args = (username)
+        args = (username,)
         response = self.sql.execute('select', sql_statement, args)
 
         # retrieve any error(s)

brain/database/dataset.py

@@ -10,16 +10,14 @@
 from brain.database.query import NoSQL
 
 
-class Collection(object):
+class Collection:
     '''
 
     This class provides an interface to retrieve, and store various parameters,
     of the specified collection, from the mongodb.
 
     Note: this class is invoked within 'base_data.py'
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self):
@@ -55,6 +53,12 @@ def query(self, collection, operation, payload=None):
         if operation == 'drop_collection':
             self.nosql.connect()
             response = self.nosql.execute(operation, collection)
+
+        elif operation == 'count_documents':
+            self.nosql.connect(collection)
+            response = self.nosql.execute(operation, payload)
+            response['result'] = int(response['result'] or 0)
+
         else:
             self.nosql.connect(collection)
             response = self.nosql.execute(operation, payload)

brain/database/entity.py

@@ -10,7 +10,7 @@
 from brain.database.query import SQL
 
 
-class Entity(object):
+class Entity:
     '''
 
     This class provides an interface to save, retrieve an SVM entity title,
@@ -19,8 +19,6 @@ class Entity(object):
     Note: this class is invoked within 'model_generate.py', 'base_data.py',
           and 'data_append.py'
 
-    Note: this class explicitly inherits the 'new-style' class.
-
     '''
 
     def __init__(self, premodel_data=None, session_type=None):
@@ -106,7 +104,7 @@ def get_title(self, id_entity):
         sql_statement = 'SELECT title '\
             'FROM tbl_dataset_entity '\
             'WHERE id_entity=%s'
-        args = (id_entity)
+        args = (id_entity,)
         response = self.sql.execute('select', sql_statement, args)
 
         # retrieve any error(s)
@@ -135,7 +133,7 @@ def get_collections(self, uid):
             'FROM tbl_dataset_entity '\
             'WHERE uid_created=%s '\
             'ORDER BY datetime_created'
-        args = (uid)
+        args = (uid,)
         response = self.sql.execute('select', sql_statement, args)
 
         # retrieve any error(s)
@@ -166,7 +164,7 @@ def get_collection_count(self, uid):
             'FROM tbl_dataset_entity '\
             'WHERE uid_created=%s'\
             ') AS c'
-        args = (uid)
+        args = (uid,)
         response = self.sql.execute('select', sql_statement, args)
 
         # retrieve any error(s)
@@ -176,7 +174,7 @@ def get_collection_count(self, uid):
         if response_error:
             return {'error': response_error, 'result': None}
         else:
-            return {'error': None, 'result': int(response['result'][0][0])}
+            return {'error': None, 'result': int(response['result'][0][0] or 0)}
 
     def remove_entity(self, uid, collection):
         '''

brain/database/model_type.py

@@ -10,7 +10,7 @@
 from brain.database.query import SQL
 
 
-class ModelType(object):
+class ModelType:
     '''
 
     Note: this class explicitly inherits the 'new-style' class.
@@ -20,7 +20,7 @@ class ModelType(object):
     def __init__(self):
         '''
 
-        This constructor is responsible for defining class variables.
+        This class provides and interface between the model_type.
 
         '''
 
@@ -49,7 +49,7 @@ def get_model_type(self, collection):
             ' INNER JOIN tbl_model_type mtype'\
             ' ON mid.model_type = mtype.id_model'\
             ' WHERE mid.collection=%s'
-        args = (collection)
+        args = (collection,)
         response = self.sql.execute('select', sql_statement, args)
 
         # retrieve any error(s)