inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-16 12:05:53 +00:00
Code Activity

Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue6281

Browse Source
This commit is contained in:
Matthias Mair
2025-01-08 08:03:18 +01:00
parent 18fdfc9b22 dcff7a5ccd
commit ea940e8c58
209 changed files with 6775 additions and 6583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
tasks.py
View File

@ -15,6 +15,29 @@ from invoke import Collection, task
from invoke.exceptions import UnexpectedExit
def task_exception_handler(t, v, tb):
"""Handle exceptions raised by tasks.
The intent here is to provide more 'useful' error messages when tasks fail.
"""
sys.__excepthook__(t, v, tb)
if t is ModuleNotFoundError:
mod_name = str(v).split(' ')[-1].strip("'")
error(f'Error importing required module: {mod_name}')
warning('- Ensure the correct Python virtual environment is active')
warning(
'- Ensure that the invoke tool is installed in the active Python environment'
)
warning(
"- Ensure all required packages are installed by running 'invoke install'"
)
sys.excepthook = task_exception_handler
def success(*args):
"""Print a success message to the console."""
msg = ' '.join(map(str, args))
@ -57,8 +80,8 @@ def checkPythonVersion():
valid = False
if not valid:
print(f'The installed python version ({version}) is not supported!')
print(f'InvenTree requires Python {REQ_MAJOR}.{REQ_MINOR} or above')
error(f'The installed python version ({version}) is not supported!')
error(f'InvenTree requires Python {REQ_MAJOR}.{REQ_MINOR} or above')
sys.exit(1)
@ -230,7 +253,7 @@ def node_available(versions: bool = False, bypass_yarn: bool = False):
# Print a warning if node is available but yarn is not
if node_version and not yarn_passes:
print(
warning(
'Node is available but yarn is not. Install yarn if you wish to build the frontend.'
)
@ -238,7 +261,7 @@ def node_available(versions: bool = False, bypass_yarn: bool = False):
return ret(yarn_passes and node_version, node_version, yarn_version)
def check_file_existance(filename: Path, overwrite: bool = False):
def check_file_existence(filename: Path, overwrite: bool = False):
"""Checks if a file exists and asks the user if it should be overwritten.
Args:
@ -252,7 +275,7 @@ def check_file_existance(filename: Path, overwrite: bool = False):
response = str(response).strip().lower()
if response not in ['y', 'yes']:
print('Cancelled export operation')
error('Cancelled export operation')
sys.exit(1)
@ -498,7 +521,7 @@ def restore(
base_cmd += f' -I {path}'
if ignore_database:
print('Skipping database archive...')
info('Skipping database archive...')
else:
info('Restoring InvenTree database')
cmd = f'dbrestore {base_cmd}'
@ -509,7 +532,7 @@ def restore(
manage(c, cmd)
if ignore_media:
print('Skipping media restore...')
info('Skipping media restore...')
else:
info('Restoring InvenTree media files')
cmd = f'mediarestore {base_cmd}'
@ -591,7 +614,11 @@ def update(
# - INVENTREE_DOCKER is set (by the docker image eg.) and not overridden by `--frontend` flag
# - `--no-frontend` flag is set
if (os.environ.get('INVENTREE_DOCKER', False) and not frontend) or no_frontend:
print('Skipping frontend update!')
if no_frontend:
info('Skipping frontend update (no_frontend flag set)')
else:
info('Skipping frontend update (INVENTREE_DOCKER flag set)')
frontend = False
no_frontend = True
else:
@ -654,7 +681,7 @@ def export_records(
info(f"Exporting database records to file '{target}'")
check_file_existance(target, overwrite)
check_file_existence(target, overwrite)
tmpfile = f'{target}.tmp'
@ -699,7 +726,7 @@ def export_records(
f_out.write(json.dumps(data_out, indent=2))
if not retain_temp:
print('Removing temporary files')
info('Removing temporary files')
os.remove(tmpfile)
success('Data export completed')
@ -1098,7 +1125,7 @@ def schema(
):
"""Export current API schema."""
filename = Path(filename).resolve()
check_file_existance(filename, overwrite)
check_file_existence(filename, overwrite)
info(f"Exporting schema file to '{filename}'")
@ -1130,7 +1157,7 @@ def schema(
def export_settings_definitions(c, filename='inventree_settings.json', overwrite=False):
"""Export settings definition to a JSON file."""
filename = Path(filename).resolve()
check_file_existance(filename, overwrite)
check_file_existence(filename, overwrite)
info(f"Exporting settings definition to '{filename}'...")
manage(c, f'export_settings_definitions {filename}', pty=True)
@ -1358,10 +1385,10 @@ def frontend_download(
current_content = current.read_text().strip()
ref_value = tag or sha
if current_content == ref_value:
print(f'Frontend {ref} is already `{ref_value}`')
info(f'Frontend {ref} is already `{ref_value}`')
return True
else:
print(
info(
f'Frontend {ref} is not expected `{ref_value}` but `{current_content}` - new version will be downloaded'
)
return False
@ -1394,7 +1421,7 @@ def frontend_download(
and content['INVENTREE_PKG_INSTALLER'] == 'PKG'
):
ref = content.get('INVENTREE_COMMIT_SHA')
print(
info(
f'[INFO] Running in package environment, got commit "{ref}" from VERSION file'
)
else:
@ -1435,7 +1462,8 @@ Then try continuing by running: invoke frontend-download --file <path-to-downloa
if not (qc_run := find_resource(workflow_runs['workflow_runs'], 'name', 'QC')):
error(f'ERROR: Cannot find any workflow runs for current SHA {ref}')
return
print(
info(
f'Found workflow {qc_run["name"]} (run {qc_run["run_number"]}-{qc_run["run_attempt"]})'
)
@ -1448,9 +1476,10 @@ Then try continuing by running: invoke frontend-download --file <path-to-downloa
artifacts['artifacts'], 'name', 'frontend-build'
)
):
print('[ERROR] Cannot find frontend-build.zip attachment for current sha')
error('[ERROR] Cannot find frontend-build.zip attachment for current sha')
return
print(
info(
f'Found artifact {frontend_artifact["name"]} with id {frontend_artifact["id"]} ({frontend_artifact["size_in_bytes"] / 1e6:.2f}MB).'
)