PersonalPublic/gpt_chat_bot
1
0
Fork 0
mirror of https://github.com/Balshgit/gpt_chat_bot.git synced 2025-12-16 21:20:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

update chat service (#31)

Browse Source 
* rename chatgpt service

* add zeus tool for new provider

* add zeus tool for new provider

* update chat service

* update README.md
This commit is contained in:
Dmitry Afanasyev
2023-10-10 23:22:41 +03:00
committed by GitHub
parent f6f3865fb6
commit e9f76d0ea9
30 changed files with 8095 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bot_microservice/core/bot/commands.py
View File

@@ -32,8 +32,8 @@ async def about_me(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
async def about_bot(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
if not update.effective_message:
return None
chat_gpt_service = ChatGptService.build()
model = await chat_gpt_service.get_current_chatgpt_model()
chatgpt_service = ChatGptService.build()
model = await chatgpt_service.get_current_chatgpt_model()
await update.effective_message.reply_text(
f"Бот использует бесплатную модель {model} для ответов на вопросы. "
f"\nПринимает запросы на разных языках.\n\nБот так же умеет переводить русские голосовые сообщения в текст. "
@@ -69,9 +69,9 @@ async def ask_question(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
await update.message.reply_text("Пожалуйста подождите, ответ в среднем занимает 10-15 секунд")
chat_gpt_service = ChatGptService.build()
chatgpt_service = ChatGptService.build()
logger.warning("question asked", user=update.message.from_user, question=update.message.text)
answer = await chat_gpt_service.request_to_chatgpt(question=update.message.text)
answer = await chatgpt_service.request_to_chatgpt(question=update.message.text)
await update.message.reply_text(answer)

20
bot_microservice/core/bot/repository.py
View File

@@ -9,7 +9,7 @@ from loguru import logger
from sqlalchemy import delete, desc, select, update
from sqlalchemy.dialects.sqlite import insert
from constants import CHAT_GPT_BASE_URI, INVALID_GPT_REQUEST_MESSAGES
from constants import CHATGPT_BASE_URI, INVALID_GPT_REQUEST_MESSAGES
from core.bot.models.chat_gpt import ChatGpt
from infra.database.db_adapter import Database
from settings.config import AppSettings
@@ -64,14 +64,14 @@ class ChatGPTRepository:
result = await session.execute(query)
return result.scalar_one()
async def ask_question(self, question: str, chat_gpt_model: str) -> str:
async def ask_question(self, question: str, chatgpt_model: str) -> str:
try:
response = await self.request_to_chatgpt_microservice(question=question, chat_gpt_model=chat_gpt_model)
response = await self.request_to_chatgpt_microservice(question=question, chatgpt_model=chatgpt_model)
status = response.status_code
for message in INVALID_GPT_REQUEST_MESSAGES:
if message in response.text:
message = f"{message}: {chat_gpt_model}"
logger.info(message, question=question, chat_gpt_model=chat_gpt_model)
message = f"{message}: {chatgpt_model}"
logger.info(message, question=question, chatgpt_model=chatgpt_model)
return message
if status != httpx.codes.OK:
logger.info(f"got response status: {status} from chat api", response.text)
@@ -81,19 +81,19 @@ class ChatGPTRepository:
logger.error("error get data from chat api", error=error)
return "Вообще всё сломалось :("
async def request_to_chatgpt_microservice(self, question: str, chat_gpt_model: str) -> Response:
data = self._build_request_data(question=question, chat_gpt_model=chat_gpt_model)
async def request_to_chatgpt_microservice(self, question: str, chatgpt_model: str) -> Response:
data = self._build_request_data(question=question, chatgpt_model=chatgpt_model)
transport = AsyncHTTPTransport(retries=3)
async with AsyncClient(base_url=self.settings.GPT_BASE_HOST, transport=transport, timeout=50) as client:
return await client.post(CHAT_GPT_BASE_URI, json=data, timeout=50)
return await client.post(CHATGPT_BASE_URI, json=data, timeout=50)
@staticmethod
def _build_request_data(*, question: str, chat_gpt_model: str) -> dict[str, Any]:
def _build_request_data(*, question: str, chatgpt_model: str) -> dict[str, Any]:
return {
"conversation_id": str(uuid4()),
"action": "_ask",
"model": chat_gpt_model,
"model": chatgpt_model,
"jailbreak": "default",
"meta": {
"id": random.randint(10**18, 10**19 - 1), # noqa: S311

8
bot_microservice/core/bot/services.py
View File

@@ -96,12 +96,12 @@ class ChatGptService:
async def request_to_chatgpt(self, question: str | None) -> str:
question = question or "Привет!"
chat_gpt_model = await self.get_current_chatgpt_model()
return await self.repository.ask_question(question=question, chat_gpt_model=chat_gpt_model)
chatgpt_model = await self.get_current_chatgpt_model()
return await self.repository.ask_question(question=question, chatgpt_model=chatgpt_model)
async def request_to_chatgpt_microservice(self, question: str) -> Response:
chat_gpt_model = await self.get_current_chatgpt_model()
return await self.repository.request_to_chatgpt_microservice(question=question, chat_gpt_model=chat_gpt_model)
chatgpt_model = await self.get_current_chatgpt_model()
return await self.repository.request_to_chatgpt_microservice(question=question, chatgpt_model=chatgpt_model)
async def get_current_chatgpt_model(self) -> str:
return await self.repository.get_current_chatgpt_model()

24
bot_microservice/core/utils.py
View File

@@ -1,18 +1,26 @@
from datetime import datetime, timedelta
from functools import lru_cache, wraps
from functools import cache, wraps
from inspect import cleandoc
from typing import Any
from typing import Any, Callable
def timed_cache(**timedelta_kwargs: Any) -> Any:
def _wrapper(func: Any) -> Any:
update_delta = timedelta(**timedelta_kwargs)
def timed_lru_cache(
microseconds: int = 0,
milliseconds: int = 0,
seconds: int = 0,
minutes: int = 0,
hours: int = 0,
) -> Any:
def _wrapper(func: Any) -> Callable[[Any], Any]:
update_delta = timedelta(
microseconds=microseconds, milliseconds=milliseconds, seconds=seconds, minutes=minutes, hours=hours
)
next_update = datetime.utcnow() + update_delta
# Apply @lru_cache to f with no cache size limit
cached_func = lru_cache(None)(func)
cached_func = cache(func)
@wraps(func)
def _wrapped(*args: Any, **kwargs: Any) -> Any:
def _wrapped(*args: Any, **kwargs: Any) -> Callable[[Any], Any]:
nonlocal next_update
now = datetime.utcnow()
if now >= next_update: