yeyang
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests 1 Activity

Alpha-snapshot20240618 #1

Open
yeyang wants to merge 278 commits from Alpha-snapshot20240618 into Bug585-YeYang
pull from: Alpha-snapshot20240618
merge into: yeyang:Bug585-YeYang
Conversation 0 Commits 278 Files Changed 59
yeyang commented 2025-05-26 19:44:05 +08:00
Owner

为方便名字查找，将vocabulary.py改为AAA_VocabularyLevelEstimator.py
test.py改为了AAA_test_estimator.py
完成AAA_VocabularyLevelEstimator.py的改进并通过测试
将AAA_VocabularyLevelEstimator.py功能整合到项目中，并完成集成测试

为方便名字查找，将vocabulary.py改为AAA_VocabularyLevelEstimator.py test.py改为了AAA_test_estimator.py 完成AAA_VocabularyLevelEstimator.py的改进并通过测试 将AAA_VocabularyLevelEstimator.py功能整合到项目中，并完成集成测试
yeyang added 278 commits 2025-05-26 19:44:05 +08:00
e9ec65e7a5 提供更便利的获取用户单词表的方法，以json数据格式范围 
1、注册了一个新的蓝图路径以供功能实现
2、wordCMD中完成功能的代码代码实现
dc37f5f229 提供更便利的获取用户单词表的方法，以json数据格式范围 
1、注册了一个新的蓝图路径以供功能实现
2、wordCMD中完成功能的代码代码实现
a0ddf4bdad 上传文件至 'app/static/js' 
修复了 Bug492 选中问号出现多个问号的问题。
解决了选中紧跟标点符号的单词，单词能正常显示。
优化了选中较长的文章时页面容易出现卡顿的问题。
2fb3003808 fix: 2023.6.1 
1. 删去了wordCMD.py中：
from flask import ....,Blueprint,....
改为：
from flask import *
2. 修改了代码的格式，包括：等号两边的空格、加号两边的空格
3. 更新了访问用户单词的token验证
3.1 使用Authorization的字段值（Bearer xxx)验证token
3.2 取消了路由访问用户单词的功能，只能在终端命令行中输入: "curl -H "Authorization: Bearer 密钥" http://127.0.0.1:5000/show/用户名/"获取单词
dca76969eb 解决程序源文件更新了，但是 docker container 中的程序源文件没有更新的问题 
问题出在 build.sh 中的 --mount type=volume,src=englishpal-db,target=/app 。
运行 docker container 时，会将整个 englishpal-db 对应的文件夹 /var/lib/docker/volumes/englishpal-db/_data
下面的内容拷贝到  docker container 里面的 /app 文件夹下面。

然而，/var/lib/docker/volumes/englishpal-db/_data 下面的源程序文件并不是最新的（比如其 main.py 是 7月17日的）。
将 target=/app 改为 target=/app/db。即可解决问题。
1b211f107d Speed up loading next article 
The key change is replacing "d1 = load_freq_history(path_prefix + 'static/frequency/ferquency.p)" with "d1 = load_freq_history(user_word_list)"
in function get_today_article() from Article.py.  Now, with a user_word_list of size about 500, the next article can be loaded within 100ms.
The new d1 is much smaller than the old one, therefore the following computation "d3 = get_difficulty_level_for_user(d1, d2)" is much faster.
The students did not feel that loading next article is slow; this is because their frequency.p is quite small.

Also log information in app/log.txt
b8222c951b revert 4120e7e54b 
revert Fix bug 551
23f0dfd8ca 更新 app/test/test_bug551_DingZeYu.py 
我这边好像没有helper文件所以我直接判断有没有这个账号，如果没有就注册一个来进行测试。这样子可以吗
90ac789bb4 Merge remote-tracking branch 'origin/Bug545-HuangHuiLing' into Bug545-HuangHuiLing 
# Conflicts:
#	app/static/js/fillword.js
#	app/static/js/highlight.js
This pull request has changes conflicting with the target branch.
  • app/Article.py
  • app/difficulty.py
  • app/main.py
  • app/static/css/highlighted.css
  • app/test/test_bug546_lixiaofeng.py
  • app/test/test_stress.py
  • requirements.txt
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b Alpha-snapshot20240618 Bug585-YeYang
git pull origin Alpha-snapshot20240618

Step 2:

Merge the changes and update on Gitea.
git checkout Bug585-YeYang
git merge --no-ff Alpha-snapshot20240618
git push origin Bug585-YeYang
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: yeyang/EnglishPal#1
There is no content yet.
Delete Branch "Alpha-snapshot20240618"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?