refac: Reorganize folders

.github/workflows/ci-capacity-settlement.yml

@@ -13,7 +13,7 @@ jobs:
     with:
       python_version: 3.11.7
       architecture: x64
-      wheel_working_directory: ./source/capacity_settlement
+      wheel_working_directory: ./source/capacity_settlement/src
       prerelease_prefix: capacity_settlement
 
   unit_tests:
@@ -23,7 +23,6 @@ jobs:
         # IMPORTANT: When adding a new folder here it should also be added in the `unit_test_check` job!
         tests_filter_expression:
           - name: Capacity Settlement
-            paths: capacity_settlement_tests/
     uses: Energinet-DataHub/.github/.github/workflows/python-ci.yml@v14
     with:
       job_name: ${{ matrix.tests_filter_expression.name }}
@@ -62,7 +61,6 @@ jobs:
           # to one of the test jobs above! This is because this filter contains the sum of all folders
           # from test jobs.
           test_path="source/capacity_settlement/tests/"
-          filter="capacity_settlement_tests/"
 
           chmod +x ./.devcontainer/check_test_count.sh
           IMAGE_TAG=${{ inputs.image_tag }} docker compose -f .devcontainer/docker-compose.yml run --rm -u root python-unit-test ./.devcontainer/check_test_count.sh $test_path $filter

.github/workflows/ci-electrical-heating.yml

@@ -13,7 +13,7 @@ jobs:
     with:
       python_version: 3.11.7
       architecture: x64
-      wheel_working_directory: ./source/electrical_heating
+      wheel_working_directory: ./source/electrical_heating/src
       prerelease_prefix: electrical_heating
 
   unit_tests:
@@ -23,7 +23,6 @@ jobs:
         # IMPORTANT: When adding a new folder here it should also be added in the `unit_test_check` job!
         tests_filter_expression:
           - name: Electrical Heating
-            paths: electrical_heating_tests/
     uses: Energinet-DataHub/.github/.github/workflows/python-ci.yml@v14
     with:
       job_name: ${{ matrix.tests_filter_expression.name }}
@@ -57,7 +56,6 @@ jobs:
           # to one of the test jobs above! This is because this filter contains the sum of all folders
           # from test jobs.
           test_path="source/electrical_heating/tests/"
-          filter="electrical_heating_tests/"
 
           chmod +x ./.devcontainer/check_test_count.sh
           IMAGE_TAG=${{ inputs.image_tag }} docker compose -f .devcontainer/docker-compose.yml run --rm -u root python-unit-test ./.devcontainer/check_test_count.sh $test_path $filter

source/capacity_settlement/capacity_settlement/entry_points/entry_point.py → source/capacity_settlement/src/capacity_settlement/entry_points/entry_point.py

@@ -7,10 +7,10 @@
 from opentelemetry.trace import SpanKind
 from telemetry_logging.span_recording import span_record_exception
 
-from capacity_settlement.entry_points.job_args.capacity_settlement_args import (
+from source.capacity_settlement.src.capacity_settlement.entry_points.job_args.capacity_settlement_args import (
     CapacitySettlementArgs,
 )
-from capacity_settlement.entry_points.job_args.capacity_settlement_job_args import (
+from source.capacity_settlement.src.capacity_settlement.entry_points.job_args.capacity_settlement_job_args import (
     parse_command_line_arguments,
     parse_job_arguments,
 )

source/capacity_settlement/tests/capacity_settlement_tests/entry_points/job_args/test_capacity_settlement_job_args.py → source/capacity_settlement/tests/capacity_settlement/entry_points/job_args/test_capacity_settlement_job_args.py

@@ -2,11 +2,11 @@
 
 import pytest
 
-from capacity_settlement.entry_points.job_args.capacity_settlement_job_args import (
+from source.capacity_settlement.src.capacity_settlement.entry_points.job_args.capacity_settlement_job_args import (
     parse_command_line_arguments,
     parse_job_arguments,
 )
-from capacity_settlement.entry_points.job_args.environment_variables import (
+from source.capacity_settlement.src.capacity_settlement.entry_points.job_args.environment_variables import (
     EnvironmentVariable,
 )
 

source/electrical_heating/tests/electrical_heating_tests/entry_points/test_entry_points.py → source/capacity_settlement/tests/capacity_settlement/entry_points/test_entry_points.py

@@ -1,7 +1,9 @@
 import pytest
 
-from electrical_heating import entry_points as module
-from test_common.entry_points.entry_point_test_util import assert_entry_point_exists
+from source.capacity_settlement.src.capacity_settlement import entry_points as module
+from source.capacity_settlement.test_common.entry_points.entry_point_test_util import (
+    assert_entry_point_exists,
+)
 
 
 @pytest.mark.parametrize(

source/capacity_settlement/tests/conftest.py

@@ -63,7 +63,7 @@ def capacity_settlement_path(source_path: str) -> str:
     `os.chdir()`. The correctness also relies on the prerequisite that this function is
     actually located in a file located directly in the tests folder.
     """
-    return f"{source_path}/capacity_settlement"
+    return f"{source_path}/capacity_settlement/src"
 
 
 @pytest.fixture(scope="session")

source/electrical_heating/electrical_heating/domain/calculation.py → source/electrical_heating/src/electrical_heating/domain/calculation.py

@@ -2,16 +2,19 @@
 import pyspark.sql.functions as F
 from telemetry_logging import use_span
 
-from electrical_heating.domain.pyspark_functions import (
-    convert_utc_to_localtime,
+from source.electrical_heating.src.electrical_heating.domain.pyspark_functions import (
     convert_localtime_to_utc,
+    convert_utc_to_localtime,
 )
-import electrical_heating.infrastructure.measurements_gold as mg
-import electrical_heating.infrastructure.electricity_market as em
-from electrical_heating.entry_points.job_args.electrical_heating_args import (
+from source.electrical_heating.src.electrical_heating.entry_points.job_args.electrical_heating_args import (
     ElectricalHeatingArgs,
 )
 
+from source.electrical_heating.src.electrical_heating.infrastructure import (
+    electricity_market as em,
+    measurements_gold as mg,
+)
+
 
 @use_span()
 def execute(spark: SparkSession, args: ElectricalHeatingArgs) -> None:

source/electrical_heating/electrical_heating/entry_points/entry_point.py → source/electrical_heating/src/electrical_heating/entry_points/entry_point.py

@@ -7,15 +7,19 @@
 from opentelemetry.trace import SpanKind
 from telemetry_logging.span_recording import span_record_exception
 
-from electrical_heating.domain import calculation
-from electrical_heating.entry_points.job_args.electrical_heating_args import (
+from source.electrical_heating.src.electrical_heating.domain import calculation
+
+
+from source.electrical_heating.src.electrical_heating.entry_points.job_args.electrical_heating_args import (
     ElectricalHeatingArgs,
 )
-from electrical_heating.entry_points.job_args.electrical_heating_job_args import (
+from source.electrical_heating.src.electrical_heating.entry_points.job_args.electrical_heating_job_args import (
     parse_command_line_arguments,
     parse_job_arguments,
 )
-from electrical_heating.infrastructure.spark_initializor import initialize_spark
+from source.electrical_heating.src.electrical_heating.infrastructure.spark_initializor import (
+    initialize_spark,
+)
 
 
 def execute() -> None:

source/electrical_heating/src/electrical_heating/entry_points/job_args/__init__.py

@@ -0,0 +1 @@
+

source/electrical_heating/electrical_heating/entry_points/job_args/electrical_heating_job_args.py → source/electrical_heating/src/electrical_heating/entry_points/job_args/electrical_heating_job_args.py

@@ -5,7 +5,7 @@
 from telemetry_logging import Logger, logging_configuration
 
 from .electrical_heating_args import ElectricalHeatingArgs
-import electrical_heating.entry_points.job_args.environment_variables as env_vars
+from .environment_variables import get_catalog_name, get_time_zone
 
 
 def parse_command_line_arguments() -> Namespace:
@@ -21,9 +21,9 @@ def parse_job_arguments(
     with logging_configuration.start_span("electrical_heating.parse_job_arguments"):
 
         electrical_heating_args = ElectricalHeatingArgs(
-            catalog_name=env_vars.get_catalog_name(),
+            catalog_name=get_catalog_name(),
             orchestration_instance_id=job_args.orchestration_instance_id,
-            time_zone=env_vars.get_time_zone(),
+            time_zone=get_time_zone(),
         )
 
         return electrical_heating_args

source/electrical_heating/electrical_heating/infrastructure/electricity_market/repository.py → source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/repository.py

@@ -1,6 +1,6 @@
 from pyspark.sql import SparkSession, DataFrame
 
-from electrical_heating.infrastructure.electricity_market.database_definitions import (
+from source.electrical_heating.src.electrical_heating.infrastructure.electricity_market.database_definitions import (
     Database,
 )
 

source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/repository.py → source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/repository.py

@@ -1,6 +1,6 @@
 from pyspark.sql import DataFrame
 
-from electrical_heating.infrastructure.measurements_bronze.database_definitions import (
+from source.electrical_heating.src.electrical_heating.infrastructure.measurements_bronze.database_definitions import (
     MeasurementsBronzeDatabase,
 )
 

source/electrical_heating/electrical_heating/infrastructure/measurements_gold/repository.py → source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/repository.py

@@ -1,6 +1,6 @@
 from pyspark.sql import SparkSession, DataFrame
 
-from electrical_heating.infrastructure.measurements_gold.database_definitions import (
+from source.electrical_heating.src.electrical_heating.infrastructure.measurements_gold.database_definitions import (
     Database,
 )
 

source/electrical_heating/tests/conftest.py

@@ -78,7 +78,7 @@ def electrical_heating_path(source_path: str) -> str:
     `os.chdir()`. The correctness also relies on the prerequisite that this function is
     actually located in a file located directly in the tests folder.
     """
-    return f"{source_path}/electrical_heating"
+    return f"{source_path}/electrical_heating/src"
 
 
 @pytest.fixture(scope="session")

source/electrical_heating/tests/electrical_heating_tests/entry_points/job_args/test_electrical_heating_job_args.py → source/electrical_heating/tests/electrical_heating/entry_points/job_args/test_electrical_heating_job_args.py

@@ -2,13 +2,14 @@
 
 import pytest
 
-from electrical_heating.entry_points.job_args.electrical_heating_job_args import (
+
+from source.electrical_heating.src.electrical_heating.entry_points.job_args.environment_variables import (
+    EnvironmentVariable,
+)
+from source.electrical_heating.src.electrical_heating.entry_points.job_args.electrical_heating_job_args import (
     parse_command_line_arguments,
     parse_job_arguments,
 )
-from electrical_heating.entry_points.job_args.environment_variables import (
-    EnvironmentVariable,
-)
 
 DEFAULT_ORCHESTRATION_INSTANCE_ID = "12345678-9fc8-409a-a169-fbd49479d711"
 

source/capacity_settlement/tests/capacity_settlement_tests/entry_points/test_entry_points.py → source/electrical_heating/tests/electrical_heating/entry_points/test_entry_points.py

@@ -1,7 +1,9 @@
 import pytest
 
-from capacity_settlement import entry_points as module
-from test_common.entry_points.entry_point_test_util import assert_entry_point_exists
+from source.electrical_heating.src.electrical_heating import entry_points as module
+from source.electrical_heating.test_common.entry_points.entry_point_test_util import (
+    assert_entry_point_exists,
+)
 
 
 @pytest.mark.parametrize(

source/electrical_heating/tests/integration_tests/calculation_scenarios/conftest.py

@@ -5,14 +5,17 @@
 from telemetry_logging import logging_configuration
 from testcommon.etl import read_csv, TestCase, TestCases
 
-from electrical_heating.domain.calculation import execute_core_logic
-from electrical_heating.infrastructure.electricity_market.schemas.child_metering_point_periods_v1 import (
+from source.electrical_heating.src.electrical_heating.domain.calculation import (
+    execute_core_logic,
+)
+from source.electrical_heating.src.electrical_heating.infrastructure.electricity_market.schemas.child_metering_point_periods_v1 import (
     child_metering_point_periods_v1,
 )
-from electrical_heating.infrastructure.electricity_market.schemas.consumption_metering_point_periods_v1 import (
+from source.electrical_heating.src.electrical_heating.infrastructure.electricity_market.schemas.consumption_metering_point_periods_v1 import (
     consumption_metering_point_periods_v1,
 )
-from electrical_heating.infrastructure.measurements_gold.schemas.time_series_points_v1 import (
+
+from source.electrical_heating.src.electrical_heating.infrastructure.measurements_gold.schemas.time_series_points_v1 import (
     time_series_points_v1,
 )