Merge branch 'main' of https://github.com/Physton/sd-webui-prompt-all-in-one

Author: Physton

scripts/on_app_started.py

@@ -57,7 +57,6 @@
 
 
 def on_app_started(_: gr.Blocks, app: FastAPI):
-    st = Storage()
     hi = History()
 
     @app.get("/physton_prompt/get_version")
@@ -109,7 +108,7 @@ async def _token_counter(request: Request):
 
     @app.get("/physton_prompt/get_data")
     async def _get_data(key: str):
-        data = st.get(key)
+        data = Storage.get(key)
         data = privacy_translate_api_config(key, data)
         return {"data": data}
 
@@ -118,7 +117,7 @@ async def _get_datas(keys: str):
         keys = keys.split(',')
         datas = {}
         for key in keys:
-            datas[key] = st.get(key)
+            datas[key] = Storage.get(key)
             datas[key] = privacy_translate_api_config(key, datas[key])
         return {"datas": datas}
 
@@ -130,7 +129,7 @@ async def _set_data(request: Request):
         if 'data' not in data:
             return {"success": False, "message": get_lang('is_required', {'0': 'data'})}
         data['data'] = unprotected_translate_api_config(data['key'], data['data'])
-        st.set(data['key'], data['data'])
+        Storage.set(data['key'], data['data'])
         return {"success": True}
 
     @app.post("/physton_prompt/set_datas")
@@ -140,12 +139,12 @@ async def _set_datas(request: Request):
             return {"success": False, "message": get_lang('is_not_dict', {'0': 'data'})}
         for key in data:
             data[key] = unprotected_translate_api_config(key, data[key])
-            st.set(key, data[key])
+            Storage.set(key, data[key])
         return {"success": True}
 
     @app.get("/physton_prompt/get_data_list_item")
     async def _get_data_list_item(key: str, index: int):
-        return {"item": st.list_get(key, index)}
+        return {"item": Storage.list_get(key, index)}
 
     @app.post("/physton_prompt/push_data_list")
     async def _push_data_list(request: Request):
@@ -154,22 +153,22 @@ async def _push_data_list(request: Request):
             return {"success": False, "message": get_lang('is_required', {'0': 'key'})}
         if 'item' not in data:
             return {"success": False, "message": get_lang('is_required', {'0': 'item'})}
-        st.list_push(data['key'], data['item'])
+        Storage.list_push(data['key'], data['item'])
         return {"success": True}
 
     @app.post("/physton_prompt/pop_data_list")
     async def _pop_data_list(request: Request):
         data = await request.json()
         if 'key' not in data:
             return {"success": False, "message": get_lang('is_required', {'0': 'key'})}
-        return {"success": True, 'item': st.list_pop(data['key'])}
+        return {"success": True, 'item': Storage.list_pop(data['key'])}
 
     @app.post("/physton_prompt/shift_data_list")
     async def _shift_data_list(request: Request):
         data = await request.json()
         if 'key' not in data:
             return {"success": False, "message": get_lang('is_required', {'0': 'key'})}
-        return {"success": True, 'item': st.list_shift(data['key'])}
+        return {"success": True, 'item': Storage.list_shift(data['key'])}
 
     @app.post("/physton_prompt/remove_data_list")
     async def _remove_data_list(request: Request):
@@ -178,15 +177,15 @@ async def _remove_data_list(request: Request):
             return {"success": False, "message": get_lang('is_required', {'0': 'key'})}
         if 'index' not in data:
             return {"success": False, "message": get_lang('is_required', {'0': 'index'})}
-        st.list_remove(data['key'], data['index'])
+        Storage.list_remove(data['key'], data['index'])
         return {"success": True}
 
     @app.post("/physton_prompt/clear_data_list")
     async def _clear_data_list(request: Request):
         data = await request.json()
         if 'key' not in data:
             return {"success": False, "message": get_lang('is_required', {'0': 'key'})}
-        st.list_clear(data['key'])
+        Storage.list_clear(data['key'])
         return {"success": True}
 
     @app.get("/physton_prompt/get_histories")
@@ -395,7 +394,7 @@ async def _get_group_tags(lang: str):
         return {"tags": get_group_tags(lang)}
 
     try:
-        translate_api = st.get('translateApi')
+        translate_api = Storage.get('translateApi')
         if translate_api == 'mbart50':
             mbart50_initialize()
     except Exception:

scripts/physton_prompt/get_lang.py

@@ -1,6 +1,4 @@
 from scripts.physton_prompt.storage import Storage
-
-storage = Storage()
 from scripts.physton_prompt.get_i18n import get_i18n
 
 
@@ -12,7 +10,7 @@ def replace_vars(text, vars):
 
 def get_lang(key, vars={}):
     i18n = get_i18n()
-    code = storage.get('languageCode')
+    code = Storage.get('languageCode')
 
     def find_lang(code):
         for item in i18n['languages']:

scripts/physton_prompt/get_translate_apis.py

@@ -2,17 +2,14 @@
 import json
 import re
 from scripts.physton_prompt.storage import Storage
-st = Storage()
 
 # from scripts.physton_prompt.storage import Storage
 
 translate_apis = {}
 
 
-# st = Storage()
 def get_translate_apis(reload=False):
     global translate_apis
-    global st
     if reload or not translate_apis:
         translate_apis = {}
         current_dir = os.path.dirname(os.path.abspath(__file__))
@@ -26,7 +23,7 @@ def get_translate_apis(reload=False):
         #         if 'config' not in item:
         #             continue
         #         config_name = 'translate_api.' + item['key']
-        #         config = st.get(config_name)
+        #         config = Storage.get(config_name)
         #         if not config:
         #             config = {}
         #         for config_item in item['config']:
@@ -102,7 +99,7 @@ def unprotected_translate_api_config(data_key, data):
     if 'config' not in api_item or not api_item['config']:
         return data
 
-    storage_data = st.get(data_key)
+    storage_data = Storage.get(data_key)
 
     for config in api_item['config']:
         # 如果有 privacy 的属性并且为 True

scripts/physton_prompt/history.py

@@ -17,26 +17,25 @@ class History:
         'img2img_neg': [],
     }
     max = 100
-    storage = Storage()
 
     def __init__(self):
         for type in self.histories:
-            self.histories[type] = self.storage.get('history.' + type)
+            self.histories[type] = Storage.get('history.' + type)
             if self.histories[type] is None:
                 self.histories[type] = []
                 self.__save_histories(type)
 
         for type in self.favorites:
-            self.favorites[type] = self.storage.get('favorite.' + type)
+            self.favorites[type] = Storage.get('favorite.' + type)
             if self.favorites[type] is None:
                 self.favorites[type] = []
                 self.__save_favorites(type)
 
     def __save_histories(self, type):
-        self.storage.set('history.' + type, self.histories[type])
+        Storage.set('history.' + type, self.histories[type])
 
     def __save_favorites(self, type):
-        self.storage.set('favorite.' + type, self.favorites[type])
+        Storage.set('favorite.' + type, self.favorites[type])
 
     def get_histories(self, type):
         histories = self.histories[type]