aaaalter

src/kohlrahbi/ahbtable/ahbtable.py

@@ -91,7 +91,7 @@ def append_ahb_sub_table(self, ahb_sub_table: AhbSubTable) -> None:
  self.table = pd.concat([self.table, ahb_sub_table.table], ignore_index=True)
 
  @staticmethod
- def line_contains_only_segment_gruppe(raw_line: pd.Series) -> bool:
+ def line_contains_only_segment_gruppe(raw_line: pd.Series[str]) -> bool:
  """
  Returns true if the given raw line only contains some meaningful data in the "Segment Gruppe" key
  """

src/kohlrahbi/changehistory/changehistorytable.py

@@ -54,7 +54,7 @@ def is_empty(val: str) -> bool:
  return pd.isna(val) or val == ""
 
  # Define a function to check if a value is considered empty for our case
- def is_the_first_column_empty(row: pd.Series) -> bool:
+ def is_the_first_column_empty(row: pd.Series[str]) -> bool:
  """
  Checks if the first column of the given row is empty.
  This is our indicator if the current row is a continuation of the upper row.

src/kohlrahbi/read_functions.py

@@ -78,10 +78,8 @@ def is_item_table_with_pruefidentifikatoren(item: Paragraph | Table | None) -> T
 
 
 def is_item_headless_table(
- item: Paragraph | Table | None,
- # seed: Seed | None,
- ahb_table: AhbTable | None,
-) -> TypeGuard[Table]:
+ value: tuple[Union[Paragraph, Table, None], Union[AhbTable, None]]
+) -> TypeGuard[tuple[Table, AhbTable]]:
  """
  Checks if the given item is a headless table.
 
@@ -93,6 +91,7 @@ def is_item_headless_table(
  Returns:
  bool: True if the item is a headless table, False otherwise.
  """
+ item, ahb_table = value
  # return isinstance(item, Table) and seed is not None and ahb_table is not None
  return isinstance(item, Table) and ahb_table is not None
 
@@ -171,7 +170,7 @@ def process_table(
  item: Paragraph | Table | None,
  pruefi: str,
  searched_pruefi_is_found: bool,
- ahb_table: AhbTable,
+ ahb_table: AhbTable | None,
  seed: Seed | None = None,
 ) -> tuple[bool, AhbTable]:
  """Processes tables to find and build the AHB table."""
@@ -184,12 +183,13 @@ def process_table(
  ahb_table = AhbTable.from_ahb_sub_table(ahb_sub_table=ahb_sub_table)
  searched_pruefi_is_found = True
 
- # elif is_item_headless_table(item, seed, ahb_table):
- elif is_item_headless_table(item, ahb_table):
+ elif is_item_headless_table((item, ahb_table)):
+ assert ahb_table is not None
+ assert isinstance(item, Table)
  assert seed is not None
  ahb_sub_table = AhbSubTable.from_headless_table(docx_table=item, tmd=seed)
  ahb_table.append_ahb_sub_table(ahb_sub_table=ahb_sub_table)
-
+ assert ahb_table is not None
  return searched_pruefi_is_found, ahb_table
 
 

src/kohlrahbi/unfoldedahb/unfoldedahbtable.py

@@ -236,7 +236,7 @@ def _get_section_name(segment_gruppe_or_section_name: str, last_section_name: st
  return last_section_name
 
  @staticmethod
- def _is_section_name(ahb_row: pd.Series) -> bool:
+ def _is_section_name(ahb_row: pd.Series[str]) -> bool:
  """
  Checks if the current AHB row is a section name.
  It uses the same logic as the function 'line_contains_only_segment_gruppe'
@@ -245,15 +245,15 @@ def _is_section_name(ahb_row: pd.Series) -> bool:
  return AhbTable.line_contains_only_segment_gruppe(ahb_row)
 
  @staticmethod
- def _is_segment_group(ahb_row: pd.Series) -> bool:
+ def _is_segment_group(ahb_row: pd.Series[str]) -> bool:
  """Checks if the current AHB row is a segment group."""
 
  if _segment_group_pattern.match(ahb_row["Segment Gruppe"]) and not ahb_row["Segment"]:
  return True
  return False
 
  @staticmethod
- def _is_segment_opening_line(ahb_row: pd.Series) -> bool:
+ def _is_segment_opening_line(ahb_row: pd.Series[str]) -> bool:
  """Checks if the current AHB row is a segment opening line.
  Example:
 
@@ -273,7 +273,7 @@ def _is_segment_opening_line(ahb_row: pd.Series) -> bool:
  return False
 
  @staticmethod
- def _is_just_segment(ahb_row: pd.Series) -> bool:
+ def _is_just_segment(ahb_row: pd.Series[str]) -> bool:
  """
  Checks if the given AHB row is a segment
  """
@@ -287,7 +287,7 @@ def _is_just_segment(ahb_row: pd.Series) -> bool:
  return False
 
  @staticmethod
- def _is_dataelement(ahb_row: pd.Series) -> bool:
+ def _is_dataelement(ahb_row: pd.Series[str]) -> bool:
  """
  Checks if the given AHB row is a dataelement
  """
@@ -296,12 +296,12 @@ def _is_dataelement(ahb_row: pd.Series) -> bool:
  return False
 
  @staticmethod
- def _is_just_value_pool_entry(ahb_row: pd.Series) -> bool:
+ def _is_just_value_pool_entry(ahb_row: pd.Series[str]) -> bool:
  """
  Checks if the given AHB row contains only a value pool entry (w/o Segment (group) and data element)
  """
  return (
- (not ahb_row["Segment Gruppe"])
+ (not ahb_row["Segment Gruppe"]) # type:ignore[return-value]
  and (not ahb_row["Segment"])
  and (not ahb_row["Datenelement"])
  and ahb_row["Codes und Qualifier"]

tox.ini

@@ -37,7 +37,7 @@ deps =
  -r dev_requirements/requirements-type_check.txt
 commands =
  mypy --show-error-codes src/kohlrahbi --strict
- mypy --show-error-codes unittests --strict
+ mypy --show-error-codes unittests
 # mypy --show-error-codes unittests # does not work yet, sadly; Some tox/packaging problems
 # add single files (ending with .py) or packages here
 

unittests/conftest.py

@@ -1,5 +1,5 @@
 import docx
-import pytest # type:ignore[import]
+import pytest
 
 from unittests.cellparagraph import CellParagraph
 

unittests/test_ahb_file_finder.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-import pytest # type:ignore[import]
+import pytest
 from maus.edifact import EdifactFormat
 
 from kohlrahbi.docxfilefinder import DocxFileFinder

unittests/test_ahb_table.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
 import pandas as pd
-import pytest # type:ignore[import]
+import pytest
 
 from kohlrahbi.ahbtable.ahbtable import AhbTable
 from kohlrahbi.unfoldedahb import UnfoldedAhb

unittests/test_cells/test_bedingung_cell_parser.py

@@ -1,5 +1,5 @@
 import pandas as pd
-import pytest # type:ignore[import]
+import pytest
 from docx.shared import Twips
 
 from kohlrahbi.docxtablecells import BedingungCell

unittests/test_cells/test_body_cell_parser.py

@@ -1,5 +1,5 @@
 import pandas as pd
-import pytest # type:ignore[import]
+import pytest
 from docx.shared import Length, Twips
 
 from kohlrahbi.docxtablecells import BodyCell

unittests/test_cells/test_edifact_struktur_cell_parser.py

@@ -1,5 +1,5 @@
 import pandas as pd
-import pytest # type:ignore[import]
+import pytest
 from docx.shared import Twips
 
 from kohlrahbi.docxtablecells import EdifactStrukturCell

unittests/test_check_row_type.py

@@ -1,5 +1,5 @@
 import docx
-import pytest # type:ignore[import]
+import pytest
 from docx.shared import RGBColor
 
 from kohlrahbi.row_type_checker import RowType, get_row_type

unittests/test_cli_pruefi.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Union
 
-import pytest # type:ignore[import]
+import pytest
 from click.testing import CliRunner, Result
 
 from kohlrahbi.ahb.command import ahb

unittests/test_conditions_format_file_mapping.py

@@ -1,4 +1,4 @@
-import pytest # type:ignore[import]
+import pytest
 from maus.edifact import EdifactFormat
 
 from kohlrahbi.conditions import find_all_files_from_all_pruefis

unittests/test_current_state.py

@@ -8,7 +8,7 @@
 from typing import Union
 
 import pandas as pd
-import pytest # type:ignore[import]
+import pytest
 from click.testing import CliRunner, Result
 
 from kohlrahbi import cli

unittests/test_docx_extensions.py

@@ -4,7 +4,7 @@
 
 from typing import Generator
 
-import pytest # type:ignore[import]
+import pytest
 from _pytest.fixtures import SubRequest # type:ignore[import]
 from docx import Document
 from docx.document import Document as DocumentClass

unittests/test_input_checks.py

@@ -1,4 +1,4 @@
-import pytest # type:ignore[import]
+import pytest
 
 from kohlrahbi.ahb import get_valid_pruefis
 

unittests/test_read_functions.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 
 import docx
-import pytest # type:ignore[import]
+import pytest
 from docx import Document
 from maus.edifact import EdifactFormat, EdifactFormatVersion
 

unittests/test_table_header.py

@@ -2,7 +2,7 @@
 Test the table_header module.
 """
 
-import pytest # type:ignore[import]
+import pytest
 
 from kohlrahbi.table_header import create_mapping_of_tabstop_positions