encommon 0.22.5__tar.gz → 0.22.7__tar.gz

{encommon-0.22.5/encommon.egg-info → encommon-0.22.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: encommon
-Version: 0.22.5
+Version: 0.22.7
 Summary: Enasis Network Common Library
 License: MIT
 Project-URL: Source, https://github.com/enasisnetwork/encommon
@@ -20,6 +20,7 @@ Requires-Dist: python-dateutil
 Requires-Dist: pyyaml
 Requires-Dist: snaptime
 Requires-Dist: sqlalchemy
+Dynamic: license-file
 
 # Enasis Network Common Library
 

{encommon-0.22.5 → encommon-0.22.7}/encommon/colors/color.py

@@ -7,6 +7,7 @@ is permitted, for more information consult the project license file.
 
 
 
+from colorsys import hls_to_rgb
 from contextlib import suppress
 from typing import Union
 
@@ -61,6 +62,51 @@ class Color:
         self.__source = source
 
 
+    @classmethod
+    def from_hsl(
+        cls,
+        hue: int,
+        sat: int,
+        lev: int,
+    ) -> 'Color':
+        """
+        Initialize instance for class using provided parameters.
+        """
+
+        h, s, l = (  # noqa: E741
+            hue / 360,
+            sat / 100,
+            lev / 100)
+
+        r, g, b = hls_to_rgb(h, l, s)
+
+        color = (
+            f'{round(r * 255):02X}'
+            f'{round(g * 255):02X}'
+            f'{round(b * 255):02X}')
+
+        return cls(color)
+
+
+    @classmethod
+    def from_rgb(
+        cls,
+        red: int,
+        green: int,
+        blue: int,
+    ) -> 'Color':
+        """
+        Initialize instance for class using provided parameters.
+        """
+
+        value = (
+            f'{red:02X}'
+            f'{green:02X}'
+            f'{blue:02X}')
+
+        return cls(value)
+
+
     def __repr__(
         self,
     ) -> str:

{encommon-0.22.5 → encommon-0.22.7}/encommon/colors/test/test_color.py

@@ -84,6 +84,7 @@ def test_Color_rgb(
     """
 
     assert Color(source).rgb == expect
+    assert Color.from_rgb(*expect) == source
 
 
 
@@ -155,7 +156,7 @@ def test_Color_xy(
      ('ffff00', (60, 100, 50)),
      ('00ffff', (180, 100, 50)),
      ('ff00ff', (300, 100, 50)),
-     ('800080', (300, 100, 25))])
+     ('80007F', (300, 100, 25))])
 def test_Color_hsl(
     source: str,
     expect: tuple[int, ...],
@@ -168,6 +169,7 @@ def test_Color_hsl(
     """
 
     assert Color(source).hsl == expect
+    assert Color.from_hsl(*expect) == source
 
 
 

{encommon-0.22.5 → encommon-0.22.7}/encommon/config/config.py

@@ -18,6 +18,7 @@ from .params import Params
 from .paths import ConfigPaths
 from .utils import config_paths
 from ..crypts import Crypts
+from ..parse import Jinja2
 from ..types import DictStrAny
 from ..types import merge_dicts
 from ..types import setate
@@ -64,6 +65,7 @@ class Config:
     __params: Optional[Params]
     __logger: Optional[Logger]
     __crypts: Optional[Crypts]
+    __jinja2: Jinja2
 
 
     def __init__(
@@ -104,6 +106,11 @@ class Config:
         self.__logger = None
         self.__crypts = None
 
+        jinja2 = Jinja2({
+            'config': self})
+
+        self.__jinja2 = jinja2
+
 
     @property
     def files(
@@ -325,3 +332,16 @@ class Config:
         self.__crypts = crypts
 
         return self.__crypts
+
+
+    @property
+    def jinja2(
+        self,
+    ) -> Jinja2:
+        """
+        Return the value for the attribute from class instance.
+
+        :returns: Value for the attribute from class instance.
+        """
+
+        return self.__jinja2

{encommon-0.22.5 → encommon-0.22.7}/encommon/config/test/test_config.py

@@ -24,7 +24,7 @@ if TYPE_CHECKING:
 
 
 
-def test_Config(
+def test_Config(  # noqa: CFQ001
     tmp_path: Path,
     config: 'Config',
 ) -> None:
@@ -46,7 +46,8 @@ def test_Config(
         '_Config__params',
         '_Config__paths',
         '_Config__logger',
-        '_Config__crypts']
+        '_Config__crypts',
+        '_Config__jinja2']
 
 
     assert inrepr(
@@ -83,6 +84,8 @@ def test_Config(
 
     assert config.crypts
 
+    assert config.jinja2
+
 
     replaces = {
         'pytemp': tmp_path,
@@ -138,6 +141,26 @@ def test_Config(
 
 
 
+def test_Config_jinja2(
+    config: 'Config',
+) -> None:
+    """
+    Perform various tests associated with relevant routines.
+
+    :param config: Primary class instance for configuration.
+    """
+
+    jinja2 = config.jinja2
+    j2parse = jinja2.parse
+
+    parsed = j2parse(
+        '{{ foo }}',
+        {'foo': 'bar'})
+
+    assert parsed == 'bar'
+
+
+
 def test_Config_cover(
     config: 'Config',
 ) -> None:

{encommon-0.22.5 → encommon-0.22.7}/encommon/parse/jinja2.py

@@ -331,3 +331,53 @@ class Jinja2:
 
 
         return value
+
+
+    def set_static(
+        self,
+        key: str,
+        value: Optional[Any] = None,
+    ) -> None:
+        """
+        Simply add the provided static into internal reference.
+
+        :param key: Where item will be inserted into reference.
+        :param value: Item that will be inserted into internal.
+        """
+
+        statics = self.__statics
+
+        if value is None:
+
+            if key in statics:
+                del statics[key]
+
+            return None
+
+        statics[key] = value
+
+
+    def set_filter(
+        self,
+        key: str,
+        value: Optional[FILTER] = None,
+    ) -> None:
+        """
+        Simply add the provided filter into internal reference.
+
+        :param key: Where item will be inserted into reference.
+        :param value: Item that will be inserted into internal.
+        """
+
+        jinjenv = self.__jinjenv
+
+        filters = jinjenv.filters
+
+        if value is None:
+
+            if key in filters:
+                del filters[key]
+
+            return None
+
+        filters[key] = value

{encommon-0.22.5 → encommon-0.22.7}/encommon/parse/test/test_jinja2.py

@@ -11,6 +11,7 @@ from typing import Any
 
 from pytest import fixture
 from pytest import mark
+from pytest import raises
 
 from ..jinja2 import Jinja2
 from ... import PROJECT
@@ -171,7 +172,7 @@ def test_Jinja2_literal(
      ('{{ "01" }}', '01'),
      ('-01', '-01'),
      ('{{ "-01" }}', '-01')])
-def test_Jinja2_cover(
+def test_Jinja2_parse(
     jinja2: Jinja2,
     value: Any,  # noqa: ANN401
     expect: Any,  # noqa: ANN401
@@ -189,3 +190,43 @@ def test_Jinja2_cover(
     parsed = parse(value)
 
     assert parsed == expect
+
+
+
+def test_Jinja2_cover(
+    jinja2: Jinja2,
+) -> None:
+    """
+    Perform various tests associated with relevant routines.
+
+    :param jinja2: Parsing class for the Jinja2 templating.
+    """
+
+    parse = jinja2.parse
+
+
+    jinja2.set_static(
+        'key', 'value')
+
+    parsed = parse('{{ key }}')
+
+    assert parsed == 'value'
+
+    jinja2.set_static('key')
+
+    with raises(Exception):
+        parse('{{ key }}')
+
+
+    jinja2.set_filter(
+        'float', float)
+
+    parsed = parse(
+        '{{ 1 | float }}')
+
+    assert parsed == 1.0
+
+    jinja2.set_filter('float')
+
+    with raises(Exception):
+        parse('{{ 1 | float }}')

{encommon-0.22.5 → encommon-0.22.7}/encommon/times/test/test_timers.py

@@ -100,8 +100,8 @@ def test_Timers(
         '_Timers__params',
         '_Timers__store',
         '_Timers__group',
-        '_Timers__store_engine',
-        '_Timers__store_session',
+        '_Timers__sengine',
+        '_Timers__session',
         '_Timers__timers']
 
 

{encommon-0.22.5 → encommon-0.22.7}/encommon/times/test/test_windows.py

@@ -111,8 +111,8 @@ def test_Windows(
         '_Windows__params',
         '_Windows__store',
         '_Windows__group',
-        '_Windows__store_engine',
-        '_Windows__store_session',
+        '_Windows__sengine',
+        '_Windows__session',
         '_Windows__start',
         '_Windows__stop',
         '_Windows__windows']

{encommon-0.22.5 → encommon-0.22.7}/encommon/times/timers.py

@@ -107,8 +107,8 @@ class Timers:
     __store: str
     __group: str
 
-    __store_engine: Engine
-    __store_session: (
+    __sengine: Engine
+    __session: (
         # pylint: disable=unsubscriptable-object
         sessionmaker[Session])
 
@@ -152,17 +152,18 @@ class Timers:
         Construct instances using the configuration parameters.
         """
 
-        store = self.__store
-
-        engine = create_engine(store)
+        sengine = create_engine(
+            self.__store,
+            pool_pre_ping=True)
 
         (SQLBase.metadata
-         .create_all(engine))
+         .create_all(sengine))
 
-        session = sessionmaker(engine)
+        session = (
+            sessionmaker(sengine))
 
-        self.__store_engine = engine
-        self.__store_session = session
+        self.__sengine = sengine
+        self.__session = session
 
 
     @property
@@ -214,7 +215,7 @@ class Timers:
         :returns: Value for the attribute from class instance.
         """
 
-        return self.__store_engine
+        return self.__sengine
 
 
     @property
@@ -227,7 +228,7 @@ class Timers:
         :returns: Value for the attribute from class instance.
         """
 
-        return self.__store_session()
+        return self.__session()
 
 
     @property

{encommon-0.22.5 → encommon-0.22.7}/encommon/times/window.py

@@ -331,22 +331,22 @@ def window_croniter(  # noqa: CFQ004
         source: datetime,
     ) -> datetime:
 
-        source = (
+        parse = (
             _operator(source)
             .get_next())
 
-        return parse_time(source)
+        return parse_time(parse)
 
 
     def _wlast(
         source: datetime,
     ) -> datetime:
 
-        source = (
+        parse = (
             _operator(source)
             .get_prev())
 
-        return parse_time(source)
+        return parse_time(parse)
 
 
     def _operator(

{encommon-0.22.5 → encommon-0.22.7}/encommon/times/windows.py

@@ -109,8 +109,8 @@ class Windows:
     __store: str
     __group: str
 
-    __store_engine: Engine
-    __store_session: (
+    __sengine: Engine
+    __session: (
         # pylint: disable=unsubscriptable-object
         sessionmaker[Session])
 
@@ -168,17 +168,18 @@ class Windows:
         Construct instances using the configuration parameters.
         """
 
-        store = self.__store
-
-        engine = create_engine(store)
+        sengine = create_engine(
+            self.__store,
+            pool_pre_ping=True)
 
         (SQLBase.metadata
-         .create_all(engine))
+         .create_all(sengine))
 
-        session = sessionmaker(engine)
+        session = (
+            sessionmaker(sengine))
 
-        self.__store_engine = engine
-        self.__store_session = session
+        self.__sengine = sengine
+        self.__session = session
 
 
     @property
@@ -230,7 +231,7 @@ class Windows:
         :returns: Value for the attribute from class instance.
         """
 
-        return self.__store_engine
+        return self.__sengine
 
 
     @property
@@ -243,7 +244,7 @@ class Windows:
         :returns: Value for the attribute from class instance.
         """
 
-        return self.__store_session()
+        return self.__session()
 
 
     @property

{encommon-0.22.5 → encommon-0.22.7}/encommon/types/test/test_classes.py

@@ -71,4 +71,5 @@ def test_lattrs(
         '_Config__params',
         '_Config__paths',
         '_Config__logger',
-        '_Config__crypts']
+        '_Config__crypts',
+        '_Config__jinja2']

encommon-0.22.7/encommon/version.txt

@@ -0,0 +1 @@
+0.22.7

{encommon-0.22.5 → encommon-0.22.7/encommon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: encommon
-Version: 0.22.5
+Version: 0.22.7
 Summary: Enasis Network Common Library
 License: MIT
 Project-URL: Source, https://github.com/enasisnetwork/encommon
@@ -20,6 +20,7 @@ Requires-Dist: python-dateutil
 Requires-Dist: pyyaml
 Requires-Dist: snaptime
 Requires-Dist: sqlalchemy
+Dynamic: license-file
 
 # Enasis Network Common Library
 

encommon-0.22.5/encommon/version.txt

@@ -1 +0,0 @@
-0.22.5