remove envType config

intel · Dec 15, 2024 · 506b106 · 506b106
1 parent 25772f1
commit 506b106
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 22 deletions.
diff --git a/WebUI/build/arc-settings.json b/WebUI/build/arc-settings.json
@@ -1,5 +1,4 @@
 {
-    "envType": "arc",
     "availableThemes": ["dark","lnl","bmg"],
     "currentTheme": "bmg"
 }
diff --git a/WebUI/build/settings.json b/WebUI/build/settings.json
@@ -1,5 +1,4 @@
 {
-    "envType": "arc",
     "availableThemes": ["dark","lnl","bmg"],
     "currentTheme": "bmg"
 }
diff --git a/WebUI/build/ultra-settings.json b/WebUI/build/ultra-settings.json
@@ -1,5 +1,4 @@
 {
-    "envType": "ultra",
     "availableThemes": ["dark"],
     "currentTheme": "dark"
 }
diff --git a/WebUI/build/ultra2-settings.json b/WebUI/build/ultra2-settings.json
@@ -1,5 +1,4 @@
 {
-    "envType": "ultra2",
     "availableThemes": ["lnl"],
     "currentTheme": "lnl"
 }
diff --git a/WebUI/electron/electron-env.d.ts b/WebUI/electron/electron-env.d.ts
@@ -34,7 +34,6 @@ type Theme = 'dark' | 'lnl' | 'bmg';
 
 type LocalSettings = {
   debug: number;
-  envType: string;
   comfyUiParameters?:string[];
 } & KVObject;
 
@@ -65,7 +64,6 @@ type ModelLists = {
 type SetupData = {
   modelPaths: ModelPaths,
   modelLists: ModelLists,
-  envType: string,
   isAdminExec:boolean,
   version:string,
 }

diff --git a/WebUI/electron/main.ts b/WebUI/electron/main.ts
@@ -55,7 +55,6 @@ const appSize = {
 export const settings: LocalSettings = {
     isAdminExec: false,
     debug: 0,
-    envType: "ultra",
     availableThemes: ["dark", "lnl"],
     currentTheme: "lnl",
     comfyUiParameters: [],
@@ -375,7 +374,6 @@ function initEventHandle() {
         return {
             modelLists: pathsManager.sacanAll(),
             modelPaths: pathsManager.modelPaths,
-            envType: settings.envType,
             isAdminExec: settings.isAdminExec,
             version: app.getVersion()
         };

diff --git a/WebUI/external/settings-dev.json b/WebUI/external/settings-dev.json
@@ -1,5 +1,4 @@
 {
-    "envType": "arc",
     "debug":1,
     "comfyUiParameters": [
         "--lowvram",

diff --git a/WebUI/src/assets/js/store/globalSetup.ts b/WebUI/src/assets/js/store/globalSetup.ts
@@ -66,8 +66,6 @@ export const useGlobalSetup = defineStore("globalSetup", () => {
 
     const graphicsList = ref(new Array<GraphicsItem>());
 
-    let envType = "";
-
     const loadingState = ref<GlobalSetupState>("verifyBackend");
     const errorMessage = ref("");
     const hdPersistentConfirmation = ref(localStorage.getItem("HdPersistentConfirmation") === "true");
@@ -79,7 +77,6 @@ export const useGlobalSetup = defineStore("globalSetup", () => {
     async function initSetup() {
         const setupData = await window.electronAPI.getInitSetting();
         const apiServiceInformation = await window.electronAPI.getServices()
-        envType = setupData.envType;
         paths.value = setupData.modelPaths;
         models.value = setupData.modelLists;
         models.value.inpaint.push(useI18N().state.ENHANCE_INPAINT_USE_IMAGE_MODEL);
@@ -104,7 +101,7 @@ export const useGlobalSetup = defineStore("globalSetup", () => {
             await window.electronAPI.showMessageBoxSync({ message: useI18N().state.ERROR_UNFOUND_GRAPHICS, title: "error", icon: "error" });
             window.electronAPI.exitApp();
         }
-        await loadUserSettings();
+        loadUserSettings();
     }
 
     async function initWebSettings(postJson: string) {
@@ -122,10 +119,7 @@ export const useGlobalSetup = defineStore("globalSetup", () => {
     }
 
     async function reloadGraphics() {
-        const formData = new FormData();
-        formData.append("env", envType);
         const response = await fetch(`${defaultBackendBaseUrl.value}/api/getGraphics`, {
-            body: formData,
             method: "POST"
         });
         const graphics = (await response.json()) as GraphicsItem[];

diff --git a/service/aipg_utils.py b/service/aipg_utils.py
@@ -214,13 +214,11 @@ def get_ESRGAN_size():
         return int(response.headers.get("Content-Length"))
 
 
-def get_support_graphics(env_type: str):
+def get_support_graphics():
     device_count = torch.xpu.device_count()
-    service_config.env_type = env_type
     graphics = list()
     for i in range(device_count):
         device_name = torch.xpu.get_device_name(i)
-        # if device_name == "Intel(R) Arc(TM) Graphics" or re.search("Intel\(R\) Arc\(TM\)", device_name) is not None:
         graphics.append({"index": i, "name": device_name})
     return graphics
 

diff --git a/service/service_config.py b/service/service_config.py
@@ -30,4 +30,3 @@
 }
 
 device = "xpu"
-env_type = "arc"
diff --git a/service/web_api.py b/service/web_api.py
@@ -168,8 +168,7 @@ def get_init_settings():
 
 @app.post("/api/getGraphics")
 def get_graphics():
-    env = request.form.get("env", default="ultra", type=str)
-    return jsonify(utils.get_support_graphics(env))
+    return jsonify(utils.get_support_graphics())
 
 
 @app.get("/api/applicationExit")