From 99b719051c6689c4937989376db302c31cc639b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Boisselier?= Date: Sat, 20 Apr 2024 19:15:24 +0200 Subject: [PATCH] fixed imports by running as a module --- K-ShakeTune/shaketune.sh | 7 ++++++- src/graph_creators/__init.py__ | 0 src/graph_creators/analyze_axesmap.py | 2 +- src/graph_creators/graph_belts.py | 4 ++-- src/graph_creators/graph_shaper.py | 4 ++-- src/graph_creators/graph_vibrations.py | 4 ++-- src/{ => graph_creators}/klippain.png | Bin src/helpers/__init__.py | 0 src/helpers/filemanager.py | 9 +++------ src/is_workflow.py | 16 +++++++++------- 10 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 src/graph_creators/__init.py__ rename src/{ => graph_creators}/klippain.png (100%) create mode 100644 src/helpers/__init__.py diff --git a/K-ShakeTune/shaketune.sh b/K-ShakeTune/shaketune.sh index 17ba92d..53af59f 100755 --- a/K-ShakeTune/shaketune.sh +++ b/K-ShakeTune/shaketune.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# This script is used to run the Shake&Tune Python scripts as a module +# from the project root directory using its virtual environment +# Usage: ./shaketune.sh + source ~/klippain_shaketune-env/bin/activate -python ~/klippain_shaketune/src/is_workflow.py "$@" +cd ~/klippain_shaketune +python -m src.is_workflow "$@" deactivate diff --git a/src/graph_creators/__init.py__ b/src/graph_creators/__init.py__ new file mode 100644 index 0000000..e69de29 diff --git a/src/graph_creators/analyze_axesmap.py b/src/graph_creators/analyze_axesmap.py index bcf5538..9376cfc 100644 --- a/src/graph_creators/analyze_axesmap.py +++ b/src/graph_creators/analyze_axesmap.py @@ -10,7 +10,7 @@ import optparse import numpy as np from scipy.signal import butter, filtfilt -from helpers.locale_utils import print_with_c_locale +from ..helpers.locale_utils import print_with_c_locale NUM_POINTS = 500 diff --git a/src/graph_creators/graph_belts.py b/src/graph_creators/graph_belts.py index a070c41..edbb316 100644 --- a/src/graph_creators/graph_belts.py +++ b/src/graph_creators/graph_belts.py @@ -20,14 +20,14 @@ from scipy.interpolate import griddata matplotlib.use('Agg') -from helpers.common_func import ( +from ..helpers.common_func import ( compute_curve_similarity_factor, compute_spectrogram, detect_peaks, parse_log, setup_klipper_import, ) -from helpers.locale_utils import print_with_c_locale, set_locale +from ..helpers.locale_utils import print_with_c_locale, set_locale ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' # For paired peaks names diff --git a/src/graph_creators/graph_shaper.py b/src/graph_creators/graph_shaper.py index 5ae23a8..aec74db 100644 --- a/src/graph_creators/graph_shaper.py +++ b/src/graph_creators/graph_shaper.py @@ -20,14 +20,14 @@ import numpy as np matplotlib.use('Agg') -from helpers.common_func import ( +from ..helpers.common_func import ( compute_mechanical_parameters, compute_spectrogram, detect_peaks, parse_log, setup_klipper_import, ) -from helpers.locale_utils import print_with_c_locale, set_locale +from ..helpers.locale_utils import print_with_c_locale, set_locale PEAKS_DETECTION_THRESHOLD = 0.05 PEAKS_EFFECT_THRESHOLD = 0.12 diff --git a/src/graph_creators/graph_vibrations.py b/src/graph_creators/graph_vibrations.py index 3931d9f..d29d617 100644 --- a/src/graph_creators/graph_vibrations.py +++ b/src/graph_creators/graph_vibrations.py @@ -21,14 +21,14 @@ import numpy as np matplotlib.use('Agg') -from helpers.common_func import ( +from ..helpers.common_func import ( compute_mechanical_parameters, detect_peaks, identify_low_energy_zones, parse_log, setup_klipper_import, ) -from helpers.locale_utils import print_with_c_locale, set_locale +from ..helpers.locale_utils import print_with_c_locale, set_locale PEAKS_DETECTION_THRESHOLD = 0.05 PEAKS_RELATIVE_HEIGHT_THRESHOLD = 0.04 diff --git a/src/klippain.png b/src/graph_creators/klippain.png similarity index 100% rename from src/klippain.png rename to src/graph_creators/klippain.png diff --git a/src/helpers/__init__.py b/src/helpers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/helpers/filemanager.py b/src/helpers/filemanager.py index ba872a7..daccb4c 100644 --- a/src/helpers/filemanager.py +++ b/src/helpers/filemanager.py @@ -6,8 +6,6 @@ import time from pathlib import Path -from is_workflow import Config - def wait_file_ready(filepath: Path) -> None: file_busy = True @@ -37,7 +35,6 @@ def wait_file_ready(filepath: Path) -> None: time.sleep(1) -def ensure_folders_exist() -> None: - for subfolder in Config.RESULTS_SUBFOLDERS.values(): - folder = Config.RESULTS_BASE_FOLDER / subfolder - Path(folder).mkdir(parents=True, exist_ok=True) +def ensure_folders_exist(folders: list[Path]) -> None: + for folder in folders: + folder.mkdir(parents=True, exist_ok=True) diff --git a/src/is_workflow.py b/src/is_workflow.py index bd75457..5092139 100755 --- a/src/is_workflow.py +++ b/src/is_workflow.py @@ -20,12 +20,12 @@ from typing import Callable, Optional from git import GitCommandError, Repo from matplotlib.figure import Figure -import helpers.filemanager as fm -from graph_creators.analyze_axesmap import axesmap_calibration -from graph_creators.graph_belts import belts_calibration -from graph_creators.graph_shaper import shaper_calibration -from graph_creators.graph_vibrations import vibrations_profile -from helpers.locale_utils import print_with_c_locale +import src.helpers.filemanager as fm +from src.graph_creators.analyze_axesmap import axesmap_calibration +from src.graph_creators.graph_belts import belts_calibration +from src.graph_creators.graph_shaper import shaper_calibration +from src.graph_creators.graph_vibrations import vibrations_profile +from src.helpers.locale_utils import print_with_c_locale class Config: @@ -358,7 +358,9 @@ class AxesMapFinder: def main(): options = Config.parse_arguments() - fm.ensure_folders_exist() + fm.ensure_folders_exist( + folders=[Config.RESULTS_BASE_FOLDER / subfolder for subfolder in Config.RESULTS_SUBFOLDERS.values()] + ) print_with_c_locale(f'Shake&Tune version: {Config.get_git_version()}')