Resolved module conflict

.gitignore

@@ -7,3 +7,4 @@ launch.sh
 conf.json
 iib.db-journal
 .env
+standalone.cmd

app.py

@@ -2,10 +2,10 @@ from fastapi import FastAPI
 from fastapi.responses import FileResponse
 import uvicorn
 import os
-from scripts.api import infinite_image_browsing_api
-from scripts.tool import cwd, get_sd_webui_conf, get_valid_img_dirs, sd_img_dirs
-from scripts.db.datamodel import DataBase, Image
-from scripts.db.update_image_data import update_image_data
+from scripts.iib.api import infinite_image_browsing_api
+from scripts.iib.tool import cwd, get_sd_webui_conf, get_valid_img_dirs, sd_img_dirs
+from scripts.iib.db.datamodel import DataBase, Image
+from scripts.iib.db.update_image_data import update_image_data
 import argparse
 
 tag = "\033[31m[warn]\033[0m"

scripts/iib/api.py

@@ -2,7 +2,7 @@ from datetime import datetime, timedelta
 import os
 import shutil
 import sqlite3
-from scripts.tool import (
+from scripts.iib.tool import (
     human_readable_size,
     is_valid_image_path,
     temp_path,
@@ -26,7 +26,7 @@ from fastapi.responses import FileResponse
 from PIL import Image
 from fastapi import Depends, FastAPI, HTTPException, Request
 import hashlib
-from scripts.db.datamodel import (
+from scripts.iib.db.datamodel import (
     DataBase,
     Image as DbImg,
     Tag,
@@ -34,8 +34,8 @@ from scripts.db.datamodel import (
     ImageTag,
     ExtraPath,
 )
-from scripts.db.update_image_data import update_image_data
-from scripts.logger import logger
+from scripts.iib.db.update_image_data import update_image_data
+from scripts.iib.logger import logger
 
 
 

scripts/iib/db/datamodel.py

@@ -1,6 +1,6 @@
 from sqlite3 import Connection, connect
 from typing import Dict, List, Optional, Union
-from scripts.tool import (
+from scripts.iib.tool import (
     cwd,
     get_modified_date,
     human_readable_size,

scripts/iib/db/update_image_data.py

@@ -1,8 +1,8 @@
 from typing import Dict, List
-from scripts.db.datamodel import Image as DbImg, Tag, ImageTag, DataBase, Floder
+from scripts.iib.db.datamodel import Image as DbImg, Tag, ImageTag, DataBase, Floder
 import os
 from PIL import Image
-from scripts.tool import (
+from scripts.iib.tool import (
     read_info_from_image,
     parse_generation_parameters,
     is_valid_image_path,
@@ -10,7 +10,7 @@ from scripts.tool import (
     is_dev,
 )
 
-from scripts.logger import logger
+from scripts.iib.logger import logger
 
 
 # 定义一个函数来获取图片文件的EXIF数据

scripts/iib/logger.py

@@ -1,5 +1,5 @@
 
-from scripts.tool import is_dev,cwd
+from scripts.iib.tool import is_dev,cwd
 
 import logging
 logger = logging.getLogger(__name__)

scripts/iib/setup.py

@@ -1,9 +1,9 @@
-from scripts.api import infinite_image_browsing_api, send_img_path
+from scripts.iib.api import infinite_image_browsing_api, send_img_path
 from modules import script_callbacks, generation_parameters_copypaste as send
-from scripts.tool import locale
-from scripts.tool import read_info_from_image
+from scripts.iib.tool import locale
+from scripts.iib.tool import read_info_from_image
 from PIL import Image
-from scripts.logger import logger
+from scripts.iib.logger import logger
 
 
 """

scripts/iib/tool.py

@@ -22,7 +22,7 @@ sd_img_dirs = [
 
 
 is_dev = os.getenv("APP_ENV") == "dev"
-cwd = os.path.normpath(os.path.join(__file__, "../../"))
+cwd = os.path.normpath(os.path.join(__file__, "../../../"))
 is_win = platform.system().lower().find("windows") != -1
 
 

scripts/iib_setup.py

@@ -0,0 +1 @@
+import scripts.iib.setup