diff --git a/.gitignore b/.gitignore index a3a18b5..fa15348 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ launch.sh conf.json iib.db-journal .env +standalone.cmd diff --git a/app.py b/app.py index 3c8fc0a..7044de2 100644 --- a/app.py +++ b/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" diff --git a/scripts/api.py b/scripts/iib/api.py similarity index 99% rename from scripts/api.py rename to scripts/iib/api.py index 2207e7c..1c0ccdd 100644 --- a/scripts/api.py +++ b/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 diff --git a/scripts/db/datamodel.py b/scripts/iib/db/datamodel.py similarity index 99% rename from scripts/db/datamodel.py rename to scripts/iib/db/datamodel.py index 9186e17..fe0cea2 100644 --- a/scripts/db/datamodel.py +++ b/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, diff --git a/scripts/db/update_image_data.py b/scripts/iib/db/update_image_data.py similarity index 95% rename from scripts/db/update_image_data.py rename to scripts/iib/db/update_image_data.py index 3216c1c..0dbad86 100644 --- a/scripts/db/update_image_data.py +++ b/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数据 diff --git a/scripts/logger.py b/scripts/iib/logger.py similarity index 92% rename from scripts/logger.py rename to scripts/iib/logger.py index 3cefebe..3d79527 100644 --- a/scripts/logger.py +++ b/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__) diff --git a/scripts/setup.py b/scripts/iib/setup.py similarity index 92% rename from scripts/setup.py rename to scripts/iib/setup.py index 709bfb3..b29640c 100644 --- a/scripts/setup.py +++ b/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 """ diff --git a/scripts/tool.py b/scripts/iib/tool.py similarity index 99% rename from scripts/tool.py rename to scripts/iib/tool.py index 7d0f865..aedf89f 100644 --- a/scripts/tool.py +++ b/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 diff --git a/scripts/iib_setup.py b/scripts/iib_setup.py new file mode 100644 index 0000000..81ac628 --- /dev/null +++ b/scripts/iib_setup.py @@ -0,0 +1 @@ +import scripts.iib.setup \ No newline at end of file