clear-skies 2.0.8__tar.gz → 2.0.10__tar.gz

{clear_skies-2.0.8 → clear_skies-2.0.10}/CHANGELOG.md

@@ -5,9 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.10] - 2025-10-06
+
+### Changed
+- Include injectable props for base secret class, and detection of… by @cmancone in [#22](https://github.com/clearskies-py/clearskies/pull/22)
+- Black by @cmancone
+- Include injectable props for base secret class, and detection of missing class by @cmancone
+
+## [2.0.9] - 2025-10-01
+
+### Added
+- Add email configs by @tnijboer in [#21](https://github.com/clearskies-py/clearskies/pull/21)
+- Add regex to string_list/string_list_callable and reuse them
+- Add email configs
+
+### Changed
+- Bump version to v2.0.9 by @github-actions[bot]
+
+### Removed
+- Remove extra call, token is already in credentials json in [#20](https://github.com/clearskies-py/clearskies/pull/20)
+
 ## [2.0.8] - 2025-09-22
 
 ### Changed
+- Bump version to v2.0.8 by @github-actions[bot]
 - Move typing import to IF TYPE_CHECKING by @cmancone in [#19](https://github.com/clearskies-py/clearskies/pull/19)
 - Move typing import to IF TYPE_CHECKING:
 
@@ -778,6 +799,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * @ made their first contribution
 * @tnijboer made their first contribution
 * @conormancone-cimpress made their first contribution
+[2.0.10]: https://github.com/clearskies-py/clearskies/compare/v2.0.9..v2.0.10
+[2.0.9]: https://github.com/clearskies-py/clearskies/compare/v2.0.8..v2.0.9
 [2.0.8]: https://github.com/clearskies-py/clearskies/compare/v2.0.7..v2.0.8
 [2.0.7]: https://github.com/clearskies-py/clearskies/compare/v2.0.6..v2.0.7
 [2.0.6]: https://github.com/clearskies-py/clearskies/compare/v2.0.5..v2.0.6

clear_skies-2.0.10/LATEST_CHANGELOG.md

@@ -0,0 +1,7 @@
+## [2.0.10] - 2025-10-06
+
+### Changed
+- Include injectable props for base secret class, and detection of… by @cmancone in [#22](https://github.com/clearskies-py/clearskies/pull/22)
+- Black by @cmancone
+- Include injectable props for base secret class, and detection of missing class by @cmancone
+

{clear_skies-2.0.8 → clear_skies-2.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clear-skies
-Version: 2.0.8
+Version: 2.0.10
 Summary: A framework for building backends in the cloud
 Project-URL: Documentation, https://clearskies.io/
 Project-URL: Repository, https://github.com/clearskies-py/clearskies

{clear_skies-2.0.8 → clear_skies-2.0.10}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "clear-skies"
 description = "A framework for building backends in the cloud"
-version = "2.0.8"
+version = "2.0.10"
 license = "MIT"
 readme = "./README.md"
 authors = [{name = "Conor Mancone", email = "cmancone@gmail.com"}]

{clear_skies-2.0.8 → clear_skies-2.0.10}/src/clearskies/configs/__init__.py

@@ -79,6 +79,10 @@ from .conditions import Conditions
 from .config import Config
 from .datetime import Datetime
 from .datetime_or_callable import DatetimeOrCallable
+from .email import Email
+from .email_list import EmailList
+from .email_list_or_callable import EmailListOrCallable
+from .email_or_email_list_or_callable import EmailOrEmailListOrCallable
 from .endpoint import Endpoint
 from .endpoint_list import EndpointList
 from .float import Float
@@ -127,6 +131,10 @@ __all__ = [
     "Config",
     "Datetime",
     "DatetimeOrCallable",
+    "Email",
+    "EmailList",
+    "EmailListOrCallable",
+    "EmailOrEmailListOrCallable",
     "Endpoint",
     "EndpointList",
     "Float",

clear_skies-2.0.10/src/clearskies/configs/email.py

@@ -0,0 +1,10 @@
+from __future__ import annotations
+
+from clearskies.configs import string
+
+
+class Email(string.String):
+    def __init__(
+        self, required=False, default=None, regexp: str = r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)"
+    ):
+        super().__init__(required=required, default=default, regexp=regexp)

clear_skies-2.0.10/src/clearskies/configs/email_list.py

@@ -0,0 +1,17 @@
+from __future__ import annotations
+
+from clearskies.configs import string_list
+
+
+class EmailList(string_list.StringList):
+    """
+    This is for a configuration that should be a list of strings in email format.
+
+    This is different than StringList, which also accepts a list of strings, but
+    validates that all of those values match the required format.
+    """
+
+    def __init__(
+        self, required=False, default=None, regexp: str = r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)"
+    ):
+        super().__init__(required=required, default=default, regexp=regexp)

clear_skies-2.0.10/src/clearskies/configs/email_list_or_callable.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from typing import Callable
+
+from clearskies.configs import string_list_or_callable
+
+
+class EmailListOrCallable(string_list_or_callable.StringListOrCallable):
+    """
+    This is for a configuration that should be a list of emails or a callable that returns a list of emails.
+
+    This is different than StringList, which also accepts a list of strings, but
+    validates that all of those values match the email format.
+    """
+
+    def __init__(
+        self, required=False, default=None, regexp: str = r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)"
+    ):
+        super().__init__(required=required, default=default, regexp=regexp)

clear_skies-2.0.10/src/clearskies/configs/email_or_email_list_or_callable.py

@@ -0,0 +1,59 @@
+from __future__ import annotations
+
+from typing import Callable
+
+from clearskies.configs import config
+
+
+class EmailOrEmailListOrCallable(config.Config):
+    """
+    This is for a configuration that should be an email or a list of emails or a callable that returns a list of emails.
+
+    This is a combination of Email and EmailListOrCallable.
+    """
+
+    def __init__(
+        self, required=False, default=None, regexp: str = r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)"
+    ):
+        self.required = required
+        self.default = default
+        self.regexp = regexp
+
+    def __set__(self, instance, value: str | list[str] | Callable[..., list[str]]):
+        if value is None:
+            return
+        if self.regexp:
+            import re
+        if isinstance(value, str):
+            if self.regexp and not re.match(self.regexp, value):
+                error_prefix = self._error_prefix(instance)
+                raise ValueError(
+                    f"{error_prefix} attempt to set a value of '{value}' but this does not match the required regexp: '{self.regexp}'."
+                )
+            value = [value]
+        elif not isinstance(value, list) and not callable(value):
+            error_prefix = self._error_prefix(instance)
+            raise TypeError(
+                f"{error_prefix} attempt to set a value of type '{value.__class__.__name__}' to a parameter that should be a list or a callable"
+            )
+        if isinstance(value, list):
+            if self.regexp:
+                import re
+
+            for index, item in enumerate(value):
+                if not isinstance(item, str):
+                    error_prefix = self._error_prefix(instance)
+                    raise TypeError(
+                        f"{error_prefix} attempt to set a value of type '{item.__class__.__name__}' for item #{index + 1}.  A string was expected."
+                    )
+                if not re.match(self.regexp, item):
+                    error_prefix = self._error_prefix(instance)
+                    raise ValueError(
+                        f"{error_prefix} attempt to set a value of '{item}' for item #{index + 1} but this does not match the required regexp: '{self.regexp}'."
+                    )
+        instance._set_config(self, value)
+
+    def __get__(self, instance, parent) -> list[str] | Callable[..., list[str]]:
+        if not instance:
+            return self  # type: ignore
+        return instance._get_config(self)

{clear_skies-2.0.8 → clear_skies-2.0.10}/src/clearskies/configs/string.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import re
+
 from clearskies.configs import config
 
 
@@ -16,8 +18,6 @@ class String(config.Config):
                 f"{error_prefix} attempt to set a value of type '{value.__class__.__name__}' to a parameter that requires a string."
             )
         if self.regexp:
-            import re
-
             if not re.match(self.regexp, value):
                 error_prefix = self._error_prefix(instance)
                 raise ValueError(

{clear_skies-2.0.8 → clear_skies-2.0.10}/src/clearskies/configs/string_list.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import re
+
 from clearskies.configs import config
 
 
@@ -11,6 +13,11 @@ class StringList(config.Config):
     valdiates that all of those values match against an allow list.
     """
 
+    def __init__(self, required=False, default=None, regexp: str = ""):
+        self.required = required
+        self.default = default
+        self.regexp = regexp
+
     def __set__(self, instance, value: list[str]):
         if value is None:
             return
@@ -18,13 +25,19 @@ class StringList(config.Config):
         if not isinstance(value, list):
             error_prefix = self._error_prefix(instance)
             raise TypeError(
-                f"{error_prefix} attempt to set a value of type '{value.__class__.__name__}' to a list parameter"
+                f"{error_prefix} attempt to set a value of type '{value.__class__.__name__}' to a list of strings parameter."
             )
+
         for index, item in enumerate(value):
             if not isinstance(item, str):
                 error_prefix = self._error_prefix(instance)
                 raise TypeError(
-                    f"{error_prefix} attempt to set a value of type '{item.__class__.__name__}' for item #{index + 1}.  A string was expected."
+                    f"{error_prefix} attempt to set a value of type '{item.__class__.__name__}' for item #{index + 1}. A string was expected."
+                )
+            if self.regexp and not re.match(self.regexp, item):
+                error_prefix = self._error_prefix(instance)
+                raise ValueError(
+                    f"{error_prefix} attempt to set a value of '{item}' for item #{index + 1} but this does not match the required regexp: '{self.regexp}'."
                 )
         instance._set_config(self, value)
 

{clear_skies-2.0.8 → clear_skies-2.0.10}/src/clearskies/configs/string_list_or_callable.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import re
 from typing import Callable
 
 from clearskies.configs import config
@@ -13,6 +14,11 @@ class StringListOrCallable(config.Config):
     valdiates that all of those values match against an allow list.
     """
 
+    def __init__(self, required=False, default=None, regexp: str = ""):
+        self.required = required
+        self.default = default
+        self.regexp = regexp
+
     def __set__(self, instance, value: list[str] | Callable[..., list[str]]):
         if value is None:
             return
@@ -29,6 +35,11 @@ class StringListOrCallable(config.Config):
                     raise TypeError(
                         f"{error_prefix} attempt to set a value of type '{item.__class__.__name__}' for item #{index + 1}.  A string was expected."
                     )
+                if self.regexp and not re.match(self.regexp, item):
+                    error_prefix = self._error_prefix(instance)
+                    raise ValueError(
+                        f"{error_prefix} attempt to set a value of '{item}' for item #{index + 1} but this does not match the required regexp: '{self.regexp}'."
+                    )
         instance._set_config(self, value)
 
     def __get__(self, instance, parent) -> list[str] | Callable[..., list[str]]:

{clear_skies-2.0.8 → clear_skies-2.0.10}/src/clearskies/di/di.py

@@ -535,8 +535,7 @@ class Di:
         override = self._class_overrides_by_class[object_to_override.__class__]
         if inspect.isclass(override):
             return self.build_class(override)
-        if hasattr(override, "injectable_properties"):
-            override.injectable_properties(self)
+        self.inject_properties(override.__class__)
         return override
 
     def add_override(self, name: str, replacement_class: type) -> None:
@@ -670,8 +669,7 @@ class Di:
         # ignore the first argument because that is just `self`
         build_arguments = init_args.args[1:]
         if not build_arguments:
-            if hasattr(class_to_build, "injectable_properties"):
-                class_to_build.injectable_properties(self)
+            self.inject_properties(class_to_build)
             built_value = class_to_build()
             if cache:
                 self._prepared[class_to_build] = built_value  # type: ignore
@@ -703,9 +701,8 @@ class Di:
 
         del self._building[class_id]
 
+        self.inject_properties(class_to_build)
         built_value = class_to_build(*args)
-        if hasattr(built_value, "injectable_properties"):
-            built_value.injectable_properties(self)
         if cache:
             self._prepared[class_to_build] = built_value  # type: ignore
         return built_value
@@ -844,6 +841,23 @@ class Di:
             return False
         return True
 
+    def inject_properties(self, cls):
+        if hasattr(cls, "injectable_properties"):
+            cls.injectable_properties(self)
+            return
+
+        if not hasattr(cls, "__injectable_properties_sanity_check"):
+            return
+
+        for attribute_name in dir(cls):
+            attribute = getattr(cls, attribute_name)
+            if hasattr(attribute, "initiated_guard") and hasattr(attribute, "set_di"):
+                raise ValueError(
+                    f"Class '{cls.__name__}' has an injectable property attached, but does not include clearskies.di.injectable_properties.InjectableProperties in it's parent classes.  You must include this as a parent class."
+                )
+        cls.__injectable_properties_sanity_check = True
+        return
+
     def provide_di(self):
         return self
 

{clear_skies-2.0.8 → clear_skies-2.0.10}/src/clearskies/secrets/akeyless.py

@@ -138,6 +138,7 @@ class Akeyless(secrets.Secrets):
         return res.token
 
     def auth_saml(self):
+        import json
         import os
         from pathlib import Path
 
@@ -145,7 +146,9 @@ class Akeyless(secrets.Secrets):
         home = str(Path.home())
         with open(f"{home}/.akeyless/.tmp_creds/{self.profile}-{self.access_id}", "r") as creds_file:
             credentials = creds_file.read()
-
+            credentials_json = json.loads(credentials)
+        if "token" in credentials_json:
+            return credentials_json["token"]
         # and now we can turn that into a token
         response = self.requests.post(
             "https://rest.akeyless.io/",

{clear_skies-2.0.8 → clear_skies-2.0.10}/src/clearskies/secrets/secrets.py

@@ -4,9 +4,10 @@ from abc import ABC
 from typing import Any
 
 import clearskies.configurable
+from clearskies.di.injectable_properties import InjectableProperties
 
 
-class Secrets(ABC, clearskies.configurable.Configurable):
+class Secrets(ABC, clearskies.configurable.Configurable, InjectableProperties):
     def create(self, path: str, value: str) -> bool:
         raise NotImplementedError(
             "It looks like you tried to use the secret system in clearskies, but didn't specify a secret manager."

{clear_skies-2.0.8 → clear_skies-2.0.10}/uv.lock

@@ -202,7 +202,7 @@ wheels = [
 
 [[package]]
 name = "clear-skies"
-version = "2.0.8"
+version = "2.0.10"
 source = { editable = "." }
 dependencies = [
     { name = "dateparser" },

clear_skies-2.0.8/LATEST_CHANGELOG.md

@@ -1,9 +0,0 @@
-## [2.0.8] - 2025-09-22
-
-### Changed
-- Move typing import to IF TYPE_CHECKING by @cmancone in [#19](https://github.com/clearskies-py/clearskies/pull/19)
-- Move typing import to IF TYPE_CHECKING:
-
-### Fixed
-- Importing reorder
-