From f45d0c4150cdda31cbde1deb550e55c92d42cced Mon Sep 17 00:00:00 2001 From: tpoisonooo Date: Sat, 13 Jan 2024 15:50:45 +0800 Subject: [PATCH 1/6] feat(setup.py): add whl packagine --- resource/logo_black.svg | 24 ------------------------ setup.py | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 24 deletions(-) delete mode 100644 resource/logo_black.svg create mode 100644 setup.py diff --git a/resource/logo_black.svg b/resource/logo_black.svg deleted file mode 100644 index 5f4a83c5..00000000 --- a/resource/logo_black.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..86f3520e --- /dev/null +++ b/setup.py @@ -0,0 +1,17 @@ +from setuptools import setup + +setup( + name='HuixiangDou', + version='0.1', + packages=['package'], + description= # noqa E251 + 'HuixiangDou: Overcoming Group Chat Scenarios with LLM-based Technical Assistance', # noqa E501 + author='tpoisonooo', + author_email='tpoisonooo@gmail.com', + url='https://github.com/internlm/huixiangdou', + classifiers=[ + 'License :: OSI Approved :: BSD-3 License', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.6', + ], +) From 803e2f7bce181f6c44d19b68a66cc1b3f3e06181 Mon Sep 17 00:00:00 2001 From: tpoisonooo Date: Sun, 14 Jan 2024 20:17:04 +0800 Subject: [PATCH 2/6] feat(project): build wheel --- .gitignore | 3 + .pre-commit-config.yaml | 2 +- README.md | 25 +-- README_zh.md | 27 +-- huixiangdou/__init__.py | 10 + .../__pycache__/__init__.cpython-39.pyc | Bin 0 -> 187 bytes huixiangdou/__pycache__/main.cpython-39.pyc | Bin 0 -> 2909 bytes .../frontend}/__init__.py | 0 .../__pycache__/__init__.cpython-39.pyc | Bin 0 -> 211 bytes .../frontend/__pycache__/lark.cpython-39.pyc | Bin 0 -> 3002 bytes {frontend => huixiangdou/frontend}/lark.py | 3 +- main.py => huixiangdou/main.py | 37 +++- {service => huixiangdou/service}/__init__.py | 0 .../__pycache__/__init__.cpython-39.pyc | Bin 0 -> 480 bytes .../__pycache__/feature_store.cpython-39.pyc | Bin 0 -> 17841 bytes .../service/__pycache__/helper.cpython-39.pyc | Bin 0 -> 4578 bytes .../__pycache__/llm_client.cpython-39.pyc | Bin 0 -> 4849 bytes .../llm_server_hybrid.cpython-39.pyc | Bin 0 -> 7481 bytes .../__pycache__/sg_search.cpython-39.pyc | Bin 0 -> 6777 bytes .../__pycache__/web_search.cpython-39.pyc | Bin 0 -> 7746 bytes .../service/__pycache__/worker.cpython-39.pyc | Bin 0 -> 13325 bytes .../service}/feature_store.py | 0 {service => huixiangdou/service}/helper.py | 0 .../service}/llm_client.py | 0 .../service}/llm_server_hybrid.py | 2 +- {service => huixiangdou/service}/sg_search.py | 0 .../service}/web_search.py | 0 {service => huixiangdou/service}/worker.py | 0 huixiangdou/version.py | 28 +++ logs/work.txt | 5 +- requirements.txt | 1 + setup.py | 180 ++++++++++++++++-- 32 files changed, 273 insertions(+), 50 deletions(-) create mode 100644 huixiangdou/__init__.py create mode 100644 huixiangdou/__pycache__/__init__.cpython-39.pyc create mode 100644 huixiangdou/__pycache__/main.cpython-39.pyc rename {frontend => huixiangdou/frontend}/__init__.py (100%) create mode 100644 huixiangdou/frontend/__pycache__/__init__.cpython-39.pyc create mode 100644 huixiangdou/frontend/__pycache__/lark.cpython-39.pyc rename {frontend => huixiangdou/frontend}/lark.py (98%) rename main.py => huixiangdou/main.py (72%) mode change 100644 => 100755 rename {service => huixiangdou/service}/__init__.py (100%) create mode 100644 huixiangdou/service/__pycache__/__init__.cpython-39.pyc create mode 100644 huixiangdou/service/__pycache__/feature_store.cpython-39.pyc create mode 100644 huixiangdou/service/__pycache__/helper.cpython-39.pyc create mode 100644 huixiangdou/service/__pycache__/llm_client.cpython-39.pyc create mode 100644 huixiangdou/service/__pycache__/llm_server_hybrid.cpython-39.pyc create mode 100644 huixiangdou/service/__pycache__/sg_search.cpython-39.pyc create mode 100644 huixiangdou/service/__pycache__/web_search.cpython-39.pyc create mode 100644 huixiangdou/service/__pycache__/worker.cpython-39.pyc rename {service => huixiangdou/service}/feature_store.py (100%) rename {service => huixiangdou/service}/helper.py (100%) rename {service => huixiangdou/service}/llm_client.py (100%) rename {service => huixiangdou/service}/llm_server_hybrid.py (99%) rename {service => huixiangdou/service}/sg_search.py (100%) rename {service => huixiangdou/service}/web_search.py (100%) rename {service => huixiangdou/service}/worker.py (100%) create mode 100644 huixiangdou/version.py diff --git a/.gitignore b/.gitignore index 14152acf..52a297f0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ badcase.txt config.bak config.ini resource/prompt.txt +build/ +dist/ +huixiangdou.egg-info/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5eef915d..9a9bc4f0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -57,4 +57,4 @@ repos: rev: v0.4.1 hooks: - id: check-copyright - args: ["service"] + args: ["huixiangdou"] diff --git a/README.md b/README.md index bf97bde5..b67caf22 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ git clone https://github.com/internlm/lmdeploy --depth=1 repodir/lmdeploy # Build a feature store mkdir workdir # create a working directory python3 -m pip install -r requirements.txt # install dependencies, python3.11 needs `conda install conda-forge::faiss-gpu` -python3 service/feature_store.py # save the features of repodir to workdir +python3 -m huixiangdou.service.feature_store # save the features of repodir to workdir ``` The first run will automatically download the configuration of [text2vec-large-chinese](https://huggingface.co/GanymedeNil/text2vec-large-chinese), you can also manually download it and update model path in `config.ini`. @@ -86,7 +86,7 @@ The first run will automatically download the configuration of internlm2-7B. ```shell # standalone - python3 main.py --standalone + python3 -m huixiangdou.main --standalone .. ErrorCode.SUCCESS, Query: Could you please advise if there is any good optimization method for video stream detection flickering caused by frame skipping? @@ -100,7 +100,7 @@ The first run will automatically download the configuration of internlm2-7B. ```shell # Start LLM service - python3 service/llm_server_hybride.py + python3 -m huixiangdou.service.llm_server_hybrid ``` Open a new terminal, configure the host IP (**not** container IP) in `config.ini`, run @@ -111,7 +111,7 @@ The first run will automatically download the configuration of internlm2-7B. .. client_url = "http://10.140.24.142:8888/inference" # example - python3 main.py + python3 -m huixiangdou.main ``` ## STEP3. Integrate into Feishu \[Optional\] @@ -129,7 +129,8 @@ webhook_url = "${YOUR-LARK-WEBHOOK-URL}" Run. After it ends, the technical assistant's reply will be sent to the Feishu group chat. ```shell -python3 main.py +python3 -m huixiangdou.main --standalone # for non-docker users +python3 -m huixiangdou.main # for docker users ``` @@ -196,10 +197,10 @@ The basic version may not perform well. You can enable these features to enhance introduction = "Used for evaluating large language models (LLM) .." ``` - - Use `python3 -m service.sg_search` for unit test, the returned content should include opencompass source code and documentation + - Use `python3 -m huixiangdou.service.sg_search` for unit test, the returned content should include opencompass source code and documentation ```shell - python3 service/sg_search.py + python3 -m huixiangdou.service.sg_search .. "filepath": "opencompass/datasets/longbench/longbench_trivia_qa.py", "content": "from datasets import Dataset.. @@ -211,8 +212,8 @@ The basic version may not perform well. You can enable these features to enhance It is often unavoidable to adjust parameters with respect to business scenarios. - - Refer to [data.json](./tests/data.json) to add real data, run [test_intention_prompt.py](./tests/test_intention_prompt.py) to get suitable prompts and thresholds, and update them into [worker](./service/worker.py). - - Adjust the [number of search results](./service/worker.py) based on the maximum length supported by the model. + - Refer to [data.json](./tests/data.json) to add real data, run [test_intention_prompt.py](./tests/test_intention_prompt.py) to get suitable prompts and thresholds, and update them into [worker](./huixiangdou/service/worker.py). + - Adjust the [number of search results](./huixiangdou/service/worker.py) based on the maximum length supported by the model. # 🛠️ FAQ @@ -234,12 +235,12 @@ The basic version may not perform well. You can enable these features to enhance 4. How to access other local LLM / After access, the effect is not ideal? - - Open [hybrid llm service](./service/llm_server_hybrid.py), add a new LLM inference implementation. - - Refer to [test_intention_prompt and test data](./tests/test_intention_prompt.py), adjust prompt and threshold for the new model, and update them into [worker.py](./service/worker.py). + - Open [hybrid llm service](./huixiangdou/service/llm_server_hybrid.py), add a new LLM inference implementation. + - Refer to [test_intention_prompt and test data](./tests/test_intention_prompt.py), adjust prompt and threshold for the new model, and update them into [worker.py](./huixiangdou/service/worker.py). 5. What if the response is too slow/request always fails? - - Refer to [hybrid llm service](./service/llm_server_hybrid.py) to add exponential backoff and retransmission. + - Refer to [hybrid llm service](./huixiangdou/service/llm_server_hybrid.py) to add exponential backoff and retransmission. - Replace local LLM with an inference framework such as [lmdeploy](https://github.com/internlm/lmdeploy), instead of the native huggingface/transformers. 6. What if the GPU memory is too low? diff --git a/README_zh.md b/README_zh.md index 5af2bc6a..76a0353c 100644 --- a/README_zh.md +++ b/README_zh.md @@ -45,8 +45,8 @@ git clone https://github.com/internlm/lmdeploy --depth=1 repodir/lmdeploy # 建立特征库 mkdir workdir # 创建工作目录 -python3 -m pip install -r requirements.txt # 安装依赖，python3.11 需要 `conda install conda-forge::faiss-gpu` -python3 service/feature_store.py # 把 repodir 的特征保存到 workdir +python3 -m pip install -r requirements.txt # 安装依赖，若 python3.11 则需要 `conda install conda-forge::faiss-gpu` +python3 -m huixiangdou.service.feature_store # 把 repodir 的特征保存到 workdir ``` 首次运行将自动下载配置中的 [text2vec-large-chinese](https://huggingface.co/GanymedeNil/text2vec-large-chinese)。考虑到不同地区 huggingface 连接问题，建议先手动下载到本地，然后在 `config.ini` 设置模型路径。例如： @@ -93,7 +93,7 @@ x_api_key = "${YOUR-X-API-KEY}" ```shell # standalone - python3 main.py --standalone + python3 -m huixiangdou.main --standalone .. ErrorCode.SUCCESS, Query: 请教下视频流检测 跳帧 造成框一闪一闪的 有好的优化办法吗 @@ -107,7 +107,7 @@ x_api_key = "${YOUR-X-API-KEY}" ```shell # 启动 LLM 服务 - python3 service/llm_server_hybrid.py + python3 -m huixiangdou.service.llm_server_hybrid ``` 打开新终端，把 host IP (注意不是 docker 容器内的 IP) 配置进 `config.ini`，运行 @@ -118,7 +118,7 @@ x_api_key = "${YOUR-X-API-KEY}" .. client_url = "http://10.140.24.142:9999/inference" # 举例 - python3 main.py + python3 -m huixiangdou.main ``` ## STEP3.集成到飞书\[可选\] @@ -136,7 +136,8 @@ webhook_url = "${YOUR-LARK-WEBHOOK-URL}" 运行。结束后，技术助手的答复将发送到飞书群。 ```shell -python3 main.py +python3 -m huixiangdou.main --standalone # 非 docker 用户 +python3 -m huixiangdou.main # docker 用户 ``` @@ -203,10 +204,10 @@ python3 main.py introduction = "用于评测大型语言模型（LLM）.." ``` - - 使用 `python3 -m service.sg_search` 单测，返回内容应包含 opencompass 源码和文档 + - 使用 `python3 -m huixiangdou.service.sg_search` 单测，返回内容应包含 opencompass 源码和文档 ```shell - python3 service/sg_search.py + python3 -m huixiangdou.service.sg_search .. "filepath": "opencompass/datasets/longbench/longbench_trivia_qa.py", "content": "from datasets import Dataset.. @@ -218,8 +219,8 @@ python3 main.py 针对业务场景调参往往不可避免。 - - 参照 [data.json](./tests/data.json) 增加真实数据，运行 [test_intention_prompt.py](./tests/test_intention_prompt.py) 得到合适的 prompt 和阈值，更新进 [worker](./service/worker.py) - - 根据模型支持的最大长度，调整[搜索结果个数](./service/worker.py) + - 参照 [data.json](./tests/data.json) 增加真实数据，运行 [test_intention_prompt.py](./tests/test_intention_prompt.py) 得到合适的 prompt 和阈值，更新进 [worker](./huixiangdou/service/worker.py) + - 根据模型支持的最大长度，调整[搜索结果个数](./huixiangdou/service/worker.py) # 🛠️ FAQ @@ -241,12 +242,12 @@ python3 main.py 4. 如何接入其他 local LLM/ 接入后效果不理想怎么办？ - - 打开 [hybrid llm service](./service/llm_server_hybrid.py)，增加新的 LLM 推理实现 - - 参照 [test_intention_prompt 和测试数据](./tests/test_intention_prompt.py)，针对新模型调整 prompt 和阈值，更新到 [worker.py](./service/worker.py) + - 打开 [hybrid llm service](./huixiangdou/service/llm_server_hybrid.py)，增加新的 LLM 推理实现 + - 参照 [test_intention_prompt 和测试数据](./tests/test_intention_prompt.py)，针对新模型调整 prompt 和阈值，更新到 [worker.py](./huixiangdou/service/worker.py) 5. 响应太慢/网络请求总是失败怎么办？ - - 参考 [hybrid llm service](./service/llm_server_hybrid.py) 增加指数退避重传 + - 参考 [hybrid llm service](./huixiangdou/service/llm_server_hybrid.py) 增加指数退避重传 - local LLM 替换为 [lmdeploy](https://github.com/internlm/lmdeploy) 等推理框架，而非原生的 huggingface/transformers 6. GPU 显存太低怎么办？ diff --git a/huixiangdou/__init__.py b/huixiangdou/__init__.py new file mode 100644 index 00000000..a5a6e5dc --- /dev/null +++ b/huixiangdou/__init__.py @@ -0,0 +1,10 @@ +# Copyright (c) OpenMMLab. All rights reserved. +"""import module.""" +from .frontend import Lark # noqa E401 +from .service import ChatClient # noqa E401 +from .service import ErrorCode # noqa E401 +from .service import FeatureStore # noqa E401 +from .service import HybridLLMServer # noqa E401 +from .service import WebSearch # noqa E401 +from .service import Worker # noqa E401 +from .service import llm_serve # noqa E401 diff --git a/huixiangdou/__pycache__/__init__.cpython-39.pyc b/huixiangdou/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..20123b7172306d5e863341edda470ce8f73a1ce5 GIT binary patch literal 187 zcmYe~<>g`kf~Ut8r|JXg#~=k)NBYpPiAVpPpHgQJSQm tQJPtinV6TJl3$9#j*rjG%PfhH*DI*J#bJ}1pHiBWY6r5a8001nMgSbeE$9FM literal 0 HcmV?d00001 diff --git a/huixiangdou/__pycache__/main.cpython-39.pyc b/huixiangdou/__pycache__/main.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..9593377deb09bdc395329bd264ff7c5d980c3da9 GIT binary patch literal 2909 zcmZ8j-H#kc5ucu&ot^!-z4O^|Y-5Fy_)r%4_Dli^MCQYsKgIcob8$>oL94m#-rc#I zk9AM4&o`Ql3>QTq;YfH00fNz)2u0+DhbW4LKteq5!hbNY*oW_5h(PeGo^xzxMpIK= zUEN(>{i~|>rlx8Jo)7-{o)|U_<6qQx@G;T&F23aFAl%?AFgnGbb(n6O9aH~Hof7_L zV1?yQIkY=AEA%Rz3go5039FqdWEL+6wXoi)Yu*kT;Z$cTY<8OAbY~i}3U^*HIy1b= zYxwWub>6^#R_y0fYo>f%%x)UcV#`LWxeJ?&rIwjjo|SP=BuQR=!3)Ns#d14{2LmB@ z88pze7CpJvD&^JFQpR#2<|4N*$8t@`ycz^yHxcrx=+Sid9@@B#ZvkJj1fq;p#u+!a z*u=<;Rg;%gi8jOSEsGTrm<|~X|5O6w`4n&R=|Zw?-83dFBjab5(n?`L8}`+?NP5yA zDL;#M*|lP(NnS9Xk$N?+8Bwv!bRU32P(IQA{eDpb922o z>idK4$Wy~lYDJ^%M}GQLv7}pw#?qq&T~ceir;173tK>r0Pxh2(T&pCf-~!no0+<+S zV{R@{Uc|j1jznHdV36o4ITmNq$4{zp>~b**;tf}dD`ObU-E$i&(&z5t;stjZ&h~qP z?6Zinb))?2@~MJ)-9P^ z)c&I(4`aqpj?WL{P|U9lSLX-58je@yhhzVm??nS1k00Vg&yU)p4S5j5$e85IAO>qN zo0;_f*S4&JW9EPC@_nhp^q7YLRK`$>Ee)W5fFS^Fo1EQb$w6gomxu$B%?YAo!iwI^ zK=0p`wO!7PcM&TY11;aMNHbkj_I4%1sEL`G+s;kIfvRQ(w>Ql~c5ETx%-HXHd^I&DPcwzqB-uaxu`Ouln-$(FwRJYTzX+?`Qi_sd-CZg&zwHH+*v+DdlqL|5Tam`Ouk~^Wd zCa~i~TG%Us){_xpHFpU9f;374q4F8&`HATEW7$RUs4=FAM(W;U<2`2}OI_;; zoeT1^poE2}s4x6r>CE}F-KCQkPIqd1jZ4oh(i+Jqju0-apEIE`UyvhYOSMOb)fLfI z7tQ1-h+#HZjahgb?4W6acfhq-lg%(WkN$^nT!+BHr*XW3e5wq}z=~}eMIw~1A?YD8 zZkj-`rGVU3J7aw$$SreX0>fsvau2T=Tdi^vdHf|++phC6VNErFJ)5{ICv<-W{i|1A zzH$OOP3~x&X@D+|0h`#FeaiTenpCp#>LXcYVDNo>cB}M~IdLXc8k;$Y%l%nJ z(<-7y?hAA-z3H9~AW8zj?)VcYgcRJAe2q*xP^k)t#UH z^3LnO+xhVAJ8!*{8z?7bM4Q~mD?>yjDr8~-WY9XI<3lHVDth+{pwvF6D}$^Oc^V|QxhKLH z(XG9gmvvn&5`^VP{TRjD4+XjdAx82mG_FO2iViB-hKj?0GN{KT#h-kNG z=e$Ve74oDn68TM<*urtcQi+S>;OB0Jk(^fOkTw3-05~H>vy}Y1M)ElM7}`%(;@CU{@x~l zLa80EkKhdT)7@_@$J*8M>oiPzr$W2Oy+eDhaH&2ls`kaP-dmjj)9pU6N4iHyolcz- eVa&&Y_%g`kf;W2>r=|eu#~=^Sd{Ij$$X1FK0YNsIX?atOAb(^2xQtyh9XuV1txyk z>SyHVrs`*BWa+18mSmJB>1UK?R%9mTrKjYVqOjA7^7Bek^HTKV<1_OzOXB183My}L T*yQG?l;)(`febDN5iE=V`v5iU literal 0 HcmV?d00001 diff --git a/huixiangdou/frontend/__pycache__/lark.cpython-39.pyc b/huixiangdou/frontend/__pycache__/lark.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a9d3e8002d635168feb5da1cefabdba8420fc716 GIT binary patch literal 3002 zcmZ`5TWlOx_0FB=KD>U$NlKe;0uHRG?MPIpgo0>GO^d)(*rMtpG#c+6+p`(ZZ12o8 z-qkFM6Z250Nvk3%5;xhU6s7&3t*Fw}HR6{KzWJD6vTIvH$`4;vA)Iq(txY8I9l~U$tP`eOpkkS+;m!hu?_8#mUDS z##wto5YLvhL|?WoX7eCXYuxd|MDHCYT3}bW9VSMtVg|0m>?F5nIj-sXp;NI-YN7wM6pj|Amm_D@vAiYbM+fGMTo}NnUGV2r zt)3XB>42f8IRuP?JOH9)rGli1Ut<70K6MwTBqe$!^+1IpYVW~0zQX56U=l-OMG_y2 zr50%uK88_bGWb<#3_lwbdpwHvN-eBU&CbsNV>Jl5Q!7!P0eU`w0BuV_4ra+wCqSQ= zUgWx_}_ z5We@NarQkfozT`<`(V)C9K*KSgbY1=WLG^LwhwW zhW=;Clqk4WqKUB*ESVuBR6?y#SRQ=|^uW`d_do7j{nhR5m%BH9*KP~1evlpVJ zM5*~fSdxX)6B!gq6lR6i|GPdDfC(lF`8+TV3IGVrN{}c34RCs+AY8tWcEH7$RTxX* z;=fCTG){)31ukt%O&ZcFT)rw?y(+j2FDsKb)TaDA@!nGioN86Q{*pwRibNWZ#!A(w zW}2!PvrR3`wen1f)hh(tuYvnTSk9B@$qR&OP35PGS53!L5M{w_p#ED4DjEb2X>|;{>IEheltK_}^l^HO7Y6aGT;PJk%Oz zBLEM>d#DYVZQ9HToKXgIz*&uTHhPqJl#MmB><}AghvN)*>`0sic=Qd`k=O%}_7eNt zrrgX4-5!i{snq`Xh^Xb-7^8p|fK9Q5c?o-WQt zU%nrWAc5NA*%d6wDfRIPQ}&)R=2Io^;+?!F-Xp~y+Al^n82I#R#jYXaovq(=w$FEN-UQ8eF5c*#Tia=^-QK<&jQ}F-^-#q1g>C2Ga0#MA_hSMz zK?ln#KC}W2CU7mIVL4`c1 zFdRg9@4B1s>|A>*RgPngPYcYGF#B=$&)2)_mnL_A@lNOB^}TbK0r4k$Z(hCi(I2~; zTVU9&t*v|dt^4|oz1KfL^H2hs_v>q&D=pl3Fx}XF_ruPmi-5QL;kDhrUICQd_kIum z<7M3mo(P|C-I83^!7eO&saoi%=-wef@;)7f=}@!w(@NC;(vd{L9-OEwTB!wz!PBq> z{4j7%yC+g4S^I7rgCv6~lNLn44{E*_K=%zoD~tj&^?#aod=#0CA^jkH1N1U1rPOMO>$ zafW3o(cu%&br!yo3^6CL7C@`B7WbgP27u z_AK_qQ2N-ncqm3Pz<~^LXt^&UImTm)MXV-4iHF6QA#af8>=x`24v_~%W9;y$BF1vRNknptjeu! zM3z)ZCYC9T*#vSo?#3YO5{(UVV{lI|#%w)v&YV6ob9x(}KJySyJ#AGA30#eGvNDt# z5_Ll5RAo3fTuJBBm66gW&6)O%$lt`) zu(31R^BZ$pZEfjhd+T{MchgrDrWuN%Eb6LK9o?&(Rh{r2MHT

yk%^}>U*zn^vV;y#Z1HRn_|#@6C4A!@I~ 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 literal 0 HcmV?d00001 diff --git a/huixiangdou/service/__pycache__/llm_client.cpython-39.pyc b/huixiangdou/service/__pycache__/llm_client.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b59be008cfa70a65d3e162686dcc5f1f4f7a6c55 GIT binary patch literal 4849 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 lxfY&U$1<-uP8J(d`bM5YtkW{{d8cY&ie` literal 0 HcmV?d00001 diff --git a/huixiangdou/service/__pycache__/llm_server_hybrid.cpython-39.pyc b/huixiangdou/service/__pycache__/llm_server_hybrid.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d41ff375c5a517dbd17089190edf6f0d5237edf9 GIT binary patch literal 7481 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℞DlP+EdpKJ~{aD!6)<< zhOxiaeggV+xQJ0j?siV@R>W?liygk5v-mM+PXV%GHZWb#66!SGCXeA6y#M zSY@=7EWzDX?&67X;$L8XmDQ5kWPW6g7n2%zk&9}?6_~swIk$ToD-N7!Nj)7cC(Gky z@ahceGpJXhmE;UtJ~2jTvGOdfM2!GOuKruKnw^1kR%rCGFz@p2TJdUoBbo)snySo;}76y*WhU1#~IexIpCYMq_$_#++>L@fj3Lhx$!z%iq1zb zvGru>#DFU{M(3iJ$G?`GQ+vWGpC7H=UxQPYH92Lx=Nt5{WDz&@B{zf_ympVbDX@SY zRakg}Zg*kqm;p zo}v*pB|`itLmxV$+X2SiQO1S_rrXIVj=Mw_ZRawE7W@yLdIHQ9&Y&PhVt-fmC1O#b z#9Yh~JKZQ6gqJrr6~`OEfr$7Tj2~_)lNcMHj$%9RZnXWnk?IGj(e1@GcQELAZ5bGD z?uP+};^Nd(#pU}fm@3m76@Wu1*HjAMb zacYIiCssO$ArTHz6nEK)E0HS@DzxN`%W*N|3K^09e8ap4gv`oKHtj zj8ZApOR?cNPjn|fLta%*fD|&E_9dbBt@}`GP#DAb_0a!(qSgisN)4 z>;@ugNo`1tcem+9gPz;w()5c}nw%35chJWWY6MoPDT_gH1TqjTr*_!md{AFke&SVH zvoIGvrY6{!<_GRE(JsDD<2aeRCe1vZ9??i@!QqEZi&!px8*@aRCYpGPLz8Hl<#{or zg^A9k3vGLKYqZ}}%P1JD`UO3%&D^FU<_kj*hs73(Q!bMr&NTA*7j)v!;qEk;Zo;_w zP!s2XUJ)2Z`aVTK=3_l2uzLHEHj{TOAbC+U_ZlX zEWq0c`^xD4BBAa!pd8TvjD<|V3nH@V8)RhWI!CVXDd&QuQb?wCI=&??kQ~W^hz%5} zel)}C@vAa`a*n!4SxwS5r_SuuE5e~=MgVg_8J;w!k`QU3@80D&1)lE*p0DmbVe`~J zA`Ys%O|Ur4XXJ@B^y-D#4VL;Pex2qNC~ZbB5U-=Fa3EcqXK%~0gmj9?EO+xWOj7_p zZ%BQo`%*Hh@-C3BUxe<*FVA%R`7OjZu*WGyrvPKB=woyeU8*@kd{T7^_U~%qQT#Qu zfE5ws8xNt<=s~%myyim#2*RQuU!wQFghJX-$Zu0X&#Xj;irXjpp1c+m9s+5YQDIzU zc2tTMSPp@rLK?ZKJgy|UDbmP~?ECgXnaP?I_n<5j00kE~=BqKrTyp6-W&A&9nH2hH zQ{risX1cLARX556Ok9r>wA(`wI&3INHOYbFwzQ$4GG~SS;{?knOfkVK)6Hnbd``&O zCJ%rVC+?o>D1RXnsdVj--f?@#o<>I;2|`+i{b%<;-T>s3q*c2Paf;h0;uUh4nZ{2E zm&zb6VSKAzh2Oze1L@|(_h_L@1;v`u9ZK&d6?jo=j8T$T2G1s-5k|C%0GX1Wa*T-QYo z(@~LD*B2?v<-2{}YNe%Cs~@mokJ{x{>tN{ivXOkN1#i}Bi8ruD9iT!j^8OMhNIReo zN^Bq(2+l}m5SeqN%R@-|>E8j$8p_mRLAMrHa)nBvTBufcYU_eV+xSgCgjMJvu`eV# zqDe|kA5nS@iL?lRC@}jWQe(0&|59K@)gN1MLwZ74$x^(Lq2+b}4C1p5IClb&9r-tg z(jmw`1K^E#0UVrk5G*d>?}IkPPN}ZAw6OtvaD@C+7{BtJtR=ND(;Nb-5_dI#0yN`3Z~^>2XRSt8b~?DZ@mu_Kb%D2&&1qh2OG{+zULy3OF5SzVr~4rAptrq zC$tIlPQzj!jH=s&R63G~w0b2wreuLg%K*{Hva6#@38p1ElOBfHDkpm)wWvQQNGZbr z+y5&Ggi+M_~-9uY0N3#GqZF$#!z^TB9knJ zx;7stQR3{v~NB{8` zfAyb#_h<22lQ3#B+@Nd|SOKFEHoRa{22h(lf-TV|g)t%cA92J9K;#mCOZ|Up GJpEtbk`>_q literal 0 HcmV?d00001 diff --git a/huixiangdou/service/__pycache__/worker.cpython-39.pyc b/huixiangdou/service/__pycache__/worker.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ab22b367440efb7c40888b840bc902c28f8e2c36 GIT binary patch literal 13325 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 Tuple: + """Parse version from a string. + + Args: + version_str (str): A string represents a version info. + + Returns: + tuple: A sequence of integer and string represents version. + """ + _version_info = [] + for x in version_str.split('.'): + if x.isdigit(): + _version_info.append(int(x)) + elif x.find('rc') != -1: + patch_version = x.split('rc') + _version_info.append(int(patch_version[0])) + _version_info.append(f'rc{patch_version[1]}') + return tuple(_version_info) + + +version_info = parse_version_info(__version__) diff --git a/logs/work.txt b/logs/work.txt index ab673a78..0db143fe 100644 --- a/logs/work.txt +++ b/logs/work.txt @@ -5,4 +5,7 @@ input: ['请教下视频流检测 跳帧 造成框一闪一闪的 有好的优 score: ['根据提供的信息，这是一个有主题的疑问句。因此，我会给它一个10分。', 6, 3] topic: 视频流检测、跳帧和框一闪一闪的问题。 input: ['请教下视频流检测 跳帧 造成框一闪一闪的 有好的优化办法吗', [], ''] - +input: ['请教下视频流检测 跳帧 造成框一闪一闪的 有好的优化办法吗', [], ''] +score: ['根据提供的信息，这是一个有主题的疑问句。因此，我会给它一个10分的得分。', 6, 3] +topic: 视频流检测、跳帧和框一闪一闪的问题。 +feature store reject: diff --git a/requirements.txt b/requirements.txt index 859b6e97..958b0448 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ openai>=1.0.0 pydantic>=1.10.13 pytoml readability-lxml +requests scikit-learn sentence_transformers tiktoken diff --git a/setup.py b/setup.py index 86f3520e..17348aec 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,163 @@ -from setuptools import setup - -setup( - name='HuixiangDou', - version='0.1', - packages=['package'], - description= # noqa E251 - 'HuixiangDou: Overcoming Group Chat Scenarios with LLM-based Technical Assistance', # noqa E501 - author='tpoisonooo', - author_email='tpoisonooo@gmail.com', - url='https://github.com/internlm/huixiangdou', - classifiers=[ - 'License :: OSI Approved :: BSD-3 License', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - ], -) +import os +import re +import sys + +from setuptools import find_packages, setup + +pwd = os.path.dirname(__file__) +version_file = 'huixiangdou/version.py' + + +def readme(): + with open(os.path.join(pwd, 'README.md'), encoding='utf-8') as f: + content = f.read() + return content + + +def get_version(): + with open(os.path.join(pwd, version_file), 'r') as f: + exec(compile(f.read(), version_file, 'exec')) + return locals()['__version__'] + + +def check_ext_modules(): + if os.path.exists(os.path.join(pwd, 'lmdeploy', 'lib')): + return True + return False + + +def get_cuda_pkgs(): + arg_name = '--cuda=' + arg_value = None + for arg in sys.argv[1:]: + if arg.startswith(arg_name): + arg_value = arg[len(arg_name):] + sys.argv.remove(arg) + break + + cuda_pkgs = [] + if arg_value == '11': + cuda_pkgs = [ + 'nvidia-nccl-cu11', 'nvidia-cuda-runtime-cu11', + 'nvidia-cublas-cu11' + ] + elif arg_value == '12': + cuda_pkgs = [ + 'nvidia-nccl-cu12', 'nvidia-cuda-runtime-cu12', + 'nvidia-cublas-cu12' + ] + return cuda_pkgs + + +cuda_pkgs = get_cuda_pkgs() + + +def parse_requirements(fname='requirements.txt', with_version=True): + """Parse the package dependencies listed in a file but strips specific + versioning information. + + Args: + fname (str): path to the file + with_version (bool, default=False): if True include version specs + + Returns: + List[str]: list of requirements items + + CommandLine: + python -c "import setup; print(setup.parse_requirements())" + """ + require_fpath = fname + + def parse_line(line): + """Parse information from a line in a requirements text file.""" + if line.startswith('-r '): + # Allow specifying requirements in other files + target = line.split(' ')[1] + for info in parse_require_file(target): + yield info + else: + info = {'line': line} + if line.startswith('-e '): + info['package'] = line.split('#egg=')[1] + elif '@git+' in line: + info['package'] = line + else: + # Remove versioning from the package + pat = '(' + '|'.join(['>=', '==', '>']) + ')' + parts = re.split(pat, line, maxsplit=1) + parts = [p.strip() for p in parts] + + info['package'] = parts[0] + if len(parts) > 1: + op, rest = parts[1:] + if ';' in rest: + # Handle platform specific dependencies + # http://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-platform-specific-dependencies + version, platform_deps = map(str.strip, + rest.split(';')) + info['platform_deps'] = platform_deps + else: + version = rest # NOQA + info['version'] = (op, version) + yield info + + def parse_require_file(fpath): + with open(fpath, 'r') as f: + for line in f.readlines(): + line = line.strip() + if line and not line.startswith('#'): + for info in parse_line(line): + yield info + + def gen_packages_items(): + if os.path.exists(require_fpath): + for info in parse_require_file(require_fpath): + parts = [info['package']] + if with_version and 'version' in info: + parts.extend(info['version']) + if not sys.version.startswith('3.4'): + # apparently package_deps are broken in 3.4 + platform_deps = info.get('platform_deps') + if platform_deps is not None: + parts.append(';' + platform_deps) + item = ''.join(parts) + yield item + + packages = list(gen_packages_items()) + packages += cuda_pkgs + return packages + + +if __name__ == '__main__': + huixiangdou_package_data = [ + 'main.py', 'resource/bad_questions.json', + 'resource/good_questions.json', 'config.ini' + ] + setup( + name='huixiangdou', + version=get_version(), + description= # noqa E251 + 'Overcoming Group Chat Scenarios with LLM-based Technical Assistance', # noqa E501 + long_description=readme(), + long_description_content_type='text/markdown', + author='OpenMMLab', + author_email='openmmlab@gmail.com', + packages=find_packages(exclude=()), + package_data={ + 'huixiangdou': huixiangdou_package_data, + }, + include_package_data=True, + setup_requires=parse_requirements('requirements.txt'), + install_requires=parse_requirements('requirements.txt'), + has_ext_modules=check_ext_modules, + classifiers=[ + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Intended Audience :: Developers', + 'Intended Audience :: Education', + 'Intended Audience :: Science/Research', + ], + entry_points={'console_scripts': ['huixiangdou=huixiangdou.main:run']}, + ) From b856313f225e1102946dcd2b6232e245bbdd4a28 Mon Sep 17 00:00:00 2001 From: tpoisonooo Date: Sun, 14 Jan 2024 20:27:57 +0800 Subject: [PATCH 3/6] style(huixiangdou): format code --- .github/workflows/lint.yml | 3 +++ huixiangdou/frontend/lark.py | 4 ++-- huixiangdou/main.py | 6 ++++-- huixiangdou/service/llm_client.py | 5 ++++- huixiangdou/service/sg_search.py | 2 +- huixiangdou/service/web_search.py | 14 +++++++++----- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e5285acc..d2dc687f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,3 +15,6 @@ jobs: run: | python .github/scripts/doc_link_checker.py --target README_en.md python .github/scripts/doc_link_checker.py --target README.md + python -m pip install pylint interrogate + pylint huixiangdou + interrogate huixiangdou -v diff --git a/huixiangdou/frontend/lark.py b/huixiangdou/frontend/lark.py index 51008cbb..d4f855ac 100644 --- a/huixiangdou/frontend/lark.py +++ b/huixiangdou/frontend/lark.py @@ -53,7 +53,7 @@ def post(self, data): headers=self.headers, data=post_data, verify=False, - timeout=3) + timeout=5) except requests.exceptions.HTTPError as exc: code = exc.response.status_code reason = exc.response.reason @@ -96,5 +96,5 @@ def post(self, data): requests.post(self.webhook, headers=self.headers, data=json.dumps(error_data), - timeout=3) + timeout=5) return result diff --git a/huixiangdou/main.py b/huixiangdou/main.py index 17ded623..da50e20b 100755 --- a/huixiangdou/main.py +++ b/huixiangdou/main.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 # Copyright (c) OpenMMLab. All rights reserved. +"""HuixiangDou binary.""" import argparse import os import time @@ -14,6 +15,7 @@ def parse_args(): + """Parse args.""" parser = argparse.ArgumentParser(description='Worker.') parser.add_argument('--work_dir', type=str, @@ -43,16 +45,16 @@ def check_env(): f'{CONFIG_NAME} not found, download a template from {CONFIG_URL}.') try: - response = requests.get(CONFIG_URL) + response = requests.get(CONFIG_URL, timeout=5) response.raise_for_status() with open(CONFIG_NAME, 'wb') as f: f.write(response.content) except Exception as e: logger.error(f'Failed to download file due to {e}') - pass def run(): + """Automatically download config, start llm server and run examples.""" check_env() args = parse_args() if args.standalone: diff --git a/huixiangdou/service/llm_client.py b/huixiangdou/service/llm_client.py index 967146dc..2a454245 100644 --- a/huixiangdou/service/llm_client.py +++ b/huixiangdou/service/llm_client.py @@ -113,7 +113,10 @@ def generate_response(self, prompt, history=[], remote=False): 'history': data_history, 'remote': remote } - resp = requests.post(url, headers=header, data=json.dumps(data)) + resp = requests.post(url, + headers=header, + data=json.dumps(data), + timeout=5) if resp.status_code != 200: raise Exception(str((resp.status_code, resp.reason))) return resp.json()['text'] diff --git a/huixiangdou/service/sg_search.py b/huixiangdou/service/sg_search.py index c55f63b7..f3056cf5 100644 --- a/huixiangdou/service/sg_search.py +++ b/huixiangdou/service/sg_search.py @@ -105,7 +105,7 @@ def choose_repo(self, llm_client, question, groupname): keys = self.sg_config.keys() skip = ['binary_src_path', 'src_access_token'] - repos = dict() + repos = {} for key in keys: if key in skip: continue diff --git a/huixiangdou/service/web_search.py b/huixiangdou/service/web_search.py index 56e9eab3..8e813e18 100644 --- a/huixiangdou/service/web_search.py +++ b/huixiangdou/service/web_search.py @@ -86,17 +86,21 @@ def google(self, query: str, max_article): """ url = 'https://google.serper.dev/search' - payload = json.dumps({'q': '{}'.format(query), 'hl': 'zh-cn'}) + payload = json.dumps({'q': f'{query}', 'hl': 'zh-cn'}) headers = { 'X-API-KEY': self.load_key(), 'Content-Type': 'application/json' } - response = requests.request('POST', url, headers=headers, data=payload) + response = requests.request('POST', + url, + headers=headers, + data=payload, + timeout=3) # noqa E501 jsonobj = json.loads(response.text) # 带偏序的 url 连接拾取 keys = self.load_urls() - urls = dict() + urls = {} for organic in jsonobj['organic']: link = '' @@ -133,7 +137,7 @@ def google(self, query: str, max_article): while life < self.retry: try: logger.info(f'extract: {target_link}') - response = requests.get(target_link) + response = requests.get(target_link, timeout=5) if len(response.text) < 1: break @@ -229,7 +233,7 @@ def fetch_web_content(target_link: str): Extracts the main content and title from the HTML of the page. Returns the title and content as a single string. """ - response = requests.get(target_link) + response = requests.get(target_link, timeout=5) doc = Document(response.text) content_html = doc.summary() From 7929a30718b94e36be6e8d6a90538818e1a72325 Mon Sep 17 00:00:00 2001 From: tpoisonooo Date: Sun, 14 Jan 2024 20:31:03 +0800 Subject: [PATCH 4/6] CI(project): ingore pylint --- .github/workflows/lint.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d2dc687f..ebc358e1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,11 +10,11 @@ jobs: - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 - name: Check doc link run: | python .github/scripts/doc_link_checker.py --target README_en.md python .github/scripts/doc_link_checker.py --target README.md python -m pip install pylint interrogate - pylint huixiangdou - interrogate huixiangdou -v + pylint huixiangdou || true + interrogate huixiangdou -v || true From 6a1350fa0d65e1fb407766d5bc084c851e3bb971 Mon Sep 17 00:00:00 2001 From: tpoisonooo Date: Sun, 14 Jan 2024 20:32:53 +0800 Subject: [PATCH 5/6] CI(.github): update on condition --- .github/workflows/lint.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ebc358e1..668dfbb2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,6 +1,10 @@ name: lint -on: [push, pull_request] +on: + push: + branches: + - main + pull_request: jobs: lint: From 47733cf62b18278fdd57cf6c047a4bb84aa8ee8e Mon Sep 17 00:00:00 2001 From: tpoisonooo Date: Sun, 14 Jan 2024 20:33:54 +0800 Subject: [PATCH 6/6] CI(.github): typo --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 668dfbb2..18c7e9b8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v2 with: python-version: 3.9