STP-Team
diff --git a/‎.dockerignore‎
Lines changed: 78 additions & 3 deletions b/‎.dockerignore‎
Lines changed: 78 additions & 3 deletions
diff --git a/‎.github/workflows/docker-release.yml‎
Lines changed: 77 additions & 0 deletions b/‎.github/workflows/docker-release.yml‎
Lines changed: 77 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 0 additions & 1 deletion b/‎.gitignore‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎Dockerfile‎
Lines changed: 16 additions & 17 deletions b/‎Dockerfile‎
Lines changed: 16 additions & 17 deletions
diff --git a/‎bot.py‎
Lines changed: 28 additions & 16 deletions b/‎bot.py‎
Lines changed: 28 additions & 16 deletions
diff --git a/‎docker-compose.yml‎
Lines changed: 8 additions & 7 deletions b/‎docker-compose.yml‎
Lines changed: 8 additions & 7 deletions
diff --git a/‎infrastructure/__init__.py‎
Lines changed: 1 addition & 0 deletions b/‎infrastructure/__init__.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎infrastructure/api/__init__.py‎
Lines changed: 1 addition & 0 deletions b/‎infrastructure/api/__init__.py‎
Lines changed: 1 addition & 0 deletions
@@ -1,4 +1,79 @@
+ Git
+.git
+.gitignore
+.gitattributes
+
+# CI
+.codeclimate.yml
+.travis.yml
+.taskcluster.yml
+
+# Docker
+docker-compose.yml
+Dockerfile
+.docker
+.dockerignore
+
+# Byte-compiled / optimized / DLL files
+**/__pycache__/
+**/*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Virtual environment
+.env
+.venv/
 venv/
-.idea/
-cache/
-README.MD
+
+# PyCharm
+.idea
+
+# Python mode for VIM
+.ropeproject
+**/.ropeproject
+
+# Vim swap files
+**/*.swp
+
+# VS Code
+.vscode/
@@ -0,0 +1,77 @@
+name: Docker CI/CD
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - feature/**
+      - fix/**
+    tags:
+      - 'v*.*.*'  # Build on version tags like v1.2.3
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: stp-team/stpsher
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,format=short
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=raw,value=latest,enable=${{ github.ref_name == 'main' }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
+
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: none
+    needs: build-and-push
+    if: github.ref_name == 'main'
+    steps:
+      - name: Deploy to server
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.SERVER_IP }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SERVER_SSH_KEY }}
+          script: |
+            docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+            docker compose -f /home/stp/projects/stpsher/docker-compose.yml up -d
+            docker system prune -af
+            
@@ -56,7 +56,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-uv.lock
 
 # Pyre type checker
 .pyre/
 
@@ -1,25 +1,24 @@
-FROM python:3.13-slim
+FROM ghcr.io/astral-sh/uv:latest AS uv
+FROM python:3.13-slim AS runtime
 
-WORKDIR /usr/src/app/stpsher-bot
+WORKDIR /app
 
-# Установка гита и других зависимостей
+# Системные зависимости
 RUN apt-get update && apt-get install -y --no-install-recommends \
     git \
-    && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/*
 
-# Установка uv
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
+# Python зависимости
+COPY --from=uv /uv /usr/local/bin/uv
+COPY pyproject.toml uv.lock* ./
+RUN uv sync --frozen --no-dev
+COPY . .
 
-# Копирование файлов проекта для лучшего кеширования
-COPY pyproject.toml uv.lock* /usr/src/app/stpsher-bot/
+# Добавляем виртуальное окружение в PATH
+ENV PATH="/app/.venv/bin:$PATH"
 
-# Установка зависимостей Python используя uv (создает .venv)
-RUN uv sync --frozen
+# Запрет Python записывать файлы .pyc и использовать буферизацию stdout
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
 
-# Копирование кода проекта
-COPY . /usr/src/app/stpsher-bot
-
-# Установка PATH для включения env
-ENV PATH="/usr/src/app/stpsher-bot/.venv/bin:$PATH"
-
-CMD ["uv", "run", "python", "main.py"]
+CMD ["uv", "run", "python", "bot.py"]
@@ -11,9 +11,11 @@
     BotCommandScopeAllGroupChats,
     BotCommandScopeAllPrivateChats,
 )
+from aiogram_dialog import setup_dialogs
 from stp_database import create_engine, create_session_pool
 
 from tgbot.config import Config, load_config
+from tgbot.dialogs.menus import common_dialogs_list, dialogs_list
 from tgbot.handlers import routers_list
 from tgbot.middlewares.ConfigMiddleware import ConfigMiddleware
 from tgbot.middlewares.DatabaseMiddleware import DatabaseMiddleware
@@ -28,7 +30,7 @@
 
 
 async def on_startup():
-    """Функция запуска бота"""
+    """Функция, активируемая при запуске основного процесса бота."""
     pass
 
 
@@ -38,12 +40,16 @@ def register_middlewares(
     bot: Bot,
     main_session_pool=None,
     kpi_session_pool=None,
-):
-    """
-    Alternative setup with more selective middleware application.
-    Use this if you want different middleware chains for different event types.
-    """
+) -> None:
+    """Установка middleware для определенных ивентов.
 
+    Args:
+        dp: Диспетчер ивентов
+        config: Конфигурация
+        bot: Экземпляр бота
+        main_session_pool: Сессия с базой данных STP
+        kpi_session_pool: Сессия с базой данных KPI
+    """
     config_middleware = ConfigMiddleware(config)
     database_middleware = DatabaseMiddleware(
         config=config,
@@ -67,16 +73,14 @@ def register_middlewares(
         dp.chat_member.outer_middleware(middleware)
 
 
-def get_storage(config):
-    """
-    Return storage based on the provided configuration.
+def get_storage(config) -> RedisStorage | MemoryStorage:
+    """Возвращает хранилище исходя из конфигурации.
 
     Args:
-        config (Config): The configuration object.
+        config: Объект конфигурации
 
     Returns:
-        Storage: The storage object based on the configuration.
-
+        Хранилище RedisStorage или MemoryStorage
     """
     if config.tg_bot.use_redis:
         return RedisStorage.from_url(
@@ -87,7 +91,8 @@ def get_storage(config):
         return MemoryStorage()
 
 
-async def main():
+async def main() -> None:
+    """Основная функция запуска бота."""
     setup_logging()
 
     storage = get_storage(bot_config)
@@ -99,7 +104,10 @@ async def main():
 
     # Определение команд для приватных чатов
     await bot.set_my_commands(
-        commands=[BotCommand(command="start", description="Главное меню")],
+        commands=[
+            BotCommand(command="start", description="Главное меню"),
+            BotCommand(command="whois", description="Поиск сотрудников"),
+        ],
         scope=BotCommandScopeAllPrivateChats(),
     )
     await bot.set_my_commands(
@@ -145,21 +153,25 @@ async def main():
 
     dp = Dispatcher(storage=storage)
 
+    # Создаем движки для доступа к базам
     main_db_engine = create_engine(bot_config.db, db_name=bot_config.db.main_db)
     kpi_db_engine = create_engine(bot_config.db, db_name=bot_config.db.kpi_db)
 
     main_db = create_session_pool(main_db_engine)
     kpi_db = create_session_pool(kpi_db_engine)
 
-    # Store session pools in dispatcher
+    # Храним сессии в диспетчере
     dp["main_db"] = main_db
     dp["kpi_db"] = kpi_db
 
     dp.include_routers(*routers_list)
+    dp.include_routers(*dialogs_list)
+    dp.include_routers(*common_dialogs_list)
+    setup_dialogs(dp)
 
     register_middlewares(dp, bot_config, bot, main_db, kpi_db)
 
-    # Setup all scheduled jobs using the new scheduler manager
+    # Запуск планировщика и добавление задач
     scheduler_manager = SchedulerManager()
     scheduler_manager.setup_jobs(main_db, bot, kpi_db)
     scheduler_manager.start()
 
@@ -1,16 +1,12 @@
 services:
   bot:
-    image: "stpsher-bot"
+    image: "ghcr.io/stp-team/stpsher:latest"
     stop_signal: SIGINT
-    build:
-      context: .
-    working_dir: "/usr/src/app/stpsher-bot"
-    volumes:
-      - .:/usr/src/app/stpsher-bot
-    command: uv run bot.py
     restart: always
     env_file:
       - ".env"
+    volumes:
+      - ./uploads:/app/uploads
 
     logging:
       driver: "json-file"
@@ -27,9 +23,14 @@ services:
     command: redis-server --port $REDIS_PORT --save 20 1 --loglevel warning --requirepass $REDIS_PASSWORD
     env_file:
       - ".env"
+    ports:
+      - "6379:6379"
     volumes:
       - cache:/data
 
+    networks:
+      - stp_bots
+
 volumes:
   cache: { }
 
 
@@ -0,0 +1 @@
+"""Интеграция внешних API."""
@@ -0,0 +1 @@
+"""Интеграция API производственного календаря."""
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+"""Интеграция внешних API."""`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+"""Интеграция API производственного календаря."""`