Llloooggg/Jarvis
1
0
Fork 0
mirror of https://github.com/Llloooggg/Jarvis.git synced 2026-03-06 03:56:23 +03:00
Code Issues 21 Packages Projects Releases Wiki Activity

Доавил заполнение бд триггерами и экшенами. Предварительно написан менеджер сценариев

Browse Source
This commit is contained in:
Denis Podshivalov
2020-03-22 12:24:31 +03:00
parent 8cf27d5a5c
commit 5b9f794498
5 changed files with 154 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
__init__.py
View File

@@ -6,7 +6,9 @@ from flask import render_template, request, redirect, url_for
from flask_login import LoginManager, login_user, login_required, logout_user, current_user from flask_login import LoginManager, login_user, login_required, logout_user, current_user
import db_routing import db_routing
from db_init import db_fill
from db_routing import app, db from db_routing import app, db
from scenarioManger import Executor
login_manager = LoginManager(app) login_manager = LoginManager(app)
@@ -63,12 +65,14 @@ def workshop():
if request.method == 'POST': if request.method == 'POST':
if 'NewScenarioName' in request.form: if 'NewScenarioName' in request.form:
newScenarioName = request.form['NewScenarioName'] newScenarioName = request.form['NewScenarioName']
triggerName = request.form['TriggerID'] triggerID = request.form['TriggerID']
triggerArgs = request.form['TriggerArgs'] triggerArgs = request.form['TriggerArgs']
actionName = request.form['ActionID'] actionID = request.form['ActionID']
actionArgs = request.form['ActionArgs'] actionArgs = request.form['ActionArgs']
db_routing.add_scenario(current_user.get_id(), newScenarioName, triggerName, triggerArgs, actionName, new_scenario = db_routing.add_scenario(current_user.get_id(), newScenarioName, triggerID, triggerArgs,
actionArgs) actionID,
actionArgs)
Executor(new_scenario)
return redirect(url_for('workshop')) return redirect(url_for('workshop'))
if 'TGUsername' in request.form: if 'TGUsername' in request.form:
@@ -131,4 +135,5 @@ def verify_password(username, password):
if __name__ == '__main__': if __name__ == '__main__':
if not os.path.exists('./data.db'): if not os.path.exists('./data.db'):
db.create_all() db.create_all()
db_fill()
app.run() app.run()

7
db_init.py Normal file
View File

@@ -0,0 +1,7 @@
from db_routing import add_trigger, add_action
def db_fill():
add_trigger('Будильник', 'alarm_clock')
add_trigger('Проверить почту', 'check_email')

34
db_routing.py
View File

@@ -66,6 +66,20 @@ def add_user(user_name, passw_hash):
return False return False
def add_trigger(name, def_name):
new_trigger = Trigger(name=name, def_name=def_name)
db.session.add(new_trigger)
db.session.commit()
return new_trigger
def add_action(name, def_name):
new_action = Action(name=name, def_name=def_name)
db.session.add(new_action)
db.session.commit()
return new_action
def add_scenario(owner_id, scenario_name, trigger_id, trigger_args, action_id, action_args): def add_scenario(owner_id, scenario_name, trigger_id, trigger_args, action_id, action_args):
new_scenario = Scenario(owner_id=owner_id, scenario_name=scenario_name, trigger_id=trigger_id, new_scenario = Scenario(owner_id=owner_id, scenario_name=scenario_name, trigger_id=trigger_id,
trigger_args=trigger_args, action_id=action_id, action_args=action_args) trigger_args=trigger_args, action_id=action_id, action_args=action_args)
@@ -81,14 +95,22 @@ def get_user(id=None, username=None):
return User.query.filter_by(username=username).first() return User.query.filter_by(username=username).first()
def get_trigers(): def get_trigers(id=None):
triggers_list = Trigger.query.all() if id is None:
return triggers_list triggers_list = Trigger.query.all()
return triggers_list
else:
trigger = Trigger.query.filter_by(id=id).first()
return trigger
def get_actions(): def get_actions(id=None):
actions_list = Action.query.all() if id is None:
return actions_list actions_list = Action.query.all()
return actions_list
else:
action = Action.query.filter_by(id=id).first()
return action
def get_user_scripts(current_user_id): def get_user_scripts(current_user_id):

23
scenarioManger.py Normal file
View File

@@ -0,0 +1,23 @@
from threading import Thread
from triggers import *
import db_routing
class Executor(Thread):
def __init__(self, scenario):
threading.Thread.__init__(self)
self.sceanrio_id = scenario.id
self.trigger_def = db_routing.get_trigers(scenario.id).def_name
self.trigger_args = scenario.trigger_args
self.action_def = db_routing.get_actions(scenario.id).def_name
self.action_args = scenario.action_args
def execute(self):
self.trigger_def(self.trigger_args)
self.action_def.def_name(self.action_args)
def run(self):
thread = Thread(target=self.execute)
thread.start()
thread.join()
db_routing.delete_scenario(self.sceanrio_id)

174
actions.py → triggers.py
View File

@@ -1,87 +1,87 @@
# Парсер почты # Парсер почты
import datetime import datetime
import email import email
import imaplib import imaplib
# будильник # будильник
import threading import threading
import time import time
# То, что нужно будет передавать функциям # То, что нужно будет передавать функциям
# Инициализация будильника # Инициализация будильника
userName = 'Denis' userName = 'Denis'
year_Alarm_Clock = 2020 year_Alarm_Clock = 2020
month_Alarm_Clock = 3 month_Alarm_Clock = 3
day_Alarm_Clock = 19 day_Alarm_Clock = 19
hour_Alarm_Clock = 12 hour_Alarm_Clock = 12
min_Alarm_Clock = 49 min_Alarm_Clock = 49
sec_Alarm_Clock = 0 sec_Alarm_Clock = 0
# Инициализация парсера почты # Инициализация парсера почты
gmail_user = '' # Login gmail_user = '' # Login
gmail_pass = '' # Password gmail_pass = '' # Password
# Сами функции # Сами функции
# Будильник # Будильник
def alarm_clock(year_Alarm_Clock, month_Alarm_Clock, day_Alarm_Clock, hour_Alarm_Clock, min_Alarm_Clock, def alarm_clock(year_Alarm_Clock, month_Alarm_Clock, day_Alarm_Clock, hour_Alarm_Clock, min_Alarm_Clock,
sec_Alarm_Clock): sec_Alarm_Clock):
dt = datetime.datetime(year_Alarm_Clock, month_Alarm_Clock, day_Alarm_Clock, hour_Alarm_Clock, min_Alarm_Clock, dt = datetime.datetime(year_Alarm_Clock, month_Alarm_Clock, day_Alarm_Clock, hour_Alarm_Clock, min_Alarm_Clock,
sec_Alarm_Clock) sec_Alarm_Clock)
diff = (dt - datetime.datetime.now()).total_seconds() diff = (dt - datetime.datetime.now()).total_seconds()
try: try:
time.sleep(diff) time.sleep(diff)
print('сообщение в телегу текст') print('сообщение в телегу текст')
except: except:
print('Нельзя поставить будильник в прошлое') print('Нельзя поставить будильник в прошлое')
return return
# проверка почты на новое письмо gmail # проверка почты на новое письмо gmail
# Нужно включить https://myaccount.google.com/lesssecureapps и https://mail.google.com/mail/u/2/#settings/fwdandpop # Нужно включить https://myaccount.google.com/lesssecureapps и https://mail.google.com/mail/u/2/#settings/fwdandpop
def check_email(gmail_user, gmail_pass): def check_email(gmail_user, gmail_pass):
mail = imaplib.IMAP4_SSL('imap.gmail.com', 993) mail = imaplib.IMAP4_SSL('imap.gmail.com', 993)
mail.login(gmail_user, gmail_pass) mail.login(gmail_user, gmail_pass)
mail.list() mail.list()
count_Email_Start = (mail.select("inbox")[1][0]).decode('utf-8') count_Email_Start = (mail.select("inbox")[1][0]).decode('utf-8')
while True: while True:
mail.list() mail.list()
count_Email_Current = (mail.select("inbox")[1][0]).decode('utf-8') count_Email_Current = (mail.select("inbox")[1][0]).decode('utf-8')
if count_Email_Current > count_Email_Start: if count_Email_Current > count_Email_Start:
result, data = mail.search(None, "ALL") result, data = mail.search(None, "ALL")
ids = data[0] # Получаем сроку номеров писем ids = data[0] # Получаем сроку номеров писем
id_list = ids.split() # Разделяем ID писем id_list = ids.split() # Разделяем ID писем
latest_email_id = id_list[-1] # Берем последний ID latest_email_id = id_list[-1] # Берем последний ID
result, data = mail.fetch(latest_email_id, "(RFC822)") # Получаем тело письма (RFC822) для данного ID result, data = mail.fetch(latest_email_id, "(RFC822)") # Получаем тело письма (RFC822) для данного ID
raw_email = data[0][1] raw_email = data[0][1]
email_message = email.message_from_bytes(raw_email) email_message = email.message_from_bytes(raw_email)
email_message_From = email_message['From'] email_message_From = email_message['From']
email_message_From = email_message_From[email_message_From.index('<'):email_message_From.index('>')] email_message_From = email_message_From[email_message_From.index('<'):email_message_From.index('>')]
email_message_From = email_message_From[1:] email_message_From = email_message_From[1:]
print('Отправить сообщение в телегу о том, что занят') print('Отправить сообщение в телегу о том, что занят')
print('Отправить "от кого" ', email_message_From) print('Отправить "от кого" ', email_message_From)
count_Email_Start = count_Email_Current count_Email_Start = count_Email_Current
time.sleep(15) # частота проверки нового письма time.sleep(15) # частота проверки нового письма
# Чтобы запустить будильник 1, Парсер 2 # Чтобы запустить будильник 1, Парсер 2
Mode = 2 Mode = 2
# Для создания потока будильника передаются: # Для создания потока будильника передаются:
# Id юзера который поставил будильник, и значения времени которые он поставил. Поток создаётся с именем(id) юзера # Id юзера который поставил будильник, и значения времени которые он поставил. Поток создаётся с именем(id) юзера
if __name__ == '__main__': if __name__ == '__main__':
if Mode == 1: if Mode == 1:
Clock_Thread = threading.Thread( Clock_Thread = threading.Thread(
target=alarm_clock, name=userName, args=(year_Alarm_Clock, target=alarm_clock, name=userName, args=(year_Alarm_Clock,
month_Alarm_Clock, month_Alarm_Clock,
day_Alarm_Clock, day_Alarm_Clock,
hour_Alarm_Clock, hour_Alarm_Clock,
min_Alarm_Clock, min_Alarm_Clock,
sec_Alarm_Clock)) sec_Alarm_Clock))
Clock_Thread.start() Clock_Thread.start()
if Mode == 2: if Mode == 2:
check_email(gmail_user, gmail_pass) check_email(gmail_user, gmail_pass)
# сценарии должны хранить логины и пароль # сценарии должны хранить логины и пароль
# запилить бота, возврат темы и отправителя в словаре. # запилить бота, возврат темы и отправителя в словаре.