clear-skies 2.0.8__py3-none-any.whl → 2.0.10__py3-none-any.whl

{clear_skies-2.0.8.dist-info → clear_skies-2.0.10.dist-info}/METADATA

@@ -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.dist-info → clear_skies-2.0.10.dist-info}/RECORD

@@ -103,7 +103,7 @@ clearskies/columns/timestamp.py,sha256=nIEbvg1YqKPjtEeFyYRnPPPSYB_lYIIUUm8zNoE8d
 clearskies/columns/updated.py,sha256=BFan3JnO2IEbryTGC2rR_RD1ruDcev49owPBYyjjSVI,3340
 clearskies/columns/uuid.py,sha256=QE1UKHA9zt7bYd59rYRmzIHSonq9-sZeQbAIQtoJC54,2265
 clearskies/configs/README.md,sha256=4-r2FvkrBTrKkcKgJ5O3Qj1RZ7nnkknenKze4XYlQDs,4827
-clearskies/configs/__init__.py,sha256=nfaevClmzwsTMYDH4R_6t2VRg4OoeInIocvclIQ-8kY,5079
+clearskies/configs/__init__.py,sha256=X3U5l_oXYh9JTeiI7IZuzz1rq5TTO4HHIvcz5gLGa9s,5357
 clearskies/configs/actions.py,sha256=5OwrokU8uTSSQ_6SvL94SOP5JVkvRRFGAXNcCdMt8aQ,1388
 clearskies/configs/any.py,sha256=QSLOO955Lbg8NqYeyxdQGXTTyfFc5P036LORUa7avHc,388
 clearskies/configs/any_dict.py,sha256=LECTIcCF22JXbAaZdWSmKh9UShRuRt8PydNCuj05ijI,907
@@ -118,6 +118,10 @@ clearskies/configs/conditions.py,sha256=a09bVac4-10ZtKPQGSu_e9VnHnwITwy_7_T4NekX
 clearskies/configs/config.py,sha256=2qsF3ZBc8tsTXDgNLL7vT01kjWanbJH3oXO9R2S6GnU,909
 clearskies/configs/datetime.py,sha256=QJxqRyFkb0YByHmaH_Rd_geUiyvBpk5xdBdRDj28278,689
 clearskies/configs/datetime_or_callable.py,sha256=hp6ay-958DWoPy8Ryf1VS4R5NPKoF9LceiUhSB7I_wg,835
+clearskies/configs/email.py,sha256=BbXGvZnO9wwT8LHexAq0ibwDNLVvv_8yUJEOThzJVE4,317
+clearskies/configs/email_list.py,sha256=cTgdQTz4HYkqbdTEHPy8LcLjPGqFWY5TOIH8cHbfXXI,582
+clearskies/configs/email_list_or_callable.py,sha256=jowDly4ZKLOYJ73aJ8VoNX338jzqTZyIcY91ANvrgt0,679
+clearskies/configs/email_or_email_list_or_callable.py,sha256=tFdAsI1sTDMOheb3h8nQhIVxnl9xzZPwZtKjYEHjkKM,2470
 clearskies/configs/endpoint.py,sha256=NEDthtdPzejAot7yzUjC01PvQJR9BIyk5YnWXCi1w9I,759
 clearskies/configs/endpoint_list.py,sha256=9xtXmZpdOh7uk9Sm3MF9xi1_N-n2DZ-F4s0zrNfEKng,1200
 clearskies/configs/float.py,sha256=7HwDMf-3VfrZxTmXwpnwDgXyzujUBpz1xPi1StdjB1Q,621
@@ -139,10 +143,10 @@ clearskies/configs/searchable_model_columns.py,sha256=PVSe9J6cGyWRCAFwqstVIVTEGT
 clearskies/configs/security_headers.py,sha256=wNtoUsghhec-NNZl9dSIRxTTApYw2vukbslYI-YY968,1403
 clearskies/configs/select.py,sha256=TaiCbNGaSsLc6lJ_0_67PXgYDXhoDwd_T_KygKSPB-0,1057
 clearskies/configs/select_list.py,sha256=ctqJW523C7UEhjahn_sWL1nlK-4OZrP01n_y1PV770s,1925
-clearskies/configs/string.py,sha256=vGTkah9Ml1Y0gw7OIu9B6C_b2lsYcOh_AKrrPrCzS_E,1129
+clearskies/configs/string.py,sha256=T65R8zvftpn-SZDxjS4ZqStBp1LWYwK9KkqH7WMK19o,1117
 clearskies/configs/string_dict.py,sha256=vE1Q9HImvu5erMvCFnU73M4SUAhL6nnYr3-szp-axRg,1392
-clearskies/configs/string_list.py,sha256=4o-p18c7VTVj5WNuqnHEtYx0aNZjvn25X0S3fbf4R28,1238
-clearskies/configs/string_list_or_callable.py,sha256=V9yuLiotQStZcAm_-dWzXW5PG8gZMSYyjerQc4RaP2E,1491
+clearskies/configs/string_list.py,sha256=qJQFn0QxVfs3WeMfKTK40GQV-zeKQSJ-wvnhAjj8uqY,1760
+clearskies/configs/string_list_or_callable.py,sha256=dOMwWAkDrQf2we3Sn7GkNBqxhvEXqtQIOoIib52YIZg,2020
 clearskies/configs/string_or_callable.py,sha256=2Bg05AYN6j3v4ttFOmD-EBGfYpok67yiuFXnTTUhhNo,702
 clearskies/configs/timedelta.py,sha256=Seuu9PexoWPqayybBjHlsDlx_EEe50BTfGOGKKecONc,703
 clearskies/configs/timezone.py,sha256=JL6bjrCS4XdJzrRdhO5kZrMIhvxfNxsvvQ7EQrT0DOo,719
@@ -158,7 +162,7 @@ clearskies/contexts/wsgi_ref.py,sha256=Z4oBIYeSsLp93dR1eBsZTaevzVYB0QrR-ugp1CQVl
 clearskies/di/__init__.py,sha256=Ab8GNv9ZksnCABq8n2gCcyLEAXD-5-kX4O8PweTJIFs,474
 clearskies/di/additional_config.py,sha256=65INxw8aqTZQsyaKPj-aQmd6FBe4_4DwibXGgWYBy14,5139
 clearskies/di/additional_config_auto_import.py,sha256=XYw0Kcnp6hp-ee-c0YjiATwJvRb2E82xk9PuoX9dGRY,758
-clearskies/di/di.py,sha256=XHlsyzWyU1adlvQlRYLcygDT3XGJptP4_qtHqSE4o-I,45461
+clearskies/di/di.py,sha256=KEIzsaM0TF1N2UcwDFhsxtYjaCSte2e0koUxuHd2rME,46044
 clearskies/di/injectable.py,sha256=TTgqhx494470I61-88BUQmHmevfat-wXVseKl8pQOEk,852
 clearskies/di/injectable_properties.py,sha256=yJP0J7l7tjG2soyXtrfDgktE7M8tQHaP-55Cmtq0b7M,6466
 clearskies/di/inject/__init__.py,sha256=plEkWId-VyhvqX5KM2HhdCqi7_ZJzPmFz69cPAo812Y,643
@@ -216,8 +220,8 @@ clearskies/query/join.py,sha256=4lrDUQzck7klKY_VYkc4SVK95SVwyy3SVTvasnsAEyc,4713
 clearskies/query/query.py,sha256=0XR3fNhOpDNJY0US2oseAS3p3Y0jxxVs86P6vWEvUcA,6063
 clearskies/query/sort.py,sha256=c-EtIkjg3kLjwSTdXD7sfyx-mNUhAepUV-2izprh3iY,754
 clearskies/secrets/__init__.py,sha256=G-A8YhCMlS_OdboSeKzCZp6iwfqwU4BPEnB5HvD88wY,142
-clearskies/secrets/akeyless.py,sha256=HNNTHCLjfvS5Uz9b6O8yzqeDJ18Zig94Pkl1fA7XOzE,7060
-clearskies/secrets/secrets.py,sha256=20Oq-PogMbFCPB6b4HyowlDD9QNY4r4BVKVm9hTrGxs,1724
+clearskies/secrets/akeyless.py,sha256=4SwnVNzMAijZtzR0Q25dizEw-q7nbS4G5s0CoGyc-G0,7219
+clearskies/secrets/secrets.py,sha256=9sYrI0PmxXAzyDCfylOmb8svXqPc9IefaWKaBPHrjxE,1815
 clearskies/secrets/additional_configs/__init__.py,sha256=cFCrbtKF5nuR061S2y1iKZp349x-y8Srdwe3VZbfSFU,1119
 clearskies/secrets/additional_configs/mysql_connection_dynamic_producer.py,sha256=CnIiXLVQdUnUey3dbCTXuNNP7Mmw1gjjNjZiBtfgGto,2757
 clearskies/secrets/additional_configs/mysql_connection_dynamic_producer_via_ssh_cert_bastion.py,sha256=N8ruxrTNhvYlp3cYXq6V78KPPr4n40LM7QoXHvD8IZg,6235
@@ -246,7 +250,7 @@ clearskies/validators/minimum_value.py,sha256=NDLcG6xCemlv3kfr-RiUaM3x2INS1GJGMB
 clearskies/validators/required.py,sha256=GWxyexwj-K6DunZWNEnZxW6tQGAFd4oOCvQrW1s1K9k,1308
 clearskies/validators/timedelta.py,sha256=DJ0pTm-SSUtjZ7phGoD6vjb086vXPzvLLijkU-jQlOs,1892
 clearskies/validators/unique.py,sha256=GFEQOMYRIO9pSGHHj6zf1GdnJ0UM7Dm4ZO4uGn19BZo,991
-clear_skies-2.0.8.dist-info/METADATA,sha256=jCJOYBO5aC6oExboDjy6JO5CdoGsZlUboVpkpvhakEg,2113
-clear_skies-2.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-clear_skies-2.0.8.dist-info/licenses/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-2.0.8.dist-info/RECORD,,
+clear_skies-2.0.10.dist-info/METADATA,sha256=tuBiBiOYS2L-LJgp6Ud75P-_BM4JGbNk5hGO_rxojAs,2114
+clear_skies-2.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+clear_skies-2.0.10.dist-info/licenses/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-2.0.10.dist-info/RECORD,,

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",

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)

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)

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)

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)

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(

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)
 

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]]:

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
 

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/",

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."