Refactoring packages and modules naming.

Author: ggeop

src/jarvis/jarvis/core/console_manager.py renamed to src/jarvis/jarvis/core/console.py

@@ -20,18 +20,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import logging
 import jarvis
 
 from sklearn.feature_extraction.text import TfidfVectorizer
 from sklearn.metrics.pairwise import cosine_similarity
 
-from jarvis.skills.skill_analyzer import SkillAnalyzer
-from jarvis.skills.skills_registry import skill_objects
-from jarvis.core.nlp_processor import ResponseCreator
-from jarvis.skills.assistant_activation import ActivationSkills
+from jarvis.skills.analyzer import SkillAnalyzer
+from jarvis.skills.registry import skill_objects
+from jarvis.core.nlp import ResponseCreator
+from jarvis.skills.collection.activation import ActivationSkills
 from jarvis.utils.mongoDB import db
-from jarvis.skills.wolframalpha import WolframSkills
+from jarvis.skills.collection.wolframalpha import WolframSkills
 
 
 class Processor:

src/jarvis/jarvis/core/nlp_processor.py renamed to src/jarvis/jarvis/core/nlp.py

@@ -24,7 +24,7 @@
 import speech_recognition as sr
 
 import jarvis
-from jarvis.core.console_manager import ConsoleManager
+from jarvis.core.console import ConsoleManager
 
 
 class STTEngine:

src/jarvis/jarvis/core/processor.py

@@ -25,7 +25,7 @@
 import pyttsx3
 import queue
 
-from jarvis.core.console_manager import ConsoleManager
+from jarvis.core.console import ConsoleManager
 
 
 class TTS:

src/jarvis/jarvis/engines/stt.py

@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 import logging
-from jarvis.core.console_manager import ConsoleManager
+from jarvis.core.console import ConsoleManager
 
 
 class TTTEngine:

src/jarvis/jarvis/engines/tts.py

@@ -24,7 +24,7 @@
 import time
 from datetime import datetime
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 from jarvis.utils.startup import play_activation_sound
 from jarvis.utils.mongoDB import db
 from jarvis.enumerations import InputMode, MongoCollections

src/jarvis/jarvis/engines/ttt.py

@@ -30,7 +30,7 @@
 
 from bs4 import BeautifulSoup as bs
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 
 
 class BrowserSkills(AssistantSkill):

src/jarvis/jarvis/skills/skill_analyzer.py renamed to src/jarvis/jarvis/skills/analyzer.py

@@ -22,12 +22,12 @@
 import importlib
 
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 from jarvis import settings
 from jarvis.utils.mongoDB import db
 from jarvis.enumerations import InputMode, MongoCollections
 from jarvis.utils import console
-from jarvis.utils import user_input
+from jarvis.utils import input
 
 input_mode = db.get_documents(collection='general_settings')[0]['input_mode']
 response_in_speech = db.get_documents(collection='general_settings')[0]['response_in_speech']
@@ -51,11 +51,11 @@ def configure_assistant(cls, **kwargs):
         console.add_dashes()
         cls.response('Set new input mode (text or voice): ')
         input_mode_values = [mode.value for mode in InputMode]
-        new_input_mode = user_input.validate_input_with_choices(available_choices=input_mode_values)
+        new_input_mode = input.validate_input_with_choices(available_choices=input_mode_values)
 
         console.add_dashes()
         cls.response('Do you want response in speech?', refresh_console=False)
-        new_response_in_speech = user_input.check_input_to_continue()
+        new_response_in_speech = input.check_input_to_continue()
 
         new_settings = {
             'assistant_name': new_assistant_name,
@@ -68,7 +68,7 @@ def configure_assistant(cls, **kwargs):
             cls.console('* {0}: {1}'.format(setting_desc, value), refresh_console=False)
 
         cls.response('Do you want to save new settings? ', refresh_console=False)
-        save = user_input.check_input_to_continue()
+        save = input.check_input_to_continue()
         if save:
             db.update_collection(collection=MongoCollections.GENERAL_SETTINGS.value, documents=[new_settings])
 

src/jarvis/jarvis/skills/collection/__init__.py

@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 from datetime import datetime, date
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 
 hour_mapping = {'0': 'twelve',
                 '1': 'one',

src/jarvis/jarvis/skills/assistant_activation.py renamed to src/jarvis/jarvis/skills/collection/activation.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 import jarvis
 
 

src/jarvis/jarvis/skills/browser.py renamed to src/jarvis/jarvis/skills/collection/browser.py

@@ -22,7 +22,7 @@
 
 import re
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 from jarvis.utils.mongoDB import db
 
 header = """
@@ -69,7 +69,7 @@ def _create_response(cls, documents):
         except Exception as e:
             cls.console(error_log=e)
         finally:
-            from jarvis.utils import user_input, console
+            from jarvis.utils import input, console
             return header + response
 
     @classmethod

src/jarvis/jarvis/skills/configuration.py renamed to src/jarvis/jarvis/skills/collection/configuration.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 from jarvis.utils.mongoDB import db
 from jarvis.utils.console import add_dashes
 

src/jarvis/jarvis/skills/datetime.py renamed to src/jarvis/jarvis/skills/collection/datetime.py

@@ -24,7 +24,7 @@
 import logging
 import speedtest
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 from jarvis.utils.startup import internet_connectivity_check
 
 

src/jarvis/jarvis/skills/general.py renamed to src/jarvis/jarvis/skills/collection/general.py

@@ -21,9 +21,9 @@
 # SOFTWARE.
 
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 from jarvis.utils.mongoDB import db
-from jarvis.utils import user_input
+from jarvis.utils import input
 
 header = """
 -----------------------------------------------------------------------------------------------
@@ -64,7 +64,7 @@ def clear_learned_skills(cls, **kwargs):
             cls.response("I can't find learned skills in my database")
         else:
             cls.response('I found learned skills..')
-            user_input.check_input_to_continue('Are you sure to remove learned skills')
+            input.check_input_to_continue('Are you sure to remove learned skills')
             user_answer = input('Are you sure to remove learned skills (y/n): ').lower()
             if user_answer:
                 db.drop_collection(collection='learned_skills')

src/jarvis/jarvis/skills/history.py renamed to src/jarvis/jarvis/skills/collection/history.py

@@ -22,7 +22,7 @@
 
 import subprocess
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 
 
 class LibreofficeSkills(AssistantSkill):

src/jarvis/jarvis/skills/assistant_info.py renamed to src/jarvis/jarvis/skills/collection/info.py

@@ -24,7 +24,7 @@
 import logging
 import time
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 
 
 class LinuxAppSkills(AssistantSkill):

src/jarvis/jarvis/skills/internet.py renamed to src/jarvis/jarvis/skills/collection/internet.py

@@ -25,8 +25,8 @@
 import logging
 
 from jarvis.settings import IPSTACK_API
-from jarvis.skills.internet import InternetSkills
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.collection.internet import InternetSkills
+from jarvis.skills.skill import AssistantSkill
 
 
 class LocationSkill(AssistantSkill):

src/jarvis/jarvis/skills/learn.py renamed to src/jarvis/jarvis/skills/collection/learn.py

@@ -22,7 +22,7 @@
 
 from word2number import w2n
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 from jarvis.utils.mapping import math_symbols_mapping
 
 

src/jarvis/jarvis/skills/libreoffice.py renamed to src/jarvis/jarvis/skills/collection/libreoffice.py

@@ -29,8 +29,8 @@
 from playsound import playsound
 from apscheduler.schedulers.background import BackgroundScheduler
 
-from jarvis.utils.user_input import validate_digits_input
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.utils.input import validate_digits_input
+from jarvis.skills.skill import AssistantSkill
 from jarvis.utils.console import OutputStyler
 
 time_intervals = {

src/jarvis/jarvis/skills/linux.py renamed to src/jarvis/jarvis/skills/collection/linux.py

@@ -23,7 +23,7 @@
 import os
 import psutil
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 
 
 class SystemHealthSkills(AssistantSkill):

src/jarvis/jarvis/skills/location.py renamed to src/jarvis/jarvis/skills/collection/location.py

@@ -23,7 +23,7 @@
 import re
 import time
 
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.skill import AssistantSkill
 
 
 class WordSkills(AssistantSkill):

src/jarvis/jarvis/skills/math.py renamed to src/jarvis/jarvis/skills/collection/math.py

@@ -25,9 +25,9 @@
 from pyowm import OWM
 
 from jarvis.settings import WEATHER_API
-from jarvis.skills.location import LocationSkill
-from jarvis.skills.internet import InternetSkills
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.collection.location import LocationSkill
+from jarvis.skills.collection.internet import InternetSkills
+from jarvis.skills.skill import AssistantSkill
 
 
 class WeatherSkills(AssistantSkill):

src/jarvis/jarvis/skills/reminder.py renamed to src/jarvis/jarvis/skills/collection/reminder.py

@@ -23,8 +23,8 @@
 import wolframalpha
 
 from jarvis.settings import WOLFRAMALPHA_API
-from jarvis.skills.internet import InternetSkills
-from jarvis.skills.assistant_skill import AssistantSkill
+from jarvis.skills.collection.internet import InternetSkills
+from jarvis.skills.skill import AssistantSkill
 
 
 class WolframSkills(AssistantSkill):

src/jarvis/jarvis/skills/system_health.py renamed to src/jarvis/jarvis/skills/collection/system_health.py

@@ -20,24 +20,24 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from jarvis.skills.assistant_activation import ActivationSkills
-from jarvis.skills.assistant_info import AssistantInfoSkills
-from jarvis.skills.datetime import DatetimeSkills
-from jarvis.skills.browser import BrowserSkills
-from jarvis.skills.general import UtilSkills
-from jarvis.skills.internet import InternetSkills
-from jarvis.skills.libreoffice import LibreofficeSkills
-from jarvis.skills.linux import LinuxAppSkills
-from jarvis.skills.location import LocationSkill
-from jarvis.skills.reminder import ReminderSkills
-from jarvis.skills.system_health import SystemHealthSkills
-from jarvis.skills.weather import WeatherSkills
-from jarvis.skills.text import WordSkills
-from jarvis.skills.history import HistorySkills
-from jarvis.skills.learn import LearnSkills
-from jarvis.skills.math import MathSkills
+from jarvis.skills.collection.activation import ActivationSkills
+from jarvis.skills.collection.info import AssistantInfoSkills
+from jarvis.skills.collection.datetime import DatetimeSkills
+from jarvis.skills.collection.browser import BrowserSkills
+from jarvis.skills.collection.general import UtilSkills
+from jarvis.skills.collection.internet import InternetSkills
+from jarvis.skills.collection.libreoffice import LibreofficeSkills
+from jarvis.skills.collection.linux import LinuxAppSkills
+from jarvis.skills.collection.location import LocationSkill
+from jarvis.skills.collection.reminder import ReminderSkills
+from jarvis.skills.collection.system_health import SystemHealthSkills
+from jarvis.skills.collection.weather import WeatherSkills
+from jarvis.skills.collection.text import WordSkills
+from jarvis.skills.collection.history import HistorySkills
+from jarvis.skills.collection.learn import LearnSkills
+from jarvis.skills.collection.math import MathSkills
 from jarvis.utils.mapping import math_tags
-from jarvis.skills.configuration import ConfigurationSkills
+from jarvis.skills.collection.configuration import ConfigurationSkills
 
 # All available assistant skills
 # Keys description:

src/jarvis/jarvis/skills/text.py renamed to src/jarvis/jarvis/skills/collection/text.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from jarvis.core.console_manager import ConsoleManager
+from jarvis.core.console import ConsoleManager
 import jarvis
 
 

src/jarvis/jarvis/skills/weather.py renamed to src/jarvis/jarvis/skills/collection/weather.py

@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 import jarvis
-from jarvis.core.console_manager import ConsoleManager
+from jarvis.core.console import ConsoleManager
 
 console_manager = ConsoleManager()
 

src/jarvis/jarvis/skills/wolframalpha.py renamed to src/jarvis/jarvis/skills/collection/wolframalpha.py

@@ -28,7 +28,7 @@
 
 from jarvis.utils import console
 from jarvis.enumerations import MongoCollections
-from jarvis.core.console_manager import ConsoleManager
+from jarvis.core.console import ConsoleManager
 
 
 
@@ -95,7 +95,7 @@ def configure_MongoDB(db, settings):
     # Load skills
     # ------------------------------------------------------------------------------------------------------------------
 
-    from jarvis.skills.skills_registry import CONTROL_SKILLS, ENABLED_BASIC_SKILLS
+    from jarvis.skills.registry import CONTROL_SKILLS, ENABLED_BASIC_SKILLS
 
     all_skills = {
         MongoCollections.CONTROL_SKILLS.value: CONTROL_SKILLS,

src/jarvis/jarvis/skills/skills_registry.py renamed to src/jarvis/jarvis/skills/registry.py

@@ -23,7 +23,7 @@
 from jarvis import settings
 from jarvis.utils.startup import internet_connectivity_check
 from jarvis.core.processor import Processor
-from jarvis.core.console_manager import ConsoleManager
+from jarvis.core.console import ConsoleManager
 
 
 def main():
@@ -32,13 +32,9 @@ def main():
     """
 
     console_manager = ConsoleManager()
-
     console_manager.console_output(info_log='Startup checks')
-
     internet_connectivity_check()
-
     console_manager.console_output(info_log='Application started')
-
     processor = Processor(console_manager=console_manager, settings_=settings)
 
     while True:

src/jarvis/jarvis/skills/assistant_skill.py renamed to src/jarvis/jarvis/skills/skill.py

@@ -25,9 +25,9 @@
 from sklearn.metrics.pairwise import cosine_similarity
 
 from jarvis import settings
-from jarvis.skills.skills_registry import CONTROL_SKILLS, BASIC_SKILLS, ENABLED_BASIC_SKILLS
+from jarvis.skills.registry import CONTROL_SKILLS, BASIC_SKILLS, ENABLED_BASIC_SKILLS
 from jarvis.enumerations import MongoCollections
-from jarvis.skills.skill_analyzer import SkillAnalyzer
+from jarvis.skills.analyzer import SkillAnalyzer
 from jarvis.utils.mongoDB import db