From f6f3865fb6a842f22439deddc5f1da54044a6d98 Mon Sep 17 00:00:00 2001 From: Dmitry Afanasyev <71835315+Balshgit@users.noreply.github.com> Date: Mon, 9 Oct 2023 00:22:26 +0300 Subject: [PATCH] rename chatgpt microservice (#30) * rename chagpt microservice * add deprecated models --- bot_microservice/constants.py | 12 +++++++++++- .../versions/2023-10-05-20-44_c2e443941930.py | 2 +- .../.clang-format | 0 .../.github/workflows/build.yaml | 0 .../.gitignore | 0 .../Dockerfile | 0 .../LICENSE | 0 .../README.md | 0 .../cfg/cpp-free-gpt.yml | 0 .../chat.png | Bin .../client/css/style.css | 0 .../client/html/index.html | 0 .../client/img/android-chrome-192x192.png | Bin .../client/img/android-chrome-512x512.png | Bin .../client/img/apple-touch-icon.png | Bin .../client/img/favicon-16x16.png | Bin .../client/img/favicon-32x32.png | Bin .../client/img/favicon.ico | Bin .../client/img/gpt.png | Bin .../client/img/site.webmanifest | 0 .../client/img/user.png | Bin .../client/js/chat.js | 0 .../client/js/highlight.min.js | 0 .../client/js/highlightjs-copy.min.js | 0 .../client/js/icons.js | 0 .../deprecated/free_gpt.cpp | 0 .../git-clang-format.py | 0 .../include/cfg.h | 0 .../include/free_gpt.h | 0 .../include/helper.hpp | 0 .../src/free_gpt.cpp | 0 .../src/main.cpp | 0 .../xmake.lua | 0 pyproject.toml | 4 ++-- 34 files changed, 14 insertions(+), 4 deletions(-) rename {chat_gpt_microservice => chatgpt_microservice}/.clang-format (100%) rename {chat_gpt_microservice => chatgpt_microservice}/.github/workflows/build.yaml (100%) rename {chat_gpt_microservice => chatgpt_microservice}/.gitignore (100%) rename {chat_gpt_microservice => chatgpt_microservice}/Dockerfile (100%) rename {chat_gpt_microservice => chatgpt_microservice}/LICENSE (100%) rename {chat_gpt_microservice => chatgpt_microservice}/README.md (100%) rename {chat_gpt_microservice => chatgpt_microservice}/cfg/cpp-free-gpt.yml (100%) rename {chat_gpt_microservice => chatgpt_microservice}/chat.png (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/css/style.css (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/html/index.html (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/android-chrome-192x192.png (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/android-chrome-512x512.png (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/apple-touch-icon.png (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/favicon-16x16.png (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/favicon-32x32.png (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/favicon.ico (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/gpt.png (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/site.webmanifest (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/img/user.png (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/js/chat.js (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/js/highlight.min.js (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/js/highlightjs-copy.min.js (100%) rename {chat_gpt_microservice => chatgpt_microservice}/client/js/icons.js (100%) rename {chat_gpt_microservice => chatgpt_microservice}/deprecated/free_gpt.cpp (100%) rename {chat_gpt_microservice => chatgpt_microservice}/git-clang-format.py (100%) rename {chat_gpt_microservice => chatgpt_microservice}/include/cfg.h (100%) rename {chat_gpt_microservice => chatgpt_microservice}/include/free_gpt.h (100%) rename {chat_gpt_microservice => chatgpt_microservice}/include/helper.hpp (100%) rename {chat_gpt_microservice => chatgpt_microservice}/src/free_gpt.cpp (100%) rename {chat_gpt_microservice => chatgpt_microservice}/src/main.cpp (100%) rename {chat_gpt_microservice => chatgpt_microservice}/xmake.lua (100%) diff --git a/bot_microservice/constants.py b/bot_microservice/constants.py index 42cb77f..9c6c7d4 100644 --- a/bot_microservice/constants.py +++ b/bot_microservice/constants.py @@ -59,4 +59,14 @@ class ChatGptModelsEnum(StrEnum): @classmethod def values(cls) -> set[str]: - return set(map(str, set(ChatGptModelsEnum))) + return set(map(str, filter(lambda m: m not in ChatGptModelsEnum._deprecated(), cls))) + + @staticmethod + def _deprecated() -> set[str]: + return { + "gpt-3.5-turbo-Aichat", + "gpt-3.5-turbo-stream-ChatForAi", + "gpt-3.5-turbo-stream-AItianhuSpace", + "gpt-3.5-turbo-AItianhu", + "gpt-3.5-turbo-acytoo", + } diff --git a/bot_microservice/infra/database/migrations/versions/2023-10-05-20-44_c2e443941930.py b/bot_microservice/infra/database/migrations/versions/2023-10-05-20-44_c2e443941930.py index 781538e..7d608f5 100644 --- a/bot_microservice/infra/database/migrations/versions/2023-10-05-20-44_c2e443941930.py +++ b/bot_microservice/infra/database/migrations/versions/2023-10-05-20-44_c2e443941930.py @@ -32,7 +32,7 @@ def upgrade() -> None: if models: return None models = [] - for model in ChatGptModelsEnum: + for model in ChatGptModelsEnum.values(): priority = 0 if model != "gpt-3.5-turbo-stream-FreeGpt" else 1 fields = {"model": model, "priority": priority} models.append(ChatGpt(**fields)) diff --git a/chat_gpt_microservice/.clang-format b/chatgpt_microservice/.clang-format similarity index 100% rename from chat_gpt_microservice/.clang-format rename to chatgpt_microservice/.clang-format diff --git a/chat_gpt_microservice/.github/workflows/build.yaml b/chatgpt_microservice/.github/workflows/build.yaml similarity index 100% rename from chat_gpt_microservice/.github/workflows/build.yaml rename to chatgpt_microservice/.github/workflows/build.yaml diff --git a/chat_gpt_microservice/.gitignore b/chatgpt_microservice/.gitignore similarity index 100% rename from chat_gpt_microservice/.gitignore rename to chatgpt_microservice/.gitignore diff --git a/chat_gpt_microservice/Dockerfile b/chatgpt_microservice/Dockerfile similarity index 100% rename from chat_gpt_microservice/Dockerfile rename to chatgpt_microservice/Dockerfile diff --git a/chat_gpt_microservice/LICENSE b/chatgpt_microservice/LICENSE similarity index 100% rename from chat_gpt_microservice/LICENSE rename to chatgpt_microservice/LICENSE diff --git a/chat_gpt_microservice/README.md b/chatgpt_microservice/README.md similarity index 100% rename from chat_gpt_microservice/README.md rename to chatgpt_microservice/README.md diff --git a/chat_gpt_microservice/cfg/cpp-free-gpt.yml b/chatgpt_microservice/cfg/cpp-free-gpt.yml similarity index 100% rename from chat_gpt_microservice/cfg/cpp-free-gpt.yml rename to chatgpt_microservice/cfg/cpp-free-gpt.yml diff --git a/chat_gpt_microservice/chat.png b/chatgpt_microservice/chat.png similarity index 100% rename from chat_gpt_microservice/chat.png rename to chatgpt_microservice/chat.png diff --git a/chat_gpt_microservice/client/css/style.css b/chatgpt_microservice/client/css/style.css similarity index 100% rename from chat_gpt_microservice/client/css/style.css rename to chatgpt_microservice/client/css/style.css diff --git a/chat_gpt_microservice/client/html/index.html b/chatgpt_microservice/client/html/index.html similarity index 100% rename from chat_gpt_microservice/client/html/index.html rename to chatgpt_microservice/client/html/index.html diff --git a/chat_gpt_microservice/client/img/android-chrome-192x192.png b/chatgpt_microservice/client/img/android-chrome-192x192.png similarity index 100% rename from chat_gpt_microservice/client/img/android-chrome-192x192.png rename to chatgpt_microservice/client/img/android-chrome-192x192.png diff --git a/chat_gpt_microservice/client/img/android-chrome-512x512.png b/chatgpt_microservice/client/img/android-chrome-512x512.png similarity index 100% rename from chat_gpt_microservice/client/img/android-chrome-512x512.png rename to chatgpt_microservice/client/img/android-chrome-512x512.png diff --git a/chat_gpt_microservice/client/img/apple-touch-icon.png b/chatgpt_microservice/client/img/apple-touch-icon.png similarity index 100% rename from chat_gpt_microservice/client/img/apple-touch-icon.png rename to chatgpt_microservice/client/img/apple-touch-icon.png diff --git a/chat_gpt_microservice/client/img/favicon-16x16.png b/chatgpt_microservice/client/img/favicon-16x16.png similarity index 100% rename from chat_gpt_microservice/client/img/favicon-16x16.png rename to chatgpt_microservice/client/img/favicon-16x16.png diff --git a/chat_gpt_microservice/client/img/favicon-32x32.png b/chatgpt_microservice/client/img/favicon-32x32.png similarity index 100% rename from chat_gpt_microservice/client/img/favicon-32x32.png rename to chatgpt_microservice/client/img/favicon-32x32.png diff --git a/chat_gpt_microservice/client/img/favicon.ico b/chatgpt_microservice/client/img/favicon.ico similarity index 100% rename from chat_gpt_microservice/client/img/favicon.ico rename to chatgpt_microservice/client/img/favicon.ico diff --git a/chat_gpt_microservice/client/img/gpt.png b/chatgpt_microservice/client/img/gpt.png similarity index 100% rename from chat_gpt_microservice/client/img/gpt.png rename to chatgpt_microservice/client/img/gpt.png diff --git a/chat_gpt_microservice/client/img/site.webmanifest b/chatgpt_microservice/client/img/site.webmanifest similarity index 100% rename from chat_gpt_microservice/client/img/site.webmanifest rename to chatgpt_microservice/client/img/site.webmanifest diff --git a/chat_gpt_microservice/client/img/user.png b/chatgpt_microservice/client/img/user.png similarity index 100% rename from chat_gpt_microservice/client/img/user.png rename to chatgpt_microservice/client/img/user.png diff --git a/chat_gpt_microservice/client/js/chat.js b/chatgpt_microservice/client/js/chat.js similarity index 100% rename from chat_gpt_microservice/client/js/chat.js rename to chatgpt_microservice/client/js/chat.js diff --git a/chat_gpt_microservice/client/js/highlight.min.js b/chatgpt_microservice/client/js/highlight.min.js similarity index 100% rename from chat_gpt_microservice/client/js/highlight.min.js rename to chatgpt_microservice/client/js/highlight.min.js diff --git a/chat_gpt_microservice/client/js/highlightjs-copy.min.js b/chatgpt_microservice/client/js/highlightjs-copy.min.js similarity index 100% rename from chat_gpt_microservice/client/js/highlightjs-copy.min.js rename to chatgpt_microservice/client/js/highlightjs-copy.min.js diff --git a/chat_gpt_microservice/client/js/icons.js b/chatgpt_microservice/client/js/icons.js similarity index 100% rename from chat_gpt_microservice/client/js/icons.js rename to chatgpt_microservice/client/js/icons.js diff --git a/chat_gpt_microservice/deprecated/free_gpt.cpp b/chatgpt_microservice/deprecated/free_gpt.cpp similarity index 100% rename from chat_gpt_microservice/deprecated/free_gpt.cpp rename to chatgpt_microservice/deprecated/free_gpt.cpp diff --git a/chat_gpt_microservice/git-clang-format.py b/chatgpt_microservice/git-clang-format.py similarity index 100% rename from chat_gpt_microservice/git-clang-format.py rename to chatgpt_microservice/git-clang-format.py diff --git a/chat_gpt_microservice/include/cfg.h b/chatgpt_microservice/include/cfg.h similarity index 100% rename from chat_gpt_microservice/include/cfg.h rename to chatgpt_microservice/include/cfg.h diff --git a/chat_gpt_microservice/include/free_gpt.h b/chatgpt_microservice/include/free_gpt.h similarity index 100% rename from chat_gpt_microservice/include/free_gpt.h rename to chatgpt_microservice/include/free_gpt.h diff --git a/chat_gpt_microservice/include/helper.hpp b/chatgpt_microservice/include/helper.hpp similarity index 100% rename from chat_gpt_microservice/include/helper.hpp rename to chatgpt_microservice/include/helper.hpp diff --git a/chat_gpt_microservice/src/free_gpt.cpp b/chatgpt_microservice/src/free_gpt.cpp similarity index 100% rename from chat_gpt_microservice/src/free_gpt.cpp rename to chatgpt_microservice/src/free_gpt.cpp diff --git a/chat_gpt_microservice/src/main.cpp b/chatgpt_microservice/src/main.cpp similarity index 100% rename from chat_gpt_microservice/src/main.cpp rename to chatgpt_microservice/src/main.cpp diff --git a/chat_gpt_microservice/xmake.lua b/chatgpt_microservice/xmake.lua similarity index 100% rename from chat_gpt_microservice/xmake.lua rename to chatgpt_microservice/xmake.lua diff --git a/pyproject.toml b/pyproject.toml index fbb1201..b518b59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -105,7 +105,7 @@ ban-relative-imports = true nested-classes-whitelist = ["Config", "Meta"] pytest-parametrize-names-type = "csv" exclude = [ - "chat_gpt_microservice/*", + "chatgpt_microservice/*", ".cache/*", ".pytest_cache/*", "*/__pycache__/*", @@ -163,7 +163,7 @@ warn_unused_configs = true warn_unreachable = true warn_no_return = true exclude = [ - "chat_gpt_microservice", + "chatgpt_microservice/*", "bot_microservice/infra/database/migrations/versions/*" ] plugins = [