Add methods Tr, Slb and Sti (#19)

* Add method tr, slb and sti.
Update CHANGES.md
Update packages
Bump version to 0.0.3

* Add tests for Tr.
Refactored some computed fields (moved to the super class).

* Update test files.

* Add more SRS test files.

* Changed to use all uppercase method type names.

* Update packages.
Update lock file.

Author: josteinl

.gitattributes

@@ -9,6 +9,7 @@
 *.[Vv][Ii][Mm] binary
 *.[Ss][Tt][Dd] binary
 *.[Tt][Oo][Tt] binary
+*.[Tt][Rr][Tt] binary
 
 # std, cpt, tot and dtr files are specified as eol=crlf
 *.[Cc][Pp][Tt] text eol=crlf

.github/workflows/branch.yaml

@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.11', '3.12', '3.13']
-        poetry-version: ['1.8.3']
+        poetry-version: ['2.1.1']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.11', '3.12', '3.13']
-        poetry-version: ['1.8.3']
+        poetry-version: ['2.1.1']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/release.yaml

@@ -1,30 +1,30 @@
-name: Release
-on:
-  release:
-    types:
-      - created
-
-jobs:
-  publish:
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ['3.12']
-        poetry-version: ['1.8.3']
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Run image
-        uses: abatilo/actions-poetry@v2
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
-      - name: Publish
-        env:
-          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-        run: |
-          poetry config pypi-token.pypi $PYPI_TOKEN
-          poetry publish --build
+name: Release
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  publish:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.12']
+        poetry-version: ['2.1.1']
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Run image
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: ${{ matrix.poetry-version }}
+      - name: Publish
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          poetry config pypi-token.pypi $PYPI_TOKEN
+          poetry publish --build

CHANGES.md

@@ -1,5 +1,11 @@
 # NGI Python SGF Parser Package
 
+_2025-02-17_
+
+Version 0.0.3
+
+Add support for the methods Pressure Sounding (Tr), Impact sounding (Slb) and Light sounding (Sti).
+
 _2024-10-15_
 
 Version 0.0.2

README.md

@@ -51,7 +51,7 @@ len(method.method_data)
 1. Software dependencies
 
    - Python 3.11 or higher
-   - Poetry
+   - Poetry 2
    - ruff code formatter
 
 2. Clone this repository

poetry.lock

@@ -15,7 +15,7 @@ exclude = '''
 
 [tool.poetry]
 name = "sgf-parser"
-version = "0.0.2"
+version = "0.0.3"
 description = "Parser for the Swedish Geotechnical Society / Svenska Geotekniska Föreningen (SGF) data format"
 license = "MIT"
 authors = ["Jostein Leira <jostein@leira.net>"]
@@ -24,9 +24,9 @@ readme = "README.md"
 homepage = "https://github.com/norwegian-geotechnical-institute/sgf-parser"
 repository = "https://github.com/norwegian-geotechnical-institute/sgf-parser"
 classifiers = [
-#    "Development Status :: 5 - Production/Stable",
+    "Development Status :: 5 - Production/Stable",
 #    "Development Status :: 4 - Beta",
-    "Development Status :: 3 - Alpha",
+#    "Development Status :: 3 - Alpha",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Topic :: Scientific/Engineering :: GIS",
@@ -58,7 +58,7 @@ no_implicit_reexport = false
 
 [tool.poetry.dependencies]
 python = ">=3.11,<4"
-pydantic = "^2.8.2"
+pydantic = "^2.10"
 python-dateutil = "^2.9.0.post0"
 types-python-dateutil = "^2.9"
 
@@ -71,8 +71,6 @@ bandit = "*"
 safety = "*"
 pip-licenses = "*"
 ruff = "*"
-# Pinned due to problem with unpinned ruamel-yaml subdependency ruamel-yaml-clib not able to install on windows
-ruamel-yaml-clib={platform = "win32", version = "<0.2.6"}
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pyproject.toml

@@ -9,4 +9,7 @@
 from sgf_parser.models.method_srs import MethodSRS, MethodSRSData
 from sgf_parser.models.method_svt import MethodSVT, MethodSVTData
 from sgf_parser.models.method_tot import MethodTOT, MethodTOTData
+from sgf_parser.models.method_tr import MethodTR, MethodTRData
+from sgf_parser.models.method_slb import MethodSLB, MethodSLBData
+from sgf_parser.models.method_sti import MethodSTI, MethodSTIData
 from sgf_parser.models.method_wst import MethodWST, MethodWSTData

src/sgf_parser/models/__init__.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 from typing import Any
 
-from pydantic import BaseModel, Field, AliasChoices, model_validator
+from pydantic import BaseModel, Field, AliasChoices, model_validator, computed_field
 
 from sgf_parser.datetime_parser import convert_str_to_datetime, convert_str_to_time
 from sgf_parser.models import MethodType
@@ -394,6 +394,27 @@ def guess_date_format(cls, data: Any) -> Any:
 
         return data
 
+    @computed_field
+    def depth_top(self) -> Decimal | None:
+        if not self.method_data:
+            return None
+
+        return min(method_data.depth for method_data in self.method_data)
+
+    @computed_field
+    def depth_base(self) -> Decimal | None:
+        if not self.method_data:
+            return None
+
+        return max(method_data.depth for method_data in self.method_data)
+
+    @computed_field
+    def stopcode(self) -> int | None:
+        if not self.method_data:
+            return None
+
+        return self.method_data[-1].comment_code
+
     method_type: MethodType
     method_data_type: type[MethodData]
 

src/sgf_parser/models/method.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
 from typing import Literal
 
-from pydantic import Field, AliasChoices, computed_field
+from pydantic import Field, AliasChoices
 
 from sgf_parser.models import MethodType, MethodData, Method
 from sgf_parser.models.types import ApplicationClass
@@ -251,27 +251,6 @@ def application_class(self) -> ApplicationClass:
         else:
             return ApplicationClass.UNKNOWN
 
-    @computed_field
-    def depth_top(self) -> Decimal | None:
-        if not self.method_data:
-            return None
-
-        return min(method_data.depth for method_data in self.method_data)
-
-    @computed_field
-    def depth_base(self) -> Decimal | None:
-        if not self.method_data:
-            return None
-
-        return max(method_data.depth for method_data in self.method_data)
-
-    @computed_field
-    def stopcode(self) -> int | None:
-        if not self.method_data:
-            return None
-
-        return self.method_data[-1].comment_code
-
     # "MA": "cone_area_ratio",  # same as header code IE
     # "IE": "cone_area_ratio",  # same as header code MA
     # "MB": "sleeve_area_ratio",  # same as header code IF