Skip to content

Do Not Merge/Draft: Python 3.10 Github Actions #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RatherRude wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Do Not Merge/Draft: Python 3.10 Github Actions #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e781f3d
feat: github action (python 3.10)
RatherRude Mar 8, 2025
55ad2a3
Merge remote-tracking branch 'origin/main' into feat/python_310_dont_…
RatherRude Mar 8, 2025
fd22fd5
feat: github action (python 3.10)
RatherRude Mar 8, 2025
afe3d71
feat: github action (python 3.10)
RatherRude Mar 8, 2025
2121027
feat: github action (python 3.10)
RatherRude Mar 8, 2025
d0e9093
feat: github action (python 3.10)
RatherRude Mar 8, 2025
e1749e9
feat: github action (python 3.10)
RatherRude Mar 8, 2025
560f058
feat: github action (python 3.10)
RatherRude Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 72 additions & 58 deletions .github/workflows/build-executable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,54 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.10'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
python -m pip install -r requirements.txt
python -m pip install --force-reinstall paddlepaddle paddleocr

# Pre-download PaddleOCR models to include in the package
- name: Pre-download PaddleOCR models
run: |
# Create a Python script to download models line by line
echo "import os" > download_models.py
echo "from paddleocr import PaddleOCR" >> download_models.py
echo "" >> download_models.py
echo "# Create models directory" >> download_models.py
echo "models_dir = os.path.join(os.getcwd(), 'paddleocr_models')" >> download_models.py
echo "os.makedirs(models_dir, exist_ok=True)" >> download_models.py
echo "" >> download_models.py
echo "# Initialize PaddleOCR to force model download" >> download_models.py
echo "# The models will be cached in the .paddleocr directory" >> download_models.py
echo "ocr = PaddleOCR(lang='en', use_gpu=False, show_log=True)" >> download_models.py
echo "" >> download_models.py
echo "# List downloaded model files to verify" >> download_models.py
echo "print('Downloaded models:')" >> download_models.py
echo "for root, dirs, files in os.walk(os.path.expanduser('~/.paddleocr')):" >> download_models.py
echo " for file in files:" >> download_models.py
echo " print(os.path.join(root, file))" >> download_models.py
echo "" >> download_models.py
echo "# Copy models to our custom directory that will be included in the package" >> download_models.py
echo "import shutil" >> download_models.py
echo "paddle_dir = os.path.expanduser('~/.paddleocr')" >> download_models.py
echo "for root, dirs, files in os.walk(paddle_dir):" >> download_models.py
echo " for file in files:" >> download_models.py
echo " src_path = os.path.join(root, file)" >> download_models.py
echo " rel_path = os.path.relpath(src_path, paddle_dir)" >> download_models.py
echo " dst_path = os.path.join(models_dir, rel_path)" >> download_models.py
echo " os.makedirs(os.path.dirname(dst_path), exist_ok=True)" >> download_models.py
echo " shutil.copy2(src_path, dst_path)" >> download_models.py
echo " print(f'Copied {src_path} to {dst_path}')" >> download_models.py

# Run the script to download models
python download_models.py

# Verify models were downloaded and copied
echo "Checking models directory:"
dir paddleocr_models

# Custom PyInstaller installation with bootloader recompilation
- name: Install custom PyInstaller
run: |
Expand All @@ -32,50 +73,6 @@ jobs:
python -m pip install --force-reinstall --ignore-installed --no-binary :all: --no-cache pyinstaller@git+https://github.com/pyinstaller/pyinstaller.git@0d562b5
$Env:CL = ""

# Add version info file
- name: Create Version Info
run: |
echo "VSVersionInfo(
ffi=FixedFileInfo(
filevers=(1, 0, 0, 0),
prodvers=(1, 0, 0, 0),
mask=0x3f,
flags=0x0,
OS=0x40004,
fileType=0x1,
subtype=0x0,
date=(0, 0)
),
kids=[
StringFileInfo([
StringTable(
u'040904B0',
[StringStruct(u'CompanyName', u'EDAP'),
StringStruct(u'FileDescription', u'EDAP Autopilot'),
StringStruct(u'FileVersion', u'1.0.0'),
StringStruct(u'InternalName', u'EDAP_Autopilot'),
StringStruct(u'LegalCopyright', u'Copyright (c) 2024'),
StringStruct(u'OriginalFilename', u'EDAP-Autopilot.exe'),
StringStruct(u'ProductName', u'EDAP Autopilot'),
StringStruct(u'ProductVersion', u'1.0.0')])
]),
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
]
)" > version_info.txt

- name: List directory contents for debugging
run: |
echo "Root directory:"
dir
echo "====================="
echo "Screen directory:"
dir screen
echo "====================="
echo "List all Python files:"
Get-ChildItem -Path . -Filter "*.py" -Recurse | Select-Object FullName
echo "====================="
echo "Recursive listing of all directories:"
Get-ChildItem -Path . -Directory -Recurse | Select-Object FullName

- name: Build executable
run: |
Expand All @@ -84,6 +81,25 @@ jobs:
echo "{}" > config.json
}

# Create configs directory and default JSON files if they don't exist
$configsDir = "configs"
if (-not (Test-Path -Path $configsDir)) {
New-Item -Path $configsDir -ItemType Directory
}

# Create default config files if they don't exist
if (-not (Test-Path -Path "$configsDir\AP.json")) {
echo "{}" > "$configsDir\AP.json"
}

if (-not (Test-Path -Path "$configsDir\ship_configs.json")) {
echo "{}" > "$configsDir\ship_configs.json"
}

if (-not (Test-Path -Path "$configsDir\resolution.json")) {
echo "{}" > "$configsDir\resolution.json"
}

# Create build info file with just the date
$buildDate = Get-Date -Format "yyyy-MM-dd"
echo "Build date: $buildDate" > build_info.txt
Expand All @@ -96,26 +112,24 @@ jobs:
--add-data "*.py;." `
--add-data "build_info.txt;." `
--add-data "config.json;." `
--add-data "configs\*.json;configs" `
--add-data "paddleocr_models;paddleocr_models" `
--collect-data "paddle" `
--collect-all "paddleocr" `
--hidden-import=PIL `
--hidden-import=PIL._imagingtk `
--hidden-import=PIL._tkinter_finder `
--version-file="version_info.txt" `
--name "EDAP-Autopilot-$buildDate" `
--name "EDAP-$buildDate" `
--clean `
--noupx `
--noconfirm `
EDAPGui.py

# Create zip archive of the directory for distribution
Compress-Archive -Path ".\dist\EDAP-Autopilot-$buildDate" -DestinationPath ".\dist\EDAP-Autopilot-$buildDate.zip"

# Check if build was successful
if (Test-Path ".\dist\EDAP-Autopilot-$buildDate.zip") {
echo "Build successful: EDAP-Autopilot-$buildDate.zip"
if (Test-Path ".\dist\EDAP-$buildDate") {
echo "Build successful: EDAP-$buildDate"
} else {
echo "Build failed or file not found at expected location"
echo "Build failed or directory not found at expected location"
exit 1
}

Expand All @@ -132,7 +146,7 @@ jobs:

# Scan using direct command line tool
$buildDate = Get-Date -Format "yyyy-MM-dd"
$buildPath = Resolve-Path ".\dist\EDAP-Autopilot-$buildDate"
$buildPath = Resolve-Path ".\dist\EDAP-$buildDate"

echo "Scanning path: $buildPath"

Expand All @@ -159,6 +173,6 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: EDAP-Autopilot
path: ./dist/EDAP-Autopilot-*.zip
name: EDAP
path: ./dist/EDAP-*
retention-days: 90
36 changes: 34 additions & 2 deletions OCR.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,37 @@
class OCR:
def __init__(self, screen):
self.screen = screen
self.paddleocr = PaddleOCR(use_angle_cls=True, lang='en', use_gpu=False, show_log=False, use_dilation=True,
use_space_char=True)
try:
# Try importing the os module for path operations
import os
import sys

# Check if we're running in a PyInstaller bundle
if getattr(sys, 'frozen', False):
# Create a models directory if it doesn't exist
# When frozen by PyInstaller, sys.executable points to the executable
executable_dir = os.path.dirname(sys.executable)
model_dir = os.path.join(executable_dir, 'paddleocr_models')
os.makedirs(model_dir, exist_ok=True)

# Initialize PaddleOCR with specific model directory to prevent downloads
self.paddleocr = PaddleOCR(use_angle_cls=True, lang='en', use_gpu=False, show_log=False,
use_dilation=True, use_space_char=True,
det_model_dir=model_dir, rec_model_dir=model_dir,
cls_model_dir=model_dir, download_progress=False)
else:
# Normal initialization for development environment
self.paddleocr = PaddleOCR(use_angle_cls=True, lang='en', use_gpu=False, show_log=False,
use_dilation=True, use_space_char=True)
except Exception as e:
# Fallback if the above fails
import traceback
print(f"Error initializing PaddleOCR: {e}")
traceback.print_exc()
# Try a simpler initialization without progress bars
self.paddleocr = PaddleOCR(use_angle_cls=True, lang='en', use_gpu=False, show_log=False,
use_dilation=True, use_space_char=True, download_progress=False)

# Class for text similarity metrics
self.jarowinkler = JaroWinkler()
self.sorensendice = SorensenDice()
Expand Down Expand Up @@ -234,6 +263,9 @@ def select_item_in_list(self, text, region, keys, min_w, min_h) -> bool:
# Next item
in_list = True
keys.send("UI_Down")

# Fallback return in case the loop is broken
return False

def wait_for_text(self, texts: list[str], region, timeout=30) -> bool:
""" Wait for a screen to appear by checking for text to appear in the region.
Expand Down