maleo-foundation 0.3.69__tar.gz → 0.3.71__tar.gz

{maleo_foundation-0.3.69 → maleo_foundation-0.3.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.3.69
+Version: 0.3.71
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.3.69 → maleo_foundation-0.3.71}/maleo_foundation/managers/configuration.py

@@ -1,5 +1,9 @@
 from pathlib import Path
+from typing import Optional
 from maleo_foundation.models.transfers.general.configurations import Configurations
+from maleo_foundation.models.transfers.general.configurations.pubsub.publisher import (
+    AdditionalTopicsConfigurations,
+)
 from maleo_foundation.models.transfers.general.settings import Settings
 from maleo_foundation.utils.loaders.yaml import YAMLLoader
 from .credential import CredentialManager
@@ -7,7 +11,10 @@ from .credential import CredentialManager
 
 class ConfigurationManager:
     def __init__(
-        self, settings: Settings, credential_manager: CredentialManager
+        self,
+        settings: Settings,
+        credential_manager: CredentialManager,
+        additional_topics_configurations: Optional[AdditionalTopicsConfigurations],
     ) -> None:
         self._settings = settings
         self._credential_manager = credential_manager
@@ -27,6 +34,9 @@ class ConfigurationManager:
         )
         data = YAMLLoader.load_from_string(secret_data)
         self._configurations = Configurations.model_validate(data)
+        self._configurations.pubsub.publisher.topics.additional = (
+            additional_topics_configurations
+        )
 
     @property
     def configurations(self) -> Configurations:

{maleo_foundation-0.3.69 → maleo_foundation-0.3.71}/maleo_foundation/managers/service.py

@@ -11,6 +11,9 @@ from typing import Optional
 from maleo_foundation.client.manager import MaleoFoundationClientManager
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
+from maleo_foundation.models.transfers.general.configurations.pubsub.publisher import (
+    AdditionalTopicsConfigurations,
+)
 from maleo_foundation.models.transfers.general.token import (
     MaleoFoundationTokenGeneralTransfers,
 )
@@ -49,6 +52,9 @@ class ServiceManager:
         db_metadata: MetaData,
         log_config: SimpleConfig,
         settings: Optional[Settings] = None,
+        additional_topics_configurations: Optional[
+            AdditionalTopicsConfigurations
+        ] = None,
     ):
         self._db_metadata = db_metadata  # * Declare DB Metadata
         self._log_config = log_config  # * Declare log config
@@ -67,7 +73,9 @@ class ServiceManager:
 
         # * Initialize Configuration Manager
         self._configuration_manager = ConfigurationManager(
-            settings=self._settings, credential_manager=self._credential_manager
+            settings=self._settings,
+            credential_manager=self._credential_manager,
+            additional_topics_configurations=additional_topics_configurations,
         )
 
         self._load_keys()

{maleo_foundation-0.3.69 → maleo_foundation-0.3.71}/maleo_foundation/models/schemas/general.py

@@ -139,12 +139,8 @@ class BaseGeneralSchemas:
 
     class DatabaseOperationResult(BaseModel):
         data_id: int = Field(..., ge=1, description="Data's ID")
-        old_data: BaseTypes.OptionalStringToAnyDict = Field(
-            None, description="Old data"
-        )
-        new_data: BaseTypes.OptionalStringToAnyDict = Field(
-            None, description="New data"
-        )
+        old_data: BaseTypes.OptionalAny = Field(None, description="Old data")
+        new_data: BaseTypes.OptionalAny = Field(None, description="New data")
 
         @model_validator(mode="after")
         def validate_data(self) -> Self:

maleo_foundation-0.3.71/maleo_foundation/models/transfers/general/configurations/pubsub/publisher.py

@@ -0,0 +1,52 @@
+from pydantic import BaseModel, ConfigDict, Field
+from typing import Optional
+
+
+class TopicConfigurations(BaseModel):
+    id: str = Field(..., description="Topic's id")
+
+
+DEFAULT_DATABASE_OPERATION_TOPIC_CONFIGURATIONS = TopicConfigurations(
+    id="database-operation"
+)
+
+DEFAULT_OPERATION_TOPIC_CONFIGURATIONS = TopicConfigurations(id="operation")
+
+
+class SingleTopicsConfigurations(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+
+class MandatoryTopicsConfigurations(SingleTopicsConfigurations):
+    database_operation: TopicConfigurations = Field(
+        default=DEFAULT_DATABASE_OPERATION_TOPIC_CONFIGURATIONS,
+        description="Database operation topic configurations",
+    )
+    operation: TopicConfigurations = Field(
+        default=DEFAULT_OPERATION_TOPIC_CONFIGURATIONS,
+        description="Operation topic configurations",
+    )
+
+
+class AdditionalTopicsConfigurations(SingleTopicsConfigurations):
+    pass
+
+
+class TopicsConfigurations(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    mandatory: MandatoryTopicsConfigurations = Field(
+        default_factory=MandatoryTopicsConfigurations,
+        description="Mandatory topics configurations",
+    )
+    additional: Optional[AdditionalTopicsConfigurations] = Field(
+        default=None, description="Additional topics configurations"
+    )
+
+
+class PublisherConfigurations(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    topics: TopicsConfigurations = Field(
+        default_factory=TopicsConfigurations, description="Topics configurations"
+    )

{maleo_foundation-0.3.69 → maleo_foundation-0.3.71}/maleo_foundation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.3.69
+Version: 0.3.71
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.3.69 → maleo_foundation-0.3.71}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.3.69"
+version = "0.3.71"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }

maleo_foundation-0.3.69/maleo_foundation/models/transfers/general/configurations/pubsub/publisher.py

@@ -1,38 +0,0 @@
-from pydantic import BaseModel, ConfigDict, Field
-from typing import Optional
-
-
-class TopicConfigurations(BaseModel):
-    id: str = Field(..., description="Topic's id")
-
-
-DEFAULT_DATABASE_ACCESS_TOPIC_CONFIGURATIONS = TopicConfigurations(id="database-access")
-
-DEFAULT_DATABASE_AUDIT_TOPIC_CONFIGURATIONS = TopicConfigurations(id="database-audit")
-
-DEFAULT_OPERATION_TOPIC_CONFIGURATIONS = TopicConfigurations(id="operation")
-
-
-class TopicsConfigurations(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    database_access: Optional[TopicConfigurations] = Field(
-        default=DEFAULT_DATABASE_ACCESS_TOPIC_CONFIGURATIONS,
-        description="Database access topic configurations",
-    )
-    database_audit: Optional[TopicConfigurations] = Field(
-        default=DEFAULT_DATABASE_AUDIT_TOPIC_CONFIGURATIONS,
-        description="Database audit topic configurations",
-    )
-    operation: Optional[TopicConfigurations] = Field(
-        default=DEFAULT_OPERATION_TOPIC_CONFIGURATIONS,
-        description="Operation topic configurations",
-    )
-
-
-class PublisherConfigurations(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    topics: TopicsConfigurations = Field(
-        default_factory=TopicsConfigurations, description="Topics configurations"
-    )