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

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

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

@@ -4,8 +4,8 @@ clearskies/column.py,sha256=3zAc5pc8zo4ws0mEU5GfbuvljkpAJJlAxmAf8lBKAVA,51299
 clearskies/configurable.py,sha256=gfX9o5qgMqc8lSzrdcUyR3b6zdOvg9ccYBQ0VvZjXkk,3085
 clearskies/decorators.py,sha256=lcXJC4xI-hRyKDSH8yklcWjOrIL9k2Qks1xP2lmyDm0,1024
 clearskies/decorators.pyi,sha256=qSRzPJYYoV9trEsh_V1BxP2HdMz0G2gOs4FV8f5hvyU,388
-clearskies/end.py,sha256=5XdtQ2Zfe7Ifqf8AvMvswtyYzxKgTTSuENxUOgym5HM,10688
-clearskies/endpoint.py,sha256=cAbba47XbeRl_XKOsl0p2yTECOQ19rAIVryIoEHt3_M,47972
+clearskies/end.py,sha256=mEPdBB4lh9zmAKTbsffCh-mQMZGIVohriWjm-952EzA,10629
+clearskies/endpoint.py,sha256=z4ys46jZC1rFSAfwdc-eScUDThcJ4mILRCQMcqvAX68,47960
 clearskies/endpoint_group.py,sha256=qsxQpt1i6IRvQqhQkt_udoVj0TMdoIOccvKyEBaeaEg,12343
 clearskies/environment.py,sha256=BbNgQH3uuCTxoHeLB9O1_HsPTaJL5aiXqY6hZ9aj-jo,3739
 clearskies/model.py,sha256=1cCx1KcAOK6_MHBdgtWdu4lZMYuPQaWHSrXsdW4v7V8,77545
@@ -68,7 +68,7 @@ clearskies/backends/cursor_backend.py,sha256=5YBO0EwxU_1YKIL3_fIbA93sh7NG4Qg8jpA
 clearskies/backends/memory_backend.py,sha256=H_2fib9EFdXsg3ZMMpC20DMHnrnYDbPgZnmiarbOhiM,33963
 clearskies/backends/secrets_backend.py,sha256=6YVx154vhFLt_Fz0dz8wjQiVbaqBzPoUlfsYXU-9h7s,4044
 clearskies/columns/__init__.py,sha256=a__-1hv-aMV3RU0Sd-BEkfItSJaG51EF2VeRQoTdka8,1990
-clearskies/columns/audit.py,sha256=LRMUtmZE7ca-k_6A57J2bDUJzU1o6hU6aFwU7sXe8c0,7594
+clearskies/columns/audit.py,sha256=KABjKk3YdV6G_43OdkhFA_iGkmjP9Sb-m0Beh2_aXU4,7624
 clearskies/columns/belongs_to_id.py,sha256=Ga3IpWlMy2_m8e5OK_iortNjHdMbF1RQF2tglWAzBVc,17575
 clearskies/columns/belongs_to_model.py,sha256=nZ-yOs5CJx_WoMQ2wLLQfwSTfuF5vantEL0DFUgwC4Q,5714
 clearskies/columns/belongs_to_self.py,sha256=cmgjxq4SmokGO2UbE0VlcFRXack9KjPLzyE9L3fNang,3725
@@ -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=X3U5l_oXYh9JTeiI7IZuzz1rq5TTO4HHIvcz5gLGa9s,5357
+clearskies/configs/__init__.py,sha256=dCuGWN6eI7r9hW8d33R4nCehEMdgEpvJU1TQ-NWVK6M,5401
 clearskies/configs/actions.py,sha256=5OwrokU8uTSSQ_6SvL94SOP5JVkvRRFGAXNcCdMt8aQ,1388
 clearskies/configs/any.py,sha256=QSLOO955Lbg8NqYeyxdQGXTTyfFc5P036LORUa7avHc,388
 clearskies/configs/any_dict.py,sha256=LECTIcCF22JXbAaZdWSmKh9UShRuRt8PydNCuj05ijI,907
@@ -123,9 +123,10 @@ clearskies/configs/email_list.py,sha256=cTgdQTz4HYkqbdTEHPy8LcLjPGqFWY5TOIH8cHbf
 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/endpoint_list.py,sha256=HS1IO2HX8Y0W5ZZU7_Yk_6p5a8mo93an5Q2KAkOl9ZU,1202
 clearskies/configs/float.py,sha256=7HwDMf-3VfrZxTmXwpnwDgXyzujUBpz1xPi1StdjB1Q,621
 clearskies/configs/float_or_callable.py,sha256=9IiylL4Gg9_7HJOrYxbUPuLGE03TwKsAMsxfB7Lh2yY,744
+clearskies/configs/headers.py,sha256=D3bo3jE8x5DA1vLeo9ewnfIBHcRbr0JavOY-SQyFeVQ,986
 clearskies/configs/integer.py,sha256=lw05RhD8ZkHO_tYJLtCUHZ_Ucz2Mf7C0Z5wVOsMqgq0,620
 clearskies/configs/integer_or_callable.py,sha256=acCUP2ZSfSMPyID2LzIOQ-dlgARpxEktgr7KFWMtGbk,739
 clearskies/configs/joins.py,sha256=i1QmxFwkpL-pnzVPh3mrHpwrvzsjt9nH5pMSj4J1TT4,944
@@ -155,14 +156,14 @@ clearskies/configs/validators.py,sha256=aAvf5dgncR8OP7_M7QUNhsHau4wAdPiXw9wNARRA
 clearskies/configs/writeable_model_column.py,sha256=22pMoOAwYjvhHBcFrBb6ImtuoahbDKd5jZrNsbykrw4,355
 clearskies/configs/writeable_model_columns.py,sha256=vQFh5w6ToC8SDi_GaEvy33csp2CTFIroAfOLigHjFKo,359
 clearskies/contexts/__init__.py,sha256=f7XVUq2UKlDH6fjmcUWk6lbe9p_OaGpZ5ZjM6CuwTGQ,247
-clearskies/contexts/cli.py,sha256=5t5rJJxlpNIrn8ITFIDvbSDbcPruoMQgei4ZjJ9Txvg,2648
-clearskies/contexts/context.py,sha256=CCaO8bXR2ZsB0HiFIQ5tY65N7Y5d1TxYHIj2d1S8sv8,3559
-clearskies/contexts/wsgi.py,sha256=scuV3FbDT4u51o4ND6XR60d196vRb3wdvcGiZ0e0SFg,2933
+clearskies/contexts/cli.py,sha256=cuGWoyRhHlO_Ba6Dozg3sGob1VZoI4TBFOLu-2Udabk,2838
+clearskies/contexts/context.py,sha256=rT-d0v5wiVqRNz_bsitTBXYEy0555-H2xr9TpETf-og,3676
+clearskies/contexts/wsgi.py,sha256=7Vhh-gX2RPZUXad1hq9IkYx1JASyfV5xoPlwMOwjHso,3188
 clearskies/contexts/wsgi_ref.py,sha256=Z4oBIYeSsLp93dR1eBsZTaevzVYB0QrR-ugp1CQVltU,2822
 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=mW7Tk6-9pI5khq9h_A2kXJ3XDytwC6JdLX3TcLxU2q0,46348
 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
@@ -205,12 +206,12 @@ clearskies/functional/routing.py,sha256=tfIvP_Y29GTGr91_1ec3LSQFoTRwpkqU4BYHXPnB
 clearskies/functional/string.py,sha256=ZnkOjx8nxqZq2TV0CIb-Kz4onGoyekTX_WkLJM6XTmM,3311
 clearskies/functional/validations.py,sha256=cPYOTwWomlQrPvqPP_Jdlds7zZ5H9GABCP5pnGzC9T4,2821
 clearskies/input_outputs/__init__.py,sha256=9qeKJULw3MQ3zqkgBZice5d7qqRgsP3y-wkhWO2Y9vM,362
-clearskies/input_outputs/cli.py,sha256=xWv6gcDKL2I7_WmmQn91IQwyR9oS-WJAdjhsc0Yvux8,6061
-clearskies/input_outputs/headers.py,sha256=R0RVVAVRVwDUiMpMrh684eYNv-1Xr8I0NzWRVIPv2Kk,1652
-clearskies/input_outputs/input_output.py,sha256=Lg2Uv5aaSGIV14Uh7hRDfj3Wctatgye0lg8TMsHrNJs,5945
-clearskies/input_outputs/programmatic.py,sha256=l00VE_yPl5vMHTc8wDvybn65c3ceCTeWNz6hjL8vev4,1717
+clearskies/input_outputs/cli.py,sha256=t7uWqLi6VI3i_zuyoKLdIq3vUwr19lQZoJmuAxVEvgg,5741
+clearskies/input_outputs/headers.py,sha256=qdnPEUJ2amKUdzasbTQb015KGzJP-d4RjIbtrPdqTqM,1680
+clearskies/input_outputs/input_output.py,sha256=tJQVN3U3MX_jpwsXJ-g-K1cdqQwyuSarTjo3JOp7zQQ,5154
+clearskies/input_outputs/programmatic.py,sha256=OCRq0M42cKZKgk4YAfJyTWo3T4jNRmnGmVr7zCTovpg,1658
 clearskies/input_outputs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-clearskies/input_outputs/wsgi.py,sha256=XU3g2IXm5Q_OLlvp3Iw1ORt0vQX_Ik9u_rLDb6kRfmk,2546
+clearskies/input_outputs/wsgi.py,sha256=-utkoQnA4SCAJ-9Ydr-zTG8W5Hbsm4n91-i6Yu6GM7U,2749
 clearskies/input_outputs/exceptions/__init__.py,sha256=3KiM3KaMYEKoToqCCQ4_no2n0W5ROqeBC0sI2Ix4P6w,82
 clearskies/input_outputs/exceptions/cli_input_error.py,sha256=kOFU8aLTLmeTL_AKDshxMu8_ufildg6p8ndhE1xHfb0,41
 clearskies/input_outputs/exceptions/cli_not_found.py,sha256=JBBuZA9ZwdkPhd3a0qaGgEPQrxh1fehy4R3ZaV2gWXU,39
@@ -221,7 +222,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 +251,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.11.dist-info/METADATA,sha256=KsFDLUKDhP1zHg3H2qmyDILiNZ4Ko0LfYTVyXUNywVM,2114
+clear_skies-2.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+clear_skies-2.0.11.dist-info/licenses/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-2.0.11.dist-info/RECORD,,

clearskies/columns/audit.py

@@ -155,7 +155,7 @@ class Audit(HasMany):
             },
         )
 
-    def post_delete(self, model):
+    def post_delete(self, model: Model) -> None:
         super().post_delete(model)
         exclude_columns = self.exclude_columns
         model_columns = self.get_model_columns()
@@ -167,7 +167,7 @@ class Audit(HasMany):
                 continue
             final_data = {
                 **final_data,
-                **(model_columns[key].to_json(model) if key in model_columns else {key: model.data.get(key)}),
+                **(model_columns[key].to_json(model) if key in model_columns else {key: model.get_raw_data().get(key)}),
             }
 
         for key in mask_columns:
@@ -178,7 +178,7 @@ class Audit(HasMany):
         self.child_model.create(
             {
                 "class": self.model_class.__name__,
-                "resource_id": model.get(self.model_class.id_column_name),
+                "resource_id": getattr(model, self.model_class.id_column_name),
                 "action": "delete",
                 "data": final_data,
             }

clearskies/configs/__init__.py

@@ -87,6 +87,7 @@ from .endpoint import Endpoint
 from .endpoint_list import EndpointList
 from .float import Float
 from .float_or_callable import FloatOrCallable
+from .headers import Headers
 from .integer import Integer
 from .integer_or_callable import IntegerOrCallable
 from .joins import Joins
@@ -139,6 +140,7 @@ __all__ = [
     "EndpointList",
     "Float",
     "FloatOrCallable",
+    "Headers",
     "Joins",
     "Integer",
     "IntegerOrCallable",

clearskies/configs/endpoint_list.py

@@ -19,7 +19,7 @@ class EndpointList(config.Config):
             if not hasattr(item, "top_level_authentication_and_authorization"):
                 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} when all items in the list should be instances of clearskies.End."
+                    f"{error_prefix} attempt to set a value of type '{item.__class__.__name__}' for item #{index + 1} when all items in the list should be instances of clearskies.End."
                 )
         instance._set_config(self, value)
 

clearskies/configs/headers.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from clearskies.configs import config
+
+if TYPE_CHECKING:
+    from clearskies.input_outputs import headers
+
+
+class Headers(config.Config):
+    """
+    This is for a configuration that should be an instance of type clearskies.input_outputs.Headers.
+    """
+
+    def __set__(self, instance, value: headers.Headers):
+        if value is None:
+            return
+
+        if not hasattr(value, "_duck_cheat") or value._duck_cheat != "headers":
+            error_prefix = self._error_prefix(instance)
+            raise TypeError(
+                f"{error_prefix} attempt to set a value of type '{value.__class__.__name__}' to a property that expets an instance of clearskies.input_outputs.Headers"
+            )
+        instance._set_config(self, value)
+
+    def __get__(self, instance, parent) -> headers.Headers:
+        if not instance:
+            return self  # type: ignore
+        return instance._get_config(self)

clearskies/contexts/cli.py

@@ -119,6 +119,11 @@ class Cli(Context):
     Although note that the first two are going to be preferred over the third, simply because with the
     third there's simply no way to specify the type of a variable.  As a result, you may run into issues
     with strict type checking on endpoints.
+
+    ### Context Callables
+
+    When using the Cli context, an additional named argument is made available to any callables invoked by clearskies:
+    `sys_argv`.  This contains `sys.argv`.
     """
 
     def __call__(self):  # type: ignore

clearskies/contexts/context.py

@@ -7,12 +7,12 @@ from typing import TYPE_CHECKING, Any, Callable
 from clearskies import exceptions
 from clearskies.di import Di
 from clearskies.di.additional_config import AdditionalConfig
+from clearskies.input_outputs import InputOutput
 from clearskies.input_outputs import Programmatic
 
 if TYPE_CHECKING:
     from clearskies.endpoint import Endpoint
     from clearskies.endpoint_group import EndpointGroup
-    from clearskies.input_outputs import InputOutput
 
 
 class Context:
@@ -54,6 +54,9 @@ class Context:
         self.application = application
 
     def execute_application(self, input_output: InputOutput):
+        self.di.add_binding("input_output", input_output)
+        self.di.add_class_override(InputOutput, input_output)
+
         if hasattr(self.application, "injectable_properties"):
             self.application.injectable_properties(self.di)
             return self.application(input_output)

clearskies/contexts/wsgi.py

@@ -72,6 +72,11 @@ class Wsgi(Context):
     by and large it's normal and expected that you'll persist the cache between requests by creating the context outside
     of any handler functions.
 
+    ### Context for Callables
+
+    When using this context, one additional named property becomes available to any callables invoked by clearskies:
+    `wsgi_environment`.  This contains the environment object passed in by the WSGI server to clearskies.
+
     """
 
     def __call__(self, env, start_response):  # type: ignore

clearskies/di/di.py

@@ -520,7 +520,7 @@ class Di:
         """
         if not inspect.isclass(class_to_override):
             raise ValueError(
-                "Invalid value passed to add_class_override for 'class_or_name' parameter: it was neither a name nor a class"
+                "Invalid value passed to add_class_override for 'class_to_override' parameter: it was not a class."
             )
 
         self._class_overrides_by_class[class_to_override] = replacement
@@ -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
@@ -726,12 +723,18 @@ class Di:
             return None
         if not callable(class_to_build):
             return None
-        if inspect.isabstract(class_to_build):
-            return None
 
-        # then first things first: check our class overrides
+        # check our class overrides
         if class_to_build in self._class_overrides_by_class:
-            return self.build_class(self._class_overrides_by_class[class_to_build], context=context, cache=cache)
+            replacement = self._class_overrides_by_class[class_to_build]
+            if not inspect.isclass(replacement):
+                return replacement
+            return self.build_class(replacement, context=context, cache=cache)
+
+        # generally we can't build abstract classes, so if the class is abstract then we should pass.
+        # However, this is not the case if it has an override - then the developer has given us specific guidance
+        if inspect.isabstract(class_to_build):
+            return None
 
         # next check our additional config classes
         built_value = None
@@ -844,6 +847,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/end.py

@@ -88,8 +88,6 @@ class End(
         if response:
             return response
 
-        self.di.add_binding("input_output", input_output)
-
         # catch everything when we do an AuthN/AuthZ check because we allow custom-defined classes,
         # and this gives more flexibility (or possibly forgiveness) for how they raise exceptions.
         try:

clearskies/endpoint.py

@@ -969,7 +969,7 @@ class Endpoint(
         """Whether or not we can handle an incoming request based on URL and request method."""
         # soo..... this excessively duplicates the logic in __call__, but I'm being lazy right now
         # and not fixing it.
-        request_method = input_output.get_request_method().upper()
+        request_method = input_output.request_method.upper()
         if request_method == "OPTIONS":
             return True
         if request_method not in self.request_methods:
@@ -986,7 +986,7 @@ class Endpoint(
         # matches_request is only checked by the endpoint group, not by the context.  As a result, we need to check our
         # route.  However we always have to check our route anyway because the full routing data can only be figured
         # out at the endpoint level, so calling out to routing.mattch_route is unavoidable.
-        request_method = input_output.get_request_method().upper()
+        request_method = input_output.request_method.upper()
         if request_method == "OPTIONS":
             return self.cors(input_output)
         if request_method not in self.request_methods:

clearskies/input_outputs/cli.py

@@ -5,19 +5,16 @@ import sys
 from os import isatty
 from sys import stdin
 
+from clearskies.input_outputs.headers import Headers
 from clearskies.input_outputs.input_output import InputOutput
 
 
 class Cli(InputOutput):
-    _args: list[str] = []
+    path: str
     _has_body: bool = False
     _body: str = ""
-    _request_method: str = ""
-    _request_headers: dict[str, str] = {}
 
     def __init__(self):
-        self._request_headers = {}
-        self._args = []
         self._parse_args(sys.argv)
         super().__init__()
 
@@ -30,16 +27,13 @@ class Cli(InputOutput):
             sys.exit(final)
         print(final)
 
-    def get_arguments(self):
-        return sys.argv
-
     def _parse_args(self, argv):
         tty_data = None
         if not isatty(stdin.fileno()):
             tty_data = sys.stdin.read().strip()
 
         request_headers = {}
-        self._args = []
+        args = []
         kwargs = {}
         index = 0
         # In general we will use positional arguments for routing, and kwargs for request data.
@@ -49,10 +43,10 @@ class Cli(InputOutput):
         while index < len(argv) - 1:
             index += 1
 
-            # if we don't start with a dash then we are a positional argument
+            # if we don't start with a dash then we are a positional argument which are used for building the URL-equivalent
             arg = argv[index]
             if arg[0] != "-":
-                self._args.append(arg)
+                args.append(arg)
                 continue
 
             # otherwise a kwarg
@@ -83,8 +77,8 @@ class Cli(InputOutput):
 
             kwargs[key] = value
 
-        self._request_headers = request_headers
-        self._request_method = "GET"
+        self.request_headers = Headers(request_headers)
+        self.request_method = "GET"
         request_method_source = ""
         for key in ["x", "X", "request_method"]:
             if key not in kwargs:
@@ -94,7 +88,7 @@ class Cli(InputOutput):
                 raise ValueError(
                     f"Invalid clearskies cli calling sequence: the request method was specified via both the -{key} parameter and the -{request_method_source} parameter. To avoid ambiguity, it should only be set once."
                 )
-            self._request_method = kwargs[key]
+            self.request_method = kwargs[key].upper()
             del kwargs[key]
             request_method_source = key
 
@@ -127,6 +121,8 @@ class Cli(InputOutput):
             final_data = kwargs
             data_source = "kwargs"
 
+        self.path = "/".join(args)
+
         # Most of the above inputs result in a string for our final data, in which case we'll leave it as the "raw body"
         # so that it can optionally be interpreted as JSON.  If we received a bunch of kwargs though, we'll allow those to
         # only be "read" as JSON.
@@ -139,17 +135,8 @@ class Cli(InputOutput):
             self._has_body = True
             self._body = final_data
 
-    def get_script_name(self):
-        return sys.argv[0]
-
-    def get_path_info(self):
-        return "/".join(self._args)
-
     def get_full_path(self):
-        return self.get_path_info()
-
-    def get_request_method(self):
-        return self._request_method
+        return self.path
 
     def has_body(self):
         return self._has_body
@@ -160,14 +147,11 @@ class Cli(InputOutput):
 
         return self._body
 
+    def get_protocol(self):
+        return "cli"
+
     def context_specifics(self):
-        return {}
+        return {"sys_argv": sys.argv}
 
     def get_client_ip(self):
         return "127.0.0.1"
-
-    def get_query_string(self):
-        return ""
-
-    def get_request_headers(self):
-        return self._request_headers

clearskies/input_outputs/headers.py

@@ -5,6 +5,7 @@ import re
 
 class Headers:
     _headers: dict[str, str] = {}
+    _duck_cheat = "headers"
 
     def __init__(self, headers: dict[str, str] = {}):
         self.__dict__["_headers"] = (

clearskies/input_outputs/input_output.py

@@ -5,7 +5,9 @@ from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any
 from urllib.parse import parse_qs
 
-from clearskies import configs, configurable, input_outputs
+from clearskies import configs, configurable
+
+from .headers import Headers
 
 if TYPE_CHECKING:
     from clearskies import typing
@@ -14,21 +16,18 @@ if TYPE_CHECKING:
 class InputOutput(ABC, configurable.Configurable):
     """Manage the request and response to the client."""
 
-    response_headers: input_outputs.Headers = None  # type: ignore
-    request_headers: input_outputs.Headers = None  # type: ignore
+    response_headers = configs.Headers(default=Headers())
+    request_headers = configs.Headers(default=Headers())
     query_parameters = configs.AnyDict(default={})
     routing_data = configs.StringDict(default={})
     authorization_data = configs.AnyDict(default={})
+    request_method = configs.Select(["GET", "POST", "PATCH", "OPTIONS", "DELETE", "SEARCH"], default="GET")
 
     _body_as_json: dict[str, Any] | list[Any] | None = {}
     _body_loaded_as_json = False
 
     def __init__(self):
-        self.response_headers = input_outputs.Headers()
-        self.request_headers = input_outputs.Headers(self.get_request_headers())
-        self.query_parameters = {key: val[0] for (key, val) in parse_qs(self.get_query_string()).items()}
-        self.authorization_data = {}
-        self.routing_data = {}
+        self.response_headers = Headers()
         self.finalize_and_validate_configuration()
 
     @abstractmethod
@@ -65,41 +64,17 @@ class InputOutput(ABC, configurable.Configurable):
                     self._body_as_json = None
         return self._body_as_json
 
-    @abstractmethod
-    def get_request_method(self) -> str:
-        """Return the request method set by the client."""
-        pass
-
-    @abstractmethod
-    def get_script_name(self) -> str:
-        """Return the script name, e.g. the path requested."""
-        pass
-
-    @abstractmethod
-    def get_path_info(self) -> str:
-        """Return the path info for the request."""
-        pass
-
-    @abstractmethod
-    def get_query_string(self) -> str:
-        """Return the full query string for the request (everything after the first question mark in the document URL)."""
-        pass
-
     @abstractmethod
     def get_client_ip(self):
         pass
 
     @abstractmethod
-    def get_request_headers(self) -> dict[str, str]:
+    def get_protocol(self):
         pass
 
+    @abstractmethod
     def get_full_path(self) -> str:
-        """Return the full path requested by the client."""
-        path_info = self.get_path_info()
-        script_name = self.get_script_name()
-        if not path_info or path_info[0] != "/":
-            path_info = f"/{path_info}"
-        return f"{path_info}{script_name}".replace("//", "/")
+        pass
 
     def context_specifics(self):
         return {}
@@ -117,17 +92,19 @@ class InputOutput(ABC, configurable.Configurable):
 
         And this function returns a dictionary with the following values:
 
-        | Key                | Type                             | Ref                             | Value                                                                           |
-        |--------------------|----------------------------------|---------------------------------|---------------------------------------------------------------------------------|
-        | routing_data       | dict[str, str]                   | input_output.routing_data       | A dictionary of data extracted from URL path parameters.                        |
-        | authorization_data | dict[str, Any]                   | input_output.authorization_data | A dictionary containing the authorization data set by the authentication method |
-        | request_data       | dict[str, Any] | None            | input_output.request_data       | The data sent along with the request (assuming a JSON request body)             |
-        | query_parameters   | dict[str, Any]                   | input_output.query_parameters   | The query parameters                                                            |
-        | request_headers    | clearskies.input_outputs.Headers | input_output.request_headers    | The request headers sent by the client                                          |
-        | **routing_data     | string                           | **input_output.routing_data     | The routing data is unpacked so keys can be fetched directly                    |
+        | Key                | Type                             | Ref                                | Value                                                                           |
+        |--------------------|----------------------------------|------------------------------------|---------------------------------------------------------------------------------|
+        | routing_data       | dict[str, str]                   | input_output.routing_data          | A dictionary of data extracted from URL path parameters.                        |
+        | authorization_data | dict[str, Any]                   | input_output.authorization_data    | A dictionary containing the authorization data set by the authentication method |
+        | request_data       | dict[str, Any] | None            | input_output.request_data          | The data sent along with the request (assuming a JSON request body)             |
+        | query_parameters   | dict[str, Any]                   | input_output.query_parameters      | The query parameters                                                            |
+        | request_headers    | clearskies.input_outputs.Headers | input_output.request_headers       | The request headers sent by the client                                          |
+        | **routing_data     | string                           | **input_output.routing_data        | The routing data is unpacked so keys can be fetched directly                    |
+        | **[varies]         | varies                           | **input_output.context_specifics() | Any additional properties added on by the context (see your context docs)       |
         """
         return {
             **self.routing_data,
+            **self.context_specifics(),
             **{
                 "routing_data": self.routing_data,
                 "authorization_data": self.authorization_data,

clearskies/input_outputs/programmatic.py

@@ -2,14 +2,15 @@ from __future__ import annotations
 
 from typing import Any
 
+from clearskies.input_outputs.headers import Headers
 from clearskies.input_outputs.input_output import InputOutput
 
 
 class Programmatic(InputOutput):
     _body: str | dict[str, Any] | list[Any] = ""
-    _request_method: str = ""
-    _request_headers: dict[str, Any] = {}
     url: str = ""
+    ip_address: str = "127.0.0.1"
+    protocol: str = "https"
 
     def __init__(
         self,
@@ -18,35 +19,30 @@ class Programmatic(InputOutput):
         body: str | dict[str, Any] | list[Any] = "",
         query_parameters: dict[str, Any] = {},
         request_headers: dict[str, str] = {},
+        ip_address: str = "127.0.0.1",
+        protocol: str = "https",
     ):
         self.url = url
-        self._request_headers = {**request_headers}
+        self.request_headers = Headers(request_headers)
+        self.query_parameters = query_parameters
+        self.ip_address = ip_address
+        self.protocol = protocol
         self._body_loaded_as_json = True
         self._body_as_json = None
-        self._request_method = request_method
+        self.request_method = request_method
         if body:
             self._body = body
             if isinstance(body, dict) or isinstance(body, list):
                 self._body_as_json = body
 
         super().__init__()
-        self.query_parameters = {**query_parameters}
 
     def respond(self, response, status_code=200):
         return (status_code, response, self.response_headers)
 
-    def get_script_name(self):
-        return self.url
-
-    def get_path_info(self):
-        return self.url
-
     def get_full_path(self):
         return self.url
 
-    def get_request_method(self):
-        return self._request_method
-
     def has_body(self):
         return bool(self._body)
 
@@ -60,10 +56,7 @@ class Programmatic(InputOutput):
         return {}
 
     def get_client_ip(self):
-        return "127.0.0.1"
-
-    def get_query_string(self):
-        return ""
+        return self.ip_address
 
-    def get_request_headers(self):
-        return self._request_headers
+    def get_protocol(self):
+        return self.protocol

clearskies/input_outputs/wsgi.py

@@ -3,22 +3,29 @@ from __future__ import annotations
 import json
 from typing import Callable
 
-from .input_output import InputOutput
+from clearskies.input_outputs.headers import Headers
+from clearskies.input_outputs.input_output import InputOutput
 
 
 class Wsgi(InputOutput):
     _environment: dict[str, str] = {}
-    _start_response: Callable = None  # type: ignore
-    _request_headers: dict[str, str] = {}
+    _start_response: Callable
     _cached_body: str | None = None
 
     def __init__(self, environment, start_response):
         self._environment = environment
         self._start_response = start_response
-        self._request_headers = {}
+        request_headers = {}
         for key, value in self._environment.items():
             if key.upper()[0:5] == "HTTP_":
-                self._request_headers[key[5:].lower()] = value
+                request_headers[key[5:].lower()] = value
+
+        self.request_headers = Headers(request_headers)
+        self.query_parameters = {
+            key: val[0] for (key, val) in parse_qs(self._environment.get("QUERY_STRING", "")).items()
+        }
+        self.request_method = self._environment.get("REQUEST_METHOD").upper()
+
         super().__init__()
 
     def _from_environment(self, key):
@@ -49,20 +56,18 @@ class Wsgi(InputOutput):
             )
         return self._cached_body
 
-    def get_request_method(self):
-        return self._from_environment("REQUEST_METHOD").upper()
-
     def get_script_name(self):
         return self._from_environment("SCRIPT_NAME")
 
     def get_path_info(self):
         return self._from_environment("PATH_INFO")
 
-    def get_query_string(self):
-        return self._from_environment("QUERY_STRING")
-
-    def get_content_type(self):
-        return self._from_environment("CONTENT_TYPE")
+    def get_full_path(self):
+        path_info = self.get_path_info()
+        script_name = self.get_script_name()
+        if not path_info or path_info[0] != "/":
+            path_info = f"/{path_info}"
+        return f"{path_info}{script_name}".replace("//", "/")
 
     def get_protocol(self):
         return self._from_environment("wsgi.url_scheme").lower()
@@ -72,6 +77,3 @@ class Wsgi(InputOutput):
 
     def get_client_ip(self):
         return self._environment.get("REMOTE_ADDR")
-
-    def get_request_headers(self):
-        return self._request_headers

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