diff --git a/.gitignore b/.gitignore index f4bb3f9..1185340 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,7 @@ celerybeat-schedule .venv venv/ ENV/ +cctv_venv/ # Spyder project settings .spyderproject diff --git a/server/app.py b/server/app.py index 08ecefd..25eb7cc 100644 --- a/server/app.py +++ b/server/app.py @@ -8,7 +8,7 @@ from model.openCv.OpenCv import OpenCV import threading - +print(os.getcwd()) with open('app_cfg.json') as file: app_cfg = json.load(file) @@ -18,10 +18,11 @@ #configuracion inicial app.config['UPLOAD_FOLDER'] = app_cfg['videos_path'] -#model_cfg = app_cfg['default_model'] # por defecto opencv_320 +#app.config['UPLOAD_FOLDER'] = "../server/files" +#model_cfg = app_cfg['x'] # por defecto opencv_320 #para cambiar modelo ----> remplazar x con un numero del 1 al 5 # 1 = opencv_320 2 = opencv_416 3 = opencv_608 4 = opencv_tiny 5 = keras -model_cfg = app_cfg['models']['5'] +model_cfg = app_cfg['5'] #homepage diff --git a/setup.py b/setup.py index e0558e4..01be8f9 100755 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ def run(self): # entry_points={ # 'console_scripts': ['mycli=mymodule:cli'], # }, - install_requires= [ "flask","gdown","numpy==1.19.2","python-opencv","tensorflow-gpu","keras","pillow","matplotlib","tqdm"], + install_requires= [ "flask","gdown","numpy==1.19.2","opencv-python","tensorflow-gpu","keras","pillow","matplotlib","tqdm"], include_package_data=True, license='GNU Affero General Public License v3 or later (AGPLv3+)', classifiers=[