Add TencentService Support #240

Jerry23011 · 2023-11-26T00:01:44Z

Closes #182

Add basic implementation for Caiyun Service Fix CR suggestion Add caiyun service transtype support perf: split caiyun test token to more parts perf: improve caiyun supported langauges dict Update Easydict/Feature/Service/Caiyun/CaiyunService.swift Co-authored-by: Kyle <[email protected]>

tisfeng · 2023-11-26T03:39:17Z

今天看了一下，才知道原来我能免费使用 GitHub Copilot，但我根本没有收到过邮件通知，不知道什么时候获得了这个资格，也不知道是哪个项目到达了标准。

很好奇，不确定是不是 Easydict 达标了，请问你有没有获得免费 GitHub Copilot 资格？

Jerry23011 · 2023-11-26T03:43:11Z

今天看了一下，才知道原来我能免费使用 GitHub Copilot，但我根本没有收到过邮件通知，不知道什么时候获得了这个资格，也不知道是哪个项目到达了标准。

很好奇，不确定是不是 Easydict 达标了，请问你有没有获得免费 GitHub Copilot 资格？

貌似是可以的

tisfeng · 2023-11-26T03:49:25Z

太棒了，请问这个通知是在哪里看到的，你有收到邮件通知吗？

Jerry23011 · 2023-11-26T03:50:37Z

太棒了，请问这个通知是在哪里看到的，你有收到邮件通知吗？

没收到邮件通知，在右侧边栏中点Copilot就可以看到了

Jerry23011 · 2023-11-26T03:54:35Z

不知道 Easydict 是不是属于"popular open source project"了

GitHub Copilot is free to use for verified students, teachers, and maintainers of popular open source projects."

https://docs.github.com/en/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot

tisfeng · 2023-11-26T04:20:57Z

看起来应该是 Easydict。

@choykarl @rainzm 你们有 GitHub Copilot 免费资格吗，另外你们有成为其他流行项目的 maintainer 吗？

Jerry23011 · 2023-11-26T06:52:58Z

@tisfeng 就差 Request Header 里面的 Authentication 参数了，实在是不知道这个签名方法v3为什么要一遍一遍算SHA256和16进制，如果有空的话可以让你看看吗？是在不行就先用签名v1

tisfeng · 2023-11-26T07:17:31Z

等我先发个新版本，晚上再看。

choykarl · 2023-11-27T09:36:27Z

看起来应该是 Easydict。

@choykarl @rainzm 你们有 GitHub Copilot 免费资格吗，另外你们有成为其他流行项目的 maintainer 吗？

@tisfeng 我一直都在用啊，我以为你们也知道

tisfeng · 2023-11-27T09:56:50Z

我没注意到，我之前是付费使用 GitHub Copilot，不知道什么时候激活了免费资格，它又不给发邮件通知。。

@choykarl 你记得是什么时候拿到免费资格的吗，我比较好奇这个所谓 “流行开源项目” 标准是什么？

choykarl · 2023-11-27T10:01:06Z

我没注意到，我之前是付费使用 GitHub Copilot，不知道什么时候激活了免费资格，它又不给发邮件通知。。

@choykarl 你记得是什么时候拿到免费资格的吗，我比较好奇这个所谓 “流行开源项目” 标准是什么？

@tisfeng 我好像进到项目里的时候就可以用，这个发放不知道啥标准，好像跟star也没关系，有的几百star就有，我的几千也没有。

tisfeng · 2023-11-28T05:39:28Z

这里最好不要使用自动 git pull 方式 merge，会显示多余的提交，建议使用 rebase 方法，保持提交历史简洁。

我电脑默认设置 git pull 就是 rebase：

git config --global pull.rebase true

参考 https://git-scm.com/book/zh/v2/Git-%E5%88%86%E6%94%AF-%E5%8F%98%E5%9F%BA

在本例中另一种简单的方法是使用 git pull --rebase 命令而不是直接 git pull。又或者你可以自己手动完成这个过程，先 git fetch，再 git rebase teamone/master。

如果你习惯使用 git pull ，同时又希望默认使用选项 --rebase，你可以执行这条语句 git config --global pull.rebase true 来更改 pull.rebase 的默认配置。

tisfeng · 2023-11-28T05:41:36Z

@Jerry23011 @choykarl 建议都设置这种方式，每次提交前都 rebase 一下最新分支代码。

Jerry23011 · 2023-11-28T05:42:00Z

这里最好不要使用自动 git pull 方式 merge，会显示多余的提交，建议使用 rebase 方法，保持提交历史简洁。

原来如此，我是纯GUI，回头学习一下CLI

Jerry23011 · 2023-11-28T06:16:24Z

彻底懵了，@tisfeng 我回头再开一个 branch + PR，这个先放在这，我试验试验

Easydict/Feature/Service/Model/EZConstKey.h

Easydict/Feature/Service/Tencent/TencentTranslateType.swift

Easydict/Feature/Utility/EZLinkParser/EZSchemeParser.m

tisfeng · 2023-12-03T04:17:55Z

另外，这种和 PR 无关的操作，不要放一起提交，应该单独 PR

Jerry23011 · 2023-12-03T04:18:21Z

另外，这种和 PR 无关的操作，不要放一起提交，应该单独 PR

收到🫡

Jerry23011 · 2023-12-03T05:46:33Z

看一下能不能撤回，用 git reflog 看一下操作历史

撤回了，再也不敢不测试就瞎 push 了 :)

tisfeng · 2023-12-03T07:34:08Z

本地怎么测试操作都行，只是推送前一定要注意提交的内容，也要确保代码能编译运行。

tisfeng · 2023-12-03T09:47:13Z

试了一下，虽然文档上没写，但发现腾讯翻译是支持繁体中文的，只要目标语言支持简体中文的都支持繁体中文。

Jerry23011 · 2023-12-03T21:08:07Z

试了一下，虽然文档上没写，但发现腾讯翻译是支持繁体中文的，只要目标语言支持简体中文的都支持繁体中文。

文档反馈了，也不知道有没有用

我执行git rebase也会把所有的commit时间都变成当前的，后来我改用git rebase --committer-date-is-author-date这个就会保留原始时间。

试了一下这个，确实是会保留 commit 时间的

tisfeng · 2023-12-11T13:37:46Z

这个看起来没什么问题，我就先合并了，游离主分支太久不好，也不方便测试。

后面如果没问题，这周末会发一个新版本。

tisfeng · 2023-12-11T13:40:19Z

行，那 TTS 就不加了，图片翻译可以加一下，这个额度完全够用了。

https://cloud.tencent.com/document/product/551/35017

文本翻译的每月免费额度为5百万字符。
图片翻译的每月免费额度为1万次调用。
语音翻译的每月免费额度为1万次调用。
文件翻译无每月免费额度。
免费额度每月1日0点重置。

另外 OCR 和图片翻译不一样，OCR 在文字识别模块下面，免费额度也不错，苹果系统 OCR 支持的语种有限，这个可以考虑作为备用选项。

https://cloud.tencent.com/document/product/866/35945

通用文字识别、卡证文字识别、票据单据识别、特定场景识别、智能结构化识别、文本图像增强、二维码和条形码识别服务开通后即可享受1,000次/月的免费调用额度，以免费资源包的形式在每个月1号自动发放到您的腾讯云账号中

本接口支持图像整体文字的检测和识别。可以识别中文、英文、中英文、日语、韩语、西班牙语、法语、德语、葡萄牙语、越南语、马来语、俄语、意大利语、荷兰语、瑞典语、芬兰语、丹麦语、挪威语、匈牙利语、泰语，阿拉伯语20种语言，且各种语言均支持与英文混合的文字识别。

至于后面的图片翻译和 OCR，你可以另外提 PR。

Jerry23011 · 2023-12-11T17:11:03Z

OK，最近一直没来得及看这个

* Add basic support for CaiyunService Add basic implementation for Caiyun Service Fix CR suggestion Add caiyun service transtype support perf: split caiyun test token to more parts perf: improve caiyun supported langauges dict Update Easydict/Feature/Service/Caiyun/CaiyunService.swift Co-authored-by: Kyle <[email protected]> * Add basic support for CaiyunService Add basic implementation for Caiyun Service Fix CR suggestion Add caiyun service transtype support perf: split caiyun test token to more parts perf: improve caiyun supported langauges dict Update Easydict/Feature/Service/Caiyun/CaiyunService.swift Co-authored-by: Kyle <[email protected]> * feat: initiate Tencent Translate support * feat: continue building Tencent Translate * fix: error when detecting unsupported languages in transType * style: code formatting * feat: proceed to Authentication header * fix: re-add TencentAPIKek * Fix header issue * fix: remove duplicated EZTencentAPIKey * perf: optimize logic in TencentTranslateType.swift * perf: optimize and localize error handling in unsupported languages * perf(UI): add English localization for Tencent Translate * perf: optimize MMOrderedDictionary logic * perf(UI): revert TMT icon * perf: initialize support for secrets customization * perf: implement demo for authentication * fix: proper json decoding * feat: implement secrets customization * style: format code Format with SwiftLint * perf: add self support language * fix: build error * perf(UI): adopt official name of Tencent Translate Co-Authored-By: Tisfeng <[email protected]> * perf: create headerAuth func for authorization * perf(UI): delete Tencent TTS in dropdown * refactor: improve tencent sign * refractor: improve tencent sign Co-Authored-By: Tisfeng <[email protected]> * fix: tencent api endpoint * Revert "perf: add self support language" This reverts commit 0bc2ab1. * perf: update handling of language * fix: correct supportedTypes * style: format code fixed extraneous white spaces with SwiftLint * perf: prepares TencentSigning for other services * perf: enable tencent from == to * perf: add missing traditional Chinese target language * perf: improve tencent error message * perf: map error response --> Response --------- Co-authored-by: Kyle <[email protected]> Co-authored-by: tisfeng <[email protected]>

Kyle-Ye and others added 3 commits November 7, 2023 01:31

feat: initiate Tencent Translate support

3d17eab

feat: continue building Tencent Translate

e65aabf

Jerry23011 added 3 commits November 25, 2023 20:25

fix: error when detecting unsupported languages in transType

9487372

style: code formatting

2322fd9

feat: proceed to Authentication header

79f0b29

Jerry23011 and others added 2 commits November 27, 2023 22:13

fix: re-add TencentAPIKek

4f75dff

Fix header issue

7ba3b85

tisfeng reviewed Nov 28, 2023

View reviewed changes

Easydict/Feature/Service/Model/EZConstKey.h Outdated Show resolved Hide resolved

tisfeng reviewed Nov 28, 2023

View reviewed changes

Easydict/Feature/Service/Tencent/TencentTranslateType.swift Outdated Show resolved Hide resolved

tisfeng reviewed Nov 28, 2023

View reviewed changes

Easydict/Feature/Service/Tencent/TencentTranslateType.swift Outdated Show resolved Hide resolved

fix: remove duplicated EZTencentAPIKey

1a49e05

tisfeng reviewed Nov 28, 2023

View reviewed changes

Easydict/Feature/Utility/EZLinkParser/EZSchemeParser.m Outdated Show resolved Hide resolved

Jerry23011 force-pushed the tencent-translate branch from a4dbf82 to 08d6880 Compare November 29, 2023 07:25

Jerry23011 force-pushed the tencent-translate branch from b7b5e5e to cde888f Compare December 3, 2023 05:45

Jerry23011 and others added 2 commits December 2, 2023 22:19

perf: prepares TencentSigning for other services

5ec8182

perf: enable tencent from == to

43016da

perf: add missing traditional Chinese target language

4065085

tisfeng added 2 commits December 3, 2023 21:53

perf: improve tencent error message

2848e10

perf: map error response --> Response

2e49e6f

Jerry23011 force-pushed the tencent-translate branch from df302d7 to 89829ad Compare December 3, 2023 21:05

Jerry23011 force-pushed the tencent-translate branch 2 times, most recently from db6447c to 2e49e6f Compare December 5, 2023 19:13

This was referenced Dec 6, 2023

🚀 功能建议：支持配置火山引擎个人 AK & SK #255

Closed

🚀 功能建议：能否支持阿里翻译 #65

Closed

Merge branch 'dev' into tencent-translate

2b0a378

tisfeng approved these changes Dec 11, 2023

View reviewed changes

tisfeng changed the title ~~[WIP] Add TencentService Support~~ Add TencentService Support Dec 11, 2023

tisfeng marked this pull request as ready for review December 11, 2023 13:42

tisfeng enabled auto-merge (squash) December 11, 2023 13:43

tisfeng approved these changes Dec 11, 2023

View reviewed changes

tisfeng merged commit d6bfd66 into tisfeng:dev Dec 11, 2023
2 checks passed

Jerry23011 deleted the tencent-translate branch January 28, 2024 08:10

tisfeng mentioned this pull request Jan 31, 2024

feat(Select Translate): keep previous result if selected text is empty when open Select Translate #375

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add TencentService Support #240

Add TencentService Support #240

Jerry23011 commented Nov 26, 2023

tisfeng commented Nov 26, 2023

Jerry23011 commented Nov 26, 2023

tisfeng commented Nov 26, 2023

Jerry23011 commented Nov 26, 2023

Jerry23011 commented Nov 26, 2023

tisfeng commented Nov 26, 2023

Jerry23011 commented Nov 26, 2023

tisfeng commented Nov 26, 2023

choykarl commented Nov 27, 2023

tisfeng commented Nov 27, 2023

choykarl commented Nov 27, 2023

tisfeng commented Nov 28, 2023

tisfeng commented Nov 28, 2023

Jerry23011 commented Nov 28, 2023

Jerry23011 commented Nov 28, 2023 •

edited

Loading

tisfeng commented Dec 3, 2023

Jerry23011 commented Dec 3, 2023

Jerry23011 commented Dec 3, 2023

tisfeng commented Dec 3, 2023

tisfeng commented Dec 3, 2023

Jerry23011 commented Dec 3, 2023

tisfeng commented Dec 11, 2023

tisfeng commented Dec 11, 2023

Jerry23011 commented Dec 11, 2023

Add TencentService Support #240

Add TencentService Support #240

Conversation

Jerry23011 commented Nov 26, 2023

tisfeng commented Nov 26, 2023

Jerry23011 commented Nov 26, 2023

tisfeng commented Nov 26, 2023

Jerry23011 commented Nov 26, 2023

Jerry23011 commented Nov 26, 2023

tisfeng commented Nov 26, 2023

Jerry23011 commented Nov 26, 2023

tisfeng commented Nov 26, 2023

choykarl commented Nov 27, 2023

tisfeng commented Nov 27, 2023

choykarl commented Nov 27, 2023

tisfeng commented Nov 28, 2023

tisfeng commented Nov 28, 2023

Jerry23011 commented Nov 28, 2023

Jerry23011 commented Nov 28, 2023 • edited Loading

tisfeng commented Dec 3, 2023

Jerry23011 commented Dec 3, 2023

Jerry23011 commented Dec 3, 2023

tisfeng commented Dec 3, 2023

tisfeng commented Dec 3, 2023

Jerry23011 commented Dec 3, 2023

tisfeng commented Dec 11, 2023

tisfeng commented Dec 11, 2023

Jerry23011 commented Dec 11, 2023

Jerry23011 commented Nov 28, 2023 •

edited

Loading