py-pilecore 0.6.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

{py_pilecore-0.6.0.dist-info → py_pilecore-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-pilecore
-Version: 0.6.0
+Version: 0.7.1
 Summary: Public python SDK for the CEMS PileCore web-API.
 License: MIT License
         
@@ -48,25 +48,20 @@ Requires-Dist: ipython ==8.11.0 ; extra == 'docs'
 Requires-Dist: asteroid-sphinx-theme ==0.0.3 ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme ==1.2.0 ; extra == 'docs'
 Provides-Extra: lint
-Requires-Dist: mypy ==1.6.1 ; extra == 'lint'
-Requires-Dist: mypy-extensions ==1.0.0 ; extra == 'lint'
-Requires-Dist: tomli ==2.0.1 ; extra == 'lint'
-Requires-Dist: typing-extensions ==4.7.1 ; extra == 'lint'
-Requires-Dist: black[jupyter] ==23.10.1 ; extra == 'lint'
-Requires-Dist: click ==8.1.3 ; extra == 'lint'
-Requires-Dist: packaging ==23.2 ; extra == 'lint'
-Requires-Dist: pathspec ==0.11.1 ; extra == 'lint'
-Requires-Dist: platformdirs ==3.5.1 ; extra == 'lint'
-Requires-Dist: isort ==5.12.0 ; extra == 'lint'
+Requires-Dist: ansible-lint ==6.22.1 ; extra == 'lint'
+Requires-Dist: black ==23.11.0 ; extra == 'lint'
+Requires-Dist: cfn-lint ==0.83.3 ; extra == 'lint'
+Requires-Dist: cpplint ==1.6.1 ; extra == 'lint'
 Requires-Dist: flake8 ==6.0.0 ; extra == 'lint'
-Requires-Dist: mccabe ==0.7.0 ; extra == 'lint'
-Requires-Dist: pycodestyle ==2.10.0 ; extra == 'lint'
-Requires-Dist: pyflakes ==3.0.1 ; extra == 'lint'
-Requires-Dist: pandas-stubs <3,>2 ; extra == 'lint'
-Requires-Dist: types-tqdm <5,>4 ; extra == 'lint'
+Requires-Dist: isort ==5.12.0 ; extra == 'lint'
+Requires-Dist: mypy ==1.7.1 ; extra == 'lint'
+Requires-Dist: sqlfluff ==2.3.5 ; extra == 'lint'
+Requires-Dist: yamllint ==1.33.0 ; extra == 'lint'
+Requires-Dist: yq ==3.2.3 ; extra == 'lint'
 Provides-Extra: test
 Requires-Dist: coveralls ; extra == 'test'
 Requires-Dist: pytest ; extra == 'test'
+Requires-Dist: openapi-core ; extra == 'test'
 
 # py-pilecore
 Public python SDK for the CEMS PileCore web-API
@@ -102,7 +97,7 @@ Go to `personal-access-tokens` and create a new user token.
 
 ## Environment
 
-We recommend developing in Python3.10 with a clean virtual environment (using `virtualenv` or `conda`), installing the requirements from the requirements.txt file:
+We recommend developing in Python3.11 with a clean virtual environment (using `virtualenv` or `conda`), installing the requirements from the requirements.txt file:
 
 Example using `virtualenv` and `pip` to install the dependencies in a new environment .env on Linux:
 
@@ -154,7 +149,7 @@ coverage run -m pytest
 
 ## Requirements
 
-Requirements are autogenerated by the `pip-compile` command with python 3.10
+Requirements are autogenerated by the `pip-compile` command with python 3.11
 
 Install pip-tools with:
 

{py_pilecore-0.6.0.dist-info → py_pilecore-0.7.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pypilecore/__init__.py,sha256=oJvwYShj_7FyNVlUgQda4tTdYyLIi5H1asdiS_uYt9M,162
-pypilecore/_version.py,sha256=R1s1AISNxSuge8l1EIVicoxY29JCaFvDTnMtfkWQDMM,175
+pypilecore/_version.py,sha256=lwhPyTTgYzs-cvOxSAquZ8lujNcRnmmZe1m2wWaWutg,175
 pypilecore/api.py,sha256=QwwHXR6HYtrF-gCHQWLvMHZnTxf5fjTlWI2cGfYSkUc,7165
 pypilecore/exceptions.py,sha256=-MZOfsxyHLCI0k1-wZFfVsMxc1lya5buuhLks5rxlCo,89
 pypilecore/plot_utils.py,sha256=rK5_067-4-x7LzZgt_t6ahcGrZInxNrqHqsy0RzCnq8,954
@@ -16,9 +16,9 @@ pypilecore/common/piles/geometry/components/common.py,sha256=scYoF-4aE0Wknx9GgSO
 pypilecore/common/piles/geometry/components/rectangle.py,sha256=591KyIejyjNAMnKg8yThFjbrPXAVHQdf08vaiQYHZdk,18411
 pypilecore/common/piles/geometry/components/round.py,sha256=MX2_qGmxr1dTtodblFfkNGkoDYqd6xgXHJ57xFuz_Z0,14735
 pypilecore/input/__init__.py,sha256=Gyqsp6zqc8AYnIp17SfqbBNjDaUkRgAam8x2r0XibwM,492
-pypilecore/input/grouper_properties.py,sha256=qOc-SNYSPdOcZZ9DsRE-sBNVOKHbUD044EWRsWDu_kc,10893
+pypilecore/input/grouper_properties.py,sha256=4Rhea8pnrbWqIIiplHdPS-EioDRurCcLe6thHkGkBEM,11146
 pypilecore/input/multi_cpt.py,sha256=V7A_MAYeJoMkGOQu1oFGJfJ3dkuBdhDSfeLvgiCLmqs,14196
-pypilecore/input/soil_properties.py,sha256=VZHGGmns768XPLjMTVwQDpy3f0LDFG0AwbKVfm3xKWc,7993
+pypilecore/input/soil_properties.py,sha256=ms2zxRPK_0zJAgei4QTJhC71Y7ivUguqoRTDUzuqyl8,8277
 pypilecore/results/__init__.py,sha256=J6CHQ7BJRnUJxrKFe25br-BUCMrBATqmvRkjtaMkmkw,507
 pypilecore/results/cases_multi_cpt_results.py,sha256=Svy26fEMuSLPzD0hdq3-aQD-6TK0oyAERkVQZFPcXrE,9948
 pypilecore/results/grouper_result.py,sha256=HcjLbnD3wt28CtIACD1OSoyJRmfu5x8Qv2BdDMpvgyY,30952
@@ -36,9 +36,9 @@ pypilecore/viewers/interactive_figures/__init__.py,sha256=u6fkLqDB35J2bdGvUewzRC
 pypilecore/viewers/interactive_figures/figure_cpt_group_results_versus_ptls.py,sha256=RzNOYQmP_yT8oYeIMW9aYNl7aAKU-uFQfygxP9AwDsU,6471
 pypilecore/viewers/interactive_figures/figure_cpt_results_plan_view.py,sha256=y1no2w0zN0yUpkNB_-WAFwQfa-IS70hJMhc-c0pOeMs,9268
 pypilecore/viewers/interactive_figures/figure_cpt_results_versus_ptls.py,sha256=6huCKcQ4bsBE-LNY-ZPa13IWuye0ENxPK4wT1dcCFRs,5964
-pypilecore/viewers/interactive_figures/utils.py,sha256=Wl5hNsTdgh6wPm_sVGg1bfKamHzGnVNpuepgOg-oOFY,1582
-py_pilecore-0.6.0.dist-info/LICENSE,sha256=3OCAZXffN0Bettjeya8uF_ZYegyvvCfH1WUt6CrHb_0,1061
-py_pilecore-0.6.0.dist-info/METADATA,sha256=mmjEYozM_QO3ZKpRV1uYHNYWS5lU-Fo5O4kw9c-8ArA,5935
-py_pilecore-0.6.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-py_pilecore-0.6.0.dist-info/top_level.txt,sha256=7BKIWZuSkbQtJ0ho5P1JvcaEbHzqADCcBuOduZmIaiI,11
-py_pilecore-0.6.0.dist-info/RECORD,,
+pypilecore/viewers/interactive_figures/utils.py,sha256=B2X8hbbmJqjm8E2VrS2EoX5F1yQ5qOQnQUG_vbsseT8,1692
+py_pilecore-0.7.1.dist-info/LICENSE,sha256=3OCAZXffN0Bettjeya8uF_ZYegyvvCfH1WUt6CrHb_0,1061
+py_pilecore-0.7.1.dist-info/METADATA,sha256=_EToNm1nMkzfEYcHpOMioBk8Uc5IGfPWE3UPOOxpNXw,5653
+py_pilecore-0.7.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+py_pilecore-0.7.1.dist-info/top_level.txt,sha256=7BKIWZuSkbQtJ0ho5P1JvcaEbHzqADCcBuOduZmIaiI,11
+py_pilecore-0.7.1.dist-info/RECORD,,

{py_pilecore-0.6.0.dist-info → py_pilecore-0.7.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pypilecore/_version.py

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

pypilecore/input/grouper_properties.py

@@ -74,7 +74,8 @@ def create_grouper_payload(
     Parameters
     ----------
     cpt_results_dict:
-        Dictionary with key as CPT name and value a SingleCPTBearingResults class
+        Dictionary with key as CPT name and value a SingleCPTBearingResults class.
+        Should contain at least 2 entries.
     pile_load_uls
         ULS load in kN. Used to determine if a grouping configuration is valid.
     stiff_construction
@@ -131,12 +132,12 @@ def create_grouper_payload(
     ValueError:
         - if NaN values are present in negative friction, bottom or shaft bearing_capacity
 
-
         - if x or y coordinate is None
 
-
         - if pile tip levels don't macht for all SingleCPTBearingResults
 
+        - if less than 2 valid CPTs are provided
+
 
     Returns
     -------
@@ -212,6 +213,12 @@ def create_grouper_payload(
                 },
             }
         )
+
+    if not len(cpt_objects) >= 2:
+        raise ValueError(
+            "The PileCore grouper requires at least 2 CPTs with valid bearing capacity."
+        )
+
     payload["cpt_objects"] = cpt_objects
 
     # validate pile tip levels

pypilecore/input/soil_properties.py

@@ -158,9 +158,19 @@ def create_soil_properties_payload(
             groundwater_level_nap=groundwater_level_nap
             if groundwater_level_nap is not None
             else cpt.delivered_vertical_position_offset - 1,
-            coordinates=dict(x=cpt.delivered_location.x, y=cpt.delivered_location.y),
         )
 
+        # Optionally add coordinates
+        if (
+            cpt.delivered_location is not None
+            and cpt.delivered_location.x is not None
+            and cpt.delivered_location.y is not None
+        ):
+            soil_properties["coordinates"] = {
+                "x": cpt.delivered_location.x,
+                "y": cpt.delivered_location.y,
+            }
+
         # Optionally add cpt-specific friction-range parameters
         if (
             individual_negative_friction_range_nap is not None

pypilecore/viewers/interactive_figures/utils.py

@@ -1,5 +1,6 @@
 from typing import Any
 
+import numpy as np
 import plotly
 
 
@@ -19,14 +20,14 @@ def get_continuous_color(colorscale: Any, intermed: float) -> Any:
         colorscale = plotly.colors.make_colorscale(viridis_colors, scale=scale)
 
     :param colorscale: A plotly continuous colorscale defined with RGB string colors.
-    :param intermed: value in the range [0, 1]
+    :param intermed: value in the range [0, 1]. If `intermed` is NaN, it returns the first color in the colorscale.
     :return: color in rgb string format
     :rtype: str
     """
     if len(colorscale) < 1:
         raise ValueError("colorscale must have at least one color")
 
-    if intermed <= 0 or len(colorscale) == 1:
+    if intermed <= 0 or len(colorscale) == 1 or np.isnan(intermed):
         return colorscale[0][1]
     if intermed >= 1:
         return colorscale[-1][1]