Browse Source

[Refactor] Add Utils Repository

monf 8 years ago
parent
commit
a5293ec063

+ 1 - 1
kalliope/Tests/test_configuration_checker.py

@@ -3,7 +3,7 @@ import unittest
 from kalliope.core.ConfigurationManager.ConfigurationChecker import ConfigurationChecker, NoSynapeName, NoSynapeNeurons, \
 from kalliope.core.ConfigurationManager.ConfigurationChecker import ConfigurationChecker, NoSynapeName, NoSynapeNeurons, \
     NoSynapeSignals, NoValidSignal, NoEventPeriod, NoValidOrder, MultipleSameSynapseName
     NoSynapeSignals, NoValidSignal, NoEventPeriod, NoValidOrder, MultipleSameSynapseName
 from kalliope.core.Models import Synapse
 from kalliope.core.Models import Synapse
-from kalliope.core.Utils import ModuleNotFoundError
+from kalliope.core.Utils.Utils import ModuleNotFoundError
 
 
 
 
 class TestConfigurationChecker(unittest.TestCase):
 class TestConfigurationChecker(unittest.TestCase):

+ 4 - 3
kalliope/Tests/test_tts_module.py

@@ -1,10 +1,11 @@
+import os
 import unittest
 import unittest
+
 import mock
 import mock
-import os
 
 
-from kalliope.core.TTS.TTSModule import TTSModule, TtsGenerateAudioFunctionNotFound
 from kalliope.core.Models.Settings import Settings
 from kalliope.core.Models.Settings import Settings
-from kalliope.core.FileManager import FileManager
+from kalliope.core.TTS.TTSModule import TTSModule, TtsGenerateAudioFunctionNotFound
+from kalliope.core.Utils.FileManager import FileManager
 
 
 
 
 class TestTTSModule(unittest.TestCase):
 class TestTTSModule(unittest.TestCase):

+ 1 - 1
kalliope/core/ConfigurationManager/ConfigurationChecker.py

@@ -1,6 +1,6 @@
 import re
 import re
 
 
-from kalliope.core.Utils import ModuleNotFoundError
+from kalliope.core.Utils.Utils import ModuleNotFoundError
 
 
 
 
 class InvalidSynapeName(Exception):
 class InvalidSynapeName(Exception):

+ 1 - 1
kalliope/core/ConfigurationManager/SettingLoader.py

@@ -1,13 +1,13 @@
 import logging
 import logging
 
 
 from YAMLLoader import YAMLLoader
 from YAMLLoader import YAMLLoader
-from kalliope.core.FileManager import FileManager
 from kalliope.core.Models import Singleton
 from kalliope.core.Models import Singleton
 from kalliope.core.Models.RestAPI import RestAPI
 from kalliope.core.Models.RestAPI import RestAPI
 from kalliope.core.Models.Settings import Settings
 from kalliope.core.Models.Settings import Settings
 from kalliope.core.Models.Stt import Stt
 from kalliope.core.Models.Stt import Stt
 from kalliope.core.Models.Trigger import Trigger
 from kalliope.core.Models.Trigger import Trigger
 from kalliope.core.Models.Tts import Tts
 from kalliope.core.Models.Tts import Tts
+from kalliope.core.Utils.FileManager import FileManager
 
 
 FILE_NAME = "settings.yml"
 FILE_NAME = "settings.yml"
 
 

+ 1 - 1
kalliope/core/NeuronModule.py

@@ -8,7 +8,7 @@ from jinja2 import Template
 
 
 from kalliope.core import OrderListener
 from kalliope.core import OrderListener
 from kalliope.core.SynapseLauncher import SynapseLauncher
 from kalliope.core.SynapseLauncher import SynapseLauncher
-from kalliope.core.Utils import Utils
+from kalliope.core.Utils.Utils import Utils
 from kalliope.core.ConfigurationManager import SettingLoader, BrainLoader
 from kalliope.core.ConfigurationManager import SettingLoader, BrainLoader
 
 
 logging.basicConfig()
 logging.basicConfig()

+ 1 - 1
kalliope/core/NeuroneLauncher.py

@@ -1,6 +1,6 @@
 import logging
 import logging
 
 
-from kalliope.core.Utils import Utils
+from kalliope.core.Utils.Utils import Utils
 
 
 logging.basicConfig()
 logging.basicConfig()
 logger = logging.getLogger("kalliope")
 logger = logging.getLogger("kalliope")

+ 1 - 1
kalliope/core/OrderAnalyser.py

@@ -2,7 +2,7 @@
 import re
 import re
 from collections import Counter
 from collections import Counter
 
 
-from kalliope.core.Utils import Utils
+from kalliope.core.Utils.Utils import Utils
 from kalliope.core.Models import Order
 from kalliope.core.Models import Order
 from kalliope.core.NeuroneLauncher import NeuroneLauncher
 from kalliope.core.NeuroneLauncher import NeuroneLauncher
 
 

+ 1 - 1
kalliope/core/OrderListener.py

@@ -4,7 +4,7 @@ from threading import Thread
 
 
 from cffi import FFI as _FFI
 from cffi import FFI as _FFI
 
 
-from kalliope.core.Utils import Utils
+from kalliope.core.Utils.Utils import Utils
 from kalliope.core.ConfigurationManager import SettingLoader
 from kalliope.core.ConfigurationManager import SettingLoader
 
 
 logging.basicConfig()
 logging.basicConfig()

+ 1 - 1
kalliope/core/ShellGui.py

@@ -10,7 +10,7 @@ from dialog import Dialog
 from kalliope.core import OrderListener
 from kalliope.core import OrderListener
 from kalliope.core.ConfigurationManager import SettingLoader
 from kalliope.core.ConfigurationManager import SettingLoader
 from kalliope.core.SynapseLauncher import SynapseLauncher
 from kalliope.core.SynapseLauncher import SynapseLauncher
-from kalliope.core.Utils import Utils
+from kalliope.core.Utils.Utils import Utils
 from kalliope.neurons.say.say import Say
 from kalliope.neurons.say.say import Say
 
 
 logging.basicConfig()
 logging.basicConfig()

+ 1 - 1
kalliope/core/TTS/TTSModule.py

@@ -3,9 +3,9 @@ import hashlib
 import logging
 import logging
 import os
 import os
 
 
-from kalliope.core.FileManager import FileManager
 from kalliope.core.ConfigurationManager import SettingLoader
 from kalliope.core.ConfigurationManager import SettingLoader
 from kalliope.core.Players import Mplayer
 from kalliope.core.Players import Mplayer
+from kalliope.core.Utils.FileManager import FileManager
 
 
 logging.basicConfig()
 logging.basicConfig()
 logger = logging.getLogger("kalliope")
 logger = logging.getLogger("kalliope")

+ 0 - 0
kalliope/core/FileManager.py → kalliope/core/Utils/FileManager.py


+ 0 - 0
kalliope/core/Utils.py → kalliope/core/Utils/Utils.py


+ 2 - 0
kalliope/core/Utils/__init__.py

@@ -0,0 +1,2 @@
+from kalliope.core.Utils import Utils
+from kalliope.core.Utils import FileManager

+ 2 - 1
kalliope/core/__init__.py

@@ -1,6 +1,7 @@
 from kalliope.core.OrderAnalyser import OrderAnalyser
 from kalliope.core.OrderAnalyser import OrderAnalyser
 from kalliope.core.OrderListener import OrderListener
 from kalliope.core.OrderListener import OrderListener
 from kalliope.core.ShellGui import ShellGui
 from kalliope.core.ShellGui import ShellGui
-from kalliope.core.FileManager import FileManager
 from kalliope.core.Utils import Utils
 from kalliope.core.Utils import Utils
+from kalliope.core.Utils import FileManager
+