Переименование проекта c OCAB в Karkas

This commit is contained in:
Armatik
2024-08-16 22:42:02 +03:00
parent 5b3963e87c
commit 3c7dffc06d
75 changed files with 257 additions and 265 deletions

View File

@@ -6,9 +6,9 @@ COPY . /app
# Фикс
RUN sed -i '/ocab-core = {/{s/, develop = true//}' /app/src/altlinux/pyproject.toml && \
sed -i '/ocab-modules = {/{s/, develop = true//}' /app/src/altlinux/pyproject.toml && \
sed -i '/ocab-core = {/{s/, develop = true//}' /app/src/ocab_modules/pyproject.toml
RUN sed -i '/karkas-core = {/{s/, develop = true//}' /app/src/altlinux/pyproject.toml && \
sed -i '/karkas-blocks = {/{s/, develop = true//}' /app/src/altlinux/pyproject.toml && \
sed -i '/karkas-core = {/{s/, develop = true//}' /app/src/karkas_blocks/pyproject.toml
WORKDIR /app/src/altlinux

View File

@@ -2,14 +2,14 @@
## Описание
Подготовленная версия OCAB Lite для интеграции в чат [Альт Линукс](https://t.me/alt_linux)
Подготовленная версия Karkas Lite для интеграции в чат [Альт Линукс](https://t.me/alt_linux)
## Функционал
Список OCAB-модулей используемых в боте:
* report - Вызов администрации чата одной командой
* welcome - Автоматическая вариативная проверка пользователей на признаки бота или другой автоматической рекламной системы
* help - Получение информации об OCAB Lite
* help - Получение информации об Karkas Lite
## Запуск

View File

@@ -1,25 +1,25 @@
import asyncio
from importlib.metadata import version
from ocab_core import OCAB
from ocab_modules import module_loader
from karkas_core import Karkas
from karkas_blocks import block_loader
async def main():
ocab = OCAB()
await ocab.init_app(
karkas = Karkas()
await karkas.init_app(
[
module_loader("standard", "config", safe=False),
module_loader("standard", "command_helper"),
block_loader("standard", "config", safe=False),
block_loader("standard", "command_helper"),
# safe=False из-за super().__init__()
module_loader("standard", "filters", safe=False),
module_loader("standard", "report"),
module_loader("standard", "welcome", safe=False),
module_loader("standard", "help"),
block_loader("standard", "filters", safe=False),
block_loader("standard", "report"),
block_loader("standard", "welcome", safe=False),
block_loader("standard", "help"),
],
metainfo={"app_version": version("altlinux")},
)
await ocab.start()
await karkas.start()
asyncio.run(main())

View File

@@ -1210,7 +1210,7 @@ files = [
]
[[package]]
name = "ocab-core"
name = "karkas-core"
version = "0.1.0"
description = ""
optional = false
@@ -1232,10 +1232,10 @@ webhook = ["fastapi (>=0.111.1,<0.112.0)", "hypercorn (>=0.17.3,<0.18.0)"]
[package.source]
type = "directory"
url = "../ocab_core"
url = "../karkas_core"
[[package]]
name = "ocab-modules"
name = "karkas-blocks"
version = "0.1.0"
description = ""
optional = false
@@ -1247,13 +1247,13 @@ develop = true
dash = "^2.17.1"
dash-bootstrap-components = "^1.6.0"
dash-extensions = "^1.0.18"
ocab-core = {path = "../ocab_core", develop = true}
karkas-core = {path = "../karkas_core", develop = true}
peewee = "^3.17.6"
pyyaml = "^6.0.1"
[package.source]
type = "directory"
url = "../ocab_modules"
url = "../karkas_blocks"
[[package]]
name = "packaging"

View File

@@ -9,8 +9,8 @@ readme = "README.md"
[tool.poetry.dependencies]
python = "~3.12"
ocab-core = { extras=["webhook"], path = "../ocab_core", develop = true }
ocab-modules = { path = "../ocab_modules", develop = true }
karkas-core = { extras=["webhook"], path = "../karkas_core", develop = true }
karkas-blocks = { path = "../karkas_blocks", develop = true }
[build-system]
requires = ["poetry-core"]