py-pilecore 0.6.0__tar.gz → 0.7.1__tar.gz

{py_pilecore-0.6.0/src/py_pilecore.egg-info → py_pilecore-0.7.1}/PKG-INFO

@@ -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
         
@@ -44,6 +44,7 @@ Requires-Dist: plotly-geo<2,>=1.0.0
 Provides-Extra: test
 Requires-Dist: coveralls; extra == "test"
 Requires-Dist: pytest; extra == "test"
+Requires-Dist: openapi-core; extra == "test"
 Provides-Extra: docs
 Requires-Dist: Sphinx==6.1.3; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints==1.22; extra == "docs"
@@ -51,23 +52,16 @@ 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: tomli==2.0.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"
 
 # py-pilecore
 Public python SDK for the CEMS PileCore web-API
@@ -103,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:
 
@@ -155,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 → py_pilecore-0.7.1}/README.md

@@ -32,7 +32,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:
 
@@ -84,7 +84,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 → py_pilecore-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "py-pilecore"
-version = "0.6.0"
+version = "0.7.1"
 description = "Public python SDK for the CEMS PileCore web-API."
 requires-python = ">=3.9"
 dependencies = [
@@ -29,7 +29,7 @@ keywords = ["API", "PileCore", "CEMS", "CRUX"]
 repository = "https://github.com/cemsbv/py-pilecore"
 
 [project.optional-dependencies]
-test = ["coveralls", "pytest"]
+test = ["coveralls", "pytest", "openapi-core"]
 docs = [
     "Sphinx==6.1.3",
     "sphinx-autodoc-typehints==1.22",
@@ -37,26 +37,21 @@ docs = [
     "asteroid-sphinx-theme==0.0.3",
     "sphinx_rtd_theme==1.2.0",
 ]
-# lint dependencies from github super-linter v5
+# lint dependencies from github super-linter
 # See https://github.com/super-linter/super-linter/tree/main/dependencies/python
+# Get a file with the latest requirements by running bash: `./get-super-linter-requirements.sh`
+# ignoring because redundant: snakemake, snakefmt, pylint
 lint = [
-    "mypy==1.6.1",
-    "mypy-extensions==1.0.0",
-    "tomli==2.0.1",
-    "typing_extensions==4.7.1",
-    "black[jupyter]==23.10.1",
-    "click==8.1.3",
-    "packaging==23.2",
-    "pathspec==0.11.1",
-    "platformdirs==3.5.1",
-    "tomli==2.0.1,",
-    "isort==5.12.0",
+    "ansible-lint==6.22.1",
+    "black==23.11.0",
+    "cfn-lint==0.83.3",
+    "cpplint==1.6.1",
     "flake8==6.0.0",
-    "mccabe==0.7.0",
-    "pycodestyle==2.10.0",
-    "pyflakes==3.0.1",
-    'pandas-stubs>2,<3',
-    'types-tqdm>4,<5',
+    "isort==5.12.0",
+    "mypy==1.7.1",
+    "sqlfluff==2.3.5",
+    "yamllint==1.33.0",
+    "yq==3.2.3",
 ]
 
 [tool.isort]

{py_pilecore-0.6.0 → py_pilecore-0.7.1/src/py_pilecore.egg-info}/PKG-INFO

@@ -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
         
@@ -44,6 +44,7 @@ Requires-Dist: plotly-geo<2,>=1.0.0
 Provides-Extra: test
 Requires-Dist: coveralls; extra == "test"
 Requires-Dist: pytest; extra == "test"
+Requires-Dist: openapi-core; extra == "test"
 Provides-Extra: docs
 Requires-Dist: Sphinx==6.1.3; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints==1.22; extra == "docs"
@@ -51,23 +52,16 @@ 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: tomli==2.0.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"
 
 # py-pilecore
 Public python SDK for the CEMS PileCore web-API
@@ -103,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:
 
@@ -155,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 → py_pilecore-0.7.1}/src/py_pilecore.egg-info/requires.txt

@@ -19,23 +19,18 @@ asteroid-sphinx-theme==0.0.3
 sphinx_rtd_theme==1.2.0
 
 [lint]
-mypy==1.6.1
-mypy-extensions==1.0.0
-tomli==2.0.1
-typing_extensions==4.7.1
-black[jupyter]==23.10.1
-click==8.1.3
-packaging==23.2
-pathspec==0.11.1
-platformdirs==3.5.1
-isort==5.12.0
+ansible-lint==6.22.1
+black==23.11.0
+cfn-lint==0.83.3
+cpplint==1.6.1
 flake8==6.0.0
-mccabe==0.7.0
-pycodestyle==2.10.0
-pyflakes==3.0.1
-pandas-stubs<3,>2
-types-tqdm<5,>4
+isort==5.12.0
+mypy==1.7.1
+sqlfluff==2.3.5
+yamllint==1.33.0
+yq==3.2.3
 
 [test]
 coveralls
 pytest
+openapi-core

{py_pilecore-0.6.0 → py_pilecore-0.7.1}/src/pypilecore/_version.py

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

{py_pilecore-0.6.0 → py_pilecore-0.7.1}/src/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

{py_pilecore-0.6.0 → py_pilecore-0.7.1}/src/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

{py_pilecore-0.6.0 → py_pilecore-0.7.1}/src/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]