From 827e6f6b440a7dbe70159b836165bce53c03a8bc Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Mon, 19 Aug 2024 11:30:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5=D1=82=20ocab=20?= =?UTF-8?q?=D0=BD=D0=B0=20karkas=20=D0=B2=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D1=82=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../external/create_report_apps/create_report.py | 3 ++- .../karkas_blocks/external/create_report_apps/main.py | 3 ++- .../karkas_blocks/external/yandexgpt/handlers.py | 7 ++++--- src/karkas_blocks/karkas_blocks/external/yandexgpt/main.py | 4 ++-- .../karkas_blocks/external/yandexgpt/yandexgpt.py | 7 ++++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/karkas_blocks/karkas_blocks/external/create_report_apps/create_report.py b/src/karkas_blocks/karkas_blocks/external/create_report_apps/create_report.py index 49c29d8..9eaf223 100644 --- a/src/karkas_blocks/karkas_blocks/external/create_report_apps/create_report.py +++ b/src/karkas_blocks/karkas_blocks/external/create_report_apps/create_report.py @@ -9,7 +9,8 @@ from aiogram.types import ( ReplyKeyboardMarkup, ReplyKeyboardRemove, ) -from ocab_core.modules_system.public_api import Utils, get_fsm_context + +from karkas_core.modules_system.public_api import Utils, get_fsm_context from .report import Report diff --git a/src/karkas_blocks/karkas_blocks/external/create_report_apps/main.py b/src/karkas_blocks/karkas_blocks/external/create_report_apps/main.py index 6c00fe9..c0010ef 100644 --- a/src/karkas_blocks/karkas_blocks/external/create_report_apps/main.py +++ b/src/karkas_blocks/karkas_blocks/external/create_report_apps/main.py @@ -9,7 +9,8 @@ from aiogram.types import ( InlineKeyboardMarkup, Message, ) -from ocab_core.modules_system.public_api import get_module, register_router + +from karkas_core.modules_system.public_api import get_module, register_router from .create_report import router as create_report_router from .create_report import start_report diff --git a/src/karkas_blocks/karkas_blocks/external/yandexgpt/handlers.py b/src/karkas_blocks/karkas_blocks/external/yandexgpt/handlers.py index 9c53940..ce0e6ea 100644 --- a/src/karkas_blocks/karkas_blocks/external/yandexgpt/handlers.py +++ b/src/karkas_blocks/karkas_blocks/external/yandexgpt/handlers.py @@ -3,13 +3,14 @@ from typing import TYPE_CHECKING from aiogram import Bot from aiogram.types import Message -from ocab_core.modules_system.public_api import get_module, log + +from karkas_core.modules_system.public_api import get_module, log from .yandexgpt import YandexGPT if TYPE_CHECKING: - from ocab_modules.standard.config import IConfig - from ocab_modules.standard.database.db_api import add_message as IAddMessage + from karkas_blocks.standard.config import IConfig + from karkas_blocks.standard.database.db_api import add_message as IAddMessage config: "IConfig" = get_module( "standard.config", diff --git a/src/karkas_blocks/karkas_blocks/external/yandexgpt/main.py b/src/karkas_blocks/karkas_blocks/external/yandexgpt/main.py index 2cc0bc2..24eb3d9 100644 --- a/src/karkas_blocks/karkas_blocks/external/yandexgpt/main.py +++ b/src/karkas_blocks/karkas_blocks/external/yandexgpt/main.py @@ -1,9 +1,9 @@ from typing import TYPE_CHECKING -from ocab_core.modules_system.public_api import get_module +from karkas_core.modules_system.public_api import get_module if TYPE_CHECKING: - from ocab_modules.standard.config import IConfig + from karkas_blocks.standard.config import IConfig config: "IConfig" = get_module("standard.config", "config") diff --git a/src/karkas_blocks/karkas_blocks/external/yandexgpt/yandexgpt.py b/src/karkas_blocks/karkas_blocks/external/yandexgpt/yandexgpt.py index 637e4a6..209a970 100644 --- a/src/karkas_blocks/karkas_blocks/external/yandexgpt/yandexgpt.py +++ b/src/karkas_blocks/karkas_blocks/external/yandexgpt/yandexgpt.py @@ -4,11 +4,12 @@ from typing import TYPE_CHECKING import aiohttp import requests -from ocab_core.modules_system.public_api import get_module, log + +from karkas_core.modules_system.public_api import get_module, log if TYPE_CHECKING: - from ocab_modules.standard.config import IConfig - from ocab_modules.standard.database import db_api as IDbApi + from karkas_blocks.standard.config import IConfig + from karkas_blocks.standard.database import db_api as IDbApi db_api: "IDbApi" = get_module("standard.database", "db_api")