瀏覽代碼

[Refactor] rename get_brain with load brain + usage of Brainloader.brain

ThiBuff 7 年之前
父節點
當前提交
5749fb74c7

+ 1 - 1
Tests/test_brain_loader.py

@@ -47,7 +47,7 @@ class TestBrainLoader(unittest.TestCase):
         brain_loader = BrainLoader(file_path=self.brain_to_test)
         self.assertEqual(brain_loader.yaml_config, self.expected_result)
 
-    def test_get_brain(self):
+    def test_load_brain(self):
         """
         Test the class return a valid brain object
         """

+ 3 - 3
kalliope/core/ConfigurationManager/BrainLoader.py

@@ -42,7 +42,7 @@ class BrainLoader(with_metaclass(Singleton, object)):
         if self.file_path is None:
             raise BrainNotFound("brain file not found")
         self.yaml_config = self.get_yaml_config()
-        self.brain = self.get_brain()
+        self.brain = self.load_brain()
 
     def get_yaml_config(self):
         """
@@ -61,7 +61,7 @@ class BrainLoader(with_metaclass(Singleton, object)):
             brain_file_path = self.file_path
         return YAMLLoader.get_config(brain_file_path)
 
-    def get_brain(self):
+    def load_brain(self):
         """
         Class Methods which loads default or the provided YAML file and return a Brain
         :return: The loaded Brain
@@ -69,7 +69,7 @@ class BrainLoader(with_metaclass(Singleton, object)):
 
         :Example:
 
-            brain = BrainLoader.get_brain(file_path="/var/tmp/brain.yml")
+            brain = BrainLoader.load_brain(file_path="/var/tmp/brain.yml")
 
         .. seealso:: Brain
         .. warnings:: Class Method

+ 1 - 1
kalliope/core/NeuronModule.py

@@ -248,7 +248,7 @@ class NeuronModule(object):
         :param is_api_call: If true, the current call comes from the api
         :param overriding_parameter_dict: dict of value to add to neuron parameters
         """
-        synapse = BrainLoader().get_brain().get_synapse_by_name(synapse_name)
+        synapse = BrainLoader().brain.get_synapse_by_name(synapse_name)
         matched_synapse = MatchedSynapse(matched_synapse=synapse,
                                          matched_order=synapse_order,
                                          user_order=user_order,

+ 1 - 1
kalliope/core/RestAPI/FlaskAPI.py

@@ -158,7 +158,7 @@ class FlaskAPI(threading.Thread):
         """
         # get a synapse object from the name
         logger.debug("[FlaskAPI] run_synapse_by_name: synapse name -> %s" % synapse_name)
-        synapse_target = BrainLoader().get_brain().get_synapse_by_name(synapse_name=synapse_name)
+        synapse_target = BrainLoader().brain.get_synapse_by_name(synapse_name=synapse_name)
 
         # get no_voice_flag if present
         no_voice = self.get_boolean_flag_from_request(request, boolean_flag_to_find="no_voice")

+ 1 - 1
kalliope/signals/order/order.py

@@ -40,7 +40,7 @@ class Order(Thread):
         # load settings and brain from singleton
         sl = SettingLoader()
         self.settings = sl.settings
-        self.brain = BrainLoader().get_brain()
+        self.brain = BrainLoader().brain
 
         # keep in memory the order to process
         self.order_to_process = None