mirror of
https://github.com/leon-ai/leon.git
synced 2024-11-27 16:16:48 +03:00
feat(skill/akinator): finish up
This commit is contained in:
parent
244d08c0bd
commit
79e7df022f
@ -121,6 +121,11 @@
|
||||
}
|
||||
},
|
||||
"answers": {
|
||||
"network_error": [
|
||||
"I cannot reach Akinator, you may verify your network.",
|
||||
"Akinator isn't reachable at the moment. Please check your network.",
|
||||
"It looks like your network cannot reach Akinator."
|
||||
],
|
||||
"calling_akinator": [
|
||||
"I'm calling my friend Akinator...",
|
||||
"Alright, let me call Akinator, wait a sec...",
|
||||
|
@ -4,9 +4,6 @@
|
||||
import utils
|
||||
from ..lib import akinator, db
|
||||
|
||||
# TODO: catch network error
|
||||
# TODO: timeout on question/answer
|
||||
|
||||
def guess(params):
|
||||
"""Guess according to the given thematic"""
|
||||
|
||||
|
@ -15,6 +15,7 @@ def setup(params):
|
||||
if thematic != 'characters':
|
||||
theme_lang = lang + '_' + thematic
|
||||
|
||||
try:
|
||||
aki = akinator.Akinator()
|
||||
|
||||
q = aki.start_game(theme_lang)
|
||||
@ -33,3 +34,5 @@ def setup(params):
|
||||
})
|
||||
|
||||
return utils.output('end', q, { 'showNextActionSuggestions': True })
|
||||
except:
|
||||
return utils.output('end', 'network_error')
|
||||
|
@ -32,6 +32,8 @@ try:
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
request_timeout = 5 # secs
|
||||
|
||||
#* URLs for the API requests
|
||||
NEW_SESSION_URL = "https://{}/new_session?callback=jQuery331023608747682107778_{}&urlApiWs={}&partner=1&childMod={}&player=website-desktop&uid_ext_session={}&frontaddr={}&constraint=ETAT<>'AV'&soft_constraint={}&question_filter={}"
|
||||
ANSWER_URL = "https://{}/answer_api?callback=jQuery331023608747682107778_{}&urlApiWs={}&childMod={}&session={}&signature={}&step={}&answer={}&frontaddr={}&question_filter={}"
|
||||
@ -96,7 +98,7 @@ class Akinator():
|
||||
"""Get uid and frontaddr from akinator.com/game"""
|
||||
|
||||
info_regex = re.compile("var uid_ext_session = '(.*)'\\;\\n.*var frontaddr = '(.*)'\\;")
|
||||
r = requests.get("https://en.akinator.com/game")
|
||||
r = requests.get("https://en.akinator.com/game", timeout=request_timeout)
|
||||
|
||||
match = info_regex.search(r.text)
|
||||
self.uid, self.frontaddr = match.groups()[0], match.groups()[1]
|
||||
@ -109,7 +111,7 @@ class Akinator():
|
||||
|
||||
bad_list = ["https://srv12.akinator.com:9398/ws"]
|
||||
while True:
|
||||
r = requests.get("https://" + uri)
|
||||
r = requests.get("https://" + uri, timeout=request_timeout)
|
||||
|
||||
match = server_regex.search(r.text)
|
||||
parsed = json.loads(match.group().split("'arrUrlThemesToPlay', ")[-1])
|
||||
@ -166,7 +168,7 @@ class Akinator():
|
||||
|
||||
self._get_session_info()
|
||||
|
||||
r = requests.get(NEW_SESSION_URL.format(self.uri, self.timestamp, self.server, str(self.child_mode).lower(), self.uid, self.frontaddr, soft_constraint, self.question_filter), headers=HEADERS)
|
||||
r = requests.get(NEW_SESSION_URL.format(self.uri, self.timestamp, self.server, str(self.child_mode).lower(), self.uid, self.frontaddr, soft_constraint, self.question_filter), headers=HEADERS, timeout=request_timeout)
|
||||
self.response = r.text
|
||||
resp = self._parse_response(r.text)
|
||||
|
||||
@ -188,7 +190,7 @@ class Akinator():
|
||||
"""
|
||||
ans = ans_to_id(ans)
|
||||
|
||||
r = requests.get(ANSWER_URL.format(self.uri, self.timestamp, self.server, str(self.child_mode).lower(), self.session, self.signature, self.step, ans, self.frontaddr, self.question_filter), headers=HEADERS)
|
||||
r = requests.get(ANSWER_URL.format(self.uri, self.timestamp, self.server, str(self.child_mode).lower(), self.session, self.signature, self.step, ans, self.frontaddr, self.question_filter), headers=HEADERS, timeout=request_timeout)
|
||||
self.response = r.text
|
||||
resp = self._parse_response(r.text)
|
||||
|
||||
@ -206,7 +208,7 @@ class Akinator():
|
||||
if self.step == 0:
|
||||
raise CantGoBackAnyFurther("You were on the first question and couldn't go back any further")
|
||||
|
||||
r = requests.get(BACK_URL.format(self.server, self.timestamp, str(self.child_mode).lower(), self.session, self.signature, self.step, self.question_filter), headers=HEADERS)
|
||||
r = requests.get(BACK_URL.format(self.server, self.timestamp, str(self.child_mode).lower(), self.session, self.signature, self.step, self.question_filter), headers=HEADERS, timeout=request_timeout)
|
||||
self.response = r.text
|
||||
resp = self._parse_response(r.text)
|
||||
|
||||
@ -225,7 +227,7 @@ class Akinator():
|
||||
|
||||
It's recommended that you call this function when Aki's progression is above 85%, which is when he will have most likely narrowed it down to just one choice. You can get his current progression via "Akinator.progression"
|
||||
"""
|
||||
r = requests.get(WIN_URL.format(self.server, self.timestamp, str(self.child_mode).lower(), self.session, self.signature, self.step), headers=HEADERS)
|
||||
r = requests.get(WIN_URL.format(self.server, self.timestamp, str(self.child_mode).lower(), self.session, self.signature, self.step), headers=HEADERS, timeout=request_timeout)
|
||||
self.response = r.text
|
||||
resp = self._parse_response(r.text)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user