Fix bugs

Author: devmiek

README.md

@@ -106,6 +106,12 @@ The method `easy_invoke` will attempt to infer the return value in the given Clo
 
 **Tips:** If an error occurs for a given Cloud Function runtime, an `InvokeError` exception is thrown. The above exceptions are defined in the `tencent.cloud.serverless.functions.errors` module.
 
+#### Close product client
+When the instantiated client is no longer in use, we should explicitly close it:
+```python
+function_client.close()
+```
+
 See the [examples source code](examples) for the complete demo code.
 
 ### Other Tencent Cloud Products

examples/quickstart.py

@@ -62,6 +62,11 @@ def main():
         print('error: ' + str(error), file = sys.stderr)
     except errors.ActionError as error:
         print('error: ' + str(error), file = sys.stderr)
+    
+    # When the instantiated client is no longer in use, we should
+    # explicitly close it:
+
+    function_client.close()
 
 if __name__ == '__main__':
     main()

packages/tencent-cloud-sdk-core/setup.py

@@ -31,7 +31,7 @@ def read_readme_content() -> str:
 
 setuptools.setup(
     name = 'tencent-cloud-sdk-core',
-    version = '0.2.5',
+    version = '0.2.6',
     packages = [
         'tencent.cloud.core'
     ],

packages/tencent-cloud-sdk-core/tencent/cloud/core/client.py

@@ -188,20 +188,57 @@ def __init__(self,
 
         self.__initialized = True
 
+    async def close_async(self):
+        '''
+        Close the client.
+        '''
+    
+        await self.__request_client.close()
+
+    def close(self):
+        '''
+        Close the client.
+        '''
+
+        self._get_event_loop().run_until_complete(self.close_async())
+
     def __del__(self):
-        if not self.__initialized:  # Base client instance construction error
+        if not self.__initialized or not hasattr(self, '_BaseClient__request_client'):
+            # Base client instance construction error
             return
 
-        # The event loop instance running in the hyperthreaded context
-        # of the underlying client should not be closed.
+        if self.__request_client.closed:
+            # Internal request client has been closed
+            return
 
         if self._get_event_loop().is_closed():
+            # The event loop instance running in the hyperthreaded context
+            # of the underlying client should not be closed.
             raise RuntimeError('destroy the client before the event loop closes')
 
         if not self._get_event_loop().is_running():
             self._get_event_loop().run_until_complete(self.__request_client.close())
         else:
-            self._get_event_loop().create_task(self.__request_client.close())
+            # This happens when the caller does not explicitly close the client.
+            #
+            # When the GC reclaims the client object, we cannot immediately close
+            # the internal session if there are other coroutines running. At the
+            # same time, GC also recycles and frees internal session object.
+            # When the internal session object is released, if it is not explicitly
+            # closed, it raises a warning and causes an internal connector leak.
+            #
+            # To avoid raising warning and connector leak, we need to trick the
+            # internal session into thinking it is closed. We will schedule the
+            # real close handler to run after the other coroutines have exited.
+            #
+            # This is an invasive solution that is not elegant.
+
+            async def _internal_session_close():
+                setattr(self.__request_client.connector, '_closed', False)
+                await self.__request_client.close()
+
+            setattr(self.__request_client.connector, '_closed', True)
+            self._get_event_loop().create_task(_internal_session_close())
 
     @property
     def error_manager(self) -> errors.ErrorManager:

packages/tencent-cloud-sdk-serverless-database/setup.py

@@ -31,7 +31,7 @@ def read_readme_content() -> str:
 
 setuptools.setup(
     name = 'tencent-cloud-sdk-serverless-database',
-    version = '0.1.3',
+    version = '0.1.4',
     packages = [
         'tencent.cloud.serverless.database'
     ],
@@ -58,6 +58,6 @@ def read_readme_content() -> str:
         # 'Development Status :: 4 - Beta'
     ],
     install_requires = [
-        'tencent-cloud-sdk-core>=0.2.5'
+        'tencent-cloud-sdk-core>=0.2.6'
     ]
 )

packages/tencent-cloud-sdk-serverless-functions/setup.py

@@ -31,7 +31,7 @@ def read_readme_content() -> str:
 
 setuptools.setup(
     name = 'tencent-cloud-sdk-serverless-functions',
-    version = '0.2.4',
+    version = '0.2.5',
     packages = [
         'tencent.cloud.serverless.functions'
     ],
@@ -58,6 +58,6 @@ def read_readme_content() -> str:
         # 'Development Status :: 4 - Beta'
     ],
     install_requires = [
-        'tencent-cloud-sdk-core>=0.2.5'
+        'tencent-cloud-sdk-core>=0.2.6'
     ]
 )

setup.py

@@ -31,7 +31,7 @@ def read_readme_content() -> str:
 
 setuptools.setup(
     name = 'tencent-cloud-sdk',
-    version = '0.2.6',
+    version = '0.2.7',
     keywords = 'tencent-cloud sdk-python',
     license = 'MIT License',
     author = 'MIEK',
@@ -54,8 +54,8 @@ def read_readme_content() -> str:
     ],
     install_requires = [
         'tencent-cloud-sdk-auth>=0.2.2',
-        'tencent-cloud-sdk-core>=0.2.5',
-        'tencent-cloud-sdk-serverless-functions>=0.2.4',
-        'tencent-cloud-sdk-serverless-database>=0.1.3'
+        'tencent-cloud-sdk-core>=0.2.6',
+        'tencent-cloud-sdk-serverless-functions>=0.2.5',
+        'tencent-cloud-sdk-serverless-database>=0.1.4'
     ]
 )