From 2b078672494dcb0953e5de4e1f10ef286c99a092 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Wed, 28 Feb 2024 02:35:41 -0800 Subject: [PATCH 01/10] chore: bump main branch version to 0.1.0.dev8 (#51) --- src/ansys/api/acp/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/api/acp/VERSION b/src/ansys/api/acp/VERSION index 696ca4b..8d76ca4 100644 --- a/src/ansys/api/acp/VERSION +++ b/src/ansys/api/acp/VERSION @@ -1 +1 @@ -0.1.0.dev7 +0.1.0.dev8 From afc5257c4b4a4d6785f8db55c4e7eba7f7712b2c Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Thu, 29 Feb 2024 09:49:30 +0100 Subject: [PATCH 02/10] Add CODEOWNERS file (#52) --- .github/CODEOWNERS | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..da6a91e --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,7 @@ +# This is a comment. +# Each line is a file pattern followed by one or more owners. + +# These owners will be the default owners for everything in +# the repo. Unless a later match takes precedence, +# Owners will be requested for review when someone opens a PR. +* @greschd @janvonrickenbach @roosre From cb1d2418413a39a8596a86a7cbd2c74a11bffdbf Mon Sep 17 00:00:00 2001 From: janvonrickenbach Date: Fri, 1 Mar 2024 10:57:15 +0100 Subject: [PATCH 03/10] add edge_set to rosettes (#53) --- src/ansys/api/acp/v0/rosette.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ansys/api/acp/v0/rosette.proto b/src/ansys/api/acp/v0/rosette.proto index 5d5dae2..d8536e7 100644 --- a/src/ansys/api/acp/v0/rosette.proto +++ b/src/ansys/api/acp/v0/rosette.proto @@ -42,6 +42,7 @@ message Properties { array_types.DoubleArray origin = 4; array_types.DoubleArray dir1 = 5; array_types.DoubleArray dir2 = 6; + base.ResourcePath edge_set = 7; } message ObjectInfo { From 0d46c798f8057cd0146e57a2db8d51500c25c511 Mon Sep 17 00:00:00 2001 From: janvonrickenbach Date: Mon, 4 Mar 2024 10:41:11 +0100 Subject: [PATCH 04/10] Feat/add ref direction table to oss (#54) --- src/ansys/api/acp/v0/oriented_selection_set.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ansys/api/acp/v0/oriented_selection_set.proto b/src/ansys/api/acp/v0/oriented_selection_set.proto index a809533..0e4fbe5 100644 --- a/src/ansys/api/acp/v0/oriented_selection_set.proto +++ b/src/ansys/api/acp/v0/oriented_selection_set.proto @@ -35,7 +35,7 @@ message Properties { array_types.DoubleArray orientation_direction = 4; repeated base.ResourcePath rosettes = 5; enum_types.RosetteSelectionMethod rosette_selection_method = 6; - // TODO: tabular values + repeated base.ResourcePath selection_rules = 7; // draping-related properties @@ -48,6 +48,7 @@ message Properties { ply_material.DrapingMaterialType draping_material_model = 14; double draping_ud_coefficient = 15; double rotation_angle = 16; + base.ResourcePath reference_direction_field = 17; } message ObjectInfo { From f3df29d73f0c4192bf197b817333ff7e598505f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 03:16:35 +0100 Subject: [PATCH 05/10] Bump softprops/action-gh-release from 1 to 2 (#57) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c5187d..675d913 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: twine-token: ${{ secrets.PYPI_TOKEN }} - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: generate_release_notes: true files: | From ce53c5a19c7ac108cafc5b32adb8c1ffc74900f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 07:55:21 +0100 Subject: [PATCH 06/10] Update protobuf requirement from <5,>=3.19 to >=3.19,<6 (#58) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d0d5b45..1fef10d 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ url=f"https://github.com/ansys/{package_name}", license="MIT", python_requires=">=3.7", - install_requires=["grpcio~=1.17", "protobuf>=3.19,<5"], + install_requires=["grpcio~=1.17", "protobuf>=3.19,<6"], package_dir={"": "src"}, packages=setuptools.find_namespace_packages("src", include=("ansys.*",)), package_data={ From 16f72303ed3b977609a20109adbc06cf48633bea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 00:09:22 +0100 Subject: [PATCH 07/10] Bump pre-commit from 3.6.2 to 3.7.0 (#59) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index c74ef55..6837283 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1 +1 @@ -pre-commit==3.6.2 +pre-commit==3.7.0 From 14487fcb3828ddf27a2593b76a5e8748a6474273 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:59:52 +0200 Subject: [PATCH 08/10] Bump ansys/actions from 5 to 6 (#60) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 675d913..ad249d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Build library source and wheel artifacts" - uses: ansys/actions/build-library@v5 + uses: ansys/actions/build-library@v6 with: library-name: ${{ env.PACKAGE_NAME }} @@ -47,7 +47,7 @@ jobs: if: github.event_name == 'push' && contains(github.ref, 'refs/tags') steps: - name: "Release to the public PyPI repository" - uses: ansys/actions/release-pypi-public@v5 + uses: ansys/actions/release-pypi-public@v6 with: library-name: ${{ env.PACKAGE_NAME }} twine-username: "__token__" From bcb342fb5b5b87844e5f2f23c57fc64a22a7be35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 10:03:55 +0200 Subject: [PATCH 09/10] Bump pre-commit from 3.7.0 to 3.7.1 (#61) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index 6837283..a93b8c1 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1 +1 @@ -pre-commit==3.7.0 +pre-commit==3.7.1 From 0bef076bd5703000b82c6bc817b73b50eab46594 Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Wed, 3 Jul 2024 08:14:17 +0200 Subject: [PATCH 10/10] Add API for Modeling Ply geometry export (#62) --- .pre-commit-config.yaml | 2 +- src/ansys/api/acp/VERSION | 2 +- src/ansys/api/acp/v0/enum_types.proto | 13 +++++ src/ansys/api/acp/v0/material.proto | 2 + src/ansys/api/acp/v0/modeling_ply.proto | 6 +++ .../api/acp/v0/ply_geometry_export.proto | 50 +++++++++++++++++++ src/ansys/api/acp/v0/solid_model.proto | 10 ++-- 7 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 src/ansys/api/acp/v0/ply_geometry_export.proto diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f7ca703..a8f6bd6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,4 +16,4 @@ repos: hooks: - id: add-license-headers args: - - --start_year=2022 \ No newline at end of file + - --start_year=2022 diff --git a/src/ansys/api/acp/VERSION b/src/ansys/api/acp/VERSION index 8d76ca4..c11082e 100644 --- a/src/ansys/api/acp/VERSION +++ b/src/ansys/api/acp/VERSION @@ -1 +1 @@ -0.1.0.dev8 +0.1.0.dev9 diff --git a/src/ansys/api/acp/v0/enum_types.proto b/src/ansys/api/acp/v0/enum_types.proto index dc2871f..4aaefa2 100644 --- a/src/ansys/api/acp/v0/enum_types.proto +++ b/src/ansys/api/acp/v0/enum_types.proto @@ -64,3 +64,16 @@ enum BooleanOperationType { ADD = 1; REMOVE = 2; } + +enum OffsetType { + NO_OFFSET = 0; + BOTTOM_OFFSET = 1; + MIDDLE_OFFSET = 2; + TOP_OFFSET = 3; +} + +enum ArrowType { + NO_ARROW = 0; + HALF_ARROW = 1; + STANDARD_ARROW = 2; +} diff --git a/src/ansys/api/acp/v0/material.proto b/src/ansys/api/acp/v0/material.proto index 1396e49..2ad551e 100644 --- a/src/ansys/api/acp/v0/material.proto +++ b/src/ansys/api/acp/v0/material.proto @@ -286,5 +286,7 @@ service ObjectService { rpc Create(CreateRequest) returns (ObjectInfo); + // Custom methods + rpc SaveToFile(SaveToFileRequest) returns (base.Empty); } diff --git a/src/ansys/api/acp/v0/modeling_ply.proto b/src/ansys/api/acp/v0/modeling_ply.proto index e586614..3a84d34 100644 --- a/src/ansys/api/acp/v0/modeling_ply.proto +++ b/src/ansys/api/acp/v0/modeling_ply.proto @@ -28,6 +28,7 @@ import "ansys/api/acp/v0/enum_types.proto"; import "ansys/api/acp/v0/array_types.proto"; import "ansys/api/acp/v0/ply_material.proto"; import "ansys/api/acp/v0/linked_selection_rule.proto"; +import "ansys/api/acp/v0/ply_geometry_export.proto"; enum ThicknessType { NOMINAL = 0; @@ -101,4 +102,9 @@ service ObjectService { rpc Delete(base.DeleteRequest) returns (base.Empty); rpc Create(CreateRequest) returns (ObjectInfo); + + // Custom methods + + rpc ExportGeometries(ply_geometry_export.ExportGeometriesRequest) + returns (base.Empty); } diff --git a/src/ansys/api/acp/v0/ply_geometry_export.proto b/src/ansys/api/acp/v0/ply_geometry_export.proto new file mode 100644 index 0000000..aab682a --- /dev/null +++ b/src/ansys/api/acp/v0/ply_geometry_export.proto @@ -0,0 +1,50 @@ +// Copyright (C) 2022 - 2024 ANSYS, Inc. and/or its affiliates. +// SPDX-License-Identifier: MIT +// +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +syntax = "proto3"; +package ansys.api.acp.v0.ply_geometry_export; + +import "ansys/api/acp/v0/base.proto"; +import "ansys/api/acp/v0/enum_types.proto"; + +enum ExportFormat { + STEP = 0; + IGES = 1; + STL = 2; +} + +message ExportOptions { + ExportFormat format = 1; + enum_types.OffsetType offset_type = 2; + bool include_boundary = 3; + bool include_surface = 4; + bool include_first_material_direction = 5; + bool include_second_material_direction = 6; + double arrow_length = 7; + enum_types.ArrowType arrow_type = 8; +} + +message ExportGeometriesRequest { + string path = 1; + repeated base.ResourcePath plies = 2; + ExportOptions options = 3; +} diff --git a/src/ansys/api/acp/v0/solid_model.proto b/src/ansys/api/acp/v0/solid_model.proto index 344ed06..5a1fbd9 100644 --- a/src/ansys/api/acp/v0/solid_model.proto +++ b/src/ansys/api/acp/v0/solid_model.proto @@ -59,15 +59,15 @@ message DropOffSettings { message ExportSettings { bool use_default_section_index = 1; - int32 section_index = 2; + int64 section_index = 2; bool use_default_coordinate_system_index = 3; - int32 coordinate_system_index = 4; + int64 coordinate_system_index = 4; bool use_default_material_index = 5; - int32 material_index = 6; + int64 material_index = 6; bool use_default_node_index = 7; - int32 node_index = 8; + int64 node_index = 8; bool use_default_element_index = 9; - int32 element_index = 10; + int64 element_index = 10; bool use_solsh_elements = 11; bool write_degenerated_elements = 12; bool drop_hanging_nodes = 13;