py-pilecore 0.2.3__tar.gz → 0.2.5__tar.gz

{py-pilecore-0.2.3/src/py_pilecore.egg-info → py-pilecore-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-pilecore
-Version: 0.2.3
+Version: 0.2.5
 Summary: Public python SDK for the CEMS PileCore web-API.
 License: MIT License
         
@@ -32,10 +32,11 @@ License-File: LICENSE
 Requires-Dist: pygef<1,>0.8
 Requires-Dist: numpy<2,>1
 Requires-Dist: pandas<3,>2
-Requires-Dist: cems-nuclei[client]<1,>0.3
+Requires-Dist: cems-nuclei[client]<1,>=0.5
 Requires-Dist: matplotlib<4,>=3.8
 Requires-Dist: tqdm[notebook]<5,>4
 Requires-Dist: natsort<9,>8
+Requires-Dist: shapely<3,>=2
 Provides-Extra: test
 Requires-Dist: coveralls; extra == "test"
 Requires-Dist: pytest; extra == "test"

{py-pilecore-0.2.3 → py-pilecore-0.2.5}/pyproject.toml

@@ -4,17 +4,18 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "py-pilecore"
-version = "0.2.3"
+version = "0.2.5"
 description = "Public python SDK for the CEMS PileCore web-API."
 requires-python = ">=3.9"
 dependencies = [
     'pygef>0.8,<1',
     'numpy>1,<2',
     'pandas>2,<3',
-    'cems-nuclei[client]>0.3,<1',
+    'cems-nuclei[client]>=0.5,<1',
     'matplotlib>=3.8,<4',
     "tqdm[notebook]>4,<5",
     "natsort>8,<9",
+    "shapely>=2,<3",
 ]
 license = { file = "LICENSE" }
 readme = "README.md"

{py-pilecore-0.2.3 → py-pilecore-0.2.5/src/py_pilecore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-pilecore
-Version: 0.2.3
+Version: 0.2.5
 Summary: Public python SDK for the CEMS PileCore web-API.
 License: MIT License
         
@@ -32,10 +32,11 @@ License-File: LICENSE
 Requires-Dist: pygef<1,>0.8
 Requires-Dist: numpy<2,>1
 Requires-Dist: pandas<3,>2
-Requires-Dist: cems-nuclei[client]<1,>0.3
+Requires-Dist: cems-nuclei[client]<1,>=0.5
 Requires-Dist: matplotlib<4,>=3.8
 Requires-Dist: tqdm[notebook]<5,>4
 Requires-Dist: natsort<9,>8
+Requires-Dist: shapely<3,>=2
 Provides-Extra: test
 Requires-Dist: coveralls; extra == "test"
 Requires-Dist: pytest; extra == "test"

{py-pilecore-0.2.3 → py-pilecore-0.2.5}/src/py_pilecore.egg-info/requires.txt

@@ -1,10 +1,11 @@
 pygef<1,>0.8
 numpy<2,>1
 pandas<3,>2
-cems-nuclei[client]<1,>0.3
+cems-nuclei[client]<1,>=0.5
 matplotlib<4,>=3.8
 tqdm[notebook]<5,>4
 natsort<9,>8
+shapely<3,>=2
 
 [docs]
 Sphinx==6.1.3

{py-pilecore-0.2.3 → py-pilecore-0.2.5}/src/pypilecore/_version.py

@@ -4,4 +4,4 @@ try:
     __version__ = version("py-pilecore")
 # during CI
 except PackageNotFoundError:
-    __version__ = "0.2.3"
+    __version__ = "0.2.5"

{py-pilecore-0.2.3 → py-pilecore-0.2.5}/src/pypilecore/input/grouper_properties.py

@@ -121,11 +121,11 @@ def create_grouper_payload(
     overrule_nan:
         Default is 0.0
         The default behavior is to replace NaN with zero, for one of the following
-        attributes ["R_b_cal", "F_nk_cal", "R_s_cal"].
+        attributes ["R_b_cal", "F_nk_d", "R_s_cal"].
     skip_nan:
         Default is False
         If True the CPTs are skipped that have NaN values in one of the following
-        attributes ["R_b_cal", "F_nk_cal", "R_s_cal"], this means that they are not used in the grouper method.
+        attributes ["R_b_cal", "F_nk_d", "R_s_cal"], this means that they are not used in the grouper method.
 
     Raises
     ------
@@ -172,7 +172,7 @@ def create_grouper_payload(
                 f" CPT {name} does not have a x-coordinate or y-coordinate"
             )
 
-        for item in ["R_b_cal", "F_nk_cal", "R_s_cal"]:
+        for item in ["R_b_cal", "F_nk_d", "R_s_cal"]:
             if np.isnan(cpt_result.table.__getattribute__(item)).any():
                 if skip_nan:
                     has_nan = True
@@ -201,7 +201,7 @@ def create_grouper_payload(
                     cpt_result.table.R_b_cal, nan=overrule_nan
                 ).tolist(),
                 "negative_friction": np.nan_to_num(
-                    cpt_result.table.F_nk_cal, nan=overrule_nan
+                    cpt_result.table.F_nk_d, nan=overrule_nan
                 ).tolist(),
                 "shaft_bearing_capacity": np.nan_to_num(
                     cpt_result.table.R_s_cal, nan=overrule_nan
@@ -227,7 +227,7 @@ def create_grouper_payload(
                 f"upper boundary: {max(pile_tip_level)}, lower boundary: {min(pile_tip_level)}. \n"
             )
         raise ValueError(msg)
-    payload["pile_tip_level"] = list(raw_lengths[0])
+    payload["pile_tip_level"] = sorted(list(raw_lengths[0]), reverse=True)
 
     return payload
 

{py-pilecore-0.2.3 → py-pilecore-0.2.5}/src/pypilecore/input/multi_cpt.py

@@ -15,9 +15,9 @@ def create_multi_cpt_payload(
     cptdata_objects: List[CPTData],
     classify_tables: Dict[str, dict],
     groundwater_level_nap: float,
-    pile_type: Literal["A", "B", "C", "D", "E", "F", "G"],
-    specification: Literal["concrete", "steel", "micro", "wood"],
-    installation: Literal["1", "2", "3", "4", "5", "6", "7"],
+    pile_type: Literal["concrete", "steel", "micro", "wood"],
+    specification: Literal["1", "2", "3", "4", "5", "6", "7"],
+    installation: Literal["A", "B", "C", "D", "E", "F", "G"],
     pile_shape: Literal["round", "rect"],
     friction_range_strategy: Literal[
         "manual", "lower_bound", "settlement_driven"
@@ -25,7 +25,8 @@ def create_multi_cpt_payload(
     stiff_construction: bool = False,
     cpts_group: List[str] | None = None,
     fixed_negative_friction_range_nap: Tuple[float, float] | None = None,
-    fixed_positive_friction_range_nap: Tuple[float, str | float] | None = None,
+    fixed_positive_friction_range_nap: Tuple[float, Literal["ptl"] | float]
+    | None = None,
     negative_shaft_friction: float | None = None,
     apply_qc3_reduction: bool | None = None,
     relative_pile_load: float | None = 0.7,
@@ -34,9 +35,11 @@ def create_multi_cpt_payload(
     pile_head_level_nap: float | Literal["surface"] = "surface",
     excavation_depth_nap: float | None = None,
     excavation_param_t: float = 1.0,
-    individual_negative_friction_range_nap: Mapping[str, Tuple[float, str]]
+    individual_negative_friction_range_nap: Mapping[str, Tuple[float, float]]
     | None = None,
-    individual_positive_friction_range_nap: Mapping[str, Tuple[float, str]]
+    individual_positive_friction_range_nap: Mapping[
+        str, Tuple[float, Literal["ptl"] | float]
+    ]
     | None = None,
     diameter_base: float | None = None,
     diameter_shaft: float | None = None,

{py-pilecore-0.2.3 → py-pilecore-0.2.5}/src/pypilecore/input/soil_properties.py

@@ -26,9 +26,11 @@ def create_soil_properties_payload(
     groundwater_level_nap: float,
     friction_range_strategy: Literal["manual", "lower_bound", "settlement_driven"],
     excavation_depth_nap: float | None = None,
-    individual_negative_friction_range_nap: Mapping[Any, Tuple[float, str]]
+    individual_negative_friction_range_nap: Mapping[Any, Tuple[float, float]]
     | None = None,
-    individual_positive_friction_range_nap: Mapping[Any, Tuple[float, str]]
+    individual_positive_friction_range_nap: Mapping[
+        Any, Tuple[float, Literal["ptl"] | float]
+    ]
     | None = None,
 ) -> Tuple[List[dict], Dict[str, dict]]:
     """

{py-pilecore-0.2.3 → py-pilecore-0.2.5}/src/pypilecore/results/grouper_result.py

@@ -528,14 +528,15 @@ class GrouperResults:
 
             - cpts within a subgroup
                 - green:
-                    Subgroups is spatially coherent, which means there are no other CPTs in between the members
-                    of the subgroup and follows the NEN9997-1 3.2.3 centre to centre validation
+                    There are no other CPTs in between the members of the subgroup. The
+                    group is also compliant with the NEN9997-1 3.2.3 centre to centre
+                    validation.
                 - orange:
-                    Subgroups is spatially coherent, which means there are no other CPTs in between the members
-                    of the subgroup and does not follow the NEN9997-1 3.2.3 centre to centre validation
+                    There are no other CPTs in between the members of the subgroup. The
+                    centre-to-centre check failed and so the group does not follow the
+                    NEN9997-1 3.2.3 centre to centre validation.
                 - red:
-                    Subgroups is not spatially coherent, which means there are other CPTs in between the
-                    members of the subgroup and does not follow the NEN9997-1 3.2.3 centre to centre validation
+                    There are other CPTs in between the members of the subgroup.
             - valid depth of the subgroup
 
         Parameters

{py-pilecore-0.2.3 → py-pilecore-0.2.5}/tests/test_input.py

@@ -313,10 +313,13 @@ def test_create_grouper_payload(
         mock_multi_cpt_bearing_response, mock_results_passover
     )
 
-    create_grouper_payload(
+    payload = create_grouper_payload(
         cptgroupresults.cpt_results.cpt_results_dict, pile_load_uls=100
     )
 
+    # check if pile tip levels are sorted
+    assert payload["pile_tip_level"] == [1.0, 0.5, 0.0, -0.5]
+
     # test value error
     single_cpt_results = cptgroupresults.cpt_results.cpt_results_dict["9"]
     with pytest.raises(ValueError):
@@ -430,8 +433,8 @@ def test_create_multi_cpt_payload_extended_round_pile(
         gamma_f_nk=1.2,
         gamma_r_s=1.5,
         gamma_r_b=1.4,
-        individual_negative_friction_range_nap={cpt.alias: [0.0, -5.0]},
-        individual_positive_friction_range_nap={cpt.alias: [-5.0, "ptl"]},
+        individual_negative_friction_range_nap={cpt.alias: (0.0, -5.0)},
+        individual_positive_friction_range_nap={cpt.alias: (-5.0, "ptl")},
         diameter_shaft=0.25,
         height_base=0.5,
         settlement_curve=2,
@@ -536,8 +539,8 @@ def test_create_multi_cpt_payload_extended_rect_pile(
         gamma_f_nk=1.2,
         gamma_r_s=1.5,
         gamma_r_b=1.4,
-        individual_negative_friction_range_nap={cpt.alias: [0.0, -5.0]},
-        individual_positive_friction_range_nap={cpt.alias: [-5.0, "ptl"]},
+        individual_negative_friction_range_nap={cpt.alias: (0.0, -5.0)},
+        individual_positive_friction_range_nap={cpt.alias: (-5.0, "ptl")},
         width_base_small=0.25,
         width_shaft_large=0.3,
         width_shaft_small=0.25,