chore(backend): update template to v0.6.0, conflicts left
This commit is contained in:
1 parent
e67dbdb325
commit
8eb31ed4d3
12 files changed
+109
-21
No files matched your search
@@ -3,4 +3,8 @@ from dishka import make_async_container
|
||||
from dependencies.providers.postgres import DbProvider
|
||||
from dependencies.providers.storage import StorageProvider
|
||||
|
||||
<<<<<<< before updating
|
||||
container = make_async_container(DbProvider(), StorageProvider())
|
||||
=======
|
||||
container = make_async_container(DbProvider(), RepositoryProvider())
|
||||
>>>>>>> after updating
|
||||
@@ -1,3 +1,6 @@
|
||||
<<<<<<< before updating
|
||||
from userbot.modules.client import DEVICE_MODEL, DEVICE_MODEL_LIMIT, PyroClient
|
||||
|
||||
__all__ = ["DEVICE_MODEL", "DEVICE_MODEL_LIMIT", "PyroClient"]
|
||||
=======
|
||||
>>>>>>> after updating
|
||||
@@ -4,7 +4,27 @@ from pydantic import Field, SecretStr
|
||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
|
||||
|
||||
<<<<<<< before updating
|
||||
class DatabaseSettings(BaseSettings):
|
||||
=======
|
||||
def is_prod() -> bool:
|
||||
return os.getenv("RUN_ENVIRONMENT") == "prod"
|
||||
|
||||
|
||||
class Section(BaseSettings):
|
||||
model_config = SettingsConfigDict(extra="ignore")
|
||||
|
||||
|
||||
class LogSettings(Section):
|
||||
level: str = "INFO"
|
||||
level_external: str = "WARNING"
|
||||
show_time: bool = False
|
||||
show_locals: bool = False
|
||||
console_width: int = 150
|
||||
|
||||
|
||||
class DatabaseSettings(Section):
|
||||
>>>>>>> after updating
|
||||
host: str = "postgres"
|
||||
port: int = 5432
|
||||
user: str = "beavergram"
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import asyncio
|
||||
from importlib import import_module
|
||||
|
||||
|
||||
async def preload(module: str) -> None:
|
||||
await asyncio.to_thread(import_module, module)
|
||||
@@ -20,13 +20,13 @@ def setup_logging() -> None:
|
||||
markup=True,
|
||||
rich_tracebacks=True,
|
||||
enable_link_path=False,
|
||||
tracebacks_show_locals=True,
|
||||
tracebacks_show_locals=env.log.show_locals,
|
||||
omit_repeated_times=False,
|
||||
show_time=env.log.show_time,
|
||||
)
|
||||
],
|
||||
)
|
||||
install(console=console, show_locals=True)
|
||||
install(console=console, show_locals=env.log.show_locals)
|
||||
|
||||
|
||||
logger = logging.getLogger("beavergram")
|
||||
|
||||
Reference in new issue
Block a user