smart-bot-factory 0.2.6__tar.gz → 0.2.8__tar.gz

{smart_bot_factory-0.2.6 → smart_bot_factory-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smart-bot-factory
-Version: 0.2.6
+Version: 0.2.8
 Summary: Библиотека для создания умных чат-ботов
 Author-email: Kopatych <kopatych@example.com>
 License: MIT

smart_bot_factory-0.2.8/publish.py

@@ -0,0 +1,122 @@
+#!/usr/bin/env python3
+"""
+Скрипт автоматической публикации библиотеки в PyPI
+- Увеличивает версию на 0.0.1
+- Очищает dist/
+- Собирает пакет через uv build
+- Публикует через twine
+"""
+
+import re
+import shutil
+import subprocess
+from pathlib import Path
+
+def increment_version(version: str) -> str:
+    """Увеличивает версию на 0.0.1"""
+    parts = version.split('.')
+    if len(parts) != 3:
+        raise ValueError(f"Неверный формат версии: {version}")
+    
+    major, minor, patch = map(int, parts)
+    patch += 1
+    
+    return f"{major}.{minor}.{patch}"
+
+def update_version_in_toml():
+    """Обновляет версию в pyproject.toml"""
+    toml_path = Path("pyproject.toml")
+    
+    if not toml_path.exists():
+        raise FileNotFoundError("pyproject.toml не найден")
+    
+    content = toml_path.read_text(encoding='utf-8')
+    
+    # Находим текущую версию
+    version_match = re.search(r'^version\s*=\s*"([^"]+)"', content, re.MULTILINE)
+    if not version_match:
+        raise ValueError("Версия не найдена в pyproject.toml")
+    
+    old_version = version_match.group(1)
+    new_version = increment_version(old_version)
+    
+    # Обновляем версию
+    new_content = re.sub(
+        r'^version\s*=\s*"[^"]+"',
+        f'version = "{new_version}"',
+        content,
+        flags=re.MULTILINE
+    )
+    
+    toml_path.write_text(new_content, encoding='utf-8')
+    
+    print(f"✅ Версия обновлена: {old_version} → {new_version}")
+    return new_version
+
+def clean_dist():
+    """Очищает папку dist/"""
+    dist_path = Path("dist")
+    
+    if dist_path.exists():
+        shutil.rmtree(dist_path)
+        print("✅ Папка dist/ очищена")
+    
+    dist_path.mkdir(exist_ok=True)
+    print("✅ Папка dist/ создана")
+
+def build_package():
+    """Собирает пакет через uv build"""
+    print("\n🔨 Сборка пакета...")
+    result = subprocess.run(["uv", "build"], check=True)
+    print("✅ Пакет собран")
+    return result.returncode == 0
+
+def upload_to_pypi():
+    """Загружает пакет в PyPI через twine"""
+    print("\n📤 Загрузка в PyPI...")
+    
+    # Используем twine через uv run
+    result = subprocess.run(
+        ["uv", "run", "twine", "upload", "dist/*"],
+        check=True
+    )
+    
+    print("✅ Пакет загружен в PyPI")
+    return result.returncode == 0
+
+def main():
+    """Основная функция"""
+    try:
+        print("🚀 Начинаем публикацию в PyPI\n")
+        
+        # 1. Обновляем версию
+        new_version = update_version_in_toml()
+        
+        # 2. Очищаем dist/
+        clean_dist()
+        
+        # 3. Собираем пакет
+        build_package()
+        
+        # 4. Загружаем в PyPI
+        upload_to_pypi()
+        
+        print(f"\n🎉 Успешно! Версия {new_version} опубликована в PyPI")
+        print(f"\n💡 Не забудьте закоммитить изменения:")
+        print(f"   git add pyproject.toml")
+        print(f"   git commit -m 'Bump version to {new_version}'")
+        print(f"   git tag v{new_version}")
+        print(f"   git push && git push --tags")
+        
+    except subprocess.CalledProcessError as e:
+        print(f"\n❌ Ошибка выполнения команды: {e}")
+        return 1
+    except Exception as e:
+        print(f"\n❌ Ошибка: {e}")
+        return 1
+    
+    return 0
+
+if __name__ == "__main__":
+    exit(main())
+

{smart_bot_factory-0.2.6 → smart_bot_factory-0.2.8}/pyproject.toml

@@ -1,49 +1,54 @@
-[project]
-name = "smart-bot-factory"
-version = "0.2.6"
-description = "Библиотека для создания умных чат-ботов"
-authors = [
-    {name = "Kopatych", email = "kopatych@example.com"}
-]
-keywords = ["chatbot", "telegram", "openai", "supabase", "cli"]
-classifiers = [
-    "Development Status :: 4 - Beta",
-    "Environment :: Console",
-    "Framework :: AsyncIO",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Topic :: Communications :: Chat",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-dependencies = [
-    # Основные зависимости из ядра
-    "aiogram>=3.4.1",
-    "supabase>=2.3.4",
-    "openai>=1.12.0",
-    "python-dotenv>=1.0.1",
-    "aiofiles>=23.0.0",
-    "pytz>=2023.3",
-    "pyyaml>=6.0.2",
-    # CLI интерфейс
-    "click>=8.0.0",
-    "project-root-finder>=1.9",
-]
-requires-python = ">=3.9"
-readme = "README.md"
-license = {text = "MIT"}
-
-[project.scripts]
-sbf = "smart_bot_factory.cli:cli"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.build.targets.wheel]
-packages = ["smart_bot_factory"]
+[project]
+name = "smart-bot-factory"
+version = "0.2.8"
+description = "Библиотека для создания умных чат-ботов"
+authors = [
+    {name = "Kopatych", email = "kopatych@example.com"}
+]
+keywords = ["chatbot", "telegram", "openai", "supabase", "cli"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: Console",
+    "Framework :: AsyncIO",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Communications :: Chat",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+dependencies = [
+    # Основные зависимости из ядра
+    "aiogram>=3.4.1",
+    "supabase>=2.3.4",
+    "openai>=1.12.0",
+    "python-dotenv>=1.0.1",
+    "aiofiles>=23.0.0",
+    "pytz>=2023.3",
+    "pyyaml>=6.0.2",
+    # CLI интерфейс
+    "click>=8.0.0",
+    "project-root-finder>=1.9",
+]
+requires-python = ">=3.9"
+readme = "README.md"
+license = {text = "MIT"}
+
+[project.scripts]
+sbf = "smart_bot_factory.cli:cli"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["smart_bot_factory"]
+
+[dependency-groups]
+dev = [
+    "twine>=6.2.0",
+]

{smart_bot_factory-0.2.6 → smart_bot_factory-0.2.8}/smart_bot_factory/handlers/handlers.py

@@ -501,7 +501,10 @@ async def process_user_message(message: Message, state: FSMContext, session_id:
         validators = message_hooks.get('validators', [])
         for validator in validators:
             try:
-                should_continue = await validator(message, supabase_client)
+                user_message = message.text
+                message_obj = message
+                
+                should_continue = await validator(user_message, message_obj)
                 if not should_continue:
                     logger.info(f"⛔ Валидатор '{validator.__name__}' прервал обработку")
                     return  # Прерываем обработку
@@ -749,7 +752,7 @@ async def process_user_message(message: Message, state: FSMContext, session_id:
         send_filters = message_hooks.get('send_filters', [])
         for filter_func in send_filters:
             try:
-                should_send = await filter_func(message.from_user.id, final_response)
+                should_send = await filter_func(message.from_user.id)
                 if not should_send:
                     logger.info(f"⛔ Фильтр '{filter_func.__name__}' заблокировал отправку")
                     return  # Не отправляем