0.53.0 release; finallize new ID magic feature

Author: yoelcortes

setup.py

@@ -11,7 +11,7 @@
     name='thermosteam',
     packages=['thermosteam'],
     license='MIT',
-    version='0.52.19',
+    version='0.53.0',
     description="BioSTEAM's Premier Thermodynamic Engine",
     long_description=open('README.rst', encoding='utf-8').read(),
     author='Yoel Cortes-Pena',

thermosteam/__init__.py

@@ -31,7 +31,7 @@
 #     update_module(chemicals, numba)
 # use_numba_chemicals()
 # del use_numba_chemicals
-__version__ = "0.52.19"
+__version__ = "0.53.0"
 
 from . import thermo
 del thermo

thermosteam/_multi_stream.py

@@ -250,7 +250,7 @@ def __init__(self,
         self._sink = self._source = None
         self.reset_cache()
 
-        if tmo.preferences.ID_inference and ID == '': ID = tmo.utils.infer_variable_assignment(self.__class__)
+        if tmo.settings.ID_magic and ID == '': ID = tmo.utils.infer_variable_assignment(self.__class__)
 
         self._register(ID)
         if vlle: self.vlle(T=T, P=P)

thermosteam/_preferences.py

@@ -42,7 +42,6 @@ class DisplayPreferences:
     tooltips_full_results: False
     graphviz_html_height: {'big-system': ('600px', '900px'), 'huge-system': ('800px', '1200px'), 'system': ('400px', '600px'), 'unit': ('225px', '400px')}
     show_all_streams: True
-    ID_inference: False
     flow: 'kmol/hr:.3g'
     T: 'K:.5g'
     P: 'Pa:.6g'
@@ -56,7 +55,7 @@ class DisplayPreferences:
                  'label_color', 'label_color', 'depth_colors', 'stream_width',
                  'unit_color', 'unit_label_color', 'unit_periphery_color',
                  'fill_cluster', 'graphviz_format', 'tooltips_full_results',
-                 'graphviz_html_height', 'show_all_streams', 'ID_inference')
+                 'graphviz_html_height', 'show_all_streams')
 
     def __init__(self):
         #: Whether to label the ID of streams with sources and sinks in process 
@@ -124,9 +123,6 @@ def __init__(self):
         #: Whether to show all streams, including empty feeds and products.
         self.show_all_streams = True
 
-        #: Whether to infer ID of unit operations, streams, and systems by variable name.
-        self.ID_inference = True
-        
     def temporary(self):
         """Return a TemporaryPreferences object that will revert back to original
         preferences after context management."""

thermosteam/_settings.py

@@ -101,6 +101,7 @@ class ProcessSettings:
     __slots__ = (
         '_thermo',
         '_flashpkg',
+        'ID_magic',
     )
 
     def __new__(cls):
@@ -281,3 +282,6 @@ def set_flashpkg(self, flashpkg):
 
 #: 
 settings: ProcessSettings = object.__new__(ProcessSettings)
+
+#: Whether to infer ID of unit operations, streams, and systems by variable assignment.
+settings.ID_magic = True 

thermosteam/_stream.py

@@ -401,7 +401,7 @@ def __init__(self, ID: Optional[str] = '',
         self._sink = self._source = None
         self.reset_cache()
 
-        if tmo.preferences.ID_inference and ID == '': ID = tmo.utils.infer_variable_assignment(self.__class__)
+        if tmo.settings.ID_magic and ID == '': ID = tmo.utils.infer_variable_assignment(self.__class__)
         self._register(ID)
         if vlle:
             self.vlle(T=T, P=P)

thermosteam/equilibrium/lle.py

@@ -121,6 +121,7 @@ def pseudo_equilibrium(K, phi, z, T, n, f_gamma, gamma_args, inner_loop_options,
 # Light weight
 def solve_lle_mol(gamma, z, T, P, sample=None, phi=1):
     n = z.size
+    if sample is not None: sample = (sample,)
     stability = lle_tangential_plane_analysis(gamma, z, T, P, samples=sample)
     if stability.unstable:
         y = stability.candidate

thermosteam/network.py

@@ -2514,10 +2514,8 @@ def from_feedstock(cls, feedstock, feeds=(), ends=None, units=None, final=True,
             recycle_ends.update(disjunction_streams)
             recycle_ends.update(network.get_all_recycles())
             recycle_ends.update(tmo.utils.products_from_units(network.units))
-            # network.sort_without_recycle(recycle_ends)
             if recycles: network.reduce_recycles()
             network.sort(recycle_ends)
-            # network._add_interaction_units({}, [])
             if interaction: network.add_interaction_units(old_connections, ends)
         return network
 
@@ -2607,7 +2605,7 @@ def _add_interaction_units(self, excluded, next_units, ends):
                             try:
                                 unext = next_units[0]
                             except:
-                                continue
+                                unext = None
                         else:
                             unext = path[inext]
                         if isa(unext, Network): unext = unext.get_first_unit()

thermosteam/utils/decorators/registered.py

@@ -68,8 +68,11 @@ def _register(self, ID):
         registry.register(ID, self)
     elif hasattr(ID, '__iter__'):
         ID, *aliases = ID
-        self._register(ID)
-        for i in aliases: self.register_alias(i)
+        if isinstance(ID, str):
+            self._register(ID)
+            for i in aliases: self.register_alias(i)
+        else:
+            raise ValueError(f'ID must be a string, not a {type(ID)} object')
     else:
         raise ValueError('invalid ID {ID!r}; ID must be a string, integer, or an interable of these')
 

thermosteam/utils/registry.py

@@ -91,10 +91,12 @@ def register_safely(self, ID, obj):
                         num = int(num)
                     except:
                         other.ID = ID + '_1'
-                    else:
-                        other.ID = base + '_' + str(num + 1) 
-                    base, num = other.ID.rsplit('_', 1)
-                    ID = base + '_' + str(int(num) + 1)
+                        base = ID
+                        num = 1
+                    ID = base + '_' + str(num + 1)
+                    while ID in data:
+                        num += 1
+                        ID = base + '_' + str(num)
                 elif ID_old:
                     warning = RuntimeWarning(
                         f"upon renaming, {obj!r} replaced {other!r} "