paramflow 0.2.5__tar.gz → 0.2.7__tar.gz

{paramflow-0.2.5/paramflow.egg-info → paramflow-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: paramflow
-Version: 0.2.5
+Version: 0.2.7
 Summary: Flexible and user-friendly parameter and configuration management library.
 Home-page: https://github.com/mduszyk/paramflow
 Classifier: Programming Language :: Python :: 3
@@ -82,19 +82,18 @@ P_PROFILE=dqn-adam python print_params.py
 
 ## Parameter Layering
 Parameters are merged from multiple sources in the following order:
-1. Configuration files (`.toml`, `.yaml`, `.ini`, `.json`)
-2. `.env` file (if enabled)
-3. Environment variables (default prefix: `P_`)
-4. Command-line arguments (`argparse`)
+1. Configuration files (`.toml`, `.yaml`, `.ini`, `.json`, `.env`)
+2. Environment variables (default prefix: `P_`)
+3. Command-line arguments (`argparse`)
 
 ### Customizing Layering Order
-You can specify the order explicitly:
+You can specify the order explicitly (`env` and `args` are reserved names):
 ```python
 params = pf.load('params.toml', 'env', '.env', 'args')
 ```
 
 ### Overriding Parameters
-Command-line arguments override other sources:
+Override parameters via command-line arguments:
 ```sh
 python print_params.py --profile dqn-adam --learning_rate 0.0002
 ```

{paramflow-0.2.5 → paramflow-0.2.7}/README.md

@@ -62,19 +62,18 @@ P_PROFILE=dqn-adam python print_params.py
 
 ## Parameter Layering
 Parameters are merged from multiple sources in the following order:
-1. Configuration files (`.toml`, `.yaml`, `.ini`, `.json`)
-2. `.env` file (if enabled)
-3. Environment variables (default prefix: `P_`)
-4. Command-line arguments (`argparse`)
+1. Configuration files (`.toml`, `.yaml`, `.ini`, `.json`, `.env`)
+2. Environment variables (default prefix: `P_`)
+3. Command-line arguments (`argparse`)
 
 ### Customizing Layering Order
-You can specify the order explicitly:
+You can specify the order explicitly (`env` and `args` are reserved names):
 ```python
 params = pf.load('params.toml', 'env', '.env', 'args')
 ```
 
 ### Overriding Parameters
-Command-line arguments override other sources:
+Override parameters via command-line arguments:
 ```sh
 python print_params.py --profile dqn-adam --learning_rate 0.0002
 ```

{paramflow-0.2.5 → paramflow-0.2.7}/paramflow/params.py

@@ -8,25 +8,25 @@ from paramflow.convert import convert_type
 from paramflow.frozen import freeze, FrozenAttrDict
 from paramflow.parser import PARSER_MAP, EnvParser, ArgsParser, DotEnvParser, Parser
 
-# defaults
-ENV_PREFIX: Final[str] = 'P_'
-ARGS_PREFIX: Final[str] = ''
-DEFAULT_PROFILE: Final[str] = 'default'
-PROFILE_KEY: Final[str] = 'profile'
+
 ENV_SOURCE: Final[str] = 'env'
 ARGS_SOURCE: Final[str] = 'args'
 
 
 def load(*sources: Tuple[str, ...],
-         env_prefix: str = ENV_PREFIX,
-         args_prefix: str = ARGS_PREFIX,
-         profile_key: str = PROFILE_KEY,
-         default_profile: str = DEFAULT_PROFILE,
+         meta_env_prefix: str = 'P_',
+         meta_args_prefix: str = '',
+         env_prefix: str = 'P_',
+         args_prefix: str = '',
+         profile_key: str = 'profile',
+         default_profile: str = 'default',
          profile: Optional[str] = None) -> FrozenAttrDict[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 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
     :param args_prefix: prefix for command-line arguments, if None disable auto adding args source
     :param profile_key: parameter name for the profile
@@ -44,8 +44,8 @@ def load(*sources: Tuple[str, ...],
         profile_key: profile,
         '__source__': ['pf.load'],
     }
-    meta_env_parser = EnvParser(ENV_PREFIX, DEFAULT_PROFILE)
-    meta_args_parser = ArgsParser(ARGS_PREFIX, DEFAULT_PROFILE, no_exit=True, descr='Meta-parameters')
+    meta_env_parser = EnvParser(meta_env_prefix, 'default')
+    meta_args_parser = ArgsParser(meta_args_prefix, 'default', no_exit=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.2.5 → paramflow-0.2.7/paramflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: paramflow
-Version: 0.2.5
+Version: 0.2.7
 Summary: Flexible and user-friendly parameter and configuration management library.
 Home-page: https://github.com/mduszyk/paramflow
 Classifier: Programming Language :: Python :: 3
@@ -82,19 +82,18 @@ P_PROFILE=dqn-adam python print_params.py
 
 ## Parameter Layering
 Parameters are merged from multiple sources in the following order:
-1. Configuration files (`.toml`, `.yaml`, `.ini`, `.json`)
-2. `.env` file (if enabled)
-3. Environment variables (default prefix: `P_`)
-4. Command-line arguments (`argparse`)
+1. Configuration files (`.toml`, `.yaml`, `.ini`, `.json`, `.env`)
+2. Environment variables (default prefix: `P_`)
+3. Command-line arguments (`argparse`)
 
 ### Customizing Layering Order
-You can specify the order explicitly:
+You can specify the order explicitly (`env` and `args` are reserved names):
 ```python
 params = pf.load('params.toml', 'env', '.env', 'args')
 ```
 
 ### Overriding Parameters
-Command-line arguments override other sources:
+Override parameters via command-line arguments:
 ```sh
 python print_params.py --profile dqn-adam --learning_rate 0.0002
 ```

{paramflow-0.2.5 → paramflow-0.2.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='paramflow',
-    version='0.2.5',
+    version='0.2.7',
     description='Flexible and user-friendly parameter and configuration management library.',
     packages=find_packages(),
     install_requires=[