Merge branch 'refs/heads/main' into release/0.17

Author: gmalinve

CONTRIBUTORS.md

@@ -59,8 +59,8 @@
 * [Jonathan Velasco](https://github.com/jvela018)
 * [Jorge Martínez](https://github.com/jorgepiloto)
 * [Josh Salant](https://github.com/jsalant22)
-* [Karan Bhagat](https://github.com/kbhagat-ansys)
 * [Karan Bhagat](https://github.com/kbhagat2)
+* [Karan Bhagat](https://github.com/kbhagat-ansys)
 * [Kathy Pippert](https://github.com/PipKat)
 * [kmahajan-cadfem](https://github.com/kmahajan-cadfem)
 * [lollipop](https://github.com/cutelolly)

doc/changelog.d/6293.dependencies.md

@@ -0,0 +1 @@
+Update grpcio requirement from <1.73,>=1.50.0 to >=1.50.0,<1.74

doc/changelog.d/6295.documentation.md

@@ -0,0 +1 @@
+Update ``contributors.md`` with the latest contributors

doc/changelog.d/6297.maintenance.md

@@ -0,0 +1 @@
+Update changelog for v0.17.3

doc/changelog.d/6299.fixed.md

@@ -0,0 +1 @@
+Parametrics fix in add_from_file for maxwell

doc/changelog.d/6302.documentation.md

@@ -0,0 +1 @@
+Fix url link after changes

pyproject.toml

@@ -35,7 +35,7 @@ classifiers = [
 
 dependencies = [
     "fpdf2",
-    "grpcio>=1.50.0,<1.73",
+    "grpcio>=1.50.0,<1.74",
     "jsonschema",
     "psutil",
     "pyedb>=0.4.0; python_version == '3.7'",

src/ansys/aedt/core/extensions/project/configure_layout.py

@@ -55,7 +55,9 @@
 EXTENSION_TITLE = "Configure Layout"
 GRID_PARAMS = {"padx": 10, "pady": 10}
 
-INTRO_LINK = "https://aedt.docs.pyansys.com/version/stable/User_guide/pyaedt_extensions_doc/project/configure_edb.html"
+INTRO_LINK = (
+    "https://aedt.docs.pyansys.com/version/stable/User_guide/pyaedt_extensions_doc/project/configure_layout.html"
+)
 GUIDE_LINK = "https://examples.aedt.docs.pyansys.com/version/dev/examples/00_edb/use_configuration/index.html"
 
 

src/ansys/aedt/core/modules/design_xploration.py

@@ -24,6 +24,7 @@
 
 import copy
 import csv
+from pathlib import Path
 from typing import Any
 from typing import Dict
 from typing import Optional
@@ -1078,75 +1079,52 @@ def delete(self, name):
 
     @pyaedt_function_handler(filename="input_file", parametricname="name")
     def add_from_file(self, input_file, name=None):
-        """Add a Parametric Setup from a csv file.
+        """Add a Parametric setup from either a csv or txt file.
 
         Parameters
         ----------
         input_file : str
-            Csv file path.
+            ``.csv`` or ``.txt`` file path.
         name : str, option
             Name of parametric setup.
 
         Returns
         -------
         bool
-            `True` if the import is executed correctly.
+            ``True`` if the import is executed correctly. ``False`` if it failed.
         """
         if not name:
             name = generate_unique_name("Parametric")
         setup = SetupParam(self._app, name, optim_type="OptiParametric")
         setup.auto_update = False
         setup.props["Sim. Setups"] = [setup_defined.name for setup_defined in self._app.setups]
+
+        file_path = Path(input_file)
+        if file_path.suffix not in [".csv", ".txt"]:
+            raise ValueError("Input file must be a CSV or TXT file.")
+
         with open_file(input_file, "r") as csvfile:
             csvreader = csv.DictReader(csvfile)
             first_data_line = next(csvreader)
-            setup.props["Sweeps"] = {"SweepDefinition": {}}
-            sweep_definition = []
-            for var_name in csvreader.fieldnames:
-                if var_name != "*":
-                    sweep_definition.append(
-                        {
-                            "Variable": var_name,
-                            "Data": first_data_line[var_name],
-                            "OffsetF1": False,
-                            "Synchronize": 0,
-                        }
-                    )
-            setup.props["Sweeps"]["SweepDefinition"] = sweep_definition
-
-            args = ["NAME:" + name]
-            _dict2arg(setup.props, args)
-
-            setup.props["Sweep Operations"] = {"add": []}
-            table = []
-            for var_name in csvreader.fieldnames:
-                if var_name != "*":
-                    table.append(first_data_line[var_name])
-            table = [table]
-            for line in csvreader:
-                table_line = []
-                for var_name in csvreader.fieldnames:
-                    if var_name != "*":
-                        table_line.append(line[var_name])
-                table.append(table_line)
-
-            if len(table) > 1:
-                for point in table[1:]:
-                    setup.props["Sweep Operations"]["add"].append(point)
-
-        cont = 0
-        for data in args:
-            if isinstance(data, list) and "NAME:Sweep Operations" in data:
-                del args[cont]
-                args.append(["NAME:Sweep Operations"])
-                break
-            cont += 1
-
-        for variation in setup.props["Sweep Operations"].get("add", []):
-            args[-1].append("add:=")
-            args[-1].append(variation)
-
-        self.optimodule.InsertSetup("OptiParametric", args)
+            sweep_definition = [
+                {
+                    "Variable": var_name,
+                    "Data": first_data_line[var_name],
+                    "OffsetF1": False,
+                    "Synchronize": 0,
+                }
+                for var_name in csvreader.fieldnames
+                if var_name != "*"
+            ]
+            setup.props["Sweeps"] = {"SweepDefinition": sweep_definition}
+
+            table = [[line[var_name] for var_name in csvreader.fieldnames if var_name != "*"] for line in csvreader]
+            if table:
+                setup.props["Sweep Operations"] = {"add": table}
+
+        args = ["NAME:" + name, input_file]
+        self.optimodule.ImportSetup("OptiParametric", args)
+
         self.setups.append(setup)
         return True
 

tests/system/general/test_11_Setup.py

@@ -240,6 +240,8 @@ def test_25a_create_parametrics(self):
         assert self.aedtapp.parametrics.add_from_file(
             os.path.join(self.local_scratch.path, "test.csv"), "ParametricsfromFile"
         )
+        with pytest.raises(ValueError):
+            self.aedtapp.parametrics.add_from_file("test.invalid", "ParametricsfromFile")
         oo = self.aedtapp.get_oo_object(self.aedtapp.odesign, r"Optimetrics\ParametricsfromFile")
         assert oo
         assert self.aedtapp.parametrics.delete("ParametricsfromFile")