Add support for WST with old method code '2'. (#22)

* Add support for old WST code (2)
Add test file old wim format.
Update CHANGES.md
Update packages
Bump version to 0.0.5

* Rename Dynamic Probing type from `type` to `dynamic_probing_type`.
Update CHANGES.md
Update packages

* Move the license to the project.classifiers section.

Author: josteinl

.github/workflows/branch.yaml

@@ -51,6 +51,6 @@ jobs:
       - name: Run bandit
         run: poetry run bandit .
       - name: Run safety
-        run: poetry run safety check -i 70612
+        run: poetry run safety check
       - name: Check for acceptable licenses
         run: poetry run pip-licenses --allow-only="MIT License;BSD License;Python Software Foundation License;Apache Software License;Mozilla Public License 2.0 (MPL 2.0);ISC License (ISCL);The Unlicense (Unlicense)"

CHANGES.md

@@ -1,5 +1,12 @@
 # NGI Python SGF Parser Package
 
+_2025-03-10_
+
+Version 0.0.5
+
+- Add support for old WST code (2).
+- Rename Dynamic Probing (DP) type from `type` to `dynamic_probing_type`.
+
 _2025-02-27_
 
 Version 0.0.4

poetry.lock

@@ -13,23 +13,31 @@ exclude = '''
 )/
 '''
 
-[tool.poetry]
+[project]
 name = "sgf-parser"
-version = "0.0.4"
+version = "0.0.5"
 description = "Parser for the Swedish Geotechnical Society / Svenska Geotekniska Föreningen (SGF) data format"
-license = "MIT"
-authors = ["Jostein Leira <jostein@leira.net>"]
-maintainers = ["Jostein Leira <jostein@leira.net>"]
+authors = [
+ { name = "Jostein Leira", email = "jostein@leira.net" }
+]
+maintainers = [
+     { name = "Jostein Leira", email = "jostein@leira.net" }
+]
 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 :: 4 - Beta",
-#    "Development Status :: 3 - Alpha",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Topic :: Scientific/Engineering :: GIS",
+    "License :: OSI Approved :: MIT License",
+]
+requires-python = ">=3.11,<4"
+dependencies=[
+    "pydantic>=2.10",
+    "python-dateutil>=2.9.0.post0",
+    "types-python-dateutil>=2.9"
 ]
 packages = [
     { include = "sgf_parser", from="src" },
@@ -56,11 +64,6 @@ check_untyped_defs = true
 no_implicit_reexport = false
 
 
-[tool.poetry.dependencies]
-python = ">=3.11,<4"
-pydantic = "^2.10"
-python-dateutil = "^2.9.0.post0"
-types-python-dateutil = "^2.9"
 
 
 [tool.poetry.group.dev.dependencies]

pyproject.toml

@@ -51,7 +51,7 @@ def __init__(self, **kwargs):
     method_type: Literal[MethodType.DP] = MethodType.DP
     method_data_type: type[MethodDPData] = MethodDPData
 
-    type: DPType
+    dynamic_probing_type: DPType
 
     predrilling_depth: Decimal = Field(Decimal("0"), alias="HO")
 
@@ -68,7 +68,7 @@ def __init__(self, **kwargs):
     def set_operation(cls, data: Any) -> Any:
         if isinstance(data, dict):
             if "HM" in data and data["HM"] is not None:
-                data["type"] = {
+                data["dynamic_probing_type"] = {
                     "8": DPType.DPSHA,
                     "108A": DPType.DPSHA,
                     "108B": DPType.DPL,

src/sgf_parser/models/method_dp.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
 from typing import Literal, Any
 
-from pydantic import Field, model_validator
+from pydantic import Field, model_validator, AliasChoices
 
 from sgf_parser.models import MethodData, Method, MethodType
 from sgf_parser.models.types import Operation
@@ -17,7 +17,7 @@ def __init__(self, **kwargs):
 
     depth: Decimal = Field(..., alias="D", description="Depth (m)")
     turning: Decimal = Field(..., alias="H", description="Turning (half revolution/0.2 m)")
-    load: Decimal = Field(..., alias="W", description="Load (kN)")
+    load: Decimal | None = Field(None, description="Load (kN)", validation_alias=AliasChoices("W", "A"))
     penetration_rate: Decimal | None = Field(None, alias="B", description="Penetration rate (mm/s)")
 
     hammering: bool | None = Field(None, alias="AP")
@@ -47,6 +47,7 @@ def set_operation(cls, data: Any) -> Any:
             if "HM" in data and data["HM"] is not None:
                 data["operation"] = {
                     "101": Operation.MANUAL,
+                    "2": Operation.MECHANICAL,
                     "102": Operation.MECHANICAL,
                 }[data["HM"]]
 

src/sgf_parser/models/method_wst.py

@@ -20,6 +20,7 @@ class Parser:
     """
 
     method_code_class_mapping = {
+        "2": models.MethodWST,
         "07": models.MethodCPT,
         "10": models.MethodSLB,
         "101": models.MethodWST,

src/sgf_parser/parser.py

@@ -0,0 +1,10 @@
+$
+HA=1,HC=826617,HB=1287,HD=20181120,HI=105021,HO=3.6,HM=2,IS=XPL110324,IK=1.0,HK=1234,HQ=Jost
+#
+D=3.625,A=1.020,H=152,B=154.208,C=1.30
+D=3.650,A=1.875,H=80,B=3.979,C=50.27
+D=3.675,A=1.020,H=24,B=3.656,C=54.70
+D=3.700,A=1.020,H=24,B=10.287,C=19.44
+D=3.725,A=2.999,H=64,B=4.715,C=42.42
+D=3.750,A=8.259,H=144,B=1.033,C=193.61
+D=3.775,A=5.681,H=24,B=1.506,C=132.82,K=91,T=Sond kan ej drivas normalt

tests/data/wst-test-2.vim

@@ -504,6 +504,16 @@ def test_return_one_method_one_placeholder(
         Decimal("0.350"): {"penetration_rate": Decimal("2.2"), "hammering": False, "rotation_rate": Decimal("0"), "load": Decimal("-0.796"), "turning": Decimal("0")},
         Decimal("0.375"): {"penetration_rate": Decimal("0.2"), "hammering": False, "rotation_rate": Decimal("0"), "load": Decimal("1.02"), "turning": Decimal("1112")},
     },
+),
+(
+        "tests/data/wst-test-2.vim", 7, Decimal("3.625"), Decimal("3.775"),
+        datetime(2018, 11, 20, 10, 50,21),
+        {
+            # load=A, hammering=AP, load=W, turning=H, rotation_rate=R
+            Decimal("3.625"): {"load":Decimal("1.020"),  "turning":Decimal("152"), "penetration_rate": Decimal("154.208"), "comment_code": None, "remarks": None, "hammering": None},
+            Decimal("3.700"): {"load": Decimal("1.020"), "turning": Decimal("24"), "penetration_rate": Decimal("10.287"), "hammering": None,},
+            Decimal("3.775"): {"load": Decimal("5.681"), "turning": Decimal("24"), "penetration_rate": Decimal("1.506"), "hammering": None, "comment_code": 91, "remarks": "Sond kan ej drivas normalt"},
+        },
 ),
          ),
     )