From 4b9374fcdc2a49d107ae751aceec1ab36c1d01b5 Mon Sep 17 00:00:00 2001 From: feie9456 Date: Wed, 20 Aug 2025 09:08:20 +0800 Subject: [PATCH] edit project arch --- main.py | 2 +- pyproject.toml | 1 + src/__init__.py | 1 + {best_model => src/best_model}/best.pt | Bin {best_model => src/best_model}/model_2.pt | Bin src/pre_func/__init__.py | 1 + {pre_func => src/pre_func}/ele_recog.py | 0 {pre_func => src/pre_func}/img_prec.py | 4 ++-- {pre_func => src/pre_func}/wires_recog.py | 0 uv.lock | 2 ++ 10 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 src/__init__.py rename {best_model => src/best_model}/best.pt (100%) rename {best_model => src/best_model}/model_2.pt (100%) create mode 100644 src/pre_func/__init__.py rename {pre_func => src/pre_func}/ele_recog.py (100%) rename {pre_func => src/pre_func}/img_prec.py (99%) rename {pre_func => src/pre_func}/wires_recog.py (100%) diff --git a/main.py b/main.py index ac97119..86db0ad 100644 --- a/main.py +++ b/main.py @@ -2,7 +2,7 @@ from flask import Flask, request, jsonify from flask_cors import CORS import numpy as np import cv2 -from pre_func.img_prec import img_recognition +from src.pre_func.img_prec import img_recognition app = Flask(__name__) CORS(app) diff --git a/pyproject.toml b/pyproject.toml index 97742bb..3ce3515 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,7 @@ dependencies = [ "flask>=3.1.1", "flask-cors>=6.0.1", "numpy>=2.3.0", + "opencv-python>=4.11.0.86", "scikit-image>=0.25.2", "ultralytics>=8.3.156", ] diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..d35f4d4 --- /dev/null +++ b/src/__init__.py @@ -0,0 +1 @@ +# 这个文件使 src 目录成为一个 Python 包 diff --git a/best_model/best.pt b/src/best_model/best.pt similarity index 100% rename from best_model/best.pt rename to src/best_model/best.pt diff --git a/best_model/model_2.pt b/src/best_model/model_2.pt similarity index 100% rename from best_model/model_2.pt rename to src/best_model/model_2.pt diff --git a/src/pre_func/__init__.py b/src/pre_func/__init__.py new file mode 100644 index 0000000..6ae7dc6 --- /dev/null +++ b/src/pre_func/__init__.py @@ -0,0 +1 @@ +# 这个文件使 pre_func 目录成为一个 Python 包 diff --git a/pre_func/ele_recog.py b/src/pre_func/ele_recog.py similarity index 100% rename from pre_func/ele_recog.py rename to src/pre_func/ele_recog.py diff --git a/pre_func/img_prec.py b/src/pre_func/img_prec.py similarity index 99% rename from pre_func/img_prec.py rename to src/pre_func/img_prec.py index 163fb0e..b4e2666 100644 --- a/pre_func/img_prec.py +++ b/src/pre_func/img_prec.py @@ -1,6 +1,6 @@ import datetime -from pre_func import wires_recog -from pre_func import ele_recog +from . import wires_recog +from . import ele_recog import cv2 import numpy as np import base64 diff --git a/pre_func/wires_recog.py b/src/pre_func/wires_recog.py similarity index 100% rename from pre_func/wires_recog.py rename to src/pre_func/wires_recog.py diff --git a/uv.lock b/uv.lock index fdb50c8..106396c 100644 --- a/uv.lock +++ b/uv.lock @@ -69,6 +69,7 @@ dependencies = [ { name = "flask" }, { name = "flask-cors" }, { name = "numpy" }, + { name = "opencv-python" }, { name = "scikit-image" }, { name = "ultralytics" }, ] @@ -78,6 +79,7 @@ requires-dist = [ { name = "flask", specifier = ">=3.1.1" }, { name = "flask-cors", specifier = ">=6.0.1" }, { name = "numpy", specifier = ">=2.3.0" }, + { name = "opencv-python", specifier = ">=4.11.0.86" }, { name = "scikit-image", specifier = ">=0.25.2" }, { name = "ultralytics", specifier = ">=8.3.156" }, ]