internal 1.0.48__tar.gz → 1.0.50__tar.gz

{internal-1.0.48 → internal-1.0.50}/PKG-INFO

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

{internal-1.0.48 → internal-1.0.50}/pyproject.toml

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

{internal-1.0.48 → internal-1.0.50}/src/internal/base_factory.py

@@ -62,6 +62,7 @@ class BaseFactory(metaclass=ABCMeta):
 
         @asynccontextmanager
         async def lifespan(app: FastAPI):
+            # code to execute when app is loading
             await mongodb.connect()
             document_model_list = await self.get_document_model_list()
             await init_beanie(database=app.state.db.get_database(), document_models=document_model_list)
@@ -70,10 +71,13 @@ class BaseFactory(metaclass=ABCMeta):
             app.state.logger.info("Initialization state cache done")
             await self.init_state_scheduler_app(app, self.get_app_config())
             app.state.logger.info("Initialization state scheduler app done")
+
             yield
+            # code to execute when app is shutting down
             await mongodb.close()
             app.state.logger.info("Database disconnected")
 
+
         if title is None:
             title = self.DEFAULT_APP_NAME
 
@@ -113,14 +117,6 @@ class BaseFactory(metaclass=ABCMeta):
                                    self.get_app_config().DATABASE_AUTH_SOURCE,
                                    self.get_app_config().DATABASE_SSL, self.get_app_config().DATABASE_SSL_CA_CERTS)
 
-        @app.on_event("startup")
-        async def startup_db_client():
-            print("startup_db_client================run")
-
-        @app.on_event("shutdown")
-        async def shutdown_db_client():
-            print("shutdown_db_client============run")
-
         app.state.db = mongodb
         app.state.config = self.get_app_config()
         self.__init_modules(app)

{internal-1.0.48 → internal-1.0.50}/src/internal/database.py

@@ -44,8 +44,14 @@ class MongoDB:
             raise DatabaseConnectFailureException()
         return self.client[self.db_name]
 
-    def get_mongodb_uri(self) -> str:
-        uri = f"mongodb://{self.user_name}:{self.password}@{self.host}:{self.port}/{self.db_name}?authSource={self.auth_source}&connectTimeoutMS={self.connection_timeout}&serverSelectionTimeoutMS={self.server_selection_timeout}&retryWrites=false"
+    async def get_mongodb_uri(self) -> str:
+        if self.user_name and self.password:
+            uri = f"mongodb://{self.user_name}:{self.password}@{self.host}:{self.port}/{self.db_name}"
+        else:
+            uri = f"mongodb://{self.host}:{self.port}/{self.db_name}"
+
+        uri += f"?authSource={self.auth_source}&connectTimeoutMS={self.connection_timeout}&serverSelectionTimeoutMS={self.server_selection_timeout}&retryWrites=false"
+
         if self.ssl:
             uri += "&ssl=true"
         if self.ssl_ca_certs and self.ssl_ca_certs != "":