methodaws 0.0.13__tar.gz → 0.0.15__tar.gz

{methodaws-0.0.13 → methodaws-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: methodaws
-Version: 0.0.13
+Version: 0.0.15
 Summary: 
 Requires-Python: >=3.8,<4.0
 Classifier: Intended Audience :: Developers

{methodaws-0.0.13 → methodaws-0.0.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "methodaws"
-version = "v0.0.13"
+version = "v0.0.15"
 description = ""
 readme = "README.md"
 authors = []
@@ -24,7 +24,7 @@ classifiers = [
     "Typing :: Typed"
 ]
 packages = [
-    { include = "method-security/methodaws", from = "src"}
+    { include = "methodaws", from = "src"}
 ]
 
 [tool.poetry.dependencies]
@@ -38,6 +38,7 @@ pytest = "^7.4.0"
 pytest-asyncio = "^0.23.5"
 python-dateutil = "^2.9.0"
 types-python-dateutil = "^2.9.0.20240316"
+ruff = "^0.5.6"
 
 [tool.pytest.ini_options]
 testpaths = [ "tests" ]
@@ -46,6 +47,9 @@ asyncio_mode = "auto"
 [tool.mypy]
 plugins = ["pydantic.mypy"]
 
+[tool.ruff]
+line-length = 120
+
 
 [build-system]
 requires = ["poetry-core"]

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/core/__init__.py

@@ -5,7 +5,6 @@ from .pydantic_utilities import (
     IS_PYDANTIC_V2,
     UniversalBaseModel,
     UniversalRootModel,
-    deep_union_pydantic_dicts,
     parse_obj_as,
     universal_field_validator,
     universal_root_validator,
@@ -18,7 +17,6 @@ __all__ = [
     "IS_PYDANTIC_V2",
     "UniversalBaseModel",
     "UniversalRootModel",
-    "deep_union_pydantic_dicts",
     "parse_obj_as",
     "serialize_datetime",
     "universal_field_validator",

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/core/pydantic_utilities.py

@@ -4,7 +4,8 @@
 import datetime as dt
 import typing
 from collections import defaultdict
-from functools import wraps
+
+import typing_extensions
 
 import pydantic
 
@@ -27,11 +28,15 @@ if IS_PYDANTIC_V2:
     from pydantic.v1.typing import (  # type: ignore # pyright: ignore[reportMissingImports] # Pydantic v2
         get_args as get_args,
     )
-    from pydantic.v1.typing import get_origin as get_origin  # pyright: ignore[reportMissingImports] # Pydantic v2
+    from pydantic.v1.typing import (  # pyright: ignore[reportMissingImports] # Pydantic v2
+        get_origin as get_origin,
+    )
     from pydantic.v1.typing import (  # pyright: ignore[reportMissingImports] # Pydantic v2
         is_literal_type as is_literal_type,
     )
-    from pydantic.v1.typing import is_union as is_union  # pyright: ignore[reportMissingImports] # Pydantic v2
+    from pydantic.v1.typing import (  # pyright: ignore[reportMissingImports] # Pydantic v2
+        is_union as is_union,
+    )
     from pydantic.v1.fields import ModelField as ModelField  # type: ignore # pyright: ignore[reportMissingImports] # Pydantic v2
 else:
     from pydantic.datetime_parse import parse_date as parse_date  # type: ignore # Pydantic v1
@@ -50,19 +55,6 @@ T = typing.TypeVar("T")
 Model = typing.TypeVar("Model", bound=pydantic.BaseModel)
 
 
-def deep_union_pydantic_dicts(
-    source: typing.Dict[str, typing.Any], destination: typing.Dict[str, typing.Any]
-) -> typing.Dict[str, typing.Any]:
-    for key, value in source.items():
-        if isinstance(value, dict):
-            node = destination.setdefault(key, {})
-            deep_union_pydantic_dicts(value, node)
-        else:
-            destination[key] = value
-
-    return destination
-
-
 def parse_obj_as(type_: typing.Type[T], object_: typing.Any) -> T:
     if IS_PYDANTIC_V2:
         adapter = pydantic.TypeAdapter(type_)  # type: ignore # Pydantic v2
@@ -90,42 +82,61 @@ class UniversalBaseModel(pydantic.BaseModel):
         json_encoders = {dt.datetime: serialize_datetime}
 
     def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        kwargs_with_defaults: typing.Any = {
+            "by_alias": True,
+            "exclude_unset": True,
+            **kwargs,
+        }
         if IS_PYDANTIC_V2:
             return super().model_dump_json(**kwargs_with_defaults)  # type: ignore # Pydantic v2
         else:
             return super().json(**kwargs_with_defaults)
 
     def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
+        """
+        Override the default dict method to `exclude_unset` by default. This function patches
+        `exclude_unset` to work include fields within non-None default values.
+        """
+        _fields_set = self.__fields_set__
+
+        fields = _get_model_fields(self.__class__)
+        for name, field in fields.items():
+            if name not in _fields_set:
+                default = _get_field_default(field)
+
+                # If the default values are non-null act like they've been set
+                # This effectively allows exclude_unset to work like exclude_none where
+                # the latter passes through intentionally set none values.
+                if default != None:
+                    _fields_set.add(name)
+
+        kwargs_with_defaults_exclude_unset: typing.Any = {
+            "by_alias": True,
+            "exclude_unset": True,
+            "include": _fields_set,
+            **kwargs,
+        }
 
         if IS_PYDANTIC_V2:
-            return deep_union_pydantic_dicts(
-                super().model_dump(**kwargs_with_defaults_exclude_unset),  # type: ignore # Pydantic v2
-                super().model_dump(**kwargs_with_defaults_exclude_none),  # type: ignore # Pydantic v2
-            )
+            return super().model_dump(**kwargs_with_defaults_exclude_unset)  # type: ignore # Pydantic v2
         else:
-            return deep_union_pydantic_dicts(
-                super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-            )
+            return super().dict(**kwargs_with_defaults_exclude_unset)
 
 
-UniversalRootModel: typing.Type[pydantic.BaseModel]
 if IS_PYDANTIC_V2:
 
     class V2RootModel(UniversalBaseModel, pydantic.RootModel):  # type: ignore # Pydantic v2
         pass
 
-    UniversalRootModel = V2RootModel
+    UniversalRootModel: typing_extensions.TypeAlias = V2RootModel  # type: ignore
 else:
-    UniversalRootModel = UniversalBaseModel
+    UniversalRootModel: typing_extensions.TypeAlias = UniversalBaseModel  # type: ignore
 
 
 def encode_by_type(o: typing.Any) -> typing.Any:
-    encoders_by_class_tuples: typing.Dict[
-        typing.Callable[[typing.Any], typing.Any], typing.Tuple[typing.Any, ...]
-    ] = defaultdict(tuple)
+    encoders_by_class_tuples: typing.Dict[typing.Callable[[typing.Any], typing.Any], typing.Tuple[typing.Any, ...]] = (
+        defaultdict(tuple)
+    )
     for type_, encoder in encoders_by_type.items():
         encoders_by_class_tuples[encoder] += (type_,)
 
@@ -136,44 +147,60 @@ def encode_by_type(o: typing.Any) -> typing.Any:
             return encoder(o)
 
 
-def update_forward_refs(model: typing.Type["Model"], **localns: typing.Any) -> None:
+def update_forward_refs(model: typing.Type["Model"]) -> None:
     if IS_PYDANTIC_V2:
-        model.model_rebuild(force=True, raise_errors=False)  # type: ignore # Pydantic v2
+        model.model_rebuild(raise_errors=False)  # type: ignore # Pydantic v2
     else:
-        model.update_forward_refs(**localns)
+        model.update_forward_refs()
 
 
 # Mirrors Pydantic's internal typing
 AnyCallable = typing.Callable[..., typing.Any]
 
 
-def universal_root_validator(pre: bool = False) -> typing.Callable[[AnyCallable], AnyCallable]:
+def universal_root_validator(
+    pre: bool = False,
+) -> typing.Callable[[AnyCallable], AnyCallable]:
     def decorator(func: AnyCallable) -> AnyCallable:
-        @wraps(func)
-        def validate(*args: typing.Any, **kwargs: typing.Any) -> AnyCallable:
-            if IS_PYDANTIC_V2:
-                wrapped_func = pydantic.model_validator("before" if pre else "after")(func)  # type: ignore # Pydantic v2
-            else:
-                wrapped_func = pydantic.root_validator(pre=pre)(func)  # type: ignore # Pydantic v1
-
-            return wrapped_func(*args, **kwargs)
-
-        return validate
+        if IS_PYDANTIC_V2:
+            return pydantic.model_validator(mode="before" if pre else "after")(func)  # type: ignore # Pydantic v2
+        else:
+            return pydantic.root_validator(pre=pre)(func)  # type: ignore # Pydantic v1
 
     return decorator
 
 
 def universal_field_validator(field_name: str, pre: bool = False) -> typing.Callable[[AnyCallable], AnyCallable]:
     def decorator(func: AnyCallable) -> AnyCallable:
-        @wraps(func)
-        def validate(*args: typing.Any, **kwargs: typing.Any) -> AnyCallable:
-            if IS_PYDANTIC_V2:
-                wrapped_func = pydantic.field_validator(field_name, mode="before" if pre else "after")(func)  # type: ignore # Pydantic v2
-            else:
-                wrapped_func = pydantic.validator(field_name, pre=pre)(func)
+        if IS_PYDANTIC_V2:
+            return pydantic.field_validator(field_name, mode="before" if pre else "after")(func)  # type: ignore # Pydantic v2
+        else:
+            return pydantic.validator(field_name, pre=pre)(func)  # type: ignore # Pydantic v1
 
-            return wrapped_func(*args, **kwargs)
+    return decorator
 
-        return validate
 
-    return decorator
+PydanticField = typing.Union[ModelField, pydantic.fields.FieldInfo]
+
+
+def _get_model_fields(
+    model: typing.Type["Model"],
+) -> typing.Mapping[str, PydanticField]:
+    if IS_PYDANTIC_V2:
+        return model.model_fields  # type: ignore # Pydantic v2
+    else:
+        return model.__fields__  # type: ignore # Pydantic v1
+
+
+def _get_field_default(field: PydanticField) -> typing.Any:
+    try:
+        value = field.get_default()  # type: ignore # Pydantic < v1.10.15
+    except:
+        value = field.default
+    if IS_PYDANTIC_V2:
+        from pydantic_core import PydanticUndefined
+
+        if value == PydanticUndefined:
+            return None
+        return value
+    return value

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/core/serialization.py

@@ -25,7 +25,10 @@ class FieldMetadata:
 
 
 def convert_and_respect_annotation_metadata(
-    *, object_: typing.Any, annotation: typing.Any, inner_type: typing.Optional[typing.Any] = None
+    *,
+    object_: typing.Any,
+    annotation: typing.Any,
+    inner_type: typing.Optional[typing.Any] = None,
 ) -> typing.Any:
     """
     Respect the metadata annotations on a field, such as aliasing. This function effectively

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/credential/credential_info.py

@@ -1,11 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ...core.pydantic_utilities import UniversalBaseModel
 import typing
-
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+import datetime as dt
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CredentialInfo(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/credential/credential_report.py

@@ -1,11 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-
+from ...core.pydantic_utilities import UniversalBaseModel
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+import typing
 from .credential_info import CredentialInfo
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CredentialReport(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/loadbalancer/certificate.py

@@ -1,10 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-
+from ...core.pydantic_utilities import UniversalBaseModel
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
+import typing
 
 
 class Certificate(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/loadbalancer/listener.py

@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from ...core.pydantic_utilities import UniversalBaseModel
 import typing
-
-import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
-from .certificate import Certificate
 from .protocol import Protocol
+from .certificate import Certificate
+import pydantic
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Listener(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/loadbalancer/load_balancer_report.py

@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-
+from ...core.pydantic_utilities import UniversalBaseModel
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
-from .load_balancer_v_1 import LoadBalancerV1
+import typing
 from .load_balancer_v_2 import LoadBalancerV2
+from .load_balancer_v_1 import LoadBalancerV1
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class LoadBalancerReport(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/loadbalancer/load_balancer_v_1.py

@@ -1,13 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from ...core.pydantic_utilities import UniversalBaseModel
 import datetime as dt
-import typing
-
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
-from .listener import Listener
+import typing
 from .target import Target
+from .listener import Listener
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class LoadBalancerV1(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/loadbalancer/load_balancer_v_2.py

@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from ...core.pydantic_utilities import UniversalBaseModel
 import datetime as dt
-import typing
-
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from .ip_address_type import IpAddressType
-from .listener import Listener
+import typing
 from .load_balancer_state import LoadBalancerState
+from .listener import Listener
 from .target_group import TargetGroup
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class LoadBalancerV2(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/loadbalancer/target.py

@@ -1,11 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from ...core.pydantic_utilities import UniversalBaseModel
+from .target_type import TargetType
 import typing
-
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
-from .target_type import TargetType
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Target(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/loadbalancer/target_group.py

@@ -1,13 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-
+from ...core.pydantic_utilities import UniversalBaseModel
+from .target_group_ip_address_type import TargetGroupIpAddressType
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+import typing
 from .protocol import Protocol
 from .target import Target
-from .target_group_ip_address_type import TargetGroupIpAddressType
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class TargetGroup(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/s_3/bucket.py

@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from ...core.pydantic_utilities import UniversalBaseModel
 import datetime as dt
-import typing
-
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .s_3_public_access_block_configuration import S3PublicAccessBlockConfiguration
+import typing
 from .bucket_versioning_status import BucketVersioningStatus
-from .encryption_rule import EncryptionRule
 from .s_3_mfa_delete_status import S3MfaDeleteStatus
-from .s_3_public_access_block_configuration import S3PublicAccessBlockConfiguration
+from .encryption_rule import EncryptionRule
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Bucket(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/s_3/encryption_rule.py

@@ -1,11 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from ...core.pydantic_utilities import UniversalBaseModel
 import typing
-
-import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from .s_3_server_side_encryption import S3ServerSideEncryption
+import pydantic
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class EncryptionRule(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/s_3/external_bucket.py

@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from ...core.pydantic_utilities import UniversalBaseModel
 import typing
-
+from .s_3_object_details import S3ObjectDetails
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from .s_3_bucket_acl import S3BucketAcl
-from .s_3_object_details import S3ObjectDetails
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class ExternalBucket(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/s_3/external_s_3_report.py

@@ -1,11 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from ...core.pydantic_utilities import UniversalBaseModel
 import typing
-
-import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
 from .external_bucket import ExternalBucket
+import pydantic
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class ExternalS3Report(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/s_3/s_3_bucket_acl.py

@@ -1,10 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-
+from ...core.pydantic_utilities import UniversalBaseModel
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
+import typing
 
 
 class S3BucketAcl(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/s_3/s_3_object_details.py

@@ -1,11 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ...core.pydantic_utilities import UniversalBaseModel
 import typing
-
+import datetime as dt
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class S3ObjectDetails(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/s_3/s_3_public_access_block_configuration.py

@@ -1,10 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-
+from ...core.pydantic_utilities import UniversalBaseModel
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
+import typing
 
 
 class S3PublicAccessBlockConfiguration(UniversalBaseModel):

{methodaws-0.0.13/src/method-security → methodaws-0.0.15/src}/methodaws/resources/s_3/s_3_report.py

@@ -1,15 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-
+from ...core.pydantic_utilities import UniversalBaseModel
 import pydantic
-
-from ...core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+import typing
 from .bucket import Bucket
+from ...core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class S3Report(UniversalBaseModel):
     account_id: str = pydantic.Field(alias="accountId")
+    region: str
     s_3_buckets: typing.Optional[typing.List[Bucket]] = pydantic.Field(alias="s3Buckets", default=None)
     errors: typing.Optional[typing.List[str]] = None