Added SQLAlchemy and Alembic to work with Postgres

alembic.ini

@@ -0,0 +1,119 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = alembic
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python-dateutil library that can be
+# installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+# sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = %(here)s/.venv/bin/ruff
+# ruff.options = --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
+
+[alembic.ext]
+sourceless=false

alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration.

alembic/env.py

@@ -0,0 +1,84 @@
+import os
+from logging.config import fileConfig
+from os import getenv
+from os.path import dirname, join
+
+from dotenv import load_dotenv
+from sqlalchemy import create_engine
+
+from alembic import context
+from db.data import Base
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = Base.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+load_dotenv(join(dirname(__file__), '..', '.env'))
+DATABASE_PASSWORD=os.getenv('DATABASE_PASSWORD')
+DATABASE_NAME=os.getenv('DATABASE_NAME')
+DATABASE_USER=os.getenv('DATABASE_USER')
+DATABASE_PORT=os.getenv('DATABASE_PORT')
+DATABASE_HOST=os.getenv('DATABASE_HOST')
+URL=f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}"
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = URL
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = create_engine(URL)
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

alembic/script.py.mako

@@ -0,0 +1,26 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"}

alembic/versions/9de2db27ca6e_initial_migration.py

@@ -0,0 +1,30 @@
+"""Initial migration
+
+Revision ID: 9de2db27ca6e
+Revises: 
+Create Date: 2023-10-29 01:23:30.890347
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9de2db27ca6e'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

db/data.py

@@ -0,0 +1,53 @@
+import os
+from os.path import dirname, join
+from typing import List, Optional
+from uuid import UUID
+
+from dotenv import load_dotenv
+from sqlalchemy import ForeignKey, create_engine
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship
+
+load_dotenv(join(dirname(__file__), '..', '.env'))
+DATABASE_PASSWORD=os.getenv('DATABASE_PASSWORD')
+DATABASE_NAME=os.getenv('DATABASE_NAME')
+DATABASE_USER=os.getenv('DATABASE_USER')
+DATABASE_PORT=os.getenv('DATABASE_PORT')
+DATABASE_HOST=os.getenv('DATABASE_HOST')
+engine = create_engine(f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}", echo=True)
+
+
+class Base(DeclarativeBase):
+    pass
+
+class User(Base):
+    __tablename__ = 'user'
+    
+    id: Mapped[int] = mapped_column(primary_key=True)
+    user_name: Mapped[Optional[str]]
+    
+    admin: Mapped['Admin'] = relationship(back_populates='user', cascade='all, delete-orphan')
+    
+    def __repr__(self) -> str:
+        return f'User(id={self.id!r}, user_name={self.user_name!r})'
+
+    def __str__(self) -> str:
+        return f'User(id={self.id!r}, user_name={self.user_name!r})'
+    
+class Admin(Base):
+    __tablename__ = 'admin'
+    
+    user_id: Mapped[int] = mapped_column(ForeignKey('user.id'), primary_key=True)
+    user: Mapped['User'] = relationship(back_populates='admin')
+    posts: Mapped[List['Post']] = relationship(back_populates='user', cascade='all, delete')
+
+class Post(Base):
+    __tablename__ = 'post'
+    
+    uuid: Mapped[UUID] = mapped_column(primary_key=True)
+    from_user_id: Mapped[int] = mapped_column(ForeignKey('admin.user_id'))
+    user: Mapped['Admin'] = relationship(back_populates='posts')
+    text: Mapped[str]
+    images: Mapped[str]
+    
+if __name__ == '__main__':
+    Base.metadata.create_all(engine)

handlers/middlewares/user.py

@@ -2,6 +2,9 @@ from typing import Any, Awaitable, Callable, Dict
 
 from aiogram import BaseMiddleware
 from aiogram.types import Message
+from sqlalchemy.orm import Session
+
+from db.data import User, engine
 
 ADMIN_LIST = [248770879, 395543883]
 
@@ -10,7 +13,12 @@ class AdminMiddleware(BaseMiddleware):
         pass
     
     async def __call__(self, handler: Callable[[Message, Dict[str, Any]], Awaitable[Any]], event: Message, data: Dict[str, Any]) -> Any:
-        if event.from_user.id in ADMIN_LIST:
+        with Session(engine) as session:
+                if not session.get(User, event.from_user.id):
+                    user = User(id=event.from_user.id, user_name=event.from_user.username)
+                    session.add(user)
+                    session.commit()
+        if event.from_user.id not in ADMIN_LIST:
             await event.answer('Команда только для админов!')
             return None
         return await handler(event, data)

requirements.txt

@@ -1,3 +1,4 @@
 aiogram==3.1.1
 aioschedule @ https://github.com/AleksHeller/python-aioschedule/archive/refs/heads/master.zip
 python-dotenv==1.0.0
+SQLAlchemy==2.0.22