Merge pull request #57 from Techainer/gevent

Handle gevent monkey patch and update pipeline

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.9"]
 
     if: "!contains(github.event.head_commit.message, 'ci skip')"
 

mlchain/__init__.py

@@ -1,3 +1,23 @@
+from os import environ
+
+if "DISABLE_GEVENT_FIX" not in environ:
+    # Fix gevent
+    try:
+        from gevent import monkey
+        monkey.patch_all(thread=False, socket=False)
+    except ImportError:
+        pass
+
+    import ssl
+    try:
+        _create_unverified_https_context = ssl._create_unverified_context
+    except AttributeError:
+        # Legacy Python that doesn't verify HTTPS certificates by default
+        pass
+    else:
+        # Handle target environment that doesn't support HTTPS verification
+        ssl._create_default_https_context = _create_unverified_https_context
+
 # Mlchain Context
 from contextvars import ContextVar
 from typing import Any, Dict
@@ -7,26 +27,17 @@
 )
 
 # Parameters of MLchain
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 
 HOST = "https://www.api.mlchain.ml"
 WEB_HOST = HOST
 API_ADDRESS = HOST
 MODEL_ID = None
-import ssl
-
-try:
-    _create_unverified_https_context = ssl._create_unverified_context
-except AttributeError:
-    # Legacy Python that doesn't verify HTTPS certificates by default
-    pass
-else:
-    # Handle target environment that doesn't support HTTPS verification
-    ssl._create_default_https_context = _create_unverified_https_context
 
 from os import environ
 
 environ['OBJC_DISABLE_INITIALIZE_FORK_SAFETY'] = 'YES'
+
 from mlchain.base.log import logger
 from .context import mlchain_context
 

mlchain/cli/mlconfig.yaml

@@ -26,7 +26,6 @@ gunicorn:
   threads: 1                    # Number of simultaneous threads in workers
   worker_class: gthread         # The base worker_class, can use gevent (For better IO) or uvicorn.workers.UvicornWorker (starlette - For Async)
   max_requests_jitter: 50       # Restart worker different time 
-  accesslog: mlchain-server.log # Log file for gunicorn
 
 bind:
   - 'unix:/tmp/gunicorn.sock' # Using sock to make gunicorn faster 

mlchain/config.py

@@ -102,6 +102,11 @@ def load_config(self, path, mode=None):
                         for k, v in data['mode']['env'][mode].items():
                             if k in environ:
                                 data['mode']['env'][mode][k] = environ[k]
+                            if isinstance(v, dict):
+                                for sub_k, sub_v in v.items():
+                                    env_key = f"{k}___{sub_k}"
+                                    if env_key in environ:
+                                        data['mode']['env'][mode][k][sub_k] = environ[env_key]
                         self.update(data['mode']['env'][mode])
 
     def get_client_config(self, name):
@@ -152,6 +157,11 @@ def load_config(data):
                     for k, v in data['mode']['env'][mode].items():
                         if k in environ:
                             data['mode']['env'][mode][k] = environ[k]
+                        if isinstance(v, dict):
+                            for sub_k, sub_v in v.items():
+                                env_key = f"{k}___{sub_k}"
+                                if env_key in environ:
+                                    data['mode']['env'][mode][k][sub_k] = environ[env_key]
                     mlconfig.update(data['mode']['env'][mode])
 
     if (mlconfig.MLCHAIN_SENTRY_DSN is not None and mlconfig.MLCHAIN_SENTRY_DSN != 'None') and data.get('wrapper', None) != 'gunicorn': 

mlchain/server/base.py

@@ -85,6 +85,7 @@ def __init__(self, model: ServeModel, name=None, version=None, api_format=None,
         self.converter = Converter()
 
         self.initialize_app()
+        self._swaggered = False
 
     def _check_status(self):
         """
@@ -113,7 +114,9 @@ def register_swagger(self):
         """
         Add Swagger to URL
         """
-        return self._register_swagger()
+        if not self._swaggered:
+            self._register_swagger()
+        self._swaggered = True
 
     def add_endpoint(self, endpoint=None, endpoint_name=None,
                       handler=None, methods=['GET', 'POST']):
@@ -178,7 +181,7 @@ def initialize_endpoint(self):
         self._register_home()
 
         try:
-            self._register_swagger()
+            self.register_swagger()
         except Exception as ex:
             logger.error("Can't register swagger with error {0}".format(ex))
 

mlchain/workflows/__init__.py

@@ -1,5 +1,2 @@
-from .background import Background
-from .parallel import Parallel
-from .task import Task, SyncTask
-from .pipeline import Step, Pipeline
-from .limiter import RateLimiter, AsyncRateLimiter
+from mlchain.workflows_sync import Task as SyncTask
+from mlchain.workflows_sync import Background, Parallel, Task, RateLimiter, AsyncRateLimiter