update app.py and delete api_client.py

api_client.py

@@ -1,85 +0,0 @@
-import requests, json
-from PIL import Image
-import matplotlib.pyplot as plt
-import numpy as np
-import base64
-import io
-
-def request_post(url, data, timeout=600, headers = None):
-    if headers is None:
-        headers = {
-            # 'content-type': 'application/json'
-            # 'Connection': 'keep-alive',
-            'Accept': '*/*', # 接受任何类型的返回数据
-            'Content-Type': 'application/json;charset=UTF-8', # 发送数据为json
-            # 'Content-Length': '156',
-            # 'Accept-Encoding': 'gzip, deflate',
-            # 'Accept-Language': 'zh-CN,zh;q=0.9',
-            # 'User-Agent': 'SamClub/5.0.45 (iPhone; iOS 15.4; Scale/3.00)',
-            # 'device-name': 'iPhone14,3',
-            # 'device-os-version': '15.4',
-            # 'device-type': 'ios',
-            # 'auth-token': authtoken,
-            # 'app-version': '5.0.45.1'
-        }
-    try:
-        response = requests.post(url=url, headers=headers, data=json.dumps(data), timeout=timeout)
-        response_data = response.json()
-        return response_data
-    except Exception as e:
-        print(f'request_post[Error]:' + str(e))
-        print(f'url: {url}')
-        print(f'data: {data}')
-        print(f'response: {response}')
-        return None
-
-url = "http://127.0.0.1:7860/imgCLeaner"
-
-def imgFile_to_base64(image_file):
-    with open(image_file, "rb") as f:
-        im_bytes = f.read()  
-    im_b64_encode = base64.b64encode(im_bytes)
-    im_b64 = im_b64_encode.decode("utf8")
-    return im_b64
-
-def base64_to_bytes(im_b64):
-    im_b64_encode = im_b64.encode("utf-8")
-    im_bytes = base64.b64decode(im_b64_encode)
-    return im_bytes
-
-def base64_to_PILImage(im_b64):
-    im_bytes = base64_to_bytes(im_b64)
-    pil_img = Image.open(io.BytesIO(im_bytes))
-    return pil_img
-
-def cleaner_img(image_file, remove_texts, mask_extend=20, disp_debug=True):
-    data = {'remove_texts': remove_texts,
-        'mask_extend': mask_extend,
-        'img': imgFile_to_base64(image_file),
-        }
-    ret = request_post(url, data, timeout=600, headers = None)  
-    if ret['code'] == 0:
-        if disp_debug:
-            for img in ret['result']['imgs']:
-                pilImage = base64_to_PILImage(img)
-                plt.imshow(pilImage)
-                plt.show()
-                plt.clf()
-                plt.close('all')    
-        img_len = len(ret['result']['imgs'])
-        pilImage = base64_to_PILImage(ret['result']['imgs'][img_len-1])  
-    else:
-        pilImage = None
-    return pilImage, ret
-
-image_file = 'dog.png'
-remove_texts = "小狗 . 椅子"
-
-mask_extend = 20
-pil_image, ret = cleaner_img(image_file, remove_texts, mask_extend, disp_debug=False) 
-
-plt.imshow(pil_image)
-plt.show()
-plt.clf()
-plt.close()
-

app.py

@@ -4,15 +4,7 @@ warnings.filterwarnings('ignore')
 
 import subprocess, io, os, sys, time
 
-run_gradio = False
-if os.environ.get('IS_MY_DEBUG') is None:
-    run_gradio = True    
-else:
-    run_gradio = False
-    # run_gradio = True
-
-if run_gradio:
-    os.system("pip install gradio==3.50.2")
+os.system("pip install gradio==3.50.2")
 
 import gradio as gr
 from loguru import logger
@@ -982,124 +974,6 @@ def main_gradio(args):
     computer_info()
     block.launch(server_name='0.0.0.0', server_port=args.port, debug=args.debug, share=args.share)
 
-import signal
-import json
-from datetime import date, datetime, timedelta
-from gevent import pywsgi
-import base64 
-
-def imgFile_to_base64(image_file):
-    with open(image_file, "rb") as f:
-        im_bytes = f.read()  
-    im_b64_encode = base64.b64encode(im_bytes)
-    im_b64 = im_b64_encode.decode("utf8")
-    return im_b64
-
-def base64_to_bytes(im_b64):
-    im_b64_encode = im_b64.encode("utf-8")
-    im_bytes = base64.b64decode(im_b64_encode)
-    return im_bytes
-
-def base64_to_PILImage(im_b64):
-    im_bytes = base64_to_bytes(im_b64)
-    pil_img = Image.open(io.BytesIO(im_bytes))
-    return pil_img
-
-class API_Starter:
-    def __init__(self):    
-        from flask import Flask, request, jsonify, make_response
-        from flask_cors import CORS, cross_origin
-        import logging
-
-        app = Flask(__name__)
-        app.logger.setLevel(logging.ERROR)
-        CORS(app, supports_credentials=True, resources={r"/*": {"origins": "*"}})
-
-        @app.route('/imgCLeaner', methods=['GET', 'POST'])
-        @cross_origin()
-        def processAssist():
-            if request.method == 'GET':
-                ret_json = {'code': -1, 'reason':'no support to get'}
-            elif request.method == 'POST':
-                request_data = request.data.decode('utf-8')
-                data = json.loads(request_data)
-                result = self.handle_data(data)
-                if result is None:
-                    ret_json = {'code': -2, 'reason':'handle error'}
-                else:
-                    ret_json = {'code': 0, 'result':result}
-            return jsonify(ret_json)
-        
-        self.app = app
-        now_time = datetime.now().strftime('%Y%m%d_%H%M%S')
-        logger.add(f'./logs/logger_[{args.port}]_{now_time}.log')  
-        signal.signal(signal.SIGINT, self.signal_handler)
-    
-    def handle_data(self, data):
-        im_b64 = data['img']
-        img = base64_to_PILImage(im_b64)
-        remove_texts = data['remove_texts']
-        remove_mask_extend = data['mask_extend']
-        results = run_anything_task(input_image = img, 
-                            text_prompt = f"{remove_texts}",  
-                            task_type = 'remove', 
-                            inpaint_prompt = '', 
-                            box_threshold = 0.3, 
-                            text_threshold = 0.25, 
-                            iou_threshold = 0.8, 
-                            inpaint_mode = "merge", 
-                            mask_source_radio = "type what to detect below", 
-                            remove_mode = "rectangle",   # ["segment", "rectangle"]
-                            remove_mask_extend = f"{remove_mask_extend}", 
-                            num_relation = 5,
-                            kosmos_input = None,
-                            cleaner_size_limit = -1,
-                            )
-        output_images = results[0]
-        if output_images is None:
-            return None
-        ret_json_images = []
-        file_temp = int(time.time())
-        count = 0
-        output_images = output_images[-1:]
-        for image_pil in output_images:
-            try:
-                img_format = image_pil.format.lower()
-            except Exception as e:
-                img_format = 'png'                
-            image_path = os.path.join(output_dir, f"api_images_{file_temp}_{count}.{img_format}")
-            count += 1
-            try:
-                image_pil.save(image_path)
-            except Exception as e:
-                Image.fromarray(image_pil).save(image_path)               
-            im_b64 = imgFile_to_base64(image_path)
-            ret_json_images.append(im_b64)
-            os.remove(image_path)
-        data = {
-            'imgs': ret_json_images,
-            }
-        return data
-  
-    def signal_handler(self, signal, frame):
-        print('\nSignal Catched! You have just type Ctrl+C!')
-        sys.exit(0)
-  
-    def run(self):
-        from gevent import pywsgi
-        logger.info(f'\nargs={args}\n')
-        computer_info()
-        print(f"Start a api server: http://0.0.0.0:{args.port}/imgCLeaner")
-        server = pywsgi.WSGIServer(('0.0.0.0', args.port), self.app)
-        server.serve_forever()  
-
-def main_api(args):
-    if args.port == 0:
-        print('Please give valid port!')
-    else:
-        api_starter = API_Starter()
-        api_starter.run() 
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser("Grounded SAM demo", add_help=True)
     parser.add_argument("--debug", action="store_true", help="using debug mode")
@@ -1137,12 +1011,7 @@ if __name__ == "__main__":
     if os.environ.get('IS_MY_DEBUG') is None:
         os.system("pip list")
 
-    if run_gradio:
-        # Provide gradio services
-        main_gradio(args)
-    else:        
-        # Provide API services
-        main_api(args)
+    main_gradio(args)