extract conditions and packages #257

DeltaDaniel · 2024-03-27T10:45:05Z

No description provided.

…tions

src/kohlrahbi/ahbtable/ahbcondtions.py

src/kohlrahbi/ahbtable/ahbpackagetable.py

src/kohlrahbi/conditions/command.py

src/kohlrahbi/read_functions.py

hf-krechan · 2024-05-10T10:32:41Z

unittests/test_ahb.py

+    @freeze_time("2024-04-29")
+    def test_save_pruefi_map_to_toml(self):
+        """
+        test save_pruefi_map_to_toml.
+        """
+        pruefis = {
+            "29001": "file1.docx",
+            "17201": "file2.docx",
+            "37001": "file3.docx",
+        }
+        save_pruefi_map_to_toml(pruefis, "FV1910")
+        expected_output_path = (
+            Path(__file__).parents[1] / "src" / "kohlrahbi" / "cache" / "FV1910_pruefi_docx_filename_map.toml"
+        )
+        assert expected_output_path.exists()
+        expected_pruefi_map = '[meta_data]\nupdated_on = 2024-04-29\n\n[pruefidentifikatoren]\n29001 = "file1.docx"\n17201 = "file2.docx"\n37001 = "file3.docx"\n'
+        with open(expected_output_path, "r", encoding="utf-8") as f:
+            actual_pruefi_map = f.read()
+        assert actual_pruefi_map == expected_pruefi_map
+        expected_output_path.unlink()


is this still needed?

I added this test as the coverage was complaining. 🤷

I think we can remove all the toml related code, because we do not use the toml pruefi map anymore.
Or am I wrong here? ^^

In fact we used in at two instances, one unsued fct (removed now in 34d1164). The other function scans all pruefis and write the pruefi to file map to the cache which again is used in get_pruefi_to_file_mapping in

kohlrahbi/src/kohlrahbi/ahb/__init__.py

Lines 221 to 235 in b757e59

def get_pruefi_to_file_mapping(basic_input_path: Path, format_version: EdifactFormatVersion) -> dict[str, str]:

"""Returns the pruefi to file mapping. If the cache file does not exist, it creates it."""

default_path_to_cache_file = Path(__file__).parents[1] / "cache" / f"{format_version}_pruefi_docx_filename_map.toml"

if default_path_to_cache_file.exists():

pruefi_to_file_mapping_cache = load_pruefi_docx_file_map_from_file(default_path_to_cache_file)

pruefi_to_file_mapping = pruefi_to_file_mapping_cache.get("pruefidentifikatoren")

if isinstance(pruefi_to_file_mapping, type(None)):

raise ReferenceError(f"Could not find pruefidentifikatoren in {default_path_to_cache_file}")

return dict(pruefi_to_file_mapping)

path_to_docx_files = basic_input_path / Path(f"edi_energy_de/{format_version}")

pruefi_to_file_mapping = find_pruefidentifikatoren(path_to_docx_files)

save_pruefi_map_to_toml(pruefi_to_file_mapping, format_version.value)

return pruefi_to_file_mapping

🤔

unittests/test_ahb_table.py

Co-authored-by: kevin <[email protected]>

as it is not used

Co-authored-by: kevin <[email protected]>

…into DDB/flavour_extract_conditions

Co-authored-by: kevin <[email protected]>

DeltaDaniel and others added 30 commits March 27, 2024 09:45

Merge remote-tracking branch 'origin/main' into DDB/new_extract_condi…

d900054

…tions

updated platformdirs 3.10.0 -> 4.1.0 in requirements

e7c2598

updated packaging 22.0 -> 23.2 in requirements

6e668e3

pip-compile requirements

8e46baa

updated know pruefis

8f8afcf

added conditions flavour

f39ca76

moved conditions parsing to flavour conditions

f033722

🩹corrected loop in process_pruefi

3dca8a4

➕added package table and functions to extract conditions

988ec6b

removed unused arguments in process_package_conditions

fa12843

➕added tests for packagetable, linting issue

fcd6ed9

linting/typechecking

83e0b70

➕added edifactformat -> file mapping

7647179

move test docx files

2d32d9d

Add new test files into new folder structure

f6c2d67

✅ Update tests to new test data folder structure

fdaf939

✅ Add unit test to compare csv export files

839bb56

📝 Add information how much pages one format has

9e750d0

🎨 Improve handling of output-path

70795eb

✅ fix test

e8b1978

✅ Add test for change history

e097205

🎨 Move changehistory functions into an extra module

edf024e

🎨 Fix imports

27d04d9

🎨 Use function to check for change history section

e039d13

🎨 split commands into separate modules

81f92ca

🚛 move dump conditions function

17482a0

✅ harmonize cli tests

cc4dc0c

🚛 move pruefi command

ff30f79

🚛 rename changehistory.function to __init__.py

f5319eb

🎨 clean up imports

f656354

DeltaDaniel requested a review from hf-krechan April 29, 2024 16:32

DeltaDaniel and others added 2 commits April 30, 2024 10:46

updated readme: --input-path -> --edi-energy-mirror-path/-eemp

c29ff00

added missing time freeze

3e1ca91

DeltaDaniel linked an issue May 8, 2024 that may be closed by this pull request

Export for Bedingungen only #2

Closed

DeltaDaniel removed a link to an issue May 8, 2024

Export for Bedingungen only #2

Closed

DeltaDaniel mentioned this pull request May 8, 2024

Export for Bedingungen only #2

Closed

hf-krechan approved these changes May 10, 2024

View reviewed changes

DeltaDaniel and others added 21 commits May 13, 2024 10:14

Update src/kohlrahbi/ahbtable/ahbcondtions.py

fbbd552

Co-authored-by: kevin <[email protected]>

Update src/kohlrahbi/ahbtable/ahbcondtions.py

754432e

Co-authored-by: kevin <[email protected]>

Update src/kohlrahbi/ahbtable/ahbcondtions.py

6c271bc

Co-authored-by: kevin <[email protected]>

simplified if statements

f091db2

Removed condition dict extraction from unfolded ahb table

010e376

as it is not used

reorganized duplicate code

973c6fc

moved function to parse conditions text due to circular import

9de2ae8

fixed minor issue

f70dc97

Update src/kohlrahbi/ahbtable/ahbpackagetable.py

1a40bd9

Co-authored-by: kevin <[email protected]>

Update src/kohlrahbi/ahbtable/ahbpackagetable.py

91accdb

Co-authored-by: kevin <[email protected]>

simplified unnecessary line

ddd45ed

Update src/kohlrahbi/ahbtable/ahbpackagetable.py

473b74e

Co-authored-by: kevin <[email protected]>

Merge remote-tracking branch 'origin/DDB/flavour_extract_conditions' …

2bca56b

…into DDB/flavour_extract_conditions

reduced call of get_format_of_pruefidentifikator fct.

0e470fc

updated doc strings and added assume-yes flag to conditions command

59127c9

Update src/kohlrahbi/read_functions.py

2d04ac8

Co-authored-by: kevin <[email protected]>

Update src/kohlrahbi/read_functions.py

e7dd4e8

Co-authored-by: kevin <[email protected]>

removed unused imports

7cbe39f

Added explanation to duplicate code warning

6b989df

Removed unused function

34d1164

Merge branch 'main' into DDB/flavour_extract_conditions

0a08b2d

DeltaDaniel merged commit 715c179 into main May 14, 2024
10 checks passed

DeltaDaniel deleted the DDB/flavour_extract_conditions branch May 14, 2024 09:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

extract conditions and packages #257

extract conditions and packages #257

DeltaDaniel commented Mar 27, 2024

hf-krechan May 10, 2024

DeltaDaniel May 14, 2024

hf-krechan May 14, 2024

DeltaDaniel May 14, 2024 •

edited

Loading

	def get_pruefi_to_file_mapping(basic_input_path: Path, format_version: EdifactFormatVersion) -> dict[str, str]:
	"""Returns the pruefi to file mapping. If the cache file does not exist, it creates it."""
	default_path_to_cache_file = Path(__file__).parents[1] / "cache" / f"{format_version}_pruefi_docx_filename_map.toml"

	if default_path_to_cache_file.exists():
	pruefi_to_file_mapping_cache = load_pruefi_docx_file_map_from_file(default_path_to_cache_file)
	pruefi_to_file_mapping = pruefi_to_file_mapping_cache.get("pruefidentifikatoren")
	if isinstance(pruefi_to_file_mapping, type(None)):
	raise ReferenceError(f"Could not find pruefidentifikatoren in {default_path_to_cache_file}")
	return dict(pruefi_to_file_mapping)

	path_to_docx_files = basic_input_path / Path(f"edi_energy_de/{format_version}")
	pruefi_to_file_mapping = find_pruefidentifikatoren(path_to_docx_files)
	save_pruefi_map_to_toml(pruefi_to_file_mapping, format_version.value)
	return pruefi_to_file_mapping

extract conditions and packages #257

extract conditions and packages #257

Conversation

DeltaDaniel commented Mar 27, 2024

hf-krechan May 10, 2024

Choose a reason for hiding this comment

DeltaDaniel May 14, 2024

Choose a reason for hiding this comment

hf-krechan May 14, 2024

Choose a reason for hiding this comment

DeltaDaniel May 14, 2024 • edited Loading

Choose a reason for hiding this comment

DeltaDaniel May 14, 2024 •

edited

Loading