fameio 2.3.0__py3-none-any.whl → 2.3.1__py3-none-any.whl

CHANGELOG.md

@@ -3,6 +3,10 @@
 SPDX-License-Identifier: CC0-1.0 -->
 
 # Changelog
+## [2.3.1](https://gitlab.com/fame-framework/fame-io/-/tags/v2.3.1) - 2024-08-26
+### Fixed
+- Fix ignored default values of `convert_results` for `merge-times` arguments #211 (@dlr-cjs, dlr_fn)
+
 ## [2.3.0](https://gitlab.com/fame-framework/fame-io/-/tags/v2.3.0) - 2024-08-12
 ### Added
 - New attribute type `string_set` #175 (@dlr_fn @dlr-cjs)

fameio/source/cli/convert_results.py

@@ -73,7 +73,7 @@ def _prepare_parser(defaults: Optional[Dict[Options, Any]]) -> argparse.Argument
     add_memory_saving_argument(parser, _get_default(defaults, Options.MEMORY_SAVING))
     add_resolve_complex_argument(parser, _get_default(defaults, Options.RESOLVE_COMPLEX_FIELD))
     add_time_argument(parser, _get_default(defaults, Options.TIME))
-    add_merge_time_parser(parser)
+    add_merge_time_parser(parser, _get_default(defaults, Options.TIME_MERGING))
     add_inputs_recovery_argument(parser, _get_default(defaults, Options.INPUT_RECOVERY))
 
     return parser

fameio/source/cli/parser.py

@@ -138,25 +138,40 @@ def add_time_argument(parser: ArgumentParser, default_value: Union[TimeOptions,
     )
 
 
-def add_merge_time_parser(parser: ArgumentParser) -> None:
-    """Adds subparser for merging of TimeSteps to given `parser`"""
-    subparser = parser.add_subparsers(dest="time_merging", required=False, help="Optional merging of TimeSteps")
+def add_merge_time_parser(parser: ArgumentParser, defaults: Optional[Dict[MergingOptions, int]]) -> None:
+    """
+    Adds subparser for merging of TimeSteps to given `parser`
+    If at least one valid time merging option is specified in given defaults, calling the subparser becomes mandatory
+    """
+    defaults = defaults if (defaults is not None) and (isinstance(defaults, dict)) else {}
+    if any([option in defaults.keys() for option in MergingOptions]):
+        subparser = parser.add_subparsers(dest="time_merging", required=True, help="Optional merging of TimeSteps")
+    else:
+        subparser = parser.add_subparsers(dest="time_merging", required=False, help="Optional merging of TimeSteps")
     group_parser = subparser.add_parser("merge-times")
-    add_focal_point_argument(group_parser)
-    add_steps_before_argument(group_parser)
-    add_steps_after_argument(group_parser)
+    add_focal_point_argument(group_parser, defaults.get(MergingOptions.FOCAL_POINT, None))
+    add_steps_before_argument(group_parser, defaults.get(MergingOptions.STEPS_BEFORE, None))
+    add_steps_after_argument(group_parser, defaults.get(MergingOptions.STEPS_AFTER, None))
 
 
-def add_focal_point_argument(parser: ArgumentParser) -> None:
+def add_focal_point_argument(parser: ArgumentParser, default_value: Optional[int]) -> None:
     """Adds `focal-point` argument to given `parser`"""
     help_text = "TimeStep on which `steps_before` earlier and `steps_after` later TimeSteps are merged on"
-    parser.add_argument("-fp", "--focal-point", required=True, type=int, help=help_text)
+    if default_value is not None:
+        parser.add_argument("-fp", "--focal-point", required=False, type=int, help=help_text, default=default_value)
+    else:
+        parser.add_argument("-fp", "--focal-point", required=True, type=int, help=help_text)
 
 
-def add_steps_before_argument(parser: ArgumentParser) -> None:
+def add_steps_before_argument(parser: ArgumentParser, default_value: Optional[int]) -> None:
     """Adds `steps-before` argument to given `parser`"""
     help_text = "Range of TimeSteps before the `focal-point` they get merged to"
-    parser.add_argument("-sb", "--steps-before", required=True, type=_non_negative_int, help=help_text)
+    if default_value is not None:
+        parser.add_argument(
+            "-sb", "--steps-before", required=False, type=_non_negative_int, help=help_text, default=default_value
+        )
+    else:
+        parser.add_argument("-sb", "--steps-before", required=True, type=_non_negative_int, help=help_text)
 
 
 def _non_negative_int(value: Any) -> int:
@@ -181,10 +196,15 @@ def _non_negative_int(value: Any) -> int:
     return value
 
 
-def add_steps_after_argument(parser: ArgumentParser) -> None:
+def add_steps_after_argument(parser: ArgumentParser, default_value: Optional[int]) -> None:
     """Adds `steps-after` argument to given `parser`"""
     help_text = "Range of TimeSteps after the `focal-point` they get merged to"
-    parser.add_argument("-sa", "--steps-after", required=True, type=_non_negative_int, help=help_text)
+    if default_value is not None:
+        parser.add_argument(
+            "-sa", "--steps-after", required=False, type=_non_negative_int, help=help_text, default=default_value
+        )
+    else:
+        parser.add_argument("-sa", "--steps-after", required=True, type=_non_negative_int, help=help_text)
 
 
 def add_inputs_recovery_argument(parser: ArgumentParser, default: bool) -> None:

{fameio-2.3.0.dist-info → fameio-2.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fameio
-Version: 2.3.0
+Version: 2.3.1
 Summary: Python scripts for operation of FAME models
 Home-page: https://gitlab.com/fame-framework/wiki/-/wikis/home
 License: Apache-2.0

{fameio-2.3.0.dist-info → fameio-2.3.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-CHANGELOG.md,sha256=vchfAyV552_Bsstyp995JpN4XAMzX9VhibbY_UqVLTQ,11827
+CHANGELOG.md,sha256=0T5FhyDSLmIo_tr4aXo_tOgJ5IsQH4WTY2JG3cnIjiI,12025
 fameio/__init__.py,sha256=IQm0MNOXkhBexiMXBoNZDK5xHUYgazH7oXm-lc0Vm04,109
 fameio/scripts/__init__.py,sha256=Bdu79kajJvvmPWdSP82Y6G8MCpP4n9ftTR-snWSbMJY,741
 fameio/scripts/__init__.py.license,sha256=2-OqCNxP4504xY2XQqseYypJi1_Qx4xJSzO3t7c3ACM,107
@@ -8,10 +8,10 @@ fameio/scripts/make_config.py,sha256=KQsj-aPXXtch8ITITCOcQUj6nYhvDs9LO7tdSikUe6w
 fameio/scripts/make_config.py.license,sha256=2-OqCNxP4504xY2XQqseYypJi1_Qx4xJSzO3t7c3ACM,107
 fameio/source/__init__.py,sha256=14CnWOIkdSeKQg6FioQSgO7UtEFF6pO4MUtDAUfwNmA,278
 fameio/source/cli/__init__.py,sha256=UqrdWnYMoy-o2--m0a4c-MtAorsc4eILXaPq27EXM1Q,112
-fameio/source/cli/convert_results.py,sha256=LY9ySXs3dAyyos0yoc-bY8M1Z9Oti-AgGYEEK5K-Ctg,3412
+fameio/source/cli/convert_results.py,sha256=oijIHua5gCjJ7ZAHNQJXNAoNRK1-pt11LlCDiwudhMQ,3458
 fameio/source/cli/make_config.py,sha256=phZKimvItl538xnwv9IhBoDkh__YqNlRk4YNDyTOFaA,2738
 fameio/source/cli/options.py,sha256=5DOFq4LMcObrSOlbt74HGE1vghByn-I30YY46tm5Snc,1422
-fameio/source/cli/parser.py,sha256=cVC6j_oy3lBQOC7nrk5oF2m5CpcohOh5y689lhvu4gw,9726
+fameio/source/cli/parser.py,sha256=WK3vV7lrCpY2GCwS0N4ppNhJfVUcJ8pRZrM6NmGE8Ks,11015
 fameio/source/loader.py,sha256=-Y0j3OrV2MwAlfxFP2YA3ZwZhP-eFVlT6hdHO4Qze2U,7536
 fameio/source/logs.py,sha256=9Iq9jcglGyALYir-Luxfa-m4uUJX074JkUM0uMwzPNc,3684
 fameio/source/metadata.py,sha256=zdqKEIEQ0NKqEmBTBdPEq0fw1MdsXwCpzs1O6rFTq_Y,1024
@@ -45,11 +45,11 @@ fameio/source/time.py,sha256=Vsd95nTubL8x5cwiznJYeti6clZCCHHJv7xjSpYqkF0,6984
 fameio/source/tools.py,sha256=B94U7Idq9ZuvsQmc9HOti016z4jn2oTTMIElWhs-5_w,1062
 fameio/source/validator.py,sha256=44wAlSxzSlaP9cm3YpNXOcs_kXIUNagctHLguY6H3T4,18596
 fameio/source/writer.py,sha256=d35rZGPLil3yku8_N6l1B45J4agKemBhAHJJPynQiJE,12499
-fameio-2.3.0.dist-info/entry_points.txt,sha256=jvQVfwJjZXPWQjJlhj1Dt6PTeblryTc1GxjKeK90twI,123
-fameio-2.3.0.dist-info/LICENSE.txt,sha256=eGHBZnhr9CWjE95SWjRfmhtK1lvVn5X4Fpf3KrrAZDg,10391
-fameio-2.3.0.dist-info/LICENSES/Apache-2.0.txt,sha256=eGHBZnhr9CWjE95SWjRfmhtK1lvVn5X4Fpf3KrrAZDg,10391
-fameio-2.3.0.dist-info/LICENSES/CC-BY-4.0.txt,sha256=y9WvMYKGt0ZW8UXf9QkZB8wj1tjJrQngKR7CSXeSukE,19051
-fameio-2.3.0.dist-info/LICENSES/CC0-1.0.txt,sha256=9Ofzc7m5lpUDN-jUGkopOcLZC3cl6brz1QhKInF60yg,7169
-fameio-2.3.0.dist-info/METADATA,sha256=meORlVQz4DNt17J2YC61Ioew13vSOPh1hFMYFjJUr8A,32471
-fameio-2.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fameio-2.3.0.dist-info/RECORD,,
+fameio-2.3.1.dist-info/entry_points.txt,sha256=jvQVfwJjZXPWQjJlhj1Dt6PTeblryTc1GxjKeK90twI,123
+fameio-2.3.1.dist-info/LICENSE.txt,sha256=eGHBZnhr9CWjE95SWjRfmhtK1lvVn5X4Fpf3KrrAZDg,10391
+fameio-2.3.1.dist-info/LICENSES/Apache-2.0.txt,sha256=eGHBZnhr9CWjE95SWjRfmhtK1lvVn5X4Fpf3KrrAZDg,10391
+fameio-2.3.1.dist-info/LICENSES/CC-BY-4.0.txt,sha256=y9WvMYKGt0ZW8UXf9QkZB8wj1tjJrQngKR7CSXeSukE,19051
+fameio-2.3.1.dist-info/LICENSES/CC0-1.0.txt,sha256=9Ofzc7m5lpUDN-jUGkopOcLZC3cl6brz1QhKInF60yg,7169
+fameio-2.3.1.dist-info/METADATA,sha256=kYlnlq-NqQnaJpgxUgfehySdfLTA0wIUF8OU66a8Wqw,32471
+fameio-2.3.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fameio-2.3.1.dist-info/RECORD,,