cars 1.0.0a1__cp310-cp310-win_amd64.whl → 1.0.0a2__cp310-cp310-win_amd64.whl

cars/pipelines/parameters/sensor_inputs.py

@@ -42,14 +42,14 @@ from cars.pipelines.parameters.sensor_loaders.sensor_loader import SensorLoader
 CARS_GEOID_PATH = "geoid/egm96.grd"  # Path in cars package (pkg)
 
 
-def sensors_check_inputs(conf, config_json_dir=None):  # noqa: C901
+def sensors_check_inputs(conf, config_dir=None):  # noqa: C901
     """
     Check the inputs given
 
     :param conf: configuration of inputs
     :type conf: dict
-    :param config_json_dir: path to dir containing json
-    :type config_json_dir: str
+    :param config_dir: path to dir containing json
+    :type config_dir: str
     """
 
     overloaded_conf = conf.copy()
@@ -74,7 +74,7 @@ def sensors_check_inputs(conf, config_json_dir=None):  # noqa: C901
     checker_inputs = Checker(inputs_schema)
     checker_inputs.validate(overloaded_conf)
 
-    check_sensors(conf, overloaded_conf, config_json_dir)
+    check_sensors(conf, overloaded_conf, config_dir)
 
     # Check srtm dir
     check_srtm(overloaded_conf[sens_cst.INITIAL_ELEVATION][sens_cst.DEM_PATH])
@@ -82,7 +82,7 @@ def sensors_check_inputs(conf, config_json_dir=None):  # noqa: C901
     return overloaded_conf
 
 
-def check_sensors(conf, overloaded_conf, config_json_dir=None):  # noqa: C901
+def check_sensors(conf, overloaded_conf, config_dir=None):  # noqa: C901
     """
     Check sensors
 
@@ -116,9 +116,7 @@ def check_sensors(conf, overloaded_conf, config_json_dir=None):  # noqa: C901
             loader_name = image.get("loader", "basic")
         else:
             raise TypeError(f"Image {image} is not of type str or dict")
-        image_loader = SensorLoader(
-            loader_name, image, "image", config_json_dir
-        )
+        image_loader = SensorLoader(loader_name, image, "image", config_dir)
         image_as_pivot_format = (
             image_loader.get_pivot_format()  # pylint: disable=E1101
         )
@@ -153,7 +151,7 @@ def check_sensors(conf, overloaded_conf, config_json_dir=None):  # noqa: C901
             else:
                 raise TypeError(f"Classif {classif} is not of type str or dict")
             classif_loader = SensorLoader(
-                loader_name, classif, "classification", config_json_dir
+                loader_name, classif, "classification", config_dir
             )
             classif_as_pivot_format = (
                 classif_loader.get_pivot_format()  # pylint: disable=E1101
@@ -172,8 +170,8 @@ def check_sensors(conf, overloaded_conf, config_json_dir=None):  # noqa: C901
         )
 
     # Modify to absolute path
-    if config_json_dir is not None:
-        modify_to_absolute_path(config_json_dir, overloaded_conf)
+    if config_dir is not None:
+        modify_to_absolute_path(config_dir, overloaded_conf)
 
     # Check image, msk and color size compatibility
     for sensor_image_key in overloaded_conf[sens_cst.SENSORS]:
@@ -220,8 +218,8 @@ def check_sensors(conf, overloaded_conf, config_json_dir=None):  # noqa: C901
             raise RuntimeError("{} not in sensors images".format(key2))
 
     # Modify to absolute path
-    if config_json_dir is not None:
-        modify_to_absolute_path(config_json_dir, overloaded_conf)
+    if config_dir is not None:
+        modify_to_absolute_path(config_dir, overloaded_conf)
     else:
         logging.debug(
             "path of config file was not given,"
@@ -383,6 +381,7 @@ def generate_geometry_plugin_with_dem(
         pairs_for_roi = None
 
     # Initialize a second geometry plugin with elevation information
+
     geom_plugin_with_dem_and_geoid = (
         AbstractGeometry(  # pylint: disable=abstract-class-instantiated
             conf_geom_plugin,
@@ -396,12 +395,12 @@ def generate_geometry_plugin_with_dem(
     return geom_plugin_with_dem_and_geoid
 
 
-def modify_to_absolute_path(config_json_dir, overloaded_conf):
+def modify_to_absolute_path(config_dir, overloaded_conf):
     """
     Modify input file path to absolute path
 
-    :param config_json_dir: directory of the json configuration
-    :type config_json_dir: str
+    :param config_dir: directory of the json configuration
+    :type config_dir: str
     :param overloaded_conf: overloaded configuration json
     :dict overloaded_conf: dict
     """
@@ -414,11 +413,11 @@ def modify_to_absolute_path(config_json_dir, overloaded_conf):
         ]:
             if isinstance(sensor_image[tag], dict):
                 sensor_image[tag]["path"] = make_relative_path_absolute(
-                    sensor_image[tag]["path"], config_json_dir
+                    sensor_image[tag]["path"], config_dir
                 )
             elif sensor_image[tag] is not None:
                 sensor_image[tag] = make_relative_path_absolute(
-                    sensor_image[tag], config_json_dir
+                    sensor_image[tag], config_dir
                 )
         for tag in [
             sens_cst.INPUT_IMG,
@@ -429,14 +428,14 @@ def modify_to_absolute_path(config_json_dir, overloaded_conf):
                     sensor_image[tag]["bands"][band]["path"] = (
                         make_relative_path_absolute(
                             sensor_image[tag]["bands"][band]["path"],
-                            config_json_dir,
+                            config_dir,
                         )
                     )
 
     if overloaded_conf[sens_cst.ROI] is not None:
         if isinstance(overloaded_conf[sens_cst.ROI], str):
             overloaded_conf[sens_cst.ROI] = make_relative_path_absolute(
-                overloaded_conf[sens_cst.ROI], config_json_dir
+                overloaded_conf[sens_cst.ROI], config_dir
             )
 
     for tag in [sens_cst.DEM_PATH, sens_cst.GEOID]:
@@ -447,7 +446,7 @@ def modify_to_absolute_path(config_json_dir, overloaded_conf):
                 overloaded_conf[sens_cst.INITIAL_ELEVATION][tag] = (
                     make_relative_path_absolute(
                         overloaded_conf[sens_cst.INITIAL_ELEVATION][tag],
-                        config_json_dir,
+                        config_dir,
                     )
                 )
 

cars/pipelines/parameters/sensor_loaders/basic_sensor_loader.py

@@ -53,7 +53,7 @@ class BasicSensorLoader(SensorLoaderTemplate):
         """
         if isinstance(conf, str):
             overloaded_conf = {}
-            image_path = make_relative_path_absolute(conf, self.json_dir)
+            image_path = make_relative_path_absolute(conf, self.config_dir)
             overloaded_conf["path"] = image_path
             overloaded_conf["loader"] = "basic"
             if self.input_type == "image":
@@ -63,7 +63,7 @@ class BasicSensorLoader(SensorLoaderTemplate):
         elif isinstance(conf, dict):
             overloaded_conf = conf.copy()
             image_path = make_relative_path_absolute(
-                conf["path"], self.json_dir
+                conf["path"], self.config_dir
             )
             overloaded_conf["path"] = image_path
             overloaded_conf["loader"] = conf.get("loader", "basic")
@@ -103,6 +103,6 @@ class BasicSensorLoader(SensorLoaderTemplate):
             }
         pivot_config["texture_bands"] = None
         pivot_sensor_loader = PivotSensorLoader(
-            pivot_config, self.input_type, self.json_dir
+            pivot_config, self.input_type, self.config_dir
         )
         self.pivot_format = pivot_sensor_loader.get_pivot_format()

cars/pipelines/parameters/sensor_loaders/pivot_sensor_loader.py

@@ -53,7 +53,7 @@ class PivotSensorLoader(SensorLoaderTemplate):
         for band in overloaded_conf["bands"]:
             overloaded_conf["bands"][band]["path"] = (
                 make_relative_path_absolute(
-                    overloaded_conf["bands"][band]["path"], self.json_dir
+                    overloaded_conf["bands"][band]["path"], self.config_dir
                 )
             )
         # Check consistency between files
@@ -92,7 +92,7 @@ class PivotSensorLoader(SensorLoaderTemplate):
             ]
         else:
             overloaded_conf["main_file"] = make_relative_path_absolute(
-                overloaded_conf["main_file"], self.json_dir
+                overloaded_conf["main_file"], self.config_dir
             )
         overloaded_conf["texture_bands"] = conf.get("texture_bands", None)
         if overloaded_conf["texture_bands"] is not None:

cars/pipelines/parameters/sensor_loaders/sensor_loader.py

@@ -39,7 +39,7 @@ class SensorLoader:
     available_loaders = {}
 
     def __new__(
-        cls, app_name: str, cfg: dict, input_type: str, config_json_dir: str
+        cls, app_name: str, cfg: dict, input_type: str, config_dir: str
     ):
         """
         Return the instance of sensor loader associated with the sensor loader
@@ -51,12 +51,10 @@ class SensorLoader:
         :type cfg: dictionary
         """
 
-        return cls.create_app(app_name, cfg, input_type, config_json_dir)
+        return cls.create_app(app_name, cfg, input_type, config_dir)
 
     @classmethod
-    def create_app(
-        cls, name: str, cfg: dict, input_type: str, config_json_dir: str
-    ):
+    def create_app(cls, name: str, cfg: dict, input_type: str, config_dir: str):
         """
         Factory command to create the sensor loader
         Return the instance of sensor loader associated with the sensor loader
@@ -74,7 +72,7 @@ class SensorLoader:
         except KeyError:
             logging.error("No sensor loader named {0} supported".format(name))
             return None
-        loader = loader_class(cfg, input_type, config_json_dir)
+        loader = loader_class(cfg, input_type, config_dir)
         return loader
 
     @classmethod

cars/pipelines/parameters/sensor_loaders/sensor_loader_template.py

@@ -30,7 +30,7 @@ class SensorLoaderTemplate:
     Class for general specification of a sensor loader
     """
 
-    def __init__(self, conf, input_type, config_json_dir):
+    def __init__(self, conf, input_type, config_dir):
         """
         Init function of SensorLoaderTemplate
 
@@ -38,7 +38,7 @@ class SensorLoaderTemplate:
         :param input_type: type of input : image or classification
         """
         self.input_type = input_type
-        self.json_dir = config_json_dir
+        self.config_dir = config_dir
         self.used_config = self.check_conf(conf)
 
         self.pivot_format = None

cars/pipelines/pipeline.py

@@ -43,7 +43,7 @@ class Pipeline:
         cls,
         pipeline_name: str,
         cfg: Dict[str, Union[str, int]],
-        config_json_dir,
+        config_dir,
     ):
         """
         Return the instance of pipeline associated with the pipeline
@@ -53,15 +53,15 @@ class Pipeline:
         :type pipeline_name: str
         :param cfg: configuration {'matching_cost_method': value}
         :type cfg: dictionary
-        :param config_json_dir: path to dir containing json
-        :type config_json_dir: str
+        :param config_dir: path to dir containing json or yaml file
+        :type config_dir: str
         """
 
-        return cls.create_pipeline(pipeline_name, cfg, config_json_dir)
+        return cls.create_pipeline(pipeline_name, cfg, config_dir)
 
     @classmethod
     def create_pipeline(
-        cls, name: str, cfg: Dict[str, Union[str, int]], config_json_dir
+        cls, name: str, cfg: Dict[str, Union[str, int]], config_dir
     ):
         """Factory command to create the pipeline
         Return the instance of pipeline associated with the pipeline
@@ -71,8 +71,8 @@ class Pipeline:
         :type pipeline_name: str
         :param cfg: cars input configuration
         :type cfg: dictionary
-        :param config_json_dir: path to dir containing json
-        :type config_json_dir: str
+        :param config_dir: path to dir containing json
+        :type config_dir: str
         """
 
         pipeline = None
@@ -85,7 +85,7 @@ class Pipeline:
                 "No pipeline named {0} supported".format(name)
             ) from kerr
 
-        pipeline = pipeline_class(cfg, config_json_dir)
+        pipeline = pipeline_class(cfg, config_dir)
 
         return pipeline