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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clear-skies
-Version: 2.0.9
+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.9.dist-info → clear_skies-2.0.10.dist-info}/RECORD

@@ -162,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
@@ -221,7 +221,7 @@ clearskies/query/query.py,sha256=0XR3fNhOpDNJY0US2oseAS3p3Y0jxxVs86P6vWEvUcA,606
 clearskies/query/sort.py,sha256=c-EtIkjg3kLjwSTdXD7sfyx-mNUhAepUV-2izprh3iY,754
 clearskies/secrets/__init__.py,sha256=G-A8YhCMlS_OdboSeKzCZp6iwfqwU4BPEnB5HvD88wY,142
 clearskies/secrets/akeyless.py,sha256=4SwnVNzMAijZtzR0Q25dizEw-q7nbS4G5s0CoGyc-G0,7219
-clearskies/secrets/secrets.py,sha256=20Oq-PogMbFCPB6b4HyowlDD9QNY4r4BVKVm9hTrGxs,1724
+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
@@ -250,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.9.dist-info/METADATA,sha256=6MAexsDWPfHN-2JRQC4PE8iIm10D3skQejnBCESu1Y0,2113
-clear_skies-2.0.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-clear_skies-2.0.9.dist-info/licenses/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-2.0.9.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/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/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."