PyThermoLinkDB 1.4.6__tar.gz → 1.4.7__tar.gz

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyThermoLinkDB
-Version: 1.4.6
+Version: 1.4.7
 Summary: PyThermoLinkDB is a Python package providing a robust and efficient interface between `PyThermoDB` and other applications.
 Author-email: Sina Gilassi <sina.gilassi@gmail.com>
 License-Expression: MIT

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/PyThermoLinkDB.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ pyThermoLinkDB/docs/thermolink.py
 pyThermoLinkDB/docs/utils.py
 pyThermoLinkDB/models/__init__.py
 pyThermoLinkDB/models/component_models.py
+pyThermoLinkDB/models/ref.py
 pyThermoLinkDB/models/source.py
 pyThermoLinkDB/thermo/__init__.py
 pyThermoLinkDB/thermo/data_source.py

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/pyThermoLinkDB/config/settings.py

@@ -1,7 +1,7 @@
 # setting
 
 # version
-__version__ = "1.4.6"
+__version__ = "1.4.7"
 # author
 __author__ = "Sina Gilassi"
 # description

pythermolinkdb-1.4.7/pyThermoLinkDB/models/ref.py

@@ -0,0 +1 @@
+# import libs

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/pyThermoLinkDB/thermo/data_source.py

@@ -1,7 +1,7 @@
 # import libs
 import logging
 from typing import Dict, Literal, Any, Optional, List
-from pythermodb_settings.models import Component
+from pythermodb_settings.models import Component, ComponentKey
 from pythermodb_settings.utils import set_component_id
 # local
 from ..thermo import Source
@@ -49,14 +49,7 @@ class DataSourceCore:
         self,
         component: Component,
         source: Source,
-        component_key: Literal[
-            'Name-State',
-            'Formula-State',
-            'Name',
-            'Formula',
-            'Name-Formula-State',
-            'Formula-Name-State'
-        ] = 'Name-State',
+        component_key: ComponentKey = 'Name-State',
     ) -> None:
         """
         Initialize DataSource with a component and source.

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/pyThermoLinkDB/thermo/equation_source.py

@@ -1,7 +1,7 @@
 # import libs
 import logging
 from typing import Dict, Literal, Any, Optional, List, Callable
-from pythermodb_settings.models import Component
+from pythermodb_settings.models import Component, ComponentKey
 from pyThermoDB.core import TableEquation
 from pythermodb_settings.utils import set_component_id
 from pyThermoDB.models import EquationResult
@@ -74,14 +74,7 @@ class EquationSourceCore:
         prop_name: str,
         component: Component,
         source: Source,
-        component_key: Literal[
-            'Name-State',
-            'Formula-State',
-            'Name',
-            'Formula',
-            'Name-Formula-State',
-            'Formula-Name-State'
-        ] = 'Name-State',
+        component_key: ComponentKey = 'Name-State',
     ) -> None:
         """
         Initialize EquationSourceCore with a property name, component, and source.

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/pyThermoLinkDB/thermo/equation_sources.py

@@ -1,7 +1,7 @@
 # import libs
 import logging
 from typing import Dict, Literal, Any, Optional, List
-from pythermodb_settings.models import Component
+from pythermodb_settings.models import Component, ComponentKey
 from pyThermoDB.core import TableEquation
 from pythermodb_settings.utils import set_component_id
 # local
@@ -51,14 +51,7 @@ class EquationSourcesCore:
         self,
         component: Component,
         source: Source,
-        component_key: Literal[
-            'Name-State',
-            'Formula-State',
-            'Name',
-            'Formula',
-            'Name-Formula-State',
-            'Formula-Name-State'
-        ] = 'Name-State',
+        component_key: ComponentKey = 'Name-State',
     ) -> None:
         """
         Initialize EquationSource with a component and source.

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/pyThermoLinkDB/thermo/main.py

@@ -2,7 +2,7 @@
 import logging
 from typing import Literal, Optional, Tuple
 from pyThermoLinkDB.models import ModelSource
-from pythermodb_settings.models import Component
+from pythermodb_settings.models import Component, ComponentKey
 from pythermodb_settings.utils import set_component_id
 # local
 from ..thermo import Source
@@ -19,14 +19,7 @@ logger = logging.getLogger(__name__)
 def mkeqs(
     component: Component,
     model_source: ModelSource,
-    component_key: Literal[
-        'Name-State',
-        'Formula-State',
-        'Name',
-        'Formula',
-        'Name-Formula-State',
-        'Formula-Name-State'
-    ] = 'Name-State',
+    component_key: ComponentKey = 'Name-State',
 ) -> Optional[EquationSourcesCore]:
     """
     Make an equation source core for a given property and component.
@@ -73,14 +66,7 @@ def mkeq(
     name: str,
     component: Component,
     model_source: ModelSource,
-    component_key: Literal[
-        'Name-State',
-        'Formula-State',
-        'Name',
-        'Formula',
-        'Name-Formula-State',
-        'Formula-Name-State'
-    ] = 'Name-State',
+    component_key: ComponentKey = 'Name-State',
 ) -> Optional[EquationSourceCore]:
     """
     Make an equation source core for a given property and component.
@@ -155,14 +141,7 @@ def mkeq(
 def mkdt(
     component: Component,
     model_source: ModelSource,
-    component_key: Literal[
-        'Name-State',
-        'Formula-State',
-        'Name',
-        'Formula',
-        'Name-Formula-State',
-        'Formula-Name-State'
-    ] = 'Name-State',
+    component_key: ComponentKey = 'Name-State',
 ) -> Optional[DataSourceCore]:
     """
     Make a data source core for a given component.

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/pyThermoLinkDB/thermo/source.py

@@ -1,9 +1,9 @@
 # import libs
 import logging
-from typing import List, Dict, Optional, Any, Tuple, Literal
+from typing import List, Dict, Optional, Any, Tuple
 from pyThermoDB.core import TableEquation
 from pyThermoDB.models import EquationResult
-from pythermodb_settings.models import Component
+from pythermodb_settings.models import Component, ComponentKey
 from pythermodb_settings.utils import set_component_id
 from pyThermoLinkDB.models import ModelSource
 # local
@@ -481,14 +481,7 @@ class Source:
         self,
         components: List[Component],
         prop_name: str,
-        component_key: Literal[
-            'Name-State',
-            'Formula-State',
-            'Name',
-            'Formula',
-            'Name-Formula-State',
-            'Formula-Name-State'
-        ] = 'Name-State',
+        component_key: ComponentKey = 'Name-State',
         **kwargs
     ) -> Optional[Dict[str, ComponentEquationSource]]:
         '''
@@ -623,14 +616,7 @@ class Source:
         components: List[Component],
         eq_src_comp: Dict[str, ComponentEquationSource],
         args_values: Optional[Dict[str, float]] = None,
-        component_key: Literal[
-            'Name-State',
-            'Formula-State',
-            'Name',
-            'Formula',
-            'Name-Formula-State',
-            'Formula-Name-State'
-        ] = 'Name-State',
+        component_key: ComponentKey = 'Name-State',
         **kwargs
     ) -> Optional[Tuple[List[float], Dict[str, Any]]]:
         '''
@@ -768,14 +754,7 @@ class Source:
         self,
         component_id: str,
         components: List[Component],
-        component_key: Literal[
-            'Name-State',
-            'Formula-State',
-            'Name',
-            'Formula',
-            'Name-Formula-State',
-            'Formula-Name-State'
-        ] = 'Name-State',
+        component_key: ComponentKey = 'Name-State',
     ) -> Optional[Dict[str, Any]]:
         """
         Get the component data from the datasource.

{pythermolinkdb-1.4.6 → pythermolinkdb-1.4.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyThermoLinkDB"
-version = "1.4.6"
+version = "1.4.7"
 description = "PyThermoLinkDB is a Python package providing a robust and efficient interface between `PyThermoDB` and other applications."
 readme = "README.md"
 authors = [