From 4dd9f6c2818c7ff520ccdcf69e128f82dba3e878 Mon Sep 17 00:00:00 2001 From: zsunreal <173136977@qq.com> Date: Sun, 23 Apr 2023 16:46:32 +0800 Subject: [PATCH 1/8] first init to xiaoliang --- ChuanhuChatbot.py | 7 ++++--- assets/favicon.ico | Bin 15406 -> 640 bytes locale/en_US.json | 3 +-- locale/ja_JP.json | 3 +-- modules/config.py | 2 +- modules/presets.py | 5 +++-- modules/utils.py | 10 ++++++++-- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ChuanhuChatbot.py b/ChuanhuChatbot.py index 650e7df4..80273dc5 100644 --- a/ChuanhuChatbot.py +++ b/ChuanhuChatbot.py @@ -273,7 +273,8 @@ def create_greeting(request: gr.Request): default_btn = gr.Button(i18n("🔙 恢复默认设置")) gr.Markdown(CHUANHU_DESCRIPTION, elem_id="description") - gr.HTML(FOOTER.format(versions=versions_html()), elem_id="footer") + # gr.HTML(FOOTER.format(versions=versions_html()), elem_id="footer") + gr.HTML(FOOTER.format(versions=""), elem_id="footer") demo.load(refresh_ui_elements_on_load, [current_model, model_select_dropdown], [like_dislike_area], show_progress=False) chatgpt_predict_args = dict( fn=predict, @@ -454,11 +455,11 @@ def create_greeting(request: gr.Request): logging.info( colorama.Back.GREEN - + "\n川虎的温馨提示：访问 http://localhost:7860 查看界面" + + "\n小亮的温馨提示：访问 http://localhost:7860 查看界面" + colorama.Style.RESET_ALL ) # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接 -demo.title = i18n("川虎Chat 🚀") +demo.title = i18n("小亮Chat 👀") if __name__ == "__main__": reload_javascript() diff --git a/assets/favicon.ico b/assets/favicon.ico index 9876786e406d8719aca016940c5457910b064134..4002d05228cbf15bb878e6cce3b7f7002911d24f 100644 GIT binary patch literal 640 zcmeAS@N?(olHy`uVBq!ia0vp^ULefD3?#MrjGTcKOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>)oxH3pvF<93#7-lf|EMia#{Qv*|-Zg1{K#j~L zL4LtN`d8VJdq9dY$=lsU@X=P=T|f?diKnkC`*Ri%K?{AKBkRk7(iWaBjv*0;-%jzI zbXbAMl~uxK0?YmXTh8{lNY4)Wx=6fg_7s)hADtT+CE5}t+I|X8NnbgYV=2RgEpIO} zi5A9a#y-CIb*AZ*)$tA6oRgJB6DQwavBfZHh0$-L^;}=g!c?!%@oJCi34JE9>d32& zcUS9%$%yw^)bxhPTIuROm{dNa)=jHQ;?)0}>q3>R)4q94mz6x?w5l)es@YGgX|uv# zn(gY^y5rBK&04Ki^b3f#3rm*lX7c^J7@Av|npv5cYa3Wt k85juMDOE?&kei>9nO2EgLt^9E*+2~pp00i_>zopr03W61YXATM literal 15406 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访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本": "developor: Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) and [明昭MZhao](https://space.bilibili.com/24807452)\n\nDownload latest code from [GitHub](https://github.com/GaiZhenbiao/ChuanhuChatGPT)", "切换亮暗色主题": "Switch light/dark theme", "您的IP区域：未知。": "Your IP region: Unknown.", "获取IP地理位置失败。原因：": "Failed to get IP location. Reason: ", diff --git a/locale/ja_JP.json b/locale/ja_JP.json index 1acbe710..316db715 100644 --- a/locale/ja_JP.json +++ b/locale/ja_JP.json @@ -44,7 +44,7 @@ "代理地址（示例：http://127.0.0.1:10809）": "プロキシアドレス（例：http://127.0.0.1:10809）", "🔄 设置代理地址": "🔄 プロキシアドレスを設定", "🔙 恢复默认设置": "🔙 デフォルト設定に戻す", - "川虎Chat 🚀": "川虎Chat 🚀", + "小亮Chat 👀": "小亮Chat 👀", "开始实时传输回答……": "ストリーム出力開始……", "Token 计数: ": "Token数: ", "，本次对话累计消耗了 ": ", 今の会話で消費合計 ", @@ -64,7 +64,6 @@ "API key为空，请检查是否输入正确。": "APIキーが入力されていません。正しく入力されているか確認してください。", "请输入对话内容。": "会話内容を入力してください。", "账单信息不适用": "課金情報は対象外です", - "由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) 和 [明昭MZhao](https://space.bilibili.com/24807452)开发
访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本": "開発：Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) と [明昭MZhao](https://space.bilibili.com/24807452)\n\n最新コードは川虎Chatのサイトへ [GitHubプロジェクト](https://github.com/GaiZhenbiao/ChuanhuChatGPT)", "切换亮暗色主题": "テーマの明暗切替", "您的IP区域：未知。": "あなたのIPアドレス地域：不明", "获取IP地理位置失败。原因：": "IPアドレス地域の取得に失敗しました。理由：", diff --git a/modules/config.py b/modules/config.py index 520a0b79..27b45de5 100644 --- a/modules/config.py +++ b/modules/config.py @@ -162,7 +162,7 @@ def update_doc_config(two_column_pdf): if dockerflag: server_name = "0.0.0.0" else: - server_name = "127.0.0.1" + server_name = "0.0.0.0" if server_port is None: if dockerflag: server_port = 7860 diff --git a/modules/presets.py b/modules/presets.py index 575547cc..212f021b 100644 --- a/modules/presets.py +++ b/modules/presets.py @@ -42,9 +42,10 @@ SIM_K = 5 INDEX_QUERY_TEMPRATURE = 1.0 -CHUANHU_TITLE = i18n("川虎Chat 🚀") +CHUANHU_TITLE = i18n("小亮Chat 👀") -CHUANHU_DESCRIPTION = i18n("由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) 和 [明昭MZhao](https://space.bilibili.com/24807452)开发
访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本") +# CHUANHU_DESCRIPTION = i18n("由Bilibili [土小亮虎虎](https://space.bilibili.com/29125536) 和 [明昭MZhao](https://space.bilibili.com/24807452)开发
访问小亮Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本") +CHUANHU_DESCRIPTION = i18n("") FOOTER = """
{versions}
""" diff --git a/modules/utils.py b/modules/utils.py index 67754aa1..0b880bc6 100644 --- a/modules/utils.py +++ b/modules/utils.py @@ -12,6 +12,8 @@ import html import sys import subprocess +import geoip2.database +import socket import gradio as gr from pypinyin import lazy_pinyin @@ -377,7 +379,11 @@ def replace_today(prompt): def get_geoip(): try: with retrieve_proxy(): - response = requests.get("https://ipapi.co/json/", timeout=5) + headers = { + 'User-Agent': 'Mozi11a/5.0 (Window NT 10.0; Win64; X64) Applewebkit/537.36 (KHmml, 1ike Gecko) ' + 'Chrome/112.0.0.0 Safari/537.36' + } + response = requests.get("https://ipapi.co/json/", timeout=5, headers=headers) data = response.json() except: data = {"error": True, "reason": "连接ipapi失败"} @@ -394,7 +400,7 @@ def get_geoip(): if country == "China": text = "**您的IP区域：中国。请立即检查代理设置，在不受支持的地区使用API可能导致账号被封禁。**" else: - text = i18n("您的IP区域：") + f"{country}。" + text = i18n("服务器IP区域：") + f"{country}。" logging.info(text) return text From b989a59e768771db345ff272ebc3245f662d83cc Mon Sep 17 00:00:00 2001 From: zsunreal <173136977@qq.com> Date: Sun, 23 Apr 2023 16:47:31 +0800 Subject: [PATCH 2/8] first init to xiaoliang --- modules/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utils.py b/modules/utils.py index 0b880bc6..eaa54e0d 100644 --- a/modules/utils.py +++ b/modules/utils.py @@ -400,7 +400,7 @@ def get_geoip(): if country == "China": text = "**您的IP区域：中国。请立即检查代理设置，在不受支持的地区使用API可能导致账号被封禁。**" else: - text = i18n("服务器IP区域：") + f"{country}。" + text = i18n("服务IP区域：") + f"{country}。" logging.info(text) return text From 7aa0eba7fb41799fe90950867d4d398080adecb8 Mon Sep 17 00:00:00 2001 From: zsunreal <173136977@qq.com> Date: Mon, 24 Apr 2023 11:28:57 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/utils.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/utils.py b/modules/utils.py index eaa54e0d..af66a348 100644 --- a/modules/utils.py +++ b/modules/utils.py @@ -12,9 +12,7 @@ import html import sys import subprocess -import geoip2.database -import socket - +qu import gradio as gr from pypinyin import lazy_pinyin import tiktoken From 08acfe137125be0c3fcaf3f02210d153cdf8222d Mon Sep 17 00:00:00 2001 From: zsunreal <173136977@qq.com> Date: Tue, 25 Apr 2023 15:58:48 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/utils.py b/modules/utils.py index 34fae23f..13e86928 100644 --- a/modules/utils.py +++ b/modules/utils.py @@ -12,7 +12,6 @@ import html import sys import subprocess -qu import gradio as gr from pypinyin import lazy_pinyin import tiktoken From a4550239c9ea1328b6741b0b6593af991ce18aa7 Mon Sep 17 00:00:00 2001 From: zsunreal <173136977@qq.com> Date: Fri, 5 May 2023 10:41:38 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChuanhuChatbot.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ChuanhuChatbot.py b/ChuanhuChatbot.py index 1e56e3a1..dc3727f7 100644 --- a/ChuanhuChatbot.py +++ b/ChuanhuChatbot.py @@ -458,13 +458,8 @@ def create_greeting(request: gr.Request): show_progress=True, ) -logging.info( - colorama.Back.GREEN - + "\n川虎的温馨提示：访问 http://localhost:7860 查看界面" - + colorama.Style.RESET_ALL -) # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接 -demo.title = i18n("川虎Chat 🚀") +demo.title = i18n("小亮Chat 👀") if __name__ == "__main__": reload_javascript() From 9514f78c5fab287c617b088cdf96ea3ea5a5e011 Mon Sep 17 00:00:00 2001 From: zsunreal <173136977@qq.com> Date: Fri, 5 May 2023 14:11:03 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=B7=B2=E4=BD=BF=E7=94=A8=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChuanhuChatbot.py | 4 +-- modules/models/models.py | 67 +++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/ChuanhuChatbot.py b/ChuanhuChatbot.py index dc3727f7..9052a28e 100644 --- a/ChuanhuChatbot.py +++ b/ChuanhuChatbot.py @@ -266,8 +266,8 @@ def create_new_model(): changeProxyBtn = gr.Button(i18n("🔄 设置代理地址")) default_btn = gr.Button(i18n("🔙 恢复默认设置")) - gr.Markdown(CHUANHU_DESCRIPTION, elem_id="description") - gr.HTML(FOOTER.format(versions=versions_html()), elem_id="footer") + # gr.Markdown(CHUANHU_DESCRIPTION, elem_id="description") + # gr.HTML(FOOTER.format(versions=versions_html()), elem_id="footer") # https://github.com/gradio-app/gradio/pull/3296 def create_greeting(request: gr.Request): diff --git a/modules/models/models.py b/modules/models/models.py index 6ff562c1..f39b45e3 100644 --- a/modules/models/models.py +++ b/modules/models/models.py @@ -20,6 +20,7 @@ import aiohttp from enum import Enum import uuid +import timedelta from ..presets import * from ..llama_func import * @@ -32,13 +33,13 @@ class OpenAIClient(BaseLLMModel): def __init__( - self, - model_name, - api_key, - system_prompt=INITIAL_SYSTEM_PROMPT, - temperature=1.0, - top_p=1.0, - user_name="" + self, + model_name, + api_key, + system_prompt=INITIAL_SYSTEM_PROMPT, + temperature=1.0, + top_p=1.0, + user_name="" ) -> None: super().__init__( model_name=model_name, @@ -81,10 +82,11 @@ def count_token(self, user_input): def billing_info(self): try: curr_time = datetime.datetime.now() + curr_time_f = (curr_time + datetime.timedelta(days=1)).strftime("%Y-%m-%d") last_day_of_month = get_last_day_of_month( curr_time).strftime("%Y-%m-%d") - first_day_of_month = curr_time.replace(day=1).strftime("%Y-%m-%d") - usage_url = f"{shared.state.usage_api_url}?start_date={first_day_of_month}&end_date={last_day_of_month}" + first_day_of_month = (curr_time.replace(day=1) - datetime.timedelta(weeks=11)).strftime("%Y-%m-%d") + usage_url = f"{shared.state.usage_api_url}?start_date={first_day_of_month}&end_date={curr_time_f}" try: usage_data = self._get_billing_data(usage_url) except Exception as e: @@ -95,7 +97,7 @@ def billing_info(self): usage_percent = round(usage_data["total_usage"] / usage_limit, 2) # return i18n("**本月使用金额** ") + f"\u3000 ${rounded_usage}" return """\ - """ + i18n("本月使用金额") + f""" + """ + i18n("已使用金额") + f"""
{usage_percent}% @@ -105,7 +107,7 @@ def billing_info(self): """ except requests.exceptions.ConnectTimeout: status_text = ( - STANDARD_ERROR_MSG + CONNECTION_TIMEOUT_MSG + ERROR_RETRIEVE_MSG + STANDARD_ERROR_MSG + CONNECTION_TIMEOUT_MSG + ERROR_RETRIEVE_MSG ) return status_text except requests.exceptions.ReadTimeout: @@ -275,7 +277,7 @@ def _get_glm_style_input(self): logging.debug(colorama.Fore.YELLOW + f"{history}" + colorama.Fore.RESET) assert ( - len(history) % 2 == 0 + len(history) % 2 == 0 ), f"History should be even length. current history is: {history}" history = [[history[i], history[i + 1]] for i in range(0, len(history), 2)] @@ -290,22 +292,22 @@ def get_answer_at_once(self): def get_answer_stream_iter(self): history, query = self._get_glm_style_input() for response, history in CHATGLM_MODEL.stream_chat( - CHATGLM_TOKENIZER, - query, - history, - max_length=self.token_upper_limit, - top_p=self.top_p, - temperature=self.temperature, + CHATGLM_TOKENIZER, + query, + history, + max_length=self.token_upper_limit, + top_p=self.top_p, + temperature=self.temperature, ): yield response class LLaMA_Client(BaseLLMModel): def __init__( - self, - model_name, - lora_path=None, - user_name="" + self, + model_name, + lora_path=None, + user_name="" ) -> None: super().__init__(model_name=model_name, user=user_name) from lmflow.datasets.dataset import Dataset @@ -334,8 +336,11 @@ def __init__( # raise Exception(f"models目录下没有这个模型: {model_name}") if lora_path is not None: lora_path = f"lora/{lora_path}" - model_args = ModelArguments(model_name_or_path=model_source, lora_model_path=lora_path, model_type=None, config_overrides=None, config_name=None, tokenizer_name=None, cache_dir=None, - use_fast_tokenizer=True, model_revision='main', use_auth_token=False, torch_dtype=None, use_lora=False, lora_r=8, lora_alpha=32, lora_dropout=0.1, use_ram_optimized_load=True) + model_args = ModelArguments(model_name_or_path=model_source, lora_model_path=lora_path, model_type=None, + config_overrides=None, config_name=None, tokenizer_name=None, cache_dir=None, + use_fast_tokenizer=True, model_revision='main', use_auth_token=False, + torch_dtype=None, use_lora=False, lora_r=8, lora_alpha=32, lora_dropout=0.1, + use_ram_optimized_load=True) pipeline_args = InferencerArguments( local_rank=0, random_seed=1, deepspeed='configs/ds_config_chatbot.json', mixed_precision='bf16') @@ -540,13 +545,13 @@ def get_answer_at_once(self): def get_model( - model_name, - lora_model_path=None, - access_key=None, - temperature=None, - top_p=None, - system_prompt=None, - user_name="" + model_name, + lora_model_path=None, + access_key=None, + temperature=None, + top_p=None, + system_prompt=None, + user_name="" ) -> BaseLLMModel: msg = i18n("模型设置为了：") + f" {model_name}" model_type = ModelType.get_type(model_name) From dc1900562a6013614d88fd6cf8507a3cfe29305e Mon Sep 17 00:00:00 2001 From: zsunreal <173136977@qq.com> Date: Fri, 5 May 2023 14:16:24 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/models/models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/models/models.py b/modules/models/models.py index f39b45e3..8a0aaa00 100644 --- a/modules/models/models.py +++ b/modules/models/models.py @@ -20,7 +20,6 @@ import aiohttp from enum import Enum import uuid -import timedelta from ..presets import * from ..llama_func import * From 273f01bdf1cfe998e8d25d4f2bf4515640034076 Mon Sep 17 00:00:00 2001 From: zsunreal <173136977@qq.com> Date: Sun, 7 May 2023 15:58:55 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=AF=B9=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/models/base_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/models/base_model.py b/modules/models/base_model.py index 72511dd4..fafa7b80 100644 --- a/modules/models/base_model.py +++ b/modules/models/base_model.py @@ -373,7 +373,7 @@ def predict( status_text = f"为了防止token超限，模型忘记了早期的 {count} 轮对话" yield chatbot, status_text - self.auto_save(chatbot) + # self.auto_save(chatbot) def retry( self,