maleo-database 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

maleo/database/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/config/additional.py

@@ -3,21 +3,7 @@ from typing import Optional, TypeVar, Union
 from maleo.enums.cache import Origin, Layer
 from maleo.enums.expiration import Expiration
 from maleo.types.base.string import OptionalString
-
-
-class RedisCacheNamespaces(BaseModel):
-    base: str = Field(..., description="Base Redis's namespace")
-
-    def create(
-        self,
-        *ext: str,
-        origin: Origin,
-        layer: Layer,
-        base_override: OptionalString = None,
-    ) -> str:
-        return ":".join(
-            [self.base if base_override is None else base_override, origin, layer, *ext]
-        )
+from maleo.utils.cache import build_namespace as build_namespace_utils
 
 
 class BaseAdditionalConfig(BaseModel):
@@ -31,6 +17,18 @@ class RedisAdditionalConfig(BaseAdditionalConfig):
     ttl: Union[float, int] = Field(
         Expiration.EXP_15MN.value, description="Time to live"
     )
-    namespaces: RedisCacheNamespaces = Field(
-        ..., description="Redis cache's namepsaces"
-    )
+    base_namespace: str = Field(..., description="Base namespace")
+
+    def build_namespace(
+        self,
+        *ext: str,
+        base: OptionalString = None,
+        client: OptionalString = None,
+        origin: Origin,
+        layer: Layer,
+        sep: str = ":",
+    ) -> str:
+        base = base or self.base_namespace
+        return build_namespace_utils(
+            *ext, base=base, client=client, origin=origin, layer=layer, sep=sep
+        )

maleo/database/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/managers/client.py

@@ -3,11 +3,12 @@ from motor.motor_asyncio import AsyncIOMotorClient
 from pymongo import MongoClient
 from redis.asyncio import Redis as AsyncRedis
 from redis import Redis as SyncRedis
-from typing import Generic, Literal, Tuple, TypeVar, Union, overload
+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
@@ -59,19 +60,39 @@ 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]):
-    pass
+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]
+
+        if isinstance(prefixes, str):
+            prefixes = [prefixes]
+
+        for prefix in prefixes:
+            async for key in self._async_client.scan_iter(f"{prefix}*"):
+                await self._async_client.delete(key)
+
+    def sync_clear(self, prefixes: Optional[Union[ListOfStrings, str]] = None):
+        if prefixes is None:
+            prefixes = [self._config.additional.base_namespace]
+
+        if isinstance(prefixes, str):
+            prefixes = [prefixes]
+
+        for prefix in prefixes:
+            for key in self._sync_client.scan_iter(f"{prefix}*"):
+                self._sync_client.delete(key)
 
 
 ClientManagerT = TypeVar(

maleo/database/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
 
 

{maleo_database-0.0.9.dist-info → maleo_database-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-database
-Version: 0.0.9
+Version: 0.0.11
 Summary: Database package for MaleoSuite
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -44,16 +44,16 @@ 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.13
+Requires-Dist: maleo-dtos>=0.0.16
 Requires-Dist: maleo-enums>=0.0.6
-Requires-Dist: maleo-exceptions>=0.0.15
-Requires-Dist: maleo-logging>=0.0.6
+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.17
+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
-Requires-Dist: maleo-utils>=0.0.4
+Requires-Dist: maleo-utils>=0.0.5
 Requires-Dist: motor>=3.7.1
 Requires-Dist: mypy_extensions>=1.1.0
 Requires-Dist: nodeenv>=1.9.1

{maleo_database-0.0.9.dist-info → maleo_database-0.0.11.dist-info}/RECORD

@@ -1,14 +1,14 @@
 maleo/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/database/dtos.py,sha256=DArPtSXzPJd896i-t4OmoqBP1mW-it8NVxvfWq7wq8Y,220
 maleo/database/enums.py,sha256=vUPlePELTC30el9rUglQpc7ZYBVMKp3SiRHCZre9oQE,1693
-maleo/database/config/__init__.py,sha256=6OK2FPbBiZdaEqhQ_Uu8g3h0jfwOvtwjoU8jZVdR70c,8607
-maleo/database/config/additional.py,sha256=kCamg5Z_FfbZBq_06QwGOjee8wOrL1wTIVlO60xNqWU,1060
+maleo/database/config/__init__.py,sha256=4ReeRmScxTgZ2622oJXhPBAzlDUJKrAYxCoX08T-OhQ,8677
+maleo/database/config/additional.py,sha256=8uTEQDoKjAlXif-1njKuicIT07H_slTWr9pE0OENAU0,1098
 maleo/database/config/connection.py,sha256=oMHIaom9PsGW0BpXW90bhuoFLNPsgQU4Fb8BateYjR4,22903
 maleo/database/config/identifier.py,sha256=b1MjhoKl3h7xJe1eVIj1wjvYH9BrjHzKnjzdjaEaTeQ,626
 maleo/database/config/pooling.py,sha256=Ms_7HjTrYathov2ef91L2rL7Ldgpr1p-7Fqg-1hv7m4,11556
-maleo/database/managers/__init__.py,sha256=-rGAmqpPoNLaWeW7jEnINl7Dh3SbSu79PFNeifTvdHI,13710
-maleo/database/managers/client.py,sha256=7C3PvOmWVvKJJdC81XK7q9pL9ZnvE02LRET46TR3Ojo,2272
-maleo/database/managers/engine.py,sha256=OYXxDhldbSevXDqod9joqXWaYgQ-NgF4YKPfUR5o9rM,1789
+maleo/database/managers/__init__.py,sha256=8gXorOSWy8YxCWj3rS0PETvmcfMS4N-8ugeGLFElHr4,13592
+maleo/database/managers/client.py,sha256=uUnXyOvm3X9V6vz1H8dR78cOpgM8DkZNaQC2aKAc2Sw,3079
+maleo/database/managers/engine.py,sha256=aF7JCjSYujodbn2QQrT_OeLX-WjUdIv5cBgWtvLgHI0,1725
 maleo/database/managers/session.py,sha256=QCyw1Um0xTmEGCHxX3kQ6z7Q_L2TT8Eq3_8NcpKIsxE,19000
 maleo/database/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/database/orm/base.py,sha256=qdRK_TQqDoZ1hANvm1mJDiblqFr77J1IhBnlENr7RK8,229
@@ -19,8 +19,8 @@ maleo/database/orm/models/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 maleo/database/orm/models/mixins/identifier.py,sha256=jICVsLUFw_f7TV_aX4KTTs_ycH35MRtRj5boTqctmZo,425
 maleo/database/orm/models/mixins/status.py,sha256=Jzithn-Hl2ct1AqboGZSXrA35aaQEDvqtaB8oL7KIyo,376
 maleo/database/orm/models/mixins/timestamp.py,sha256=TWqBTBvgSxcPsK0m7ggVrkHqzlqCM-2Zox7TAwCxd0I,1500
-maleo_database-0.0.9.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
-maleo_database-0.0.9.dist-info/METADATA,sha256=Q4z2ym27XApDkrDUBtG14dcIDYyunJYe1qVbm1FKZh8,3836
-maleo_database-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_database-0.0.9.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
-maleo_database-0.0.9.dist-info/RECORD,,
+maleo_database-0.0.11.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
+maleo_database-0.0.11.dist-info/METADATA,sha256=GXvfEMFO40BEclJarNFIoIRjyHhfGBN63z3rPkjxsoc,3837
+maleo_database-0.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_database-0.0.11.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
+maleo_database-0.0.11.dist-info/RECORD,,