rb-commons 0.1.1__tar.gz → 0.1.2__tar.gz

{rb_commons-0.1.1 → rb_commons-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rb-commons
-Version: 0.1.1
+Version: 0.1.2
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/Abdulvoris101/rb-commons
 Author: Abdulvoris

rb_commons-0.1.2/rb_commons/configs/config.py

@@ -0,0 +1,47 @@
+from typing import Optional
+
+from pydantic_settings import BaseSettings
+
+class CommonConfigs(BaseSettings):
+    service_name: str = None
+    service_port: int = None
+    service_id: str = None
+    service_hostname: str = '127.0.0.1'
+    service_host: str = None
+
+    consul_host: str = '127.0.0.1'
+    consul_port: int = 8888
+
+#     db
+    POSTGRES_HOST: str = None
+    POSTGRES_USER: str = None
+    POSTGRES_PORT: int = None
+    POSTGRES_PASSWORD: str = None
+    POSTGRES_DB: str = None
+    DB_ALEMBIC_URL: str = None
+
+    @property
+    def database_url(self) -> Optional[str]:
+        """Construct the database URL if all required fields are present."""
+        required_fields = [
+            self.POSTGRES_USER,
+            self.POSTGRES_PASSWORD,
+            self.POSTGRES_HOST,
+            self.POSTGRES_PORT,
+            self.POSTGRES_DB
+        ]
+        if all(required_fields):
+            return (
+                f"postgresql+asyncpg://{self.POSTGRES_USER}:"
+                f"{self.POSTGRES_PASSWORD}@{self.POSTGRES_HOST}:"
+                f"{self.POSTGRES_PORT}/{self.POSTGRES_DB}"
+            )
+        return None
+
+    class Config:
+        env_file = ".env"
+        env_file_encoding = "utf-8"
+        extra = "ignore"
+
+
+configs = CommonConfigs()

{rb_commons-0.1.1 → rb_commons-0.1.2}/rb_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rb-commons
-Version: 0.1.1
+Version: 0.1.2
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/Abdulvoris101/rb-commons
 Author: Abdulvoris

{rb_commons-0.1.1 → rb_commons-0.1.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="rb-commons",
-    version="0.1.1",
+    version="0.1.2",
     author="Abdulvoris",
     author_email="erkinovabdulvoris101@gmail.com",
     description="Commons of project and simplified orm based on sqlalchemy.",

rb_commons-0.1.1/rb_commons/configs/config.py

@@ -1,30 +0,0 @@
-from pydantic_settings import BaseSettings
-
-class CommonConfigs(BaseSettings):
-    service_name: str
-    service_port: int
-    service_id: str
-    service_hostname: str = '127.0.0.1'
-    service_host: str
-
-    consul_host: str = '127.0.0.1'
-    consul_port: int = 8888
-
-#     db
-    POSTGRES_HOST: str
-    POSTGRES_USER: str
-    POSTGRES_PORT: int
-    POSTGRES_PASSWORD: str
-    POSTGRES_DB: str
-    DB_ALEMBIC_URL: str
-
-    @property
-    def database_url(self):
-        return f"postgresql+asyncpg://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}@{self.POSTGRES_HOST}:{self.POSTGRES_PORT}/{self.POSTGRES_DB}"
-
-    class Config:
-        env_file = ".env"
-        env_file_encoding = "utf-8"
-
-
-configs = CommonConfigs()