Minor changes for compatibility to Python 3.10

precise/model.py

@@ -70,7 +70,7 @@ def create_model(model_name: Optional[str], params: ModelParams) -> 'Sequential'
         model = load_precise_model(model_name)
     else:
         from keras.layers.core import Dense
-        from keras.layers.recurrent import GRU
+        from keras.layers import GRU
         from keras.models import Sequential
 
         model = Sequential()

precise/network_runner.py

@@ -78,18 +78,10 @@ class KerasRunner(Runner):
     """ Executes a regular Keras model created from precise-train"""
     def __init__(self, model_name: str):
         import tensorflow as tf
-        # ISSUE 88 - Following 3 lines added to resolve issue 88 - JM 2020-02-04 per liny90626
-        from tensorflow.python.keras.backend import set_session # ISSUE 88
-        self.sess = tf.Session() # ISSUE 88
-        set_session(self.sess) # ISSUE 88
         self.model = load_precise_model(model_name)
-        self.graph = tf.get_default_graph()
 
     def predict(self, inputs: np.ndarray):
-        from tensorflow.python.keras.backend import set_session		# ISSUE 88
-        with self.graph.as_default():
-            set_session(self.sess)		# ISSUE 88
-            return self.model.predict(inputs)
+        return self.model.predict(inputs)
 
     def run(self, inp: np.ndarray) -> float:
         return self.predict(inp[np.newaxis])[0][0]

precise/scripts/train.py

@@ -54,7 +54,7 @@
 
 ...
 """
-from fitipy import Fitipy
+from fitipy import FList
 from keras.callbacks import LambdaCallback
 from os.path import splitext, isfile
 from prettyparse import Usage
@@ -90,12 +90,12 @@ def __init__(self, args):
         from keras.callbacks import ModelCheckpoint, TensorBoard
         checkpoint = ModelCheckpoint(args.model, monitor=args.metric_monitor,
                                      save_best_only=args.save_best)
-        epoch_fiti = Fitipy(splitext(args.model)[0] + '.epoch')
-        self.epoch = epoch_fiti.read().read(0, int)
+        epoch_fiti = FList(splitext(args.model)[0] + '.epoch')
+        self.epoch = int(epoch_fiti.data[0]) if len(epoch_fiti.data) else 0
 
         def on_epoch_end(_a, _b):
             self.epoch += 1
-            epoch_fiti.write().write(self.epoch, str)
+            epoch_fiti.append(self.epoch)
 
         self.model_base = splitext(self.args.model)[0]
 
@@ -113,7 +113,7 @@ def on_epoch_end(_a, _b):
 
     @staticmethod
     def load_sample_data(filename, train_data) -> Tuple[set, dict]:
-        samples = Fitipy(filename).read().set()
+        samples = set(FList(filename).data)
         hash_to_ind = {
             calc_sample_hash(inp, outp): ind
             for ind, (inp, outp) in enumerate(zip(*train_data))

requirements.txt

@@ -1,44 +1,39 @@
-absl-py==0.7.1
-astor==0.7.1
-attrs==19.1.0
-cycler==0.10.0
-decorator==4.4.0
-fitipy==0.1.2
-future==0.17.1
-gast==0.2.2
-grpcio==1.19.0
-h5py==2.9.0
-Keras==2.2.4
-Keras-Applications==1.0.7
-Keras-Preprocessing==1.0.9
-kiwisolver==1.0.1
-Markdown==3.1
-matplotlib==3.0.3
-mock==2.0.0
--e [email protected]:MycroftAI/mycroft-precise@37ef1ab91eeca81fd889bce2967775b2f6918d97#egg=mycroft_precise
-numpy==1.16.2
-pbr==5.1.3
-pocketsphinx==0.1.15
-portalocker==1.4.0
--e [email protected]:MycroftAI/mycroft-precise@37ef1ab91eeca81fd889bce2967775b2f6918d97#egg=precise_runner&subdirectory=runner
-prettyparse==0.1.4
-protobuf==3.7.1
-PyAudio==0.2.11
-pymongo==3.7.2
-pyparsing==2.3.1
-python-dateutil==2.8.0
-PyYAML==5.1
-scikit-learn==0.20.3
-scikit-optimize==0.5.2
-scipy==1.2.1
-six==1.12.0
+absl-py==1.4.0
+astor==0.8.1
+attrs==23.1.0
+cycler==0.11.0
+decorator==5.1.1
+fitipy==1.0.0
+future==0.18.3
+gast==0.4.0
+grpcio==1.54.2
+h5py==3.9.0
+Keras
+kiwisolver==1.4.4
+Markdown==3.4.3
+matplotlib==3.7.1
+mock==5.0.2
+numpy==1.23.5
+pbr==5.11.1
+pocketsphinx==5.0.1
+portalocker==2.7.0
+prettyparse==1.2.0
+protobuf==4.23.3
+PyAudio==0.2.13
+pymongo==4.4.0
+pyparsing==3.1.0
+python-dateutil==2.8.2
+PyYAML==6.0
+scikit-learn==1.2.2
+scikit-optimize==0.9.0
+scipy==1.10.1
+six==1.16.0
 sonopy==0.1.2
 speechpy-fast==2.4
-tensorboard==1.13.1
-tensorflow==1.13.1
-tensorflow-estimator==1.13.0
-termcolor==1.1.0
-tqdm==4.31.1
-typing==3.6.6
-wavio==0.0.4
-Werkzeug==0.15.3
+tensorboard==2.12.3
+tensorflow==2.12.0
+termcolor==2.3.0
+tqdm==4.65.0
+typing==3.7.4.3
+wavio==0.0.7
+Werkzeug==2.3.6

setup.py

@@ -41,6 +41,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.10',
     ],
     packages=[
         'precise',
@@ -71,11 +72,11 @@
     },
     include_package_data=True,
     install_requires=[
-        'numpy==1.16',
-        'tensorflow>=1.13,<1.14',  # Must be on piwheels
+        'numpy',
+        'tensorflow',  # Must be on piwheels
         'sonopy',
         'pyaudio',
-        'keras<=2.1.5',
+        'keras',
         'h5py',
         'wavio',
         'typing',