internal 0.1.83__tar.gz → 0.1.85__tar.gz

{internal-0.1.83 → internal-0.1.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 0.1.83
+Version: 0.1.85
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-0.1.83 → internal-0.1.85}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "internal"
-version = "0.1.83"
+version = "0.1.85"
 description = ""
 authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"

{internal-0.1.83 → internal-0.1.85}/src/internal/base_config.py

@@ -23,10 +23,15 @@ class BaseConfig(BaseSettings):
     AWS_LOGGROUP_NAME: str = ""
 
     # MongoDB
-    DATABASE_URL: str = ""
+    DATABASE_HOST: str = ''
+    DATABASE_USERNAME: str = ''
+    DATABASE_PASSWORD: str = ''
+    DATABASE_PORT: int = 27017
     DATABASE_NAME: str = ""
     DATABASE_SSL: bool = True
     DATABASE_SSL_CA_CERTS: str = "/rds-combined-ca-bundle.pem"
+    DATABASE_SERVER_SELECTION_TIMEOUT_MS: int = 5000
+    DATABASE_CONNECT_TIMEOUT_MS: int = 10000
 
     # Micro Service
     AUTH_BASE_URL: str = "http://auth-service-api"

internal-0.1.85/src/internal/database.py

@@ -0,0 +1,44 @@
+from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo.errors import ServerSelectionTimeoutError
+
+from .exception.internal_exception import DatabaseInitializeFailureException, DatabaseConnectFailureException
+
+
+class MongoDB:
+    # def __init__(self, connection_url: str, db_name: str, ssl: bool = False, ssl_ca_certs: str = None):
+    #     self.client = None
+    #     self.connection_url = connection_url
+    #     self.db_name = db_name
+    #     self.ssl = ssl
+    #     self.ssl_ca_certs = ssl_ca_certs
+    def __init__(self, user_name: str, password: str, host: str, port: int, db_name: str, server_selection_timeout: int,
+                 connection_timeout: int, ssl: bool = False, ssl_ca_certs: str = None):
+        self.client = None
+        self.user_name = user_name
+        self.password = password
+        self.host = host
+        self.port = port
+        self.db_name = db_name
+        self.connection_timeout = connection_timeout
+        self.server_selection_timeout = server_selection_timeout
+        self.ssl = ssl
+        self.ssl_ca_certs = ssl_ca_certs
+
+    async def connect(self):
+        try:
+            self.client = AsyncIOMotorClient(username=self.user_name, password=self.password, host=self.host,
+                                             port=self.port, ssl=self.ssl, tlsCAFile=self.ssl_ca_certs,
+                                             connectTimeoutMS=self.connection_timeout,
+                                             serverSelectionTimeoutMS=self.server_selection_timeout,
+                                             retryWrites=False)
+        except ServerSelectionTimeoutError:
+            raise DatabaseInitializeFailureException()
+
+    async def close(self):
+        if self.client:
+            self.client.close()
+
+    def get_database(self):
+        if not self.client:
+            raise DatabaseConnectFailureException()
+        return self.client[self.db_name]

internal-0.1.83/src/internal/database.py

@@ -1,28 +0,0 @@
-from motor.motor_asyncio import AsyncIOMotorClient
-from pymongo.errors import ServerSelectionTimeoutError
-
-from .exception.internal_exception import DatabaseInitializeFailureException, DatabaseConnectFailureException
-
-
-class MongoDB:
-    def __init__(self, connection_url: str, db_name: str, ssl: bool = False, ssl_ca_certs: str = None):
-        self.client = None
-        self.connection_url = connection_url
-        self.db_name = db_name
-        self.ssl = ssl
-        self.ssl_ca_certs = ssl_ca_certs
-
-    async def connect(self):
-        try:
-            self.client = AsyncIOMotorClient(self.connection_url, ssl=self.ssl, tlsCAFile=self.ssl_ca_certs)
-        except ServerSelectionTimeoutError:
-            raise DatabaseInitializeFailureException()
-
-    async def close(self):
-        if self.client:
-            self.client.close()
-
-    def get_database(self):
-        if not self.client:
-            raise DatabaseConnectFailureException()
-        return self.client[self.db_name]