Fix json args parsing

Conchylicultor · The ml_collections Authors · commit 91e91a549918 · 2026-02-19T04:47:23.000-08:00
PiperOrigin-RevId: 872336116
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/__init__.py b/ml_collections/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/__init__.py b/ml_collections/config_dict/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/config_dict.py b/ml_collections/config_dict/config_dict.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/config.py b/ml_collections/config_dict/examples/config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/config_dict_advanced.py b/ml_collections/config_dict/examples/config_dict_advanced.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/config_dict_basic.py b/ml_collections/config_dict/examples/config_dict_basic.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/config_dict_initialization.py b/ml_collections/config_dict/examples/config_dict_initialization.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/config_dict_lock.py b/ml_collections/config_dict/examples/config_dict_lock.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/config_dict_placeholder.py b/ml_collections/config_dict/examples/config_dict_placeholder.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/examples_test.py b/ml_collections/config_dict/examples/examples_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/field_reference.py b/ml_collections/config_dict/examples/field_reference.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/examples/frozen_config_dict.py b/ml_collections/config_dict/examples/frozen_config_dict.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/tests/config_dict_test.py b/ml_collections/config_dict/tests/config_dict_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/tests/field_reference_test.py b/ml_collections/config_dict/tests/field_reference_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_dict/tests/frozen_config_dict_test.py b/ml_collections/config_dict/tests/frozen_config_dict_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/__init__.py b/ml_collections/config_flags/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/config_flags.py b/ml_collections/config_flags/config_flags.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,7 +63,10 @@ def _load_source(module_name: str, module_path: str) -> types.ModuleType:
 
 
 class _LiteralParser(flags.ArgumentParser):
-  """Parse arbitrary built-in (`--cfg.val=1`, `--cfg.val="[1, 2, {}]"`,...)."""
+  """Parse arbitrary built-in (`--cfg.val=1`, `--cfg.val="[1, 2, {}]"`,...).
+
+  Note: This accepts both JSON and Python literals for broader compatibility.
+  """
 
   def parse(self, argument: str) -> Any:
     # _LiteralParser cannot know in advance what is the expected type.
@@ -73,13 +76,14 @@ def parse(self, argument: str) -> Any:
       raise TypeError('argument should be a string')
     # Absl hardcode bool values as lower-case: `--cfg.my_bool`, so convert
     # them to Python built-in
-    if argument in ('true', 'false'):
-      argument = argument.capitalize()
     try:
-      return ast.literal_eval(argument)
-    except (SyntaxError, ValueError):
-      # Otherwise, the flag is a string: `--cfg.value="my_string"`
-      return argument
+      return json.loads(argument)
+    except json.JSONDecodeError:
+      try:
+        return ast.literal_eval(argument)
+      except (SyntaxError, ValueError):
+        # Otherwise, the flag is a string: `--cfg.value="my_string"`
+        return argument
 
   def flag_type(self):
     return 'config_literal'
diff --git a/ml_collections/config_flags/config_path.py b/ml_collections/config_flags/config_path.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/examples/config.py b/ml_collections/config_flags/examples/config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/examples/define_config_dataclass_basic.py b/ml_collections/config_flags/examples/define_config_dataclass_basic.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/examples/define_config_dict_basic.py b/ml_collections/config_flags/examples/define_config_dict_basic.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/examples/define_config_file_basic.py b/ml_collections/config_flags/examples/define_config_file_basic.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/examples/examples_test.py b/ml_collections/config_flags/examples/examples_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/examples/parameterised_config.py b/ml_collections/config_flags/examples/parameterised_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/config_overriding_test.py b/ml_collections/config_flags/tests/config_overriding_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/config_path_test.py b/ml_collections/config_flags/tests/config_path_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/configdict_config.py b/ml_collections/config_flags/tests/configdict_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/dataclass_overriding_test.py b/ml_collections/config_flags/tests/dataclass_overriding_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/fieldreference_config.py b/ml_collections/config_flags/tests/fieldreference_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/ioerror_config.py b/ml_collections/config_flags/tests/ioerror_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/literal_config.py b/ml_collections/config_flags/tests/literal_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/mini_config.py b/ml_collections/config_flags/tests/mini_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/mock_config.py b/ml_collections/config_flags/tests/mock_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/parameterised_config.py b/ml_collections/config_flags/tests/parameterised_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/spork.py b/ml_collections/config_flags/tests/spork.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/tuple_parser_test.py b/ml_collections/config_flags/tests/tuple_parser_test.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/typeerror_config.py b/ml_collections/config_flags/tests/typeerror_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tests/valueerror_config.py b/ml_collections/config_flags/tests/valueerror_config.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/config_flags/tuple_parser.py b/ml_collections/config_flags/tuple_parser.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ml_collections/conftest.py b/ml_collections/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2025 The ML Collections Authors.
+# Copyright 2026 The ML Collections Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2025 The ML Collections Authors.`
	`1`	`+# Copyright 2026 The ML Collections Authors.`
`2`	`2`	`#`
`3`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`# you may not use this file except in compliance with the License.`