Merge/retro/refactor actions grpc

.github/workflows/ci.yml

@@ -35,21 +35,85 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: "Build Package"
-        uses: pyansys/pydpf-actions/build_package@v2.2
+        uses: pyansys/pydpf-actions/build_package@v2.2.dev1
         with:
           python-version: ${{ matrix.python-version }}
           ANSYS_VERSION: ${{env.ANSYS_VERSION}}
           PACKAGE_NAME: ${{env.PACKAGE_NAME}}
           MODULE: ${{env.MODULE}}
           dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
           install_extras: plotting
-          wheelhouse: "false"
+          wheelhouse: false
+          extra-pip-args: "--pre --find-links .github/workflows/"
 
-      - name: "Test Package"
-        uses: pyansys/pydpf-actions/test_package@v2.2.dev0
+      - name: "Prepare Testing Environment"
+        uses: pyansys/pydpf-actions/prepare_tests@v2.2
+        with:
+          DEBUG: true
+
+      - name: "Test Docstrings"
+        uses: pyansys/pydpf-actions/test_docstrings@v2.2
         with:
           MODULE: ${{env.MODULE}}
-          DEBUG: True
+          PACKAGE_NAME: ${{env.PACKAGE_NAME}}
+
+      - name: "Separate long Core tests"
+        shell: pwsh
+        run: |
+          New-Item -Path ".\" -Name "local_server_test" -ItemType "directory"
+          New-Item -Path ".\" -Name "test_workflow" -ItemType "directory"
+          Copy-Item -Path "tests\conftest.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\conftest.py" -Destination ".\test_workflow\"
+          Copy-Item -Path "tests\test_launcher.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_server.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_local_server.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_multi_server.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_workflow.py" -Destination ".\test_workflow\"
+          Copy-Item -Path "tests\test_remote_workflow.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_remote_operator.py" -Destination ".\local_server_test\"
+          Remove-Item -Path "tests\test_server.py"
+          Remove-Item -Path "tests\test_launcher.py"
+          Remove-Item -Path "tests\test_local_server.py"
+          Remove-Item -Path "tests\test_multi_server.py"
+          Remove-Item -Path "tests\test_workflow.py"
+          Remove-Item -Path "tests\test_remote_workflow.py"
+          Remove-Item -Path "tests\test_remote_operator.py"
+
+      - name: "Test API"
+        shell: bash
+        working-directory: tests
+        run: |
+          pytest $DEBUG --cov=ansys.dpf.${{env.MODULE}} --cov-report=xml --cov-report=html --log-level=ERROR --junitxml=junit/test-results.xml --reruns 2 .
+
+      - name: "Kill all servers"
+        uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
+
+      - name: "Test API 2"
+        shell: bash
+        working-directory: local_server_test
+        run: |
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml --reruns 2 .
+
+      - name: "Kill all servers"
+        uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
+
+      - name: "Test API 3"
+        shell: bash
+        working-directory: test_workflow
+        run: |
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results3.xml --reruns 3 .
+
+      - name: "Kill all servers"
+        uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
+
+      - name: "Upload Test Results"
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.PACKAGE_NAME }}_pytest
+          path: tests/junit/test-results.xml
+
+      - name: "Upload coverage to Codecov"
+        uses: codecov/codecov-action@v2
 
       - name: 'Upload to PyPi'
         if: contains(github.ref, 'refs/tags')
@@ -75,38 +139,18 @@ jobs:
         with:
           python-version: 3.8
 
-      - id: install-dpf
-        uses: pyansys/pydpf-actions/install-dpf-server@v2.2
+      - name: "Build Package"
+        id: build-package
+        uses: pyansys/pydpf-actions/build_package@v2.2.dev1
         with:
+          python-version: ${{ matrix.python-version }}
+          ANSYS_VERSION: ${{env.ANSYS_VERSION}}
+          PACKAGE_NAME: ${{env.PACKAGE_NAME}}
+          MODULE: ${{env.MODULE}}
           dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
-          ANSYS_VERSION : ${{env.ANSYS_VERSION}}
-
-      - name: Set AWP_ROOT$env:ANSYS_VERSION
-        run: echo "AWP_ROOT$env:ANSYS_VERSION=${{ steps.install-dpf.outputs.SERVER }}"  | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
-
-      - name: Set SERVER
-        run: echo "SERVER=$env:AWP_ROOT221"  | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
-
-      - name: "Install gatebin Windows"
-        working-directory: .github\workflows
-        run: pip install ansys_dpf_gatebin-0.1.dev1-py3-none-win_amd64.whl
-
-      - name: "Install pygate"
-        working-directory: .github\workflows
-        run: |
-          pip install ansys_dpf_gate-0.1.dev1-py3-none-any.whl
-          pip install ansys_grpc_dpf-0.5.dev1-py3-none-any.whl
-
-      - name: Install ansys-dpf-core
-        shell: cmd
-        run: |
-          pip install -r requirements/requirements_build.txt
-          python setup.py bdist_wheel
-          FOR /F %%a in ('dir /s/b dist\*.whl') do SET WHEELPATH=%%a
-          ECHO %WHEELPATH%
-          cd tests
-          pip install %WHEELPATH%
-          python -c "from ansys.dpf import core"
+          install_extras: plotting
+          wheelhouse: false
+          extra-pip-args: "--pre --find-links .github/workflows/"
 
       - name: Install OpenGL
         run: |

.github/workflows/retro.yml

@@ -28,19 +28,70 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: "Build Package"
-        uses: pyansys/pydpf-actions/build_package@v2.2
+        uses: pyansys/pydpf-actions/build_package@v2.2.dev1
         with:
           python-version: ${{ matrix.python-version }}
           ANSYS_VERSION: ${{env.ANSYS_VERSION}}
           PACKAGE_NAME: ${{env.PACKAGE_NAME}}
           MODULE: ${{env.MODULE}}
           dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
           install_extras: plotting
-          wheel: "false"
-          wheelhouse: "false"
+          wheel: false
+          extra-pip-args: "--pre --find-links .github/workflows/"
+
+      - name: "Install ansys-grpc-dpf==0.4.0"
+        shell: pwsh
+        run: |
+          pip install ansys-grpc-dpf==0.4.0
 
-      - name: "Test Package"
-        uses: pyansys/pydpf-actions/test_package@v2.2.dev0
+      - name: "Prepare Testing Environment"
+        uses: pyansys/pydpf-actions/prepare_tests@v2.2
         with:
-          MODULE: ${{env.MODULE}}
-          DOCTEST: "false"
+          DEBUG: true
+
+      - name: "Separate long Core tests"
+        shell: pwsh
+        run: |
+          New-Item -Path ".\" -Name "local_server_test" -ItemType "directory"
+          Copy-Item -Path "tests\conftest.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_launcher.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_server.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_local_server.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_multi_server.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_workflow.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_remote_workflow.py" -Destination ".\local_server_test\"
+          Copy-Item -Path "tests\test_remote_operator.py" -Destination ".\local_server_test\"
+          Remove-Item -Path "tests\test_server.py"
+          Remove-Item -Path "tests\test_launcher.py"
+          Remove-Item -Path "tests\test_local_server.py"
+          Remove-Item -Path "tests\test_multi_server.py"
+          Remove-Item -Path "tests\test_workflow.py"
+          Remove-Item -Path "tests\test_remote_workflow.py"
+          Remove-Item -Path "tests\test_remote_operator.py"
+
+      - name: "Test API"
+        shell: bash
+        working-directory: tests
+        run: |
+          pytest $DEBUG --cov=ansys.dpf.${{env.MODULE}} --cov-report=xml --cov-report=html --log-level=ERROR --junitxml=junit/test-results.xml --reruns 2 .
+
+      - name: "Kill all servers"
+        uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
+
+      - name: "Test API 2"
+        shell: bash
+        working-directory: local_server_test
+        run: |
+          pytest $DEBUG --cov=ansys.dpf.core --cov-report=xml --cov-report=html --cov-append --log-level=ERROR --junitxml=../tests/junit/test-results2.xml --reruns 2 .
+
+      - name: "Kill all servers"
+        uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
+
+      - name: "Upload Test Results"
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.PACKAGE_NAME }}_pytest
+          path: tests/junit/test-results.xml
+
+      - name: "Upload coverage to Codecov"
+        uses: codecov/codecov-action@v2

ansys/dpf/core/_version.py

@@ -7,8 +7,8 @@
 min_server_version = "2.0"
 
 server_to_ansys_grpc_dpf_version = {
-    "1.0": "0.2.2",
-    "2.0": "0.3.0",
+    "1.0": "==0.2.2",
+    "2.0": "==0.3.0",
     "3.0": ">=0.4.0",
     "4.0": ">=0.5.0",
 }

ansys/dpf/core/data_tree.py

@@ -83,13 +83,15 @@ def __init__(self, data=None, data_tree=None, server=None):
         # step 2: get api
         self._api_instance = None  # see property self._api
 
-        # step3: init environment
-        self._api.init_dpf_data_tree_environment(self)  # creates stub when gRPC
-
         # step4: if object exists, take the instance, else create it
         if data_tree is not None:
+            if not isinstance(data_tree, dict):
+                # step3: init environment
+                self._api.init_dpf_data_tree_environment(self)  # creates stub when gRPC
             self._internal_obj = data_tree
         else:
+            # step3: init environment
+            self._api.init_dpf_data_tree_environment(self)  # creates stub when gRPC
             if self._server.has_client():
                 self._internal_obj = self._api.dpf_data_tree_new_on_client(self._server.client)
             else:

ansys/dpf/core/misc.py

@@ -122,8 +122,6 @@ def find_ansys():
     for version in sorted(versions, reverse=True):
         if not version.isnumeric():
             continue
-        if version == __ansys_version__:
-            continue
         elif version < __ansys_version__:
             ansys_path = os.environ.get("AWP_ROOT" + version)
             if ansys_path:

ansys/dpf/core/server_types.py

@@ -234,7 +234,7 @@ def _compare_ansys_grpc_dpf_version(right_grpc_module_version_str: str, grpc_mod
         from packaging.version import parse as parse_version
         right_version_first_numbers = re.search(r"\d", right_grpc_module_version_str)
         right_version_numbers = right_grpc_module_version_str[
-                                right_version_first_numbers.start():-1]
+                                right_version_first_numbers.start():]
         compare = "==" if right_version_first_numbers.start() == 0 else \
             right_grpc_module_version_str[0:right_version_first_numbers.start()].strip()
         if compare == "==":
@@ -282,7 +282,7 @@ def check_ansys_grpc_dpf_version(server, timeout):
                             f"{compatibility_link} while still using DPF server {server_version}, "
                             f"please install version {right_grpc_module_version} of ansys-grpc-dpf"
                             f" with the command: \n"
-                            f"     pip install ansys-grpc-dpf=={right_grpc_module_version}"
+                            f"     pip install ansys-grpc-dpf{right_grpc_module_version}"
                             )
 
 
@@ -754,13 +754,7 @@ def __init__(
     def _create_shutdown_funcs(self):
         self._core_api = data_processing_grpcapi.DataProcessingGRPCAPI
         self._core_api.init_data_processing_environment(self)
-        from ansys.grpc.dpf import base_pb2
-        self._preparing_shutdown_func = (
-            data_processing_grpcapi._get_stub(self).PrepareShutdown, base_pb2.Empty()
-        )
-        self._shutdown_func = (
-            data_processing_grpcapi._get_stub(self).ReleaseServer, base_pb2.Empty()
-        )
+        self._core_api.bind_delete_server_func(self)
 
     @property
     def client(self):

tests/conftest.py

@@ -276,6 +276,25 @@ def remote_config_server_type(request):
     def server_type_legacy_grpc(request):
         return core.start_local_server(config=request.param, as_global=False)
 
+    @pytest.fixture(scope="session", params=[ServerConfig(protocol=CommunicationProtocols.gRPC,
+                                                          legacy=True),
+                                             ServerConfig(protocol=CommunicationProtocols.gRPC,
+                                                          legacy=False)],
+                    ids=[
+                        "ansys-grpc-dpf config",
+                        "gRPC CLayer config"
+                    ])
+    def remote_config_server_type(request):
+        return request.param
+
+    @pytest.fixture(scope="session", params=[ServerConfig(protocol=CommunicationProtocols.gRPC,
+                                                          legacy=True)],
+                    ids=[
+                        "ansys-grpc-dpf",
+                    ])
+    def server_type_legacy_grpc(request):
+        return core.start_local_server(config=request.param, as_global=False)
+
 else:
 
     @pytest.fixture(scope="session")
@@ -339,8 +358,6 @@ def server_clayer(request):
     ):
         core.settings.get_runtime_client_config(server).cache_enabled = False
     return server
-
-
 class LocalServers:
     def __init__(self):
         self._local_servers = []

tests/test_meshregion.py

@@ -198,27 +198,6 @@ def test_get_connectivities_field_meshedregion(simple_bar_model):
     assert np.allclose(connectivity.data, field_connect.data)
 
 
-@conftest.raises_for_servers_version_under("3.0")
-def test_set_connectivities_field_meshed_region(simple_bar_model):
-    mesh = simple_bar_model.metadata.meshed_region
-    connectivity = mesh.elements.connectivities_field
-    new_connectivity_data = connectivity.data
-    assert new_connectivity_data[0] == 1053
-    new_connectivity_data[0] = 0
-    connectivity.data = new_connectivity_data
-    mesh.elements.connectivities_field = connectivity
-    connectivity = mesh.elements.connectivities_field
-    assert connectivity.data[0] == 0
-
-    new_connectivity_data[0] = 1
-    connectivity.data = new_connectivity_data
-    mesh.set_property_field(
-        dpf.core.common.elemental_properties.connectivity, connectivity
-    )
-    connectivity = mesh.elements.connectivities_field
-    assert connectivity.data[0] == 1
-
-
 def test_get_nodes_meshedregion(simple_bar_model):
     mesh = simple_bar_model.metadata.meshed_region
     node = mesh.nodes.node_by_id(1)