From 0f13ba384e11e587eaf25ab85295921c48cf0083 Mon Sep 17 00:00:00 2001
From: Alex Bezdieniezhnykh <zxsanny@gmail.com>
Date: Mon, 10 Feb 2025 16:39:44 +0200
Subject: [PATCH] complete requirements.txt list fix build.cmd

---
 Azaion.Inference/README.md        |  7 +++++++
 Azaion.Inference/build.cmd        |  7 +++----
 Azaion.Inference/inference.pyx    |  1 -
 Azaion.Inference/main.pyx         |  1 -
 Azaion.Inference/requirements.txt |  9 +++++++--
 Azaion.Inference/start.spec       | 12 +++++++-----
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/Azaion.Inference/README.md b/Azaion.Inference/README.md
index 5307e74..9756597 100644
--- a/Azaion.Inference/README.md
+++ b/Azaion.Inference/README.md
@@ -57,6 +57,8 @@ This is crucial for the build because build needs Python.h header and other file
 ```
     python -m pip install --upgrade pip
     pip install requirements.txt
+    pip install pyinstaller
+
 ```
 In case of  fbgemm.dll  error (Windows specific):
     
@@ -67,3 +69,8 @@ In case of  fbgemm.dll  error (Windows specific):
 ```
     python setup.py build_ext --inplace
 ```
+
+<h3>Build exe</h3>
+```
+    .\build.exe
+```
diff --git a/Azaion.Inference/build.cmd b/Azaion.Inference/build.cmd
index dd5761f..8b95662 100644
--- a/Azaion.Inference/build.cmd
+++ b/Azaion.Inference/build.cmd
@@ -2,10 +2,11 @@ pyinstaller --onefile ^
 --collect-all jwt ^
 --collect-all requests ^
 --collect-all psutil ^
---collect-all cryptography ^
 --collect-all msgpack ^
---collect-all expecttest ^
 --collect-all zmq ^
+--collect-all cryptography ^
+--collect-all cv2 ^
+--collect-all onnxruntime ^
 --hidden-import user ^
 --hidden-import security ^
 --hidden-import secure_model ^
@@ -17,6 +18,4 @@ pyinstaller --onefile ^
 --hidden-import ai_config ^
 --hidden-import inference ^
 --hidden-import remote_command_handler ^
---hidden-import cv2 ^
---hidden-import onnxruntime ^
 start.py
\ No newline at end of file
diff --git a/Azaion.Inference/inference.pyx b/Azaion.Inference/inference.pyx
index d26a073..fe0c696 100644
--- a/Azaion.Inference/inference.pyx
+++ b/Azaion.Inference/inference.pyx
@@ -1,6 +1,5 @@
 import json
 import mimetypes
-import time
 
 import cv2
 import numpy as np
diff --git a/Azaion.Inference/main.pyx b/Azaion.Inference/main.pyx
index 72440db..5d306f0 100644
--- a/Azaion.Inference/main.pyx
+++ b/Azaion.Inference/main.pyx
@@ -1,7 +1,6 @@
 import traceback
 from queue import Queue
 cimport constants
-import msgpack
 
 from api_client cimport ApiClient
 from annotation cimport Annotation
diff --git a/Azaion.Inference/requirements.txt b/Azaion.Inference/requirements.txt
index 9f4bded..7526e44 100644
--- a/Azaion.Inference/requirements.txt
+++ b/Azaion.Inference/requirements.txt
@@ -1,5 +1,10 @@
-setuptools
 Cython
 opencv-python
 numpy
-onnxruntime-gpu
\ No newline at end of file
+onnxruntime-gpu
+cryptography
+psutil
+msgpack
+pyjwt
+zmq
+requests
\ No newline at end of file
diff --git a/Azaion.Inference/start.spec b/Azaion.Inference/start.spec
index 1e8c699..8a6d5ac 100644
--- a/Azaion.Inference/start.spec
+++ b/Azaion.Inference/start.spec
@@ -3,21 +3,23 @@ from PyInstaller.utils.hooks import collect_all
 
 datas = []
 binaries = []
-hiddenimports = ['user', 'security', 'secure_model', 'api_client', 'hardware_service', 'constants', 'annotation', 'remote_command', 'ai_config', 'inference', 'remote_command_handler', 'cv2', 'onnxruntime']
+hiddenimports = ['user', 'security', 'secure_model', 'api_client', 'hardware_service', 'constants', 'annotation', 'remote_command', 'ai_config', 'inference', 'remote_command_handler']
 tmp_ret = collect_all('jwt')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 tmp_ret = collect_all('requests')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 tmp_ret = collect_all('psutil')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
-tmp_ret = collect_all('cryptography')
-datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 tmp_ret = collect_all('msgpack')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
-tmp_ret = collect_all('expecttest')
-datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 tmp_ret = collect_all('zmq')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
+tmp_ret = collect_all('cryptography')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
+tmp_ret = collect_all('cv2')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
+tmp_ret = collect_all('onnxruntime')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 
 
 a = Analysis(