maleo-database 0.0.10__tar.gz → 0.0.11__tar.gz

{maleo_database-0.0.10 → maleo_database-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-database
-Version: 0.0.10
+Version: 0.0.11
 Summary: Database package for MaleoSuite
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -44,12 +44,12 @@ Requires-Dist: identify>=2.6.13
 Requires-Dist: idna>=3.10
 Requires-Dist: importlib_metadata>=8.7.0
 Requires-Dist: maleo-constants>=0.0.6
-Requires-Dist: maleo-dtos>=0.0.15
+Requires-Dist: maleo-dtos>=0.0.16
 Requires-Dist: maleo-enums>=0.0.6
-Requires-Dist: maleo-exceptions>=0.0.16
+Requires-Dist: maleo-exceptions>=0.0.17
 Requires-Dist: maleo-logging>=0.0.7
 Requires-Dist: maleo-mixins>=0.0.13
-Requires-Dist: maleo-schemas>=0.0.18
+Requires-Dist: maleo-schemas>=0.0.19
 Requires-Dist: maleo-types-base>=0.0.2
 Requires-Dist: maleo-types-controllers>=0.0.1
 Requires-Dist: maleo-types-enums>=0.0.4

{maleo_database-0.0.10 → maleo_database-0.0.11}/maleo_database.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-database
-Version: 0.0.10
+Version: 0.0.11
 Summary: Database package for MaleoSuite
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -44,12 +44,12 @@ Requires-Dist: identify>=2.6.13
 Requires-Dist: idna>=3.10
 Requires-Dist: importlib_metadata>=8.7.0
 Requires-Dist: maleo-constants>=0.0.6
-Requires-Dist: maleo-dtos>=0.0.15
+Requires-Dist: maleo-dtos>=0.0.16
 Requires-Dist: maleo-enums>=0.0.6
-Requires-Dist: maleo-exceptions>=0.0.16
+Requires-Dist: maleo-exceptions>=0.0.17
 Requires-Dist: maleo-logging>=0.0.7
 Requires-Dist: maleo-mixins>=0.0.13
-Requires-Dist: maleo-schemas>=0.0.18
+Requires-Dist: maleo-schemas>=0.0.19
 Requires-Dist: maleo-types-base>=0.0.2
 Requires-Dist: maleo-types-controllers>=0.0.1
 Requires-Dist: maleo-types-enums>=0.0.4

{maleo_database-0.0.10 → maleo_database-0.0.11}/maleo_database.egg-info/requires.txt

@@ -35,12 +35,12 @@ identify>=2.6.13
 idna>=3.10
 importlib_metadata>=8.7.0
 maleo-constants>=0.0.6
-maleo-dtos>=0.0.15
+maleo-dtos>=0.0.16
 maleo-enums>=0.0.6
-maleo-exceptions>=0.0.16
+maleo-exceptions>=0.0.17
 maleo-logging>=0.0.7
 maleo-mixins>=0.0.13
-maleo-schemas>=0.0.18
+maleo-schemas>=0.0.19
 maleo-types-base>=0.0.2
 maleo-types-controllers>=0.0.1
 maleo-types-enums>=0.0.4

{maleo_database-0.0.10 → maleo_database-0.0.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo-database"
-version = "0.0.10"
+version = "0.0.11"
 description = "Database package for MaleoSuite"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }
@@ -50,12 +50,12 @@ dependencies = [
     "idna>=3.10",
     "importlib_metadata>=8.7.0",
     "maleo-constants>=0.0.6",
-    "maleo-dtos>=0.0.15",
+    "maleo-dtos>=0.0.16",
     "maleo-enums>=0.0.6",
-    "maleo-exceptions>=0.0.16",
+    "maleo-exceptions>=0.0.17",
     "maleo-logging>=0.0.7",
     "maleo-mixins>=0.0.13",
-    "maleo-schemas>=0.0.18",
+    "maleo-schemas>=0.0.19",
     "maleo-types-base>=0.0.2",
     "maleo-types-controllers>=0.0.1",
     "maleo-types-enums>=0.0.4",

{maleo_database-0.0.10 → maleo_database-0.0.11}/src/config/__init__.py

@@ -33,7 +33,7 @@ from .pooling import (
 )
 
 
-class BaseDatabaseConfig(
+class BaseConfig(
     BaseModel, Generic[ConnectionConfigT, PoolingConfigT, AdditionalConfigT]
 ):
     """Base configuration for database."""
@@ -44,8 +44,8 @@ class BaseDatabaseConfig(
     additional: AdditionalConfigT = Field(..., description="Additional config")
 
 
-class MySQLDatabaseConfig(
-    BaseDatabaseConfig[
+class MySQLConfig(
+    BaseConfig[
         MySQLConnectionConfig,
         MySQLPoolingConfig,
         None,
@@ -72,8 +72,8 @@ class MySQLDatabaseConfig(
             return create_sync_engine(url, **self.engine_kwargs)
 
 
-class PostgreSQLDatabaseConfig(
-    BaseDatabaseConfig[
+class PostgreSQLConfig(
+    BaseConfig[
         PostgreSQLConnectionConfig,
         PostgreSQLPoolingConfig,
         None,
@@ -100,8 +100,8 @@ class PostgreSQLDatabaseConfig(
             return create_sync_engine(url, **self.engine_kwargs)
 
 
-class SQLiteDatabaseConfig(
-    BaseDatabaseConfig[
+class SQLiteConfig(
+    BaseConfig[
         SQLiteConnectionConfig,
         SQLitePoolingConfig,
         None,
@@ -128,8 +128,8 @@ class SQLiteDatabaseConfig(
             return create_sync_engine(url, **self.engine_kwargs)
 
 
-class SQLServerDatabaseConfig(
-    BaseDatabaseConfig[
+class SQLServerConfig(
+    BaseConfig[
         SQLServerConnectionConfig,
         SQLServerPoolingConfig,
         None,
@@ -158,15 +158,15 @@ class SQLServerDatabaseConfig(
 
 SQLConfigT = TypeVar(
     "SQLConfigT",
-    PostgreSQLDatabaseConfig,
-    MySQLDatabaseConfig,
-    SQLiteDatabaseConfig,
-    SQLServerDatabaseConfig,
+    PostgreSQLConfig,
+    MySQLConfig,
+    SQLiteConfig,
+    SQLServerConfig,
 )
 
 
-class ElasticsearchDatabaseConfig(
-    BaseDatabaseConfig[
+class ElasticsearchConfig(
+    BaseConfig[
         ElasticsearchConnectionConfig,
         ElasticsearchPoolingConfig,
         None,
@@ -204,8 +204,8 @@ class ElasticsearchDatabaseConfig(
             return Elasticsearch(hosts, **self.client_kwargs)
 
 
-class MongoDBDatabaseConfig(
-    BaseDatabaseConfig[
+class MongoDBConfig(
+    BaseConfig[
         MongoDBConnectionConfig,
         MongoDBPoolingConfig,
         None,
@@ -233,8 +233,8 @@ class MongoDBDatabaseConfig(
             return MongoClient(url, **self.client_kwargs)
 
 
-class RedisDatabaseConfig(
-    BaseDatabaseConfig[
+class RedisConfig(
+    BaseConfig[
         RedisConnectionConfig,
         RedisPoolingConfig,
         RedisAdditionalConfig,
@@ -260,19 +260,31 @@ class RedisDatabaseConfig(
 
 NoSQLConfigT = TypeVar(
     "NoSQLConfigT",
-    ElasticsearchDatabaseConfig,
-    MongoDBDatabaseConfig,
-    RedisDatabaseConfig,
+    ElasticsearchConfig,
+    MongoDBConfig,
+    RedisConfig,
 )
 
 
-ConfigT = TypeVar(
-    "ConfigT",
-    PostgreSQLDatabaseConfig,
-    MySQLDatabaseConfig,
-    SQLiteDatabaseConfig,
-    SQLServerDatabaseConfig,
-    MongoDBDatabaseConfig,
-    RedisDatabaseConfig,
-    ElasticsearchDatabaseConfig,
+DatabaseConfigT = TypeVar(
+    "DatabaseConfigT",
+    PostgreSQLConfig,
+    MySQLConfig,
+    SQLiteConfig,
+    SQLServerConfig,
+    MongoDBConfig,
+    RedisConfig,
+    ElasticsearchConfig,
 )
+
+
+# * This class is left empty to be overridden in the future when defining configuration
+class Config(BaseModel):
+    pass
+
+
+ConfigT = TypeVar("ConfigT", bound=Config)
+
+
+class ConfigMixin(BaseModel, Generic[ConfigT]):
+    database: ConfigT = Field(..., description="Databases config")

{maleo_database-0.0.10 → maleo_database-0.0.11}/src/managers/__init__.py

@@ -31,14 +31,14 @@ from maleo.schemas.operation.system import (
 from maleo.schemas.response import NoDataResponse
 from maleo.types.base.uuid import OptionalUUID
 from ..config import (
-    MySQLDatabaseConfig,
-    PostgreSQLDatabaseConfig,
-    SQLiteDatabaseConfig,
-    SQLServerDatabaseConfig,
+    MySQLConfig,
+    PostgreSQLConfig,
+    SQLiteConfig,
+    SQLServerConfig,
     SQLConfigT,
-    ElasticsearchDatabaseConfig,
-    MongoDBDatabaseConfig,
-    RedisDatabaseConfig,
+    ElasticsearchConfig,
+    MongoDBConfig,
+    RedisConfig,
     NoSQLConfigT,
     ConfigT,
 )
@@ -251,19 +251,19 @@ class SQLDatabaseManager(DatabaseManager[SQLConfigT], Generic[SQLConfigT]):
         await self._engine_manager.dispose()
 
 
-class MySQLDatabaseManager(SQLDatabaseManager[MySQLDatabaseConfig]):
+class MySQLDatabaseManager(SQLDatabaseManager[MySQLConfig]):
     pass
 
 
-class PostgreSQLDatabaseManager(SQLDatabaseManager[PostgreSQLDatabaseConfig]):
+class PostgreSQLDatabaseManager(SQLDatabaseManager[PostgreSQLConfig]):
     pass
 
 
-class SQLiteDatabaseManager(SQLDatabaseManager[SQLiteDatabaseConfig]):
+class SQLiteDatabaseManager(SQLDatabaseManager[SQLiteConfig]):
     pass
 
 
-class SQLServerDatabaseManager(SQLDatabaseManager[SQLServerDatabaseConfig]):
+class SQLServerDatabaseManager(SQLDatabaseManager[SQLServerConfig]):
     pass
 
 
@@ -361,20 +361,18 @@ class NoSQLDatabaseManager(
 
 
 class ElasticsearchDatabaseManager(
-    NoSQLDatabaseManager[ElasticsearchDatabaseConfig, AsyncElasticsearch, Elasticsearch]
+    NoSQLDatabaseManager[ElasticsearchConfig, AsyncElasticsearch, Elasticsearch]
 ):
     pass
 
 
 class MongoDBDatabaseManager(
-    NoSQLDatabaseManager[MongoDBDatabaseConfig, AsyncIOMotorClient, MongoClient]
+    NoSQLDatabaseManager[MongoDBConfig, AsyncIOMotorClient, MongoClient]
 ):
     pass
 
 
-class RedisDatabaseManager(
-    NoSQLDatabaseManager[RedisDatabaseConfig, AsyncRedis, SyncRedis]
-):
+class RedisDatabaseManager(NoSQLDatabaseManager[RedisConfig, AsyncRedis, SyncRedis]):
     pass
 
 

{maleo_database-0.0.10 → maleo_database-0.0.11}/src/managers/client.py

@@ -6,9 +6,9 @@ from redis import Redis as SyncRedis
 from typing import Generic, Literal, Optional, Tuple, TypeVar, Union, overload
 from maleo.types.base.string import ListOfStrings
 from ..config import (
-    ElasticsearchDatabaseConfig,
-    MongoDBDatabaseConfig,
-    RedisDatabaseConfig,
+    ElasticsearchConfig,
+    MongoDBConfig,
+    RedisConfig,
     NoSQLConfigT,
 )
 from ..enums import Connection
@@ -60,18 +60,18 @@ class ClientManager(
 
 
 class ElasticsearchClientManager(
-    ClientManager[ElasticsearchDatabaseConfig, AsyncElasticsearch, Elasticsearch]
+    ClientManager[ElasticsearchConfig, AsyncElasticsearch, Elasticsearch]
 ):
     pass
 
 
 class MongoDBClientManager(
-    ClientManager[MongoDBDatabaseConfig, AsyncIOMotorClient, MongoClient]
+    ClientManager[MongoDBConfig, AsyncIOMotorClient, MongoClient]
 ):
     pass
 
 
-class RedisClientManager(ClientManager[RedisDatabaseConfig, AsyncRedis, SyncRedis]):
+class RedisClientManager(ClientManager[RedisConfig, AsyncRedis, SyncRedis]):
     async def async_clear(self, prefixes: Optional[Union[ListOfStrings, str]] = None):
         if prefixes is None:
             prefixes = [self._config.additional.base_namespace]

{maleo_database-0.0.10 → maleo_database-0.0.11}/src/managers/engine.py

@@ -2,10 +2,10 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.ext.asyncio import AsyncEngine
 from typing import Generic, Literal, Tuple, TypeVar, Union, overload
 from ..config import (
-    MySQLDatabaseConfig,
-    PostgreSQLDatabaseConfig,
-    SQLiteDatabaseConfig,
-    SQLServerDatabaseConfig,
+    MySQLConfig,
+    PostgreSQLConfig,
+    SQLiteConfig,
+    SQLServerConfig,
     SQLConfigT,
 )
 from ..enums import Connection
@@ -39,19 +39,19 @@ class EngineManager(Generic[SQLConfigT]):
         self._sync_engine.dispose()
 
 
-class MySQLEngineManager(EngineManager[MySQLDatabaseConfig]):
+class MySQLEngineManager(EngineManager[MySQLConfig]):
     pass
 
 
-class PostgreSQLEngineManager(EngineManager[PostgreSQLDatabaseConfig]):
+class PostgreSQLEngineManager(EngineManager[PostgreSQLConfig]):
     pass
 
 
-class SQLiteEngineManager(EngineManager[SQLiteDatabaseConfig]):
+class SQLiteEngineManager(EngineManager[SQLiteConfig]):
     pass
 
 
-class SQLServerEngineManager(EngineManager[SQLServerDatabaseConfig]):
+class SQLServerEngineManager(EngineManager[SQLServerConfig]):
     pass