amsdal_utils 0.5.4__tar.gz → 0.5.6__tar.gz

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_utils
-Version: 0.5.4
+Version: 0.5.6
 Summary: Utils for AMSDAL data framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_utils/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_utils/#issues

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/change-logs.md

@@ -1,3 +1,15 @@
+## [v0.5.6](https://pypi.org/project/amsdal_utils/0.5.6/) - 2024-11-05
+
+### Fixed
+
+- Fixed for additionalProperties handling in schemas with references
+
+## [v0.5.5](https://pypi.org/project/amsdal_utils/0.5.5/) - 2024-10-20
+
+### Added
+
+- External connection config
+
 ## [v0.5.4](https://pypi.org/project/amsdal_utils/0.5.4/) - 2024-07-11
 
 ### Added

amsdal_utils-0.5.6/latest-changelogs.md

@@ -0,0 +1,5 @@
+## [v0.5.6](https://pypi.org/project/amsdal_utils/0.5.6/) - 2024-11-05
+
+### Fixed
+
+- Fixed for additionalProperties handling in schemas with references

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/pyproject.toml

@@ -42,7 +42,7 @@ dev = [
     "pydantic==2.6.4",
     "black>=24.3.0",
     "mypy>=1.15.0",
-    "ruff>=0.9.7",
+    "ruff>=0.12.4",
     "towncrier==24.8.0",
     "types-PyYAML==6.0.12.20250516",
 ]

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present
 #
 # SPDX-License-Identifier: AMSDAL End User License Agreement
-__version__ = '0.5.4'
+__version__ = '0.5.6'

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/config/data_models/connection_config.py

@@ -1,3 +1,4 @@
+from enum import Enum
 from typing import Any
 
 from pydantic import BaseModel
@@ -7,6 +8,20 @@ from pydantic import field_validator
 DEFAULT_NAME = 'default'
 
 
+class ConnectionType(str, Enum):
+    """
+    Enumeration of connection types.
+
+    - LAKEHOUSE: Lakehouse database connection with historical tracking
+    - STATE: State database connection without historical tracking
+    - EXTERNAL_SERVICE: Connection to an external service
+    """
+
+    LAKEHOUSE = 'lakehouse'
+    STATE = 'state'
+    EXTERNAL_SERVICE = 'external_service'
+
+
 class ConnectionConfig(BaseModel):
     """
     Configuration model for a connection.
@@ -15,11 +30,15 @@ class ConnectionConfig(BaseModel):
         name (str): The name of the connection.
         backend (str): The backend implementation for the connection.
         credentials (dict[str, Any]): The credentials required for the connection.
+        connection_type (ConnectionType): The type of connection (lakehouse, state, external_service).
+        is_managed (bool): Whether the connection participates in AMSDAL lifecycle management.
     """
 
     name: str = DEFAULT_NAME
     backend: str = 'amsdal_data.connections.implementations.iceberg_history.IcebergHistoricalConnection'
     credentials: dict[str, Any] = Field(default_factory=dict)
+    connection_type: ConnectionType = ConnectionType.LAKEHOUSE
+    is_managed: bool = True
 
     @field_validator('credentials', mode='before')
     @classmethod

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/config/data_models/resources_config.py

@@ -1,4 +1,5 @@
 from pydantic import BaseModel
+from pydantic import Field
 
 from amsdal_utils.config.data_models.repository_config import RepositoryConfig
 
@@ -11,9 +12,13 @@ class ResourcesConfig(BaseModel):
         lakehouse (str): The lakehouse configuration.
         lock (str): The lock configuration.
         repository (RepositoryConfig): The repository configuration.
+        worker (str): The worker configuration.
+        external_services (dict[str, str]): Mapping of service names to connection names for external services.
+            Example: {"email": "smtp_connection", "storage": "s3_connection"}
     """
 
     lakehouse: str
     lock: str | None = None
     repository: RepositoryConfig | None = None
     worker: str | None = None
+    external_services: dict[str, str] = Field(default_factory=dict)

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/models/data_models/address.py

@@ -26,7 +26,7 @@ class JSONExtendedEncoder(json.JSONEncoder):
     """Custom JSON encoder to handle additional types."""
 
     def default(self, obj: Any) -> Any:
-        if isinstance(obj, (Decimal, datetime, date, time, bytes)):  # noqa: UP038
+        if isinstance(obj, (Decimal, datetime, date, time, bytes)):
             return {
                 '__type__': type(obj).__name__,
                 'value': base64.b64encode(obj).decode('utf-8') if isinstance(obj, bytes) else str(obj),

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/models/data_models/core.py

@@ -91,7 +91,7 @@ def process_one_of(data: dict[str, Any]) -> dict[str, Any]:
 
 
 def process_any_of(data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]:
-    from amsdal_utils.schemas.schema import PropertyData
+    from amsdal_utils.schemas.schema import PropertyData  # noqa: PLC0415
 
     _any_of = data.pop('anyOf')
     if _any_of in [[{'$ref': '#/$defs/Reference'}], [{'$ref': '#/$defs/Reference'}, {'type': 'null'}]]:
@@ -129,7 +129,7 @@ def process_any_of(data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]
         definition.update(data)
         data = definition
 
-    elif 'additionalProperties' in _any_of_element:
+    elif 'additionalProperties' in _any_of_element and isinstance(_any_of_element['additionalProperties'], dict):
         _add_props = _any_of_element.pop('additionalProperties')
 
         if 'anyOf' in _add_props:

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/models/data_models/metadata.py

@@ -42,7 +42,7 @@ class Metadata(BaseModel):
 
     @property
     def address(self) -> Address:
-        from amsdal_utils.config.manager import AmsdalConfigManager
+        from amsdal_utils.config.manager import AmsdalConfigManager  # noqa: PLC0415
 
         _class_name = self.class_schema_reference.ref.object_id
 

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/query/utils.py

@@ -77,3 +77,6 @@ class Q:
             and self.connector == __value.connector
             and self.negated == __value.negated
         )
+
+    def __hash__(self) -> int:
+        return hash((self.connector, self.negated, tuple(self.children)))

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/schemas/schema.py

@@ -51,7 +51,7 @@ class PropertyData(TypeData, extra='allow'):
             data.pop('$ref')
             data.update(_def)
 
-        if 'additionalProperties' in data:
+        if 'additionalProperties' in data and isinstance(data['additionalProperties'], dict):
             _add_props = data.pop('additionalProperties')
 
             if 'anyOf' in _add_props:

{amsdal_utils-0.5.4 → amsdal_utils-0.5.6}/src/amsdal_utils/utils/singleton.py

@@ -7,7 +7,7 @@ T = TypeVar('T')
 
 
 class Singleton(type, Generic[T]):
-    __instances: ClassVar[dict[type[T], T]] = {}  # type: ignore[misc]
+    __instances: ClassVar[dict[type[T], T]] = {}
 
     def __call__(
         cls: type[T],