Xtecl/config logging

.docker/requirements.txt

@@ -37,7 +37,10 @@ coverage==7.6.8
 pytest==8.3.3
 configargparse==1.7.0
 pytest-mock==3.14.0
+pydantic==2.10.5
+pydantic-settings==2.7.1
 
 # Custom packages
 opengeh-spark-sql-migrations @ git+https://[email protected]/Energinet-DataHub/[email protected]#subdirectory=source/spark_sql_migrations
-opengeh-telemetry @ git+https://[email protected]/Energinet-DataHub/[email protected]#subdirectory=source/telemetry
+# opengeh-telemetry @ git+https://[email protected]/Energinet-DataHub/[email protected]#subdirectory=source/telemetry
+opengeh-telemetry @ git+https://[email protected]/Energinet-DataHub/opengeh-python-packages.git@cbang/simplify_entry_point2#subdirectory=source/telemetry

source/databricks/calculation_engine/contracts/calculation-job-parameters-reference.txt

@@ -13,3 +13,5 @@
 --created-by-user-id=c2975345-d935-44a2-b7bf-2629db4aa8bf
 # It's a flag: True if present, otherwise false
 #--is-internal-calculation
+--orchestration_instance_id=4a540892-2c0a-46a9-9257-c4e13051d76a
+--force_configuration = false

source/databricks/calculation_engine/contracts/internal-calculation-job-parameters-reference.txt

@@ -13,3 +13,6 @@
 --created-by-user-id=c2975345-d935-44a2-b7bf-2629db4aa8bf
 # It's a flag: True if present, otherwise false
 --is-internal-calculation
+--orchestration_instance_id=4a540892-2c0a-46a9-9257-c4e13051d76a
+--force_configuration = false
+

source/databricks/calculation_engine/package/calculation/calculator_args.py

@@ -13,22 +13,64 @@
 # limitations under the License.
 
 from dataclasses import dataclass
-from datetime import datetime
-
+from datetime import datetime, timezone
+from pydantic_settings import BaseSettings, CliSettingsSource, PydanticBaseSettingsSource
+from pydantic.dataclasses import Field
+from typing import Tuple, Type, Optional
 from package.codelists.calculation_type import (
     CalculationType,
 )
+import os
+
+
+# @dataclass
+# class CalculatorArgs:
+#     calculation_id: str
+#     calculation_grid_areas: list[str]
+#     calculation_period_start_datetime: datetime
+#     calculation_period_end_datetime: datetime
+#     calculation_type: CalculationType
+#     calculation_execution_time_start: datetime
+#     created_by_user_id: str
+#     time_zone: str
+#     quarterly_resolution_transition_datetime: datetime
+#     is_internal_calculation: bool
+
 
+class CalculatorArgs(BaseSettings):
+    """
+    CalculatorArgs class uses Pydantic BaseSettings to configure and validate parameters.
+    Parameters can come from both runtime (CLI) or from environment variables.
+    The priority is CLI parameters first and then environment variables.
+    """
+    calculation_id: str = Field(..., alias="calculation-id") #From CLI
+    calculation_grid_areas: list[str] = Field(..., alias="grid-areas") #From CLI
+    calculation_period_start_datetime: datetime = Field(..., alias="period-start-datetime") #From CLI
+    calculation_period_end_datetime: datetime = Field(..., alias="period-end-datetime") #From CLI
+    calculation_type: CalculationType = Field(..., alias="calculation-type") #From CLI
+    calculation_execution_time_start: datetime = datetime.now(timezone.utc)
+    created_by_user_id: str = Field(..., alias="created-by-user-id") #From CLI
+    time_zone: str #From ENVIRONMENT
+    quarterly_resolution_transition_datetime: datetime #From ENVIRONMENT
+    is_internal_calculation: Optional[bool] = Field(default=False, alias="is-internal-calculation") #From CLI
 
-@dataclass
-class CalculatorArgs:
-    calculation_id: str
-    calculation_grid_areas: list[str]
-    calculation_period_start_datetime: datetime
-    calculation_period_end_datetime: datetime
-    calculation_type: CalculationType
-    calculation_execution_time_start: datetime
-    created_by_user_id: str
-    time_zone: str
-    quarterly_resolution_transition_datetime: datetime
-    is_internal_calculation: bool
+    @classmethod
+    def settings_customise_sources(
+        cls,
+        settings_cls: Type[BaseSettings],
+        init_settings: PydanticBaseSettingsSource,
+        env_settings: PydanticBaseSettingsSource,
+        dotenv_settings: PydanticBaseSettingsSource,
+        file_secret_settings: PydanticBaseSettingsSource,
+    ) -> Tuple[PydanticBaseSettingsSource, ...]:
+        return CliSettingsSource(settings_cls, cli_parse_args=True, cli_ignore_unknown_args=True), env_settings, init_settings
+
+
+
+# os.environ['TIME_ZONE'] = 'tzutc'
+# os.environ['QUARTERLY_RESOLUTION_TRANSITION_DATETIME'] = '1989-01-01'
+#
+# _settings = CalculatorArgs()
+# #
+# for s in _settings:
+#     print(s)