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

clearskies/query/query.py

@@ -2,12 +2,9 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Self
 
-from .condition import Condition
-from .join import Join
-from .sort import Sort
-
 if TYPE_CHECKING:
     from clearskies import Model
+    from clearskies.query import Condition, Join, Sort
 
 
 class Query:

clearskies/secrets/__init__.py

@@ -1,6 +1,7 @@
-# from .akeyless import AKeyless, AKeylessAdditionalConfig
 from clearskies.secrets.secrets import Secrets
+from clearskies.secrets.akeyless import Akeyless
 
 __all__ = [
     "Secrets",
+    "Akeyless",
 ]

clearskies/secrets/akeyless.py

@@ -1,19 +1,21 @@
+from __future__ import annotations
+
 import datetime
 from typing import Any
 
-import clearskies.configs
-from clearskies.di import InjectableProperties, inject
+from clearskies import configs, secrets
+from clearskies.di import inject
 
 
-class Akeyless(clearskies.Configurable, clearskies.di.InjectableProperties):
-    requests = clearskies.di.inject.Requests()
-    environment = clearskies.di.inject.Environment()
-    akeyless = clearskies.di.inject.ByName("akeyless")
+class Akeyless(secrets.Secrets):
+    requests = inject.Requests()
+    environment = inject.Environment()
+    akeyless = inject.ByName("akeyless_sdk")
 
-    access_id = clearskies.configs.String(required=True, regexp=r"^p-[\d\w]+$")
-    access_type = clearskies.configs.Select(["aws_iam", "saml", "jwt"], required=True)
-    api_host = clearskies.configs.String(default="https://api.akeyless.io")
-    profile = clearskies.configs.String(regexp=r"^[\d\w\-]+$")
+    access_id = configs.String(required=True, regexp=r"^p-[\d\w]+$")
+    access_type = configs.Select(["aws_iam", "saml", "jwt"], required=True)
+    api_host = configs.String(default="https://api.akeyless.io")
+    profile = configs.String(regexp=r"^[\d\w\-]+$")
 
     _token_refresh: datetime.datetime = None  # type: ignore
     _token: str = ""
@@ -136,6 +138,7 @@ class Akeyless(clearskies.Configurable, clearskies.di.InjectableProperties):
         return res.token
 
     def auth_saml(self):
+        import json
         import os
         from pathlib import Path
 
@@ -143,7 +146,9 @@ class Akeyless(clearskies.Configurable, clearskies.di.InjectableProperties):
         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

@@ -1,8 +1,13 @@
+from __future__ import annotations
+
+from abc import ABC
 from typing import Any
 
+import clearskies.configurable
+
 
-class Secrets:
-    def create(self, path: str, value: str) -> None:
+class Secrets(ABC, clearskies.configurable.Configurable):
+    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."
         )

clearskies/security_header.py

@@ -1,7 +1,9 @@
-from clearskies.configurable import Configurable
+from __future__ import annotations
 
+from clearskies import configurable
 
-class SecurityHeader(Configurable):
+
+class SecurityHeader(configurable.Configurable):
     """
     Attach all the various security headers to endpoints.
 

clearskies/security_headers/cache_control.py

@@ -1,20 +1,21 @@
-import clearskies.configs
-import clearskies.decorators
+from __future__ import annotations
+
+from clearskies import configs, decorators
 from clearskies.security_header import SecurityHeader
 
 
 class CacheControl(SecurityHeader):
-    max_age = clearskies.configs.Integer()
-    s_maxage = clearskies.configs.Integer()
-    stale_while_revalidate = clearskies.configs.Integer()
-    stale_if_error = clearskies.configs.Integer()
-    immutable = clearskies.configs.Boolean(default=False)
-    must_understand = clearskies.configs.Boolean(default=False)
-    no_cache = clearskies.configs.Boolean(default=False)
-    no_store = clearskies.configs.Boolean(default=False)
-    no_transform = clearskies.configs.Boolean(default=False)
-    private = clearskies.configs.Boolean(default=False)
-    public = clearskies.configs.Boolean(default=False)
+    max_age = configs.Integer()
+    s_maxage = configs.Integer()
+    stale_while_revalidate = configs.Integer()
+    stale_if_error = configs.Integer()
+    immutable = configs.Boolean(default=False)
+    must_understand = configs.Boolean(default=False)
+    no_cache = configs.Boolean(default=False)
+    no_store = configs.Boolean(default=False)
+    no_transform = configs.Boolean(default=False)
+    private = configs.Boolean(default=False)
+    public = configs.Boolean(default=False)
 
     numbers: list[str] = [
         "max_age",
@@ -32,7 +33,7 @@ class CacheControl(SecurityHeader):
         "public",
     ]
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         max_age: int | None = None,

clearskies/security_headers/cors.py

@@ -1,18 +1,19 @@
-import clearskies.configs
-import clearskies.decorators
+from __future__ import annotations
+
+from clearskies import configs, decorators
 from clearskies.security_header import SecurityHeader
 
 
 class Cors(SecurityHeader):
-    origin = clearskies.configs.String()
-    methods = clearskies.configs.StringList(default=[])
-    headers = clearskies.configs.StringList(default=[])
-    max_age = clearskies.configs.Integer(default=5)
-    credentials = clearskies.configs.Boolean(default=False)
-    expose_headers = clearskies.configs.StringList(default=[])
+    origin = configs.String()
+    methods = configs.StringList(default=[])
+    headers = configs.StringList(default=[])
+    max_age = configs.Integer(default=5)
+    credentials = configs.Boolean(default=False)
+    expose_headers = configs.StringList(default=[])
     is_cors = True
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         credentials: bool = False,

clearskies/security_headers/csp.py

@@ -1,31 +1,32 @@
-import clearskies.configs
-import clearskies.decorators
+from __future__ import annotations
+
+from clearskies import configs, decorators
 from clearskies.security_header import SecurityHeader
 
 
 class Csp(SecurityHeader):
     header_name = "content-security-policy"
-    default_src = clearskies.configs.String()
-    script_src = clearskies.configs.String()
-    style_src = clearskies.configs.String()
-    img_src = clearskies.configs.String()
-    connect_src = clearskies.configs.String()
-    font_src = clearskies.configs.String()
-    object_src = clearskies.configs.String()
-    media_src = clearskies.configs.String()
-    frame_src = clearskies.configs.String()
-    sandbox = clearskies.configs.String()
-    report_uri = clearskies.configs.String()
-    child_src = clearskies.configs.String()
-    form_action = clearskies.configs.String()
-    frame_ancestors = clearskies.configs.String()
-    plugin_types = clearskies.configs.String()
-    base_uri = clearskies.configs.String()
-    report_to = clearskies.configs.String()
-    worker_src = clearskies.configs.String()
-    manifest_src = clearskies.configs.String()
-    prefetch_src = clearskies.configs.String()
-    navigate_to = clearskies.configs.String()
+    default_src = configs.String()
+    script_src = configs.String()
+    style_src = configs.String()
+    img_src = configs.String()
+    connect_src = configs.String()
+    font_src = configs.String()
+    object_src = configs.String()
+    media_src = configs.String()
+    frame_src = configs.String()
+    sandbox = configs.String()
+    report_uri = configs.String()
+    child_src = configs.String()
+    form_action = configs.String()
+    frame_ancestors = configs.String()
+    plugin_types = configs.String()
+    base_uri = configs.String()
+    report_to = configs.String()
+    worker_src = configs.String()
+    manifest_src = configs.String()
+    prefetch_src = configs.String()
+    navigate_to = configs.String()
 
     directives = [
         "default_src",
@@ -51,7 +52,7 @@ class Csp(SecurityHeader):
         "navigate_to",
     ]
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         default_src: str = "",

clearskies/security_headers/hsts.py

@@ -1,13 +1,14 @@
-import clearskies.configs
-import clearskies.decorators
+from __future__ import annotations
+
+from clearskies import configs, decorators
 from clearskies.security_header import SecurityHeader
 
 
 class Hsts(SecurityHeader):
-    max_age = clearskies.configs.Integer(default=31536000)
-    include_sub_domains = clearskies.configs.Boolean()
+    max_age = configs.Integer(default=31536000)
+    include_sub_domains = configs.Boolean()
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(
         self,
         max_age: int = 31536000,

clearskies/typing.py

@@ -1,7 +1,7 @@
 from typing import Any, Callable
 
 from clearskies.action import Action
-from clearskies.query.condition import Condition
+from clearskies.query import Condition
 from clearskies.validator import Validator
 
 action = Callable[..., dict[str, Any]] | Action

clearskies/validator.py

@@ -6,13 +6,12 @@ from typing import TYPE_CHECKING, Any
 from clearskies import configurable
 
 if TYPE_CHECKING:
-    import clearskies.column
-    import clearskies.model
+    from clearskies import Column, Model
 
 
 class Validator(ABC, configurable.Configurable):
     """
-    Attach input validation rules to columns!
+    Attach input validation rules to columns.
 
     The validators provide a way to attach input validation logic to columns.  The columns themselves already
     provide basic validation (making sure strings are strings, integers are integers, etc...) but these classes
@@ -26,12 +25,12 @@ class Validator(ABC, configurable.Configurable):
     is_unique = False
     is_required = False
 
-    def __call__(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def __call__(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         return self.check(model, column_name, data)
 
     @abstractmethod
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         pass
 
-    def additional_write_columns(self, is_create=False) -> dict[str, clearskies.column.Column]:
+    def additional_write_columns(self, is_create=False) -> dict[str, Column]:
         return {}

clearskies/validators/after_column.py

@@ -5,31 +5,30 @@ from typing import TYPE_CHECKING, Any
 
 import dateparser
 
-import clearskies.configs
-import clearskies.decorators
+from clearskies import configs, decorators
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
 class AfterColumn(Validator):
     """The name of the other date column for comparison."""
 
-    other_column_name = clearskies.configs.String(default="", required=True)
+    other_column_name = configs.String(default="", required=True)
 
     """
     If true, then this column is allowed to be eqaul to the other column.
     """
-    allow_equal = clearskies.configs.Boolean(default=False)
+    allow_equal = configs.Boolean(default=False)
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(self, other_column_name: str, allow_equal: bool = False):
         self.other_column_name = other_column_name
         self.allow_equal = allow_equal
         self.finalize_and_validate_configuration()
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         # we won't check anything for missing values (columns should be required if that is an issue)
         if not data.get(column_name):
             return ""

clearskies/validators/before_column.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 
 from clearskies.validators.after_column import AfterColumn

clearskies/validators/in_the_future.py

@@ -1,24 +1,21 @@
 from __future__ import annotations
 
 import datetime
-from collections import OrderedDict
 from typing import TYPE_CHECKING, Any
 
 import dateparser
 
-import clearskies.configs
-import clearskies.decorators
-import clearskies.di
+from clearskies.di import InjectableProperties, inject
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
-class InTheFuture(Validator, clearskies.di.InjectableProperties):
-    utcnow = clearskies.di.inject.Utcnow()
+class InTheFuture(Validator, InjectableProperties):
+    utcnow = inject.Utcnow()
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         if not data.get(column_name):
             return ""
 

clearskies/validators/in_the_future_at_least.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 
 from clearskies.validators.timedelta import Timedelta

clearskies/validators/in_the_future_at_most.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 
 from clearskies.validators.timedelta import Timedelta

clearskies/validators/in_the_past.py

@@ -1,24 +1,21 @@
 from __future__ import annotations
 
 import datetime
-from collections import OrderedDict
 from typing import TYPE_CHECKING, Any
 
 import dateparser
 
-import clearskies.configs
-import clearskies.decorators
-import clearskies.di
+from clearskies.di import InjectableProperties, inject
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
-class InThePast(Validator, clearskies.di.InjectableProperties):
-    utcnow = clearskies.di.inject.Utcnow()
+class InThePast(Validator, InjectableProperties):
+    utcnow = inject.Utcnow()
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         if not data.get(column_name):
             return ""
 

clearskies/validators/in_the_past_at_least.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 
 from clearskies.validators.timedelta import Timedelta

clearskies/validators/in_the_past_at_most.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 
 from clearskies.validators.timedelta import Timedelta

clearskies/validators/maximum_length.py

@@ -1,23 +1,22 @@
 from __future__ import annotations
 
-import datetime
 from typing import TYPE_CHECKING, Any
 
-import clearskies.configs
+from clearskies import configs
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
 class MaximumLength(Validator):
-    maximum_length = clearskies.configs.Integer(required=True)
+    maximum_length = configs.Integer(required=True)
 
     def __init__(self, maximum_length: int):
         self.maximum_length = maximum_length
         self.finalize_and_validate_configuration()
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         # we won't check anything for missing values (columns should be required if that is an issue)
         if not data.get(column_name):
             return ""

clearskies/validators/maximum_value.py

@@ -3,21 +3,21 @@ from __future__ import annotations
 import datetime
 from typing import TYPE_CHECKING, Any
 
-import clearskies.configs
+from clearskies import configs
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
 class MaximumValue(Validator):
-    maximum_value = clearskies.configs.Integer(required=True)
+    maximum_value = configs.Integer(required=True)
 
     def __init__(self, maximum_value: int):
         self.maximum_value = maximum_value
         self.finalize_and_validate_configuration()
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         if column_name not in data:
             return ""
         try:

clearskies/validators/minimum_length.py

@@ -3,21 +3,21 @@ from __future__ import annotations
 import datetime
 from typing import TYPE_CHECKING, Any
 
-import clearskies.configs
+from clearskies import configs
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
 class MinimumLength(Validator):
-    minimum_length = clearskies.configs.Integer(required=True)
+    minimum_length = configs.Integer(required=True)
 
     def __init__(self, minimum_length: int):
         self.minimum_length = minimum_length
         self.finalize_and_validate_configuration()
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         # we won't check anything for missing values (columns should be required if that is an issue)
         if not data.get(column_name):
             return ""

clearskies/validators/minimum_value.py

@@ -3,21 +3,21 @@ from __future__ import annotations
 import datetime
 from typing import TYPE_CHECKING, Any
 
-import clearskies.configs
+from clearskies import configs
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
 class MinimumValue(Validator):
-    minimum_value = clearskies.configs.Integer(required=True)
+    minimum_value = configs.Integer(required=True)
 
     def __init__(self, minimum_value: int):
         self.minimum_value = minimum_value
         self.finalize_and_validate_configuration()
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         if column_name not in data:
             return ""
         try:

clearskies/validators/required.py

@@ -1,19 +1,17 @@
 from __future__ import annotations
 
-import datetime
 from typing import TYPE_CHECKING, Any
 
-import clearskies.configs
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
 class Required(Validator):
     is_required = True
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         # you'd think that "required" is straight forward and we want an input error if it isn't found.
         # this isn't strictly true though.  If the model already exists, the column has a value in the model already,
         # and the column is completely missing from the input data, then it is actually perfectly fine (because

clearskies/validators/timedelta.py

@@ -6,21 +6,20 @@ from typing import TYPE_CHECKING, Any
 
 import dateparser
 
-import clearskies.configs
-import clearskies.decorators
-import clearskies.di
+from clearskies import configs, decorators
+from clearskies.di import InjectableProperties, inject
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
-class Timedelta(Validator, clearskies.di.InjectableProperties):
-    timedelta = clearskies.configs.Timedelta(default=None)
+class Timedelta(Validator, InjectableProperties):
+    timedelta = configs.Timedelta(default=None)
 
-    utcnow = clearskies.di.inject.Utcnow()
+    utcnow = inject.Utcnow()
 
-    @clearskies.decorators.parameters_to_properties
+    @decorators.parameters_to_properties
     def __init__(self, timedelta: datetime.timedelta):
         self.finalize_and_validate_configuration()
 
@@ -44,7 +43,7 @@ class Timedelta(Validator, clearskies.di.InjectableProperties):
             parts.append(f"{amount} {name}" + ("s" if amount != 1 else ""))
         return ", ".join(parts)
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         if not data.get(column_name):
             return ""
 

clearskies/validators/unique.py

@@ -3,17 +3,16 @@ from __future__ import annotations
 import datetime
 from typing import TYPE_CHECKING, Any
 
-import clearskies.configs
 from clearskies.validator import Validator
 
 if TYPE_CHECKING:
-    import clearskies.model
+    from clearskies import Model
 
 
 class Unique(Validator):
     is_unique = True
 
-    def check(self, model: clearskies.model.Model, column_name: str, data: dict[str, Any]) -> str:
+    def check(self, model: Model, column_name: str, data: dict[str, Any]) -> str:
         # Unique is mildly tricky.  We obviously want to search the backend for the new value,
         # but we need to first skip this if our column is not being set, or if we're editing
         # the model and nothing is changing.