fix the import path for the new layout. ex: 'from kalliope.core…' unstead of 'from core'

kalliope/Tests/test_brain_loader.py

@@ -1,11 +1,11 @@
 import unittest
 
-from core.ConfigurationManager import BrainLoader
-from core.Models import Event
-from core.Models import Neuron
-from core.Models import Synapse
-from core.Models import Order
-from core.Models.Brain import Brain
+from kalliope.core.ConfigurationManager import BrainLoader
+from kalliope.core.Models import Event
+from kalliope.core.Models import Neuron
+from kalliope.core.Models import Synapse
+from kalliope.core.Models import Order
+from kalliope.core.Models.Brain import Brain
 
 
 class TestBrainLoader(unittest.TestCase):

kalliope/Tests/test_configuration_checker.py

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

kalliope/Tests/test_order_analyser.py

@@ -1,10 +1,10 @@
 import unittest
 
 
-from core.OrderAnalyser import OrderAnalyser
-from core.Models.Neuron import Neuron
-from core.Models.Synapse import Synapse
-from core.Models.Order import Order
+from kalliope.core.OrderAnalyser import OrderAnalyser
+from kalliope.core.Models.Neuron import Neuron
+from kalliope.core.Models.Synapse import Synapse
+from kalliope.core.Models.Order import Order
 
 
 class TestOrderAnalyser(unittest.TestCase):

kalliope/Tests/test_settings_loader.py

@@ -1,10 +1,10 @@
 import unittest
 
-from core.ConfigurationManager import SettingLoader
-from core.Models.RestAPI import RestAPI
-from core.Models.Stt import Stt
-from core.Models.Trigger import Trigger
-from core.Models.Tts import Tts
+from kalliope.core.ConfigurationManager import SettingLoader
+from kalliope.core.Models.RestAPI import RestAPI
+from kalliope.core.Models.Stt import Stt
+from kalliope.core.Models.Trigger import Trigger
+from kalliope.core.Models.Tts import Tts
 
 
 class TestSettingLoader(unittest.TestCase):

kalliope/Tests/test_yaml_loader.py

@@ -1,6 +1,6 @@
 import unittest
 
-from core.ConfigurationManager.YAMLLoader import YAMLFileNotFound, YAMLLoader
+from kalliope.core.ConfigurationManager.YAMLLoader import YAMLFileNotFound, YAMLLoader
 
 
 class TestYAMLLoader(unittest.TestCase):

kalliope/__init__.py

@@ -3,15 +3,15 @@
 import argparse
 import logging
 
-from core import ShellGui
-from core import Utils
-from core.ConfigurationManager.BrainLoader import BrainLoader
-from core.CrontabManager import CrontabManager
-from core.MainController import MainController
+from kalliope.core import ShellGui
+from kalliope.core import Utils
+from kalliope.core.ConfigurationManager.BrainLoader import BrainLoader
+from kalliope.core.CrontabManager import CrontabManager
+from kalliope.core.MainController import MainController
 import signal
 import sys
 
-from core.SynapseLauncher import SynapseLauncher
+from kalliope.core.SynapseLauncher import SynapseLauncher
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/core/ConfigurationManager/BrainLoader.py

@@ -3,13 +3,13 @@ import logging
 import os
 
 from YAMLLoader import YAMLLoader
-from core.ConfigurationManager.ConfigurationChecker import ConfigurationChecker
-from core.Models import Singleton
-from core.Models.Brain import Brain
-from core.Models.Event import Event
-from core.Models.Neuron import Neuron
-from core.Models.Order import Order
-from core.Models.Synapse import Synapse
+from kalliope.core.ConfigurationManager.ConfigurationChecker import ConfigurationChecker
+from kalliope.core.Models import Singleton
+from kalliope.core.Models.Brain import Brain
+from kalliope.core.Models.Event import Event
+from kalliope.core.Models.Neuron import Neuron
+from kalliope.core.Models.Order import Order
+from kalliope.core.Models.Synapse import Synapse
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/core/ConfigurationManager/ConfigurationChecker.py

@@ -1,6 +1,6 @@
 import re
 
-from core.Utils import ModuleNotFoundError
+from kalliope.core.Utils import ModuleNotFoundError
 
 
 class InvalidSynapeName(Exception):
@@ -139,7 +139,7 @@ class ConfigurationChecker:
             :type neuron_module_name: str
             :return:
             """
-            package_name = "neurons"
+            package_name = "kalliope.neurons"
             mod = __import__(package_name, fromlist=[neuron_module_name])
             try:
                 getattr(mod, neuron_module_name)

kalliope/core/ConfigurationManager/SettingLoader.py

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

kalliope/core/CrontabManager.py

@@ -3,8 +3,8 @@ import logging
 from crontab import CronSlices
 from crontab import CronTab
 
-from core import Utils
-from core.Models import Event
+from kalliope.core import Utils
+from kalliope.core.Models import Event
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")
@@ -18,7 +18,7 @@ class InvalidCrontabPeriod(Exception):
     pass
 
 CRONTAB_COMMENT = "KALLIOPE"
-KALLIOPE_ENTRY_POINT_SCRIPT = "kalliope.py"
+KALLIOPE_ENTRY_POINT_SCRIPT = "__init__.py"
 
 
 class CrontabManager:

kalliope/core/MainController.py

@@ -4,14 +4,14 @@ import random
 
 from flask import Flask
 
-from core import Utils
-from core.ConfigurationManager import SettingLoader
-from core.OrderAnalyser import OrderAnalyser
-from core.OrderListener import OrderListener
-from core.Players import Mplayer
-from core.RestAPI.FlaskAPI import FlaskAPI
-from core.TriggerLauncher import TriggerLauncher
-from neurons.say.say import Say
+from kalliope.core import Utils
+from kalliope.core.ConfigurationManager import SettingLoader
+from kalliope.core.OrderAnalyser import OrderAnalyser
+from kalliope.core.OrderListener import OrderListener
+from kalliope.core.Players import Mplayer
+from kalliope.core.RestAPI.FlaskAPI import FlaskAPI
+from kalliope.core.TriggerLauncher import TriggerLauncher
+from kalliope.neurons.say.say import Say
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/core/NeuronModule.py

@@ -6,10 +6,10 @@ import random
 import sys
 from jinja2 import Template
 
-from core import OrderListener
-from core.SynapseLauncher import SynapseLauncher
-from core.Utils import Utils
-from core.ConfigurationManager import SettingLoader, BrainLoader
+from kalliope.core import OrderListener
+from kalliope.core.SynapseLauncher import SynapseLauncher
+from kalliope.core.Utils import Utils
+from kalliope.core.ConfigurationManager import SettingLoader, BrainLoader
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/core/NeuroneLauncher.py

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

kalliope/core/OrderAnalyser.py

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

kalliope/core/OrderListener.py

@@ -4,8 +4,8 @@ from threading import Thread
 
 from cffi import FFI as _FFI
 
-from core.Utils import Utils
-from core.ConfigurationManager import SettingLoader
+from kalliope.core.Utils import Utils
+from kalliope.core.ConfigurationManager import SettingLoader
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/core/RestAPI/FlaskAPI.py

@@ -4,9 +4,9 @@ from flask import jsonify
 from flask import request
 from flask_restful import abort
 
-from core import OrderAnalyser
-from core.RestAPI.utils import requires_auth
-from core.SynapseLauncher import SynapseLauncher
+from kalliope.core import OrderAnalyser
+from kalliope.core.RestAPI.utils import requires_auth
+from kalliope.core.SynapseLauncher import SynapseLauncher
 
 
 class FlaskAPI(threading.Thread):

kalliope/core/RestAPI/utils.py

@@ -1,7 +1,7 @@
 from functools import wraps
 from flask import request, Response
 
-from core.ConfigurationManager import SettingLoader
+from kalliope.core.ConfigurationManager import SettingLoader
 
 
 def check_auth(username, password):

kalliope/core/ShellGui.py

@@ -7,11 +7,11 @@ import sys
 
 from dialog import Dialog
 
-from core import OrderListener
-from core.ConfigurationManager import SettingLoader
-from core.SynapseLauncher import SynapseLauncher
-from core.Utils import Utils
-from neurons.say.say import Say
+from kalliope.core import OrderListener
+from kalliope.core.ConfigurationManager import SettingLoader
+from kalliope.core.SynapseLauncher import SynapseLauncher
+from kalliope.core.Utils import Utils
+from kalliope.neurons.say.say import Say
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/core/SynapseLauncher.py

@@ -1,4 +1,4 @@
-from core.NeuroneLauncher import NeuroneLauncher
+from kalliope.core.NeuroneLauncher import NeuroneLauncher
 
 
 class SynapseNameNotFound(Exception):

kalliope/core/TTS/TTSLauncher.py

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

kalliope/core/TTS/TTSModule.py

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

kalliope/core/TriggerLauncher.py

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

kalliope/core/Utils.py

@@ -73,7 +73,7 @@ class Utils(object):
         :return:
         """
         logger.debug("Run plugin %s with parameter %s" % (module_name, parameters))
-        module_name_with_path = package_name + "." + module_name.lower() + "." + module_name.lower()
+        module_name_with_path = "kalliope." + package_name + "." + module_name.lower() + "." + module_name.lower()
         mod = __import__(module_name_with_path, fromlist=[module_name])
         try:
             klass = getattr(mod, module_name)

kalliope/core/__init__.py

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

kalliope/manual_testing.py

@@ -1,9 +1,9 @@
 # coding: utf8
 import logging
 
-from core import OrderAnalyser
-from core.ConfigurationManager import BrainLoader
-from core.ConfigurationManager.SettingLoader import SettingLoader
+from kalliope.core import OrderAnalyser
+from kalliope.core.ConfigurationManager import BrainLoader
+from kalliope.core.ConfigurationManager.SettingLoader import SettingLoader
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/neurons/ansible_playbook/ansible_playbook.py

@@ -4,7 +4,7 @@ from ansible.vars import VariableManager
 from ansible.inventory import Inventory
 from ansible.executor.playbook_executor import PlaybookExecutor
 
-from core.NeuronModule import NeuronModule, MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException
 
 
 class Ansible_playbook(NeuronModule):

kalliope/neurons/gmail_checker/gmail_checker.py

@@ -3,7 +3,7 @@ import logging
 
 from gmail import Gmail
 from email.header import decode_header
-from core.NeuronModule import NeuronModule, MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/neurons/kill_switch/kill_switch.py

@@ -1,6 +1,6 @@
 import sys
 
-from core.NeuronModule import NeuronModule
+from kalliope.core.NeuronModule import NeuronModule
 
 
 class Kill_switch(NeuronModule):

kalliope/neurons/neurotransmitter/neurotransmitter.py

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

kalliope/neurons/openweathermap/openweathermap.py

@@ -1,6 +1,6 @@
 import pyowm
 
-from core.NeuronModule import NeuronModule, MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException
 
 
 class Openweathermap(NeuronModule):

kalliope/neurons/push_message/push_message.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from pushetta import Pushetta
 
-from core.NeuronModule import NeuronModule, MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException
 
 
 class Push_message(NeuronModule):

kalliope/neurons/say/say.py

@@ -1,4 +1,4 @@
-from core.NeuronModule import NeuronModule, MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException
 
 
 class Say(NeuronModule):

kalliope/neurons/script/script.py

@@ -2,7 +2,7 @@ import subprocess
 import os
 import threading
 
-from core.NeuronModule import NeuronModule, MissingParameterException, InvalidParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException, InvalidParameterException
 
 
 class AsyncShell(threading.Thread):

kalliope/neurons/shell/shell.py

@@ -1,7 +1,7 @@
 import logging
 import subprocess
 import threading
-from core.NeuronModule import NeuronModule, MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/neurons/sleep/sleep.py

@@ -1,6 +1,6 @@
 import time
 
-from core.NeuronModule import NeuronModule,  MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule,  MissingParameterException
 
 
 class Sleep(NeuronModule):

kalliope/neurons/systemdate/systemdate.py

@@ -1,6 +1,6 @@
 import time
 
-from core.NeuronModule import NeuronModule
+from kalliope.core.NeuronModule import NeuronModule
 
 
 class Systemdate(NeuronModule):

kalliope/neurons/tasker_autoremote/tasker_autoremote.py

@@ -2,7 +2,7 @@ import logging
 
 import requests
 
-from core.NeuronModule import NeuronModule, MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")

kalliope/neurons/twitter/twitter.py

@@ -1,6 +1,6 @@
 import twitter
 
-from core.NeuronModule import NeuronModule, InvalidParameterException, MissingParameterException
+from kalliope.core.NeuronModule import NeuronModule, InvalidParameterException, MissingParameterException
 
 
 class Twitter(NeuronModule):

kalliope/neurons/wake_on_lan/wake_on_lan.py

@@ -1,7 +1,7 @@
 import ipaddress
 import logging
 
-from core.NeuronModule import NeuronModule, MissingParameterException, InvalidParameterException
+from kalliope.core.NeuronModule import NeuronModule, MissingParameterException, InvalidParameterException
 from wakeonlan import wol
 
 logging.basicConfig()

kalliope/neurons/wikipedia_searcher/wikipedia_searcher.py

@@ -1,6 +1,6 @@
 import logging
 
-from core.NeuronModule import NeuronModule, InvalidParameterException
+from kalliope.core.NeuronModule import NeuronModule, InvalidParameterException
 import wikipedia
 
 logging.basicConfig()

kalliope/settings.yml

@@ -15,7 +15,7 @@ default_trigger: "snowboy"
 # - snowboy
 triggers:
   - snowboy:
-      pmdl_file: "trigger/snowboy/resources/kalliope-FR-6samples.pmdl"
+      pmdl_file: "kalliope/trigger/snowboy/resources/kalliope-FR-6samples.pmdl"
       
 
 # ---------------------------

kalliope/stt/apiai/apiai.py

@@ -1,7 +1,7 @@
 import speech_recognition as sr
 
-from core import Utils
-from core.OrderListener import OrderListener
+from kalliope.core import Utils
+from kalliope.core.OrderListener import OrderListener
 
 
 class Apiai(OrderListener):

kalliope/stt/bing/bing.py

@@ -1,7 +1,7 @@
 import speech_recognition as sr
 
-from core import Utils
-from core.OrderListener import OrderListener
+from kalliope.core import Utils
+from kalliope.core.OrderListener import OrderListener
 
 
 class Bing(OrderListener):

kalliope/stt/google/google.py

@@ -1,7 +1,7 @@
 import speech_recognition as sr
 
-from core import Utils
-from core.OrderListener import OrderListener
+from kalliope.core import Utils
+from kalliope.core.OrderListener import OrderListener
 
 
 class Google(OrderListener):

kalliope/stt/houndify/houndify.py

@@ -1,7 +1,7 @@
 import speech_recognition as sr
 
-from core import Utils
-from core.OrderListener import OrderListener
+from kalliope.core import Utils
+from kalliope.core.OrderListener import OrderListener
 
 
 class Houndify(OrderListener):

kalliope/stt/wit/wit.py

@@ -1,7 +1,7 @@
 import speech_recognition as sr
 
-from core import Utils
-from core.OrderListener import OrderListener
+from kalliope.core import Utils
+from kalliope.core.OrderListener import OrderListener
 
 
 class Wit(OrderListener):

kalliope/trigger/snowboy/snowboy.py

@@ -1,7 +1,7 @@
 import logging
 import time
 
-from trigger.snowboy import snowboydecoder
+from kalliope.trigger.snowboy import snowboydecoder
 
 
 class MissingParameterException(Exception):

kalliope/trigger/snowboy/snowboydetect.py

@@ -3,7 +3,7 @@
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
-from core.ConfigurationManager import SettingLoader
+from kalliope.core.ConfigurationManager import SettingLoader
 from sys import version_info
 
 sl = SettingLoader.Instance()

kalliope/tts/acapela/acapela.py

@@ -1,7 +1,7 @@
 import requests
 import re
-from core import FileManager
-from core.TTS.TTSModule import TTSModule, FailToLoadSoundFile, MissingTTSParameter
+from kalliope.core import FileManager
+from kalliope.core.TTS.TTSModule import TTSModule, FailToLoadSoundFile, MissingTTSParameter
 import logging
 
 logging.basicConfig()

kalliope/tts/googletts/googletts.py

@@ -1,6 +1,6 @@
 import requests
-from core import FileManager
-from core.TTS.TTSModule import TTSModule, FailToLoadSoundFile
+from kalliope.core import FileManager
+from kalliope.core.TTS.TTSModule import TTSModule, FailToLoadSoundFile
 import logging
 
 logging.basicConfig()

kalliope/tts/pico2wave/pico2wave.py

@@ -1,7 +1,7 @@
 import os
 import subprocess
 
-from core.TTS.TTSModule import TTSModule
+from kalliope.core.TTS.TTSModule import TTSModule
 import logging
 import sys
 

kalliope/tts/voicerss/voicerss.py

@@ -1,6 +1,6 @@
 import requests
-from core import FileManager
-from core.TTS.TTSModule import TTSModule, FailToLoadSoundFile
+from kalliope.core import FileManager
+from kalliope.core.TTS.TTSModule import TTSModule, FailToLoadSoundFile
 import logging
 
 logging.basicConfig()

kalliope/tts/voxygen/voxygen.py

@@ -2,8 +2,8 @@ import logging
 
 import requests
 
-from core import FileManager
-from core.TTS.TTSModule import TTSModule, MissingTTSParameter
+from kalliope.core import FileManager
+from kalliope.core.TTS.TTSModule import TTSModule, MissingTTSParameter
 
 logging.basicConfig()
 logger = logging.getLogger("kalliope")