mrlan
/
EnglishPal
4
0
Fork 11
Code Issues Pull Requests 22 Projects Releases Wiki Activity

Merge branch 'Bug509-XieQiuHan-WangZiming' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427

Alpha-snapshot20230427
Hui Lan 2023-04-27 07:21:15 +08:00
parent e118d92659 d30a434b2a
commit 779dafefe8
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Article.py
View File

@ -32,20 +32,20 @@ def get_article_body(s):
return '\n'.join(lst) return '\n'.join(lst)
def get_today_article(user_word_list, had_read_articles): def get_today_article(user_word_list, visited_articles):
rq = RecordQuery(path_prefix + 'static/wordfreqapp.db') rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
if had_read_articles is None: if visited_articles is None:
had_read_articles = { visited_articles = {
"index" : 0, # 为 article_ids 的索引 "index" : 0, # 为 article_ids 的索引
"article_ids": [] # 之前显示文章的id列表，越后越新 "article_ids": [] # 之前显示文章的id列表，越后越新
} }
if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章，因此查找所有的文章 if visited_articles["index"] > len(visited_articles["article_ids"])-1: # 生成新的文章，因此查找所有的文章
rq.instructions("SELECT * FROM article") rq.instructions("SELECT * FROM article")
else: # 生成阅读过的文章，因此查询指定 article_id 的文章 else: # 生成阅读过的文章，因此查询指定 article_id 的文章
if had_read_articles["article_ids"][had_read_articles["index"]] == 'null': # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作 if visited_articles["article_ids"][visited_articles["index"]] == 'null': # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作
had_read_articles["index"] -= 1 visited_articles["index"] -= 1
had_read_articles["article_ids"].pop() visited_articles["article_ids"].pop()
rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]])) rq.instructions('SELECT * FROM article WHERE article_id=%d' % (visited_articles["article_ids"][visited_articles["index"]]))
rq.do() rq.do()
result = rq.get_results() result = rq.get_results()
random.shuffle(result) random.shuffle(result)
@ -60,25 +60,25 @@ def get_today_article(user_word_list, had_read_articles):
d_user = load_freq_history(user_word_list) d_user = load_freq_history(user_word_list)
user_level = user_difficulty_level(d_user, d3) # more consideration as user's behaviour is dynamic. Time factor should be considered. user_level = user_difficulty_level(d_user, d3) # more consideration as user's behaviour is dynamic. Time factor should be considered.
text_level = 0 text_level = 0
if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章 if visited_articles["index"] > len(visited_articles["article_ids"])-1: # 生成新的文章
amount_of_had_read_articles = len(had_read_articles["article_ids"]) amount_of_visited_articles = len(visited_articles["article_ids"])
amount_of_existing_articles = result.__len__() amount_of_existing_articles = result.__len__()
if amount_of_had_read_articles == amount_of_existing_articles: # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了 if amount_of_visited_articles == amount_of_existing_articles: # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了
result_of_generate_article = "had read all articles" result_of_generate_article = "had read all articles"
else: else:
for k in range(3): # 最多尝试3次 for k in range(3): # 最多尝试3次
for reading in result: for reading in result:
text_level = text_difficulty_level(reading['text'], d3) text_level = text_difficulty_level(reading['text'], d3)
factor = random.gauss(0.8, 0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1 factor = random.gauss(0.8, 0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平 if reading['article_id'] not in visited_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平
d = reading d = reading
had_read_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行 visited_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行
result_of_generate_article = "found" result_of_generate_article = "found"
break break
if result_of_generate_article == "found": # 用于成功找到文章后及时退出外层循环 if result_of_generate_article == "found": # 用于成功找到文章后及时退出外层循环
break break
if result_of_generate_article != "found": # 阅读完所有文章，或者循环3次没有找到适合的文章，则放入空（“null”） if result_of_generate_article != "found": # 阅读完所有文章，或者循环3次没有找到适合的文章，则放入空（“null”）
had_read_articles["article_ids"].append('null') visited_articles["article_ids"].append('null')
else: # 生成已经阅读过的文章 else: # 生成已经阅读过的文章
d = random.choice(result) d = random.choice(result)
text_level = text_difficulty_level(d['text'], d3) text_level = text_difficulty_level(d['text'], d3)
@ -97,7 +97,7 @@ def get_today_article(user_word_list, had_read_articles):
"answer": get_answer_part(d['question']) "answer": get_answer_part(d['question'])
} }
return had_read_articles, today_article, result_of_generate_article return visited_articles, today_article, result_of_generate_article
def load_freq_history(path): def load_freq_history(path):

4
app/account_service.py
View File

@ -37,7 +37,7 @@ def signup():
session[username] = username session[username] = username
session['username'] = username session['username'] = username
session['expiry_date'] = get_expiry_date(username) session['expiry_date'] = get_expiry_date(username)
session['had_read_articles'] = None session['visited_articles'] = None
return jsonify({'status': '2'}) return jsonify({'status': '2'})
else: else:
return jsonify({'status': '1'}) return jsonify({'status': '1'})
@ -66,7 +66,7 @@ def login():
session['username'] = username session['username'] = username
user_expiry_date = get_expiry_date(username) user_expiry_date = get_expiry_date(username)
session['expiry_date'] = user_expiry_date session['expiry_date'] = user_expiry_date
session['had_read_articles'] = None session['visited_articles'] = None
return jsonify({'status': '1'}) return jsonify({'status': '1'})
else: else:
return jsonify({'status': '0'}) return jsonify({'status': '0'})

2
app/templates/userpage_get.html
View File

@ -52,7 +52,7 @@
{% if result_of_generate_article != "had read all articles" %} {% if result_of_generate_article != "had read all articles" %}
<a id="next_btn" class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a> <a id="next_btn" class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
{% endif %} {% endif %}
{% if session.get('had_read_articles') and session.get('had_read_articles')['index']>0 %} {% if session.get('visited_articles') and session.get('visited_articles')['index']>0 %}
<a id="pre_btn" class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a> <a id="pre_btn" class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
{% endif %} {% endif %}

24
app/user_service.py
View File

@ -30,12 +30,12 @@ def user_reset(username):
:return: 返回页面内容 :return: 返回页面内容
''' '''
if request.method == 'GET': if request.method == 'GET':
had_read_articles = session.get("had_read_articles") visited_articles = session.get("visited_articles")
if had_read_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来,无需index+=1 if visited_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来,无需index+=1
had_read_articles['article_ids'].pop() visited_articles['article_ids'].pop()
else: # 当前不为“null”，直接 index+=1 else: # 当前不为“null”，直接 index+=1
had_read_articles["index"] += 1 visited_articles["index"] += 1
session["had_read_articles"] = had_read_articles session["visited_articles"] = visited_articles
return redirect(url_for('user_bp.userpage', username=username)) return redirect(url_for('user_bp.userpage', username=username))
else: else:
return 'Under construction' return 'Under construction'
@ -48,11 +48,11 @@ def user_back(username):
:return: 返回页面内容 :return: 返回页面内容
''' '''
if request.method == 'GET': if request.method == 'GET':
had_read_articles = session.get("had_read_articles") visited_articles = session.get("visited_articles")
had_read_articles["index"] -= 1 # 上一篇，index-=1 visited_articles["index"] -= 1 # 上一篇，index-=1
if had_read_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来 if visited_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来
had_read_articles['article_ids'].pop() visited_articles['article_ids'].pop()
session["had_read_articles"] = had_read_articles session["visited_articles"] = visited_articles
return redirect(url_for('user_bp.userpage', username=username)) return redirect(url_for('user_bp.userpage', username=username))
@ -139,8 +139,8 @@ def userpage(username):
words = '' words = ''
for x in lst3: for x in lst3:
words += x[0] + ' ' words += x[0] + ' '
had_read_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('had_read_articles')) visited_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('visited_articles'))
session['had_read_articles'] = had_read_articles session['visited_articles'] = visited_articles
# 通过 today_article，加载前端的显示页面 # 通过 today_article，加载前端的显示页面
return render_template('userpage_get.html', return render_template('userpage_get.html',
admin_name=ADMIN_NAME, admin_name=ADMIN_NAME,