Merge branch 'master' of https://github.com/neozhu/label-studio-ml-backend

Author: neozhu

.github/workflows/build.yml

@@ -104,7 +104,7 @@ jobs:
 
  - name: Push Docker image
  if: steps.check_changes.outputs.skip != 'true'
- uses: docker/build-push-action@v5.1.0
+ uses: docker/build-push-action@v5.2.0
  id: docker_build_and_push
  with:
  context: "${{ env.examples_dir }}/${{ env.backend_dir_name }}"

label_studio_ml/api.py

@@ -165,6 +165,7 @@ def safe_str_cmp(a, b):
 @_server.before_request
 def check_auth():
  if BASIC_AUTH is not None:
+
  auth = request.authorization
  if not auth or not (safe_str_cmp(auth.username, BASIC_AUTH[0]) and safe_str_cmp(auth.password, BASIC_AUTH[1])):
  return Response('Unauthorized', 401, {'WWW-Authenticate': 'Basic realm="Login required"'})

label_studio_ml/default_configs/_wsgi.py.tmpl

@@ -112,7 +112,7 @@ if __name__ == "__main__":
  print('Check "' + {model_class}.__name__ + '" instance creation..')
  model = {model_class}(**kwargs)
 
- app = init_app(model_class={model_class})
+ app = init_app(model_class={model_class}, basic_auth_user=args.basic_auth_user, basic_auth_pass=args.basic_auth_pass)
 
  app.run(host=args.host, port=args.port, debug=args.debug)
 

label_studio_ml/examples/llm_interactive/_wsgi.py

@@ -67,6 +67,14 @@ def get_kwargs_from_config(config_path=_DEFAULT_CONFIG_PATH):
  parser.add_argument(
  '--check', dest='check', action='store_true',
  help='Validate model instance before launching server')
+ parser.add_argument('--basic-auth-user',
+ default=os.environ.get('ML_SERVER_BASIC_AUTH_USER', None),
+ help='Basic auth user')
+
+ parser.add_argument('--basic-auth-pass',
+ default=os.environ.get('ML_SERVER_BASIC_AUTH_PASS', None),
+ help='Basic auth pass')
+
 
  args = parser.parse_args()
 
@@ -105,7 +113,7 @@ def parse_kwargs():
  print('Check "' + OpenAIInteractive.__name__ + '" instance creation..')
  model = OpenAIInteractive(**kwargs)
 
- app = init_app(model_class=OpenAIInteractive)
+ app = init_app(model_class=OpenAIInteractive, basic_auth_user=args.basic_auth_user, basic_auth_pass=args.basic_auth_pass)
 
  app.run(host=args.host, port=args.port, debug=args.debug)
 

label_studio_ml/examples/segment_anything_model/README.md

@@ -193,7 +193,15 @@ or
 ```bash
 docker-compose up
 ```
-to start the backend in a docker container.
+to start the backend in a docker container;
+
+or
+
+```bash
+MOBILESAM_CHECKPOINT=path/to/mobile_sam.pt label-studio-ml start segment_anything_model/
+```
+
+> Note: if you see the error on MacOS, try set the environment variable `KMP_DUPLICATE_LIB_OK=True`
 
 ## Set up a Project in Label Studio for Segment Anything
 

label_studio_ml/examples/segment_anything_model/_wsgi.py

@@ -66,6 +66,13 @@ def get_kwargs_from_config(config_path=_DEFAULT_CONFIG_PATH):
  parser.add_argument(
  '--check', dest='check', action='store_true',
  help='Validate model instance before launching server')
+ parser.add_argument('--basic-auth-user',
+ default=os.environ.get('ML_SERVER_BASIC_AUTH_USER', None),
+ help='Basic auth user')
+
+ parser.add_argument('--basic-auth-pass',
+ default=os.environ.get('ML_SERVER_BASIC_AUTH_PASS', None),
+ help='Basic auth pass')
 
  args = parser.parse_args()
 
@@ -104,7 +111,7 @@ def parse_kwargs():
  print('Check "' + SamMLBackend.__name__ + '" instance creation..')
  model = SamMLBackend(**kwargs)
 
- app = init_app(model_class=SamMLBackend)
+ app = init_app(model_class=SamMLBackend, basic_auth_user=args.basic_auth_user, basic_auth_pass=args.basic_auth_pass)
 
  app.run(host=args.host, port=args.port, debug=args.debug)
 

label_studio_ml/examples/segment_anything_model/start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Execute the gunicorn command
-exec gunicorn --preload --bind :$PORT --workers 1 --threads 8 --timeout 0 _wsgi:app
+exec gunicorn --preload --bind :${PORT:-9090} --workers 1 --threads 8 --timeout 0 _wsgi:app