Bump version to 0.0.9 and enhance support for Dissipation Tests (DT)

Author: josteinl

.github/workflows/release.yaml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.12']
+        python-version: ['3.13']
     steps:
       - uses: actions/checkout@v4
 

CHANGES.md

@@ -1,5 +1,12 @@
 # NGI Python SGF Parser Package
 
+_2025-08-12_
+
+Version 0.0.9
+
+- Better support for importing Dissipation Tests (DT). Still need the code `HM=35`, and we do not handle dissipation
+  tests with `HM=7`.
+
 _2025-05-13_
 
 Version 0.0.8

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sgf-parser"
-version = "0.0.8"
+version = "0.0.9"
 description = "Parser for the Swedish Geotechnical Society / Svenska Geotekniska Föreningen (SGF) data format"
 authors = [{ name = "Jostein Leira", email = "jostein@leira.net" }]
 requires-python = ">=3.11,<4"

src/sgf_parser/models/method_dt.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
 from typing import Literal
 
-from pydantic import Field
+from pydantic import Field, AliasChoices
 
 from sgf_parser.models import MethodType, MethodData, Method
 
@@ -15,9 +15,14 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
     time: Decimal | None = Field(None, alias="AD", description="Elapsed time (s)")
-    u2: Decimal | None = Field(None, alias="AG", description="Shoulder pressure (kPa)")
+    u2: Decimal | None = Field(None, description="Shoulder pressure (kPa)", validation_alias=AliasChoices("U", "AG"))
+    fs: Decimal | None = Field(None, description="Friction (kPa)", validation_alias=AliasChoices("FS", "F"))
+    qc: Decimal | None = Field(None, description="Resistance (MPa)", validation_alias=AliasChoices("QC", "Q"))
     depth: Decimal | None = Field(None, alias="D", description="Depth (m)")
 
+    def __repr__(self):
+        return f"<{self.__class__.__name__} {self.time}>"
+
 
 class MethodDT(Method):
     """

src/sgf_parser/parser.py

@@ -1,3 +1,4 @@
+import copy
 import re
 from typing import TextIO, Any
 
@@ -82,6 +83,13 @@ def parse(self, file: TextIO) -> list[Method]:
                     # Starting a new data block, so store the current collected header in a new method
                     method = self.parse_header(header)
                     header = {}
+                elif _new_state == ParseState.DATA and _old_state == ParseState.DATA:
+                    # Starting a new data block, while handling data. No new header,
+                    # so use the previous method to create a new method of the same type
+                    if method:
+                        methods.append(method)
+                    method = copy.copy(method)
+                    method.method_data = []
                 elif _new_state in (ParseState.HEADER, ParseState.METHOD) and _old_state == ParseState.DATA:
                     # Finished populating current method, since new method is starting
                     # Store the current method, and empty the current method
@@ -143,7 +151,7 @@ def parse_data(self, method: Method, row: str) -> MethodData:
         row_dict = self._convert_str_to_dict(row)
         method_data = method.method_data_type.model_validate(row_dict)
         if hasattr(method_data, "flushing"):
-                method_data.flushing = method.is_flushing_active(method_data)
+            method_data.flushing = method.is_flushing_active(method_data)
         if hasattr(method_data, "hammering"):
             method_data.hammering = method.is_hammer_active(method_data)
         if hasattr(method_data, "increased_rotation_rate"):