Merge pull request #5 from LEv145/dev

v 0.2.1

dockers/production/docker-compose.yml → docker_composes/production.yml

@@ -2,19 +2,20 @@ version: "3.9"
 
 services:
     discoboltalka:
-        build: ../..
+        build: ..
+        image: lev145/discoboltalka
         depends_on:
             - postgresql
         volumes:
-            - ../../work_dir/config.toml:/usr/app/config.toml
+            - ../work_dir/production/config.toml:/usr/app/config.toml
+        restart: unless-stopped
 
     postgresql:
         image: postgres:14
         environment:
             POSTGRES_DB: "discoboltalka"
             POSTGRES_USER: "discoboltalka_user"
             POSTGRES_PASSWORD: "A4VJ4G1mbwKH"
-        ports:
-            - "5432:5432"
         volumes:
-            - ../../work_dir/postgresql_data:/var/lib/postgresql/data
+            - ../work_dir/production/postgresql_data:/var/lib/postgresql/data
+        restart: unless-stopped

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "discoboltalka"
-version = "0.2.0"
+version = "0.2.1"
 description = "Discord bot for 'Demo Болталка'"
 authors = ["lev"]
 license = "MIT"
@@ -13,7 +13,6 @@ aiohttp = "^3.8.1"
 SQLAlchemy = "^1.4.36"
 asyncpg = "^0.25.0"
 sqlalchemy2-stubs = "^0.0.2-alpha.22"
-injector = "^0.19.0"
 
 [tool.poetry.dev-dependencies]
 mkinit = "^0.3.4"

src/discoboltalka/api/__init__.py

@@ -1,6 +1,3 @@
-from .abstract_repositories import (
-    AbstractDialogRepository,
-)
 from .adapters import (
     ErrorEmbed,
     context_table,
@@ -16,17 +13,18 @@
     ClientResponseError,
     ValidationError,
 )
-from .repositories import (
-    DialogRepository,
+from .query_apis import (
+    ABCDialogQueryAPI,
+    DialogQueryAPI,
 )
 
 __all__ = [
+    "ABCDialogQueryAPI",
     "APIError",
-    "AbstractDialogRepository",
     "BoltalkaAPI",
     "BoltalkaEvents",
     "ClientResponseError",
-    "DialogRepository",
+    "DialogQueryAPI",
     "ErrorEmbed",
     "ValidationError",
     "context_table",

src/discoboltalka/api/events/__init__.py

@@ -1,4 +1,4 @@
-from .boltalka_events import (
+from .boltalka import (
     BoltalkaEvents,
 )
 

src/discoboltalka/api/events/boltalka_events.py → src/discoboltalka/api/events/boltalka.py

@@ -13,7 +13,7 @@
     ClientResponseError,
 )
 from ..adapters.embeds import ErrorEmbed
-from ..abstract_repositories import AbstractDialogRepository
+from ..query_apis import ABCDialogQueryAPI
 
 
 _logger = logging.getLogger(__name__)
@@ -23,7 +23,7 @@ class BoltalkaEvents():
     def __init__(
         self,
         boltalka_api: BoltalkaAPI,
-        dialog_repository: AbstractDialogRepository,
+        dialog_repository: ABCDialogQueryAPI,
         channels_for_conversation: list | None = None,
     ) -> None:
         self._boltalka_api = boltalka_api

src/discoboltalka/api/query_apis/__init__.py

@@ -0,0 +1,8 @@
+from .abc import (
+    ABCDialogQueryAPI,
+)
+from .impl import (
+    DialogQueryAPI,
+)
+
+__all__ = ["ABCDialogQueryAPI", "DialogQueryAPI"]

src/discoboltalka/api/query_apis/abc/__init__.py

@@ -0,0 +1,5 @@
+from .dialog import (
+    ABCDialogQueryAPI,
+)
+
+__all__ = ["ABCDialogQueryAPI"]

src/discoboltalka/api/abstract_repositories/abstract_dialog_repository.py → src/discoboltalka/api/query_apis/abc/dialog.py

@@ -1,7 +1,7 @@
 import abc
 
 
-class AbstractDialogRepository(abc.ABC):
+class ABCDialogQueryAPI(abc.ABC):
     @abc.abstractmethod
     async def get_last_contexts(self, user_id: int) -> list[str]:
         pass

src/discoboltalka/api/query_apis/impl/__init__.py

@@ -0,0 +1,5 @@
+from .dialog import (
+    DialogQueryAPI,
+)
+
+__all__ = ["DialogQueryAPI"]

src/discoboltalka/api/repositories/dialog_repository.py → src/discoboltalka/api/query_apis/impl/dialog.py

@@ -6,8 +6,8 @@
 from sqlalchemy.sql import select
 from sqlalchemy.dialects.postgresql import insert
 
-from ..adapters import dialog_table, context_table
-from ..abstract_repositories import AbstractDialogRepository
+from ..abc import ABCDialogQueryAPI
+from ...adapters import dialog_table, context_table
 
 
 if t.TYPE_CHECKING:
@@ -18,7 +18,7 @@
     insert = Insert
 
 
-class DialogRepository(AbstractDialogRepository):
+class DialogQueryAPI(ABCDialogQueryAPI):
     def __init__(
         self,
         session: AsyncSession,

src/discoboltalka/application/logic.py

@@ -7,7 +7,7 @@
 from discoboltalka.api import (
     BoltalkaAPI,
     BoltalkaEvents,
-    DialogRepository,
+    DialogQueryAPI,
 )
 
 from .providers import (
@@ -33,7 +33,7 @@ async def async_main() -> None:
     message_event_config = config.message_event_config
     boltalka_event = BoltalkaEvents(
         boltalka_api=boltalka_api,
-        dialog_repository=DialogRepository(session=postgres_session),
+        dialog_repository=DialogQueryAPI(session=postgres_session),
         channels_for_conversation=message_event_config.channels_for_conversation,
     )
 

tests/discoboltalka/api/test_database.py

@@ -5,7 +5,7 @@
 from sqlalchemy.sql import select, insert
 
 from discoboltalka.api.adapters.orm import sqlalchemy_metadata
-from discoboltalka.api.repositories.dialog_repository import (
+from discoboltalka.api.query_apis.impl.dialog_repository import (
     context_table,
     dialog_table,
     DialogRepository,