Merge pull request #353 from ansforge/fix/converter-clean-logs

Fix/converter clean logs

Author: SimonClo

converter/converter/versions/base_message_converter.py

@@ -47,13 +47,11 @@ def convert(cls, source_version, target_version, edxl_json):
             # Convert directly if version are consecutive
             if abs(source_version_index - target_version_index) == 1:
                 if source_version_index < target_version_index:
-                    logger.info(f"Upgrading message version from {source_version}")
-                    return cls.upgrade(source_version, source_version_index, edxl_json)
+                    target_version = version_order_list[source_version_index + 1]
+                    return cls.upgrade(source_version, target_version, edxl_json)
                 else:
-                    logger.info(f"Downgrading message version from {source_version}")
-                    return cls.downgrade(
-                        source_version, source_version_index, edxl_json
-                    )
+                    target_version = version_order_list[source_version_index - 1]
+                    return cls.downgrade(source_version, target_version, edxl_json)
 
             # Convert message to consecutive version
             version_delta = 1 if source_version_index < target_version_index else -1
@@ -76,26 +74,28 @@ def convert(cls, source_version, target_version, edxl_json):
             cls.raise_conversion_not_implemented_error(source_version, target_version)
 
     @classmethod
-    def upgrade(cls, source_version, source_version_index, edxl_json):
+    def upgrade(cls, source_version, target_version, edxl_json):
+        logger.info(
+            f"Upgrading message version from {source_version} to {target_version}"
+        )
         if source_version == "v1":
             return cls.convert_v1_to_v2(edxl_json)
         elif source_version == "v2":
             return cls.convert_v2_to_v3(edxl_json)
         else:
-            return cls.raise_conversion_impossible_error(
-                source_version, version_order_list[source_version_index + 1]
-            )
+            return cls.raise_conversion_impossible_error(source_version, target_version)
 
     @classmethod
-    def downgrade(cls, source_version, source_version_index, edxl_json):
+    def downgrade(cls, source_version, target_version, edxl_json):
+        logger.info(
+            f"Downgrading message version from {source_version} to {target_version}"
+        )
         if source_version == "v2":
             return cls.convert_v2_to_v1(edxl_json)
         elif source_version == "v3":
             return cls.convert_v3_to_v2(edxl_json)
         else:
-            return cls.raise_conversion_impossible_error(
-                source_version, version_order_list[source_version_index - 1]
-            )
+            return cls.raise_conversion_impossible_error(source_version, target_version)
 
     @classmethod
     def convert_v1_to_v2(cls, edxl_json):
@@ -127,12 +127,12 @@ def raise_conversion_impossible_error(cls, source_version, target_version):
 
     @classmethod
     def copy_input_content(cls, input_json: Dict[str, Any]) -> Dict[str, Any]:
-        logger.info("Copying input content")
+        logger.debug("Copying input content")
         return cls._copy_input_content(input_json, cls.get_message_type())
 
     @classmethod
     def copy_input_use_case_content(cls, input_json: Dict[str, Any]) -> Dict[str, Any]:
-        logger.info("Copying input use case content")
+        logger.debug("Copying input use case content")
         return cls._copy_input_use_case_content(input_json, cls.get_message_type())
 
     @classmethod
@@ -141,7 +141,7 @@ def format_output_json(
         output_json: Dict[str, Any],
         output_use_case_json: Dict[str, Any],
     ) -> Dict[str, Any]:
-        logger.info("Formatting output JSON")
+        logger.debug("Formatting output JSON")
         return cls._format_output_json(
             output_json, output_use_case_json, cls.get_message_type()
         )