paramflow 0.3.2__tar.gz → 0.4__tar.gz

{paramflow-0.3.2/paramflow.egg-info → paramflow-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paramflow
-Version: 0.3.2
+Version: 0.4
 Summary: A lightweight library for hyperparameter and configuration management
 Home-page: https://github.com/mduszyk/paramflow
 Classifier: Programming Language :: Python :: 3

{paramflow-0.3.2 → paramflow-0.4}/paramflow/convert.py

@@ -33,3 +33,18 @@ def convert_type(dst_value, src_value, path=''):
         if path != '':
             path += ' '
         raise TypeError(f'unable to convert {path}{src_type} to {dst_type}') from e
+
+
+def infer_type(value: str):
+    result = value
+    if '.' in value:
+        try:
+            result = float(value)
+        except ValueError:
+            pass
+    else:
+        try:
+            result = int(value)
+        except ValueError:
+            pass
+    return result

{paramflow-0.3.2 → paramflow-0.4}/paramflow/frozen.py

@@ -1,7 +1,7 @@
 from typing import Union, List, Dict
 
 
-class FrozenAttrDict(dict):
+class ParamsDict(dict):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -20,7 +20,7 @@ class FrozenAttrDict(dict):
         raise TypeError('FrozenAttrDict is immutable')
 
 
-class FrozenList(list):
+class ParamsList(list):
 
     def __setitem__(self, index, value):
         raise TypeError('FrozenList is immutable')
@@ -53,7 +53,7 @@ class FrozenList(list):
         raise TypeError('FrozenList is immutable')
 
 
-def freeze(params: Union[List[any], Dict[str, any]]) -> Union[FrozenList[any], FrozenAttrDict[str, any]]:
+def freeze(params: Union[List[any], Dict[str, any]]) -> Union[ParamsList[any], ParamsDict[str, any]]:
     """
     Recursively freeze dictionaries and list making them read-only. Frozen dict profides attribute-style access.
     :param params: parameters as python dict and list tree
@@ -63,16 +63,16 @@ def freeze(params: Union[List[any], Dict[str, any]]) -> Union[FrozenList[any], F
         for key, value in params.items():
             if isinstance(value, dict) or isinstance(value, list):
                 params[key] = freeze(value)
-        return FrozenAttrDict(params)
+        return ParamsDict(params)
     elif isinstance(params, list):
         for i in range(len(params)):
             value = params[i]
             if isinstance(value, dict) or isinstance(value, list):
                 params[i] = freeze(value)
-        return FrozenList(params)
+        return ParamsList(params)
 
 
-def unfreeze(params: Union[FrozenList[any], FrozenAttrDict[str, any]]) -> Union[List[any], Dict[str, any]]:
+def unfreeze(params: Union[ParamsList[any], ParamsDict[str, any]]) -> Union[List[any], Dict[str, any]]:
     """
     Recursively unfreeze tree of frozen dicts and lists.
     Useful for serialization, where deserialization of immutable dict or list may fail.

{paramflow-0.3.2 → paramflow-0.4}/paramflow/params.py

@@ -5,7 +5,7 @@ from functools import reduce
 from typing import List, Dict, Optional, Union, Final, Type, Tuple
 
 from paramflow.convert import convert_type
-from paramflow.frozen import freeze, FrozenAttrDict
+from paramflow.frozen import freeze, ParamsDict
 from paramflow.parser import PARSER_MAP, EnvParser, ArgsParser, DotEnvParser, Parser
 
 ENV_SOURCE: Final[str] = 'env'
@@ -19,11 +19,11 @@ def load(*sources: Tuple[str, ...],
          args_prefix: str = '',
          profile_key: str = 'profile',
          default_profile: str = 'default',
-         profile: Optional[str] = None) -> FrozenAttrDict[str, any]:
+         profile: Optional[str] = None) -> ParamsDict[str, any]:
     """
     Load parameters form multiple sources, layer them on top of each other and activate profile.
     Activation of profile means learying it on top of the default profile.
-    :param source: file or multiple files to load parameters from
+    :param sources: file or multiple files to load parameters from
     :param meta_env_prefix: prefix for env vars that are used to overwrite meta params
     :param meta_args_prefix: prefix for command-line arguments to overwrite meta params
     :param env_prefix: prefix for env vars that are used to overwrite params, if None disable auto adding env source
@@ -44,7 +44,8 @@ def load(*sources: Tuple[str, ...],
         '__source__': ['pf.load'],
     }
     meta_env_parser = EnvParser(meta_env_prefix, 'default')
-    meta_args_parser = ArgsParser(meta_args_prefix, 'default', no_exit=True, descr='Meta-parameters')
+    meta_args_parser = ArgsParser(meta_args_prefix, 'default',
+                                  no_exit=True, consume_args=True, descr='Meta-parameters')
     meta = deep_merge(meta, meta_env_parser(meta))
     meta = deep_merge(meta, meta_args_parser(meta))
     meta = freeze(meta)

{paramflow-0.3.2 → paramflow-0.4}/paramflow/parser.py

@@ -2,11 +2,14 @@ import argparse
 import configparser
 import json
 import os
+import sys
 from abc import ABC, abstractmethod
 from typing import Dict, Final, Type
 
 import yaml
 
+from paramflow.convert import infer_type
+
 
 class Parser(ABC):
     @abstractmethod
@@ -131,12 +134,13 @@ class NoExitArgumentParser(argparse.ArgumentParser):
 class ArgsParser(Parser):
 
     def __init__(self, prefix: str, default_profile: str, target_profile: str = None,
-                 no_exit: bool = False, descr: str = None):
+                 no_exit: bool = False, descr: str = None, consume_args: bool = False):
         self.prefix = prefix
         self.default_profile = default_profile
         self.target_profile = target_profile
         self.no_exit = no_exit
         self.descr = descr
+        self.consume_args = consume_args
 
     def __call__(self, params: Dict[str, any]) -> Dict[str, any]:
         if self.target_profile is None and self.default_profile in params:
@@ -151,12 +155,21 @@ class ArgsParser(Parser):
             if typ is dict or typ is list or typ is bool or typ is tuple or value is None:
                 typ = str
             parser.add_argument(f'--{self.prefix}{key}', type=typ, default=None, help=f'{key} = {value}')
-        args, _ = parser.parse_known_args()
+        args, remaining = parser.parse_known_args()
         args_params = {}
         for arg_key, arg_value in args.__dict__.items():
             if arg_value is not None:
                 key = arg_key.replace(self.prefix, '')
                 args_params[key] = arg_value
+
+        if self.consume_args:
+            sys.argv = [sys.argv[0]] + remaining
+        else:
+            it = iter(remaining)
+            for arg_name, arg_value in zip(it, it):
+                key = arg_name.replace('--', '').replace(self.prefix, '')
+                args_params[key] = infer_type(arg_value)
+
         result = args_params
         if len(args_params) > 0:
             if self.target_profile is not None:

{paramflow-0.3.2 → paramflow-0.4/paramflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paramflow
-Version: 0.3.2
+Version: 0.4
 Summary: A lightweight library for hyperparameter and configuration management
 Home-page: https://github.com/mduszyk/paramflow
 Classifier: Programming Language :: Python :: 3

{paramflow-0.3.2 → paramflow-0.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='paramflow',
-    version='0.3.2',
+    version='0.4',
     description='A lightweight library for hyperparameter and configuration management', 
     packages=find_packages(),
     install_requires=[