Skip to content

Commit 94f5c15

Browse files
committed
JSON files are moved to a new directory ("jsonf_files")
json_config.py: - Implemented `json_config_selector` function to handle JSON configurations for `augmentation`, `testing`, and `training` operations. - Each operation now maps to specific configuration and schema JSON file paths via `JSON_FILES_PATHS.get_data_path`. - Enables streamlined selection of JSON configurations, improving modularity. augmentation.py, draw_rectangles.py, test.py, train.py - Previous bindings for JSON_FILES_PATH replaced with json_config_selector() data_paths.py: - In ConfigFilePaths() paths are changed.
1 parent 7610b85 commit 94f5c15

12 files changed

+40
-20
lines changed

config/data_paths.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,19 @@ def get_data_path(self, key):
210210
class ConfigFilePaths(_Const):
211211
dirs_config_paths = {
212212
"config_augmentation":
213-
"config/augmentation_config.json",
213+
"config/json_files/augmentation_config.json",
214214
"config_schema_augmentation":
215-
"config/augmentation_config_schema.json",
215+
"config/json_files/augmentation_config_schema.json",
216216

217217
"config_training":
218-
"config/training_config.json",
218+
"config/json_files/training_config.json",
219219
"config_schema_training":
220-
"config/training_config_schema.json",
220+
"config/json_files/training_config_schema.json",
221221

222222
"config_testing":
223-
"config/testing_config.json",
223+
"config/json_files/testing_config.json",
224224
"config_schema_testing":
225-
"config/testing_config_schema.json"
225+
"config/json_files/testing_config_schema.json"
226226
}
227227

228228
# ------------------------------------------------------------------------------------------------------------------

config/json_config.py

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
from config.data_paths import JSON_FILES_PATHS
2+
3+
4+
def json_config_selector(operation):
5+
json_cfg = {
6+
"augmentation": {
7+
"config": JSON_FILES_PATHS.get_data_path("config_augmentation"),
8+
"schema": JSON_FILES_PATHS.get_data_path("config_schema_augmentation")
9+
},
10+
"testing": {
11+
"config": JSON_FILES_PATHS.get_data_path("config_testing"),
12+
"schema": JSON_FILES_PATHS.get_data_path("config_schema_testing")
13+
},
14+
"training": {
15+
"config": JSON_FILES_PATHS.get_data_path("config_training"),
16+
"schema": JSON_FILES_PATHS.get_data_path("config_schema_training")
17+
}
18+
}
19+
20+
return json_cfg[operation]
File renamed without changes.
File renamed without changes.

dataset_operations/augmentation.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from typing import List, Tuple
88
from tqdm import tqdm
99

10-
from config.data_paths import JSON_FILES_PATHS
1110
from config.dataset_config import dataset_images_path_selector
11+
from config.json_config import json_config_selector
1212
from utils.utils import load_config_json
1313

1414

@@ -174,8 +174,8 @@ def main() -> None:
174174
"""
175175

176176
aug_cfg = (
177-
load_config_json(json_schema_filename=JSON_FILES_PATHS.get_data_path("config_schema_augmentation"),
178-
json_filename=JSON_FILES_PATHS.get_data_path("config_augmentation"))
177+
load_config_json(json_schema_filename=json_config_selector("augmentation")["schema"],
178+
json_filename=json_config_selector("augmentation")["config"])
179179
)
180180

181181
if aug_cfg.get("do_augmentation"):

dataset_operations/draw_rectangles.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from concurrent.futures import ProcessPoolExecutor
77
from tqdm import tqdm
88

9-
from config.data_paths import JSON_FILES_PATHS
109
from config.dataset_config import dataset_images_path_selector
10+
from config.json_config import json_config_selector
1111
from utils.utils import load_config_json, file_reader
1212

1313

@@ -56,8 +56,8 @@ def main() -> None:
5656

5757
cfg = (
5858
load_config_json(
59-
json_schema_filename=JSON_FILES_PATHS.get_data_path("config_schema_augmentation"),
60-
json_filename=JSON_FILES_PATHS.get_data_path("config_augmentation")
59+
json_schema_filename=json_config_selector("augmentation")["schema"],
60+
json_filename=json_config_selector("augmentation")["config"]
6161
)
6262
)
6363

src/test.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
from sklearn.metrics import mean_squared_error
1313
from tqdm import tqdm
1414

15-
from config.data_paths import JSON_FILES_PATHS
1615
from config.network_config import network_configs
16+
from config.json_config import json_config_selector
1717
from config.dataset_config import dataset_data_path_selector, dataset_images_path_selector
1818
from models.network_selector import NetworkFactory
1919
from utils.utils import (setup_logger, device_selector, get_patch, patch2img, set_img_color, avg_of_list,
@@ -28,15 +28,15 @@ def __init__(self):
2828

2929
train_cfg = (
3030
load_config_json(
31-
json_schema_filename=JSON_FILES_PATHS.get_data_path("config_schema_training"),
32-
json_filename=JSON_FILES_PATHS.get_data_path("config_training")
31+
json_schema_filename=json_config_selector("training")["schema"],
32+
json_filename=json_config_selector("training")["config"]
3333
)
3434
)
3535

3636
self.test_cfg = (
3737
load_config_json(
38-
json_schema_filename=JSON_FILES_PATHS.get_data_path("config_schema_testing"),
39-
json_filename=JSON_FILES_PATHS.get_data_path("config_testing")
38+
json_schema_filename=json_config_selector("testing")["schema"],
39+
json_filename=json_config_selector("testing")["config"]
4040
)
4141
)
4242

src/train.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from config.network_config import network_configs
1515
from config.dataset_config import dataset_images_path_selector, dataset_data_path_selector
16-
from config.data_paths import JSON_FILES_PATHS
16+
from config.json_config import json_config_selector
1717
from dataloaders.data_loader_ae import MVTecDataset
1818
from dataloaders.data_loader_dae import MVTecDatasetDenoising
1919
from models.network_selector import NetworkFactory
@@ -31,8 +31,8 @@ def __init__(self):
3131

3232
self.train_cfg = (
3333
load_config_json(
34-
json_schema_filename=JSON_FILES_PATHS.get_data_path("config_schema_training"),
35-
json_filename=JSON_FILES_PATHS.get_data_path("config_training")
34+
json_schema_filename=json_config_selector("training")["schema"],
35+
json_filename=json_config_selector("training")["config"]
3636
)
3737
)
3838

0 commit comments

Comments
 (0)