changes

Author: petrCher

Makefile

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 configure: venv
-	source ./venv/bin/activate && pip install -r requirements.txt -r requirements.dev.txt
+	source ./venv/bin/activate && pip install --force-reinstall -r requirements.txt -r requirements.dev.txt
 
 venv:
 	python3.11 -m venv venv

migrations/env.py

@@ -1,81 +1,48 @@
+import asyncio
+import asyncio
 from logging.config import fileConfig
-
+ 
 from alembic import context
-from sqlalchemy import engine_from_config, pool
-
+from sqlalchemy import pool
+from sqlalchemy.ext.asyncio import async_engine_from_config
+ 
 from src.models.base import BaseDbModel
 from src.settings import get_settings
-
-
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
+ 
 config = context.config
 settings = get_settings()
-
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
+config.set_main_option('sqlalchemy.url', str(settings.DB_DSN))
+ 
 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 = BaseDbModel.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.
-
-
-def run_migrations_offline():
-    """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 = config.get_main_option("sqlalchemy.url")
-    context.configure(
-        url=url,
-        target_metadata=target_metadata,
-        literal_binds=True,
-        dialect_opts={"paramstyle": "named"},
-    )
-
+ 
+def run_migrations_offline() -> None:
+    url = config.get_main_option('sqlalchemy.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():
-    """Run migrations in 'online' mode.
-
-    In this scenario we need to create an Engine
-    and associate a connection with the context.
-
-    """
-    configuration = config.get_section(config.config_ini_section)
+ 
+def do_run_migrations(connection):
+    context.configure(connection=connection, target_metadata=target_metadata)
+    with context.begin_transaction():
+        context.run_migrations()
+ 
+async def run_async_migrations() -> None:
+    configuration = config.get_section(config.config_ini_section, {})
     configuration['sqlalchemy.url'] = str(settings.DB_DSN)
-    connectable = engine_from_config(
-        configuration,
-        prefix="sqlalchemy.",
-        poolclass=pool.NullPool,
-    )
-
-    with connectable.connect() as connection:
-        context.configure(connection=connection, target_metadata=target_metadata)
-
-        with context.begin_transaction():
-            context.run_migrations()
-
-
+    connectable = async_engine_from_config(
+        configuration, prefix='sqlalchemy.', poolclass=pool.NullPool)
+    async with connectable.connect() as connection:
+        await connection.run_sync(do_run_migrations)
+    await connectable.dispose()
+ 
+def run_migrations_online() -> None:
+    asyncio.run(run_async_migrations())
+ 
 if context.is_offline_mode():
     run_migrations_offline()
 else:
-    run_migrations_online()
+    run_migrations_online()

src/handlers/__init__.py

@@ -3,9 +3,9 @@
 from src.handlers import registration, admin, menu, text
 
 def setup_routers() -> Router:
-    root=Router
-    root.include_router(admin.router)
+    root=Router()
+    #root.include_router(admin.router)
     root.include_router(registration.router)
-    root.include_router(menu.router)
+    #root.include_router(menu.router)
     root.include_router(text.router)
     return root

src/handlers/registration.py

@@ -17,9 +17,8 @@ async def cmd_start(message: Message, state: FSMContext, session: AsyncSession)-
     user_id=message.from_user.id
     username=message.from_user.username
 
-    existing = await session.execute(
-        select(Users).where(Users.tg_id==user_id)
-    )
+    existing = Users.query(session=session).filter(Users.tg_id == user_id).one_or_none()
+    
     user=existing.scalar_one_or_none()
     if user:
         await message.answer(