mmisp-lib 0.8.0__tar.gz → 0.8.1__tar.gz

{mmisp_lib-0.8.0 → mmisp_lib-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mmisp-lib
-Version: 0.8.0
+Version: 0.8.1
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE

{mmisp_lib-0.8.0 → mmisp_lib-0.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mmisp-lib"
-version = "0.8.0"
+version = "0.8.1"
 description = ""
 authors = []
 readme = "README.md"

{mmisp_lib-0.8.0 → mmisp_lib-0.8.1}/src/mmisp/db/config.py

@@ -10,33 +10,38 @@ The following environment variables are supported:
 """
 
 import logging
-from dataclasses import dataclass
 from os import getenv
 
 from dotenv import load_dotenv
+from pydantic import BaseSettings, Field, root_validator
 
 
-@dataclass
-class DatabaseConfig:
-    DATABASE_URL: str
-    DEBUG: bool
-    RETRY_SLEEP: int
-    MAX_RETRIES: int
+class DatabaseConfig(BaseSettings):
+    DATABASE_URL: str | None = None
+    DEBUG: bool = False
+    RETRY_SLEEP: int = Field(5, env="DB_RETRY")
+    MAX_RETRIES: int = Field(100, env="DB_MAX_RETRIES")
+    CONNECTION_INIT: bool = True
     DB_LOGLEVEL: str | None = None
 
+    @root_validator(skip_on_failure=True)
+    def require_db_url_or_no_connection(cls: "DatabaseConfig", values: dict) -> dict:
+        db_url = values.get("DATABASE_URL")
+        connection_init = values.get("CONNECTION_INIT")
+        if db_url is None and connection_init:
+            raise ValueError("Environment variable DATABASE_URL is required when CONNECTION_INIT is not False")
+
+        return values
+
 
 load_dotenv(getenv("ENV_FILE", ".env"))
 
 
-config: DatabaseConfig = DatabaseConfig(
-    DATABASE_URL=getenv("DATABASE_URL", ""),
-    DEBUG=bool(getenv("DEBUG", False)),
-    RETRY_SLEEP=int(getenv("DB_RETRY", 5)),
-    MAX_RETRIES=int(getenv("DB_MAX_RETRIES", 100)),
-    DB_LOGLEVEL=getenv("DB_LOGLEVEL", None),
-)
+config: DatabaseConfig = DatabaseConfig()
+
 sqlalchemy_logger = logging.getLogger("sqlalchemy.engine")
 sqlalchemy_logger.setLevel(logging.WARNING)
+
 if config.DEBUG:
     sqlalchemy_logger.setLevel(logging.INFO)
 

{mmisp_lib-0.8.0 → mmisp_lib-0.8.1}/src/mmisp/db/database.py

@@ -114,4 +114,6 @@ async def create_all_models() -> None:
     await sessionmanager.create_all()
 
 
-sessionmanager = DatabaseSessionManager()
+sessionmanager = None
+if config.CONNECTION_INIT:
+    sessionmanager = DatabaseSessionManager()

{mmisp_lib-0.8.0 → mmisp_lib-0.8.1}/src/mmisp_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mmisp-lib
-Version: 0.8.0
+Version: 0.8.1
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE