corelp 1.0.33__py3-none-any.whl → 1.0.35__py3-none-any.whl

corelp/modules/print_LP/print.py

@@ -52,8 +52,8 @@ class Print() :
 
     Parameters
     ----------
-    string : object
-        The object to print. Its :meth:`__str__` representation is used.
+    *strings : tuple
+        The objects to print. Its :meth:`__str__` representation is used.
     verbose : bool, optional
         If ``True`` (default), printing is performed.  
         If ``False``, printing is skipped unless overridden.
@@ -135,14 +135,17 @@ class Print() :
     """
 
     # Main function
-    def __call__(self, string, verbose=None, *, return_string=False, file=None, mode='a', end='\n', **kwargs) :
+    def __call__(self, *strings, verbose=None, return_string=False, file=None, mode='a', end='\n', **kwargs) :
+
         # Muting
         verbose = verbose if verbose is not None else self.verbose
         if not verbose :
             return None
         
+        # Formatting string
+        string = ", ".join([str(string) for string in strings]) + end
+
         # Printing markdown
-        string = str(string) + end
         self.print(Markdown(string), **kwargs)
 
         # Writting to file
@@ -170,7 +173,7 @@ class Print() :
     def log(self) :
         return self.console.log
     pyprint = pyprint # python print
-    richprint = richprint # rich print
+    richprint = richprint # rich prints
 
 
 
@@ -281,7 +284,8 @@ class Print() :
         AvgLoopTimeColumn(),
         TimeRemainingColumn(),
         EndTimeColumn(),
-        transient=False
+        transient=False,
+        console=self.console
         )
     
     _bars : dict = field(default=None, repr=False)

corelp/modules/user_inputs_LP/test_user_inputs.py

@@ -34,7 +34,8 @@ def test_user_inputs() :
         raise ValueError(f'{inputs} should be dict(a=1)')
     user_inputs() #init
     b = 2
-    if user_inputs() != {'b': 2} :
+    inputs = user_inputs()
+    if inputs != {'b': 2} :
         raise ValueError(f'{inputs} should be dict(b=2)')
 
 

corelp/modules/user_inputs_LP/user_inputs.py

@@ -19,18 +19,14 @@ import inspect
 
 # %% Function
 
-def user_inputs() :
+def user_inputs(reset=False) :
     r"""
-    Return a dictionary of variables defined by the user in the interactive
-    environment.
+    Return a dictionary of variables defined by the user in the interactive environment.
 
-    This function is intended for use inside other functions via
-    ``function(**user_inputs())``.  
-    **It should not be used to store its return value**, e.g. **do not do**::
-
-        variable = user_inputs()
-
-    Instead, call it directly when needed.
+    Parameters
+    ----------
+    reset : bool or str
+        True to set as first call, String value to define a group of parameters
 
     Returns
     -------
@@ -40,30 +36,49 @@ def user_inputs() :
     Examples
     --------
     >>> from corelp import user_inputs
-    >>> user_inputs()       # First call (initializes and clears import-related variables)
-    {}
+    >>> user_inputs(True)       # First call (initializes and clears import-related variables)
+    None
     >>> a = 1               # User defines a variable
     >>> user_inputs()       # Now returns: {'a': 1}
     {'a': 1}
     """
-
     frame = inspect.currentframe().f_back
     ns = {**frame.f_globals, **frame.f_locals}
 
     # ---- Filter user variables (ignore internals starting with "_") ----
-    ns = {k: v for k, v in ns.items() if not k.startswith("_")}
-
-    # ---- Return only new or updated variables ----
-    updated = {
-        k: v
-        for k, v in ns.items()
-        if k not in user_inputs.cache or user_inputs.cache[k] is not v
-    }
-
-    user_inputs.cache.update(updated)
-    return updated
+    ns = {key: value for key, value in ns.items() if not key.startswith("_")}
+
+    # Validate status
+    if reset :
+        user_inputs.current_group = reset if isinstance(reset, str) else None
+        user_inputs.cache = None
+
+    # Case when user_inputs is on top : cache = None
+    if user_inputs.cache is None :
+        user_inputs.cache = ns
+        return
+
+    # Case when user_inputs is at bottom : cache = dict
+    else :
+        updated = { key: value for key, value in ns.items() if key not in user_inputs.cache or user_inputs.cache[key] is not value}
+        values = {key: value for key, value in updated.items() if not key.endswith('_')}
+        comments = {key: value for key, value in updated.items() if key.endswith('_')}
+        
+        # Group values
+        if user_inputs.current_group is not None :
+            user_inputs.groups_values[user_inputs.current_group] = values
+            user_inputs.groups_comments[user_inputs.current_group] = comments
+
+        # End
+        user_inputs.current_group = None
+        user_inputs.cache = None
+        return values
+
+user_inputs.cache = None
+user_inputs.current_group = None
+user_inputs.groups_values = {}
+user_inputs.groups_comments = {}
 
-user_inputs.cache = {}
 
 
 # %% Test function run

{corelp-1.0.33.dist-info → corelp-1.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: corelp
-Version: 1.0.33
+Version: 1.0.35
 Summary: A library that gathers core functions for python programming.
 Requires-Dist: joblib
 Requires-Dist: rich

{corelp-1.0.33.dist-info → corelp-1.0.35.dist-info}/RECORD

@@ -22,7 +22,7 @@ corelp/modules/main_LP/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 corelp/modules/main_LP/main.py,sha256=vU9zXt6bLux1Fq6FiPwxhTJVo4SxJYeMbwKF0v_AjDs,10169
 corelp/modules/main_LP/test_main.py,sha256=mxL645pZdkJ8J5MFdj0K-z8xRCGKQ0zw1NvmW3iPGB4,1741
 corelp/modules/print_LP/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-corelp/modules/print_LP/print.py,sha256=7TYjAGypT_TI0UHmL9F8zPL7gjFfJn2DnCpx0cu4IGM,8565
+corelp/modules/print_LP/print.py,sha256=qPCqLpY2PdGLQaWmZKv9oh-MnvmpNYAplPeOcizO0uU,8662
 corelp/modules/print_LP/test_print.py,sha256=uMmCrnyIVSlZg_ZEOk2mr5zDlEpTN2KMq4jFu5p6n4I,2292
 corelp/modules/prop_LP/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corelp/modules/prop_LP/prop.py,sha256=lfsENmjg65mpXxt9V9n3Nn__wHgNJA61l8_UXBKn1lc,3999
@@ -37,13 +37,13 @@ corelp/modules/test_LP/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 corelp/modules/test_LP/test.py,sha256=KwAeIZWQ7pZX85J50q6qfB4HuJUgREu1ieB_byPqI2g,1361
 corelp/modules/test_LP/test_test.py,sha256=sXI6G4OBnWXSqrfMy9QdabkYIvcD80EmnNcnQiXxcRI,605
 corelp/modules/user_inputs_LP/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-corelp/modules/user_inputs_LP/test_user_inputs.py,sha256=lK8pYm5q5ob9ry3T-gU3J_-KZMKWCCmeuFjjH7DkF_8,927
-corelp/modules/user_inputs_LP/user_inputs.py,sha256=dqv78EnT1NiUf4ix_P6bQLoiAjNKHjYVu7lZYm-jXtI,1713
+corelp/modules/user_inputs_LP/test_user_inputs.py,sha256=-6YzBomJxIZSfnfbJPvnfgon3K5RTC3WQKNT4enpVH0,947
+corelp/modules/user_inputs_LP/user_inputs.py,sha256=ochRTY892XwYANBRyP-kwR_-7S96AVF4fIhfe6P4t1c,2472
 corelp/modules.json,sha256=ZQ8BMU8X2u71wfVj_AufwOoJUPdaxU_AHn7Ohbkp-Pc,3122
 corelp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corelp/pythonLP.png:Zone.Identifier,sha256=uVLSTPcBvE56fSHhroXGEYJOgFeaiYNsDLSbGTRGzP4,25
 corelp/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 corelp/scripts.json,sha256=RBNvo1WzZ4oRRq0W9-hknpT7T8If536DEMBg9hyq_4o,2
-corelp-1.0.33.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-corelp-1.0.33.dist-info/METADATA,sha256=pwYkVZsYhheWKpAm9-1Un6IyAurHA93nB5IEtanT8Cc,1698
-corelp-1.0.33.dist-info/RECORD,,
+corelp-1.0.35.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+corelp-1.0.35.dist-info/METADATA,sha256=_vAnlUmQ2r-K1ii8wOzfI9Z4P5bm9US1g3MrblSVL9U,1698
+corelp-1.0.35.dist-info/RECORD,,