From 8d1c4a88c53038a31c6d9b8a3f93ab256701c689 Mon Sep 17 00:00:00 2001 From: dkunhamb Date: Fri, 17 Jan 2025 13:53:58 -0600 Subject: [PATCH 01/10] helper py not needed --- src/ansys/mechanical/core/mechanical.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index 6651f5ef8..ae37804c1 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1254,9 +1254,7 @@ def list_files(self): >>> files = mechanical.list_files() >>> for file in files: print(file) """ - result = self.run_python_script( - "import pymechanical_helpers\npymechanical_helpers.GetAllProjectFiles(ExtAPI)" - ) + result = self.run_python_script("""ExtAPI.DataModel.Project.FilePath""") files_out = result.splitlines() if not files_out: # pragma: no cover From e0783482ab5f8e243c821e99111676b2d99e68f7 Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Fri, 17 Jan 2025 19:56:34 +0000 Subject: [PATCH 02/10] chore: adding changelog file 1052.maintenance.md [dependabot-skip] --- doc/changelog.d/1052.maintenance.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/1052.maintenance.md diff --git a/doc/changelog.d/1052.maintenance.md b/doc/changelog.d/1052.maintenance.md new file mode 100644 index 000000000..8bc159fdd --- /dev/null +++ b/doc/changelog.d/1052.maintenance.md @@ -0,0 +1 @@ +Helper python file no longer needed \ No newline at end of file From b2d8531855ec70482527bde15b4868aa2880ef2e Mon Sep 17 00:00:00 2001 From: dkunhamb Date: Fri, 17 Jan 2025 15:03:35 -0600 Subject: [PATCH 03/10] update list --- src/ansys/mechanical/core/mechanical.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index ae37804c1..cf0cf919e 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1254,9 +1254,16 @@ def list_files(self): >>> files = mechanical.list_files() >>> for file in files: print(file) """ - result = self.run_python_script("""ExtAPI.DataModel.Project.FilePath""") - - files_out = result.splitlines() + list = [] + mechdbPath = self.run_python_script("""ExtAPI.DataModel.Project.FilePath""") + if mechdbPath != "": + list.append(mechdbPath) + rootDir = self.run_python_script("""ExtAPI.DataModel.Project.ProjectDirectory""") + + for dirPath, dirNames, fileNames in os.walk(rootDir): + for fileName in fileNames: + list.append(os.path.join(dirPath, fileName)) + files_out = "\n".join(list).splitlines() if not files_out: # pragma: no cover self.log_warning("No files listed") return files_out From 7a715d22ca79f709b9b9d30c71395d585501a634 Mon Sep 17 00:00:00 2001 From: dkunhamb Date: Fri, 31 Jan 2025 09:54:39 -0600 Subject: [PATCH 04/10] add prints --- src/ansys/mechanical/core/mechanical.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index b2abf57c4..6bf9729fe 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1269,11 +1269,13 @@ def list_files(self): if mechdbPath != "": list.append(mechdbPath) rootDir = self.run_python_script("""ExtAPI.DataModel.Project.ProjectDirectory""") - + print("-" * 50, rootDir) for dirPath, dirNames, fileNames in os.walk(rootDir): for fileName in fileNames: list.append(os.path.join(dirPath, fileName)) + print("-" * 50, files_out) files_out = "\n".join(list).splitlines() + print("-" * 50, files_out) if not files_out: # pragma: no cover self.log_warning("No files listed") return files_out From 46f0277b13c2aefce03fc26e1560f2ee50ea2b3b Mon Sep 17 00:00:00 2001 From: dkunhamb Date: Fri, 31 Jan 2025 10:12:01 -0600 Subject: [PATCH 05/10] add prints for lists --- src/ansys/mechanical/core/mechanical.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index 6bf9729fe..f6d0c7bc8 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1266,16 +1266,17 @@ def list_files(self): """ list = [] mechdbPath = self.run_python_script("""ExtAPI.DataModel.Project.FilePath""") + print("mechdb path if any", mechdbPath) if mechdbPath != "": list.append(mechdbPath) rootDir = self.run_python_script("""ExtAPI.DataModel.Project.ProjectDirectory""") - print("-" * 50, rootDir) + print("-" * 50, "rootDir -- ", rootDir) for dirPath, dirNames, fileNames in os.walk(rootDir): for fileName in fileNames: list.append(os.path.join(dirPath, fileName)) - print("-" * 50, files_out) + print("-" * 50, "list", list) files_out = "\n".join(list).splitlines() - print("-" * 50, files_out) + print("-" * 50, "list split", files_out) if not files_out: # pragma: no cover self.log_warning("No files listed") return files_out From 4cf4d41f91f9227931089a10ab519209fb95fdf6 Mon Sep 17 00:00:00 2001 From: Dipin Nair Date: Fri, 31 Jan 2025 12:24:28 -0500 Subject: [PATCH 06/10] list dir --- src/ansys/mechanical/core/mechanical.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index f6d0c7bc8..679fedbbf 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1270,13 +1270,18 @@ def list_files(self): if mechdbPath != "": list.append(mechdbPath) rootDir = self.run_python_script("""ExtAPI.DataModel.Project.ProjectDirectory""") - print("-" * 50, "rootDir -- ", rootDir) + if not os.path.exists(rootDir): + print(f"Error: rootDir {rootDir} does not exist") + print("-" * 10, "rootDir -- ", rootDir) + print("Directory listing of /tmp:") + print(os.listdir("/tmp")) + print(os.listdir(rootDir)) for dirPath, dirNames, fileNames in os.walk(rootDir): for fileName in fileNames: list.append(os.path.join(dirPath, fileName)) - print("-" * 50, "list", list) + print("-" * 10, "list", list) files_out = "\n".join(list).splitlines() - print("-" * 50, "list split", files_out) + print("-" * 10, "list split", files_out) if not files_out: # pragma: no cover self.log_warning("No files listed") return files_out From 45b910cc26289ce3cbc9b24cb8624a12b730ee50 Mon Sep 17 00:00:00 2001 From: Dipin Nair Date: Fri, 31 Jan 2025 12:55:10 -0500 Subject: [PATCH 07/10] more logs --- src/ansys/mechanical/core/mechanical.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index 679fedbbf..c4ce8bea1 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1264,6 +1264,14 @@ def list_files(self): >>> files = mechanical.list_files() >>> for file in files: print(file) """ + # result = self.run_python_script( + # "import pymechanical_helpers\npymechanical_helpers.GetAllProjectFiles(ExtAPI)" + # ) + + # files_out = result.splitlines() + # if not files_out: # pragma: no cover + # self.log_warning("No files listed") + # return files_out list = [] mechdbPath = self.run_python_script("""ExtAPI.DataModel.Project.FilePath""") print("mechdb path if any", mechdbPath) @@ -1273,8 +1281,12 @@ def list_files(self): if not os.path.exists(rootDir): print(f"Error: rootDir {rootDir} does not exist") print("-" * 10, "rootDir -- ", rootDir) + print('repeating project dir again') + rootDir = self.run_python_script("""ExtAPI.DataModel.Project.ProjectDirectory""") + if not os.path.exists(rootDir): + print(f"Error: rootDir {rootDir} does not exist") + print("-" * 10, "rootDir -- ", rootDir) print("Directory listing of /tmp:") - print(os.listdir("/tmp")) print(os.listdir(rootDir)) for dirPath, dirNames, fileNames in os.walk(rootDir): for fileName in fileNames: From 29292072638760bcc11fde3b1c4a322373f9775b Mon Sep 17 00:00:00 2001 From: Dipin Nair Date: Fri, 31 Jan 2025 13:37:04 -0500 Subject: [PATCH 08/10] add more prints --- src/ansys/mechanical/core/mechanical.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index c4ce8bea1..f4795f627 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1281,12 +1281,12 @@ def list_files(self): if not os.path.exists(rootDir): print(f"Error: rootDir {rootDir} does not exist") print("-" * 10, "rootDir -- ", rootDir) - print('repeating project dir again') + print("repeating project dir again") rootDir = self.run_python_script("""ExtAPI.DataModel.Project.ProjectDirectory""") if not os.path.exists(rootDir): - print(f"Error: rootDir {rootDir} does not exist") + print(f"Error: rootDir {rootDir} does not exist") print("-" * 10, "rootDir -- ", rootDir) - print("Directory listing of /tmp:") + print("Directory listing of tmp:") print(os.listdir(rootDir)) for dirPath, dirNames, fileNames in os.walk(rootDir): for fileName in fileNames: From e18d8bf3305a8e2d04ded7058af37b1cc85f3420 Mon Sep 17 00:00:00 2001 From: dkunhamb Date: Tue, 4 Feb 2025 15:51:38 -0600 Subject: [PATCH 09/10] update list_files with one run_python_script call --- src/ansys/mechanical/core/mechanical.py | 43 ++++++++----------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index f4795f627..3c29772f9 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1264,36 +1264,21 @@ def list_files(self): >>> files = mechanical.list_files() >>> for file in files: print(file) """ - # result = self.run_python_script( - # "import pymechanical_helpers\npymechanical_helpers.GetAllProjectFiles(ExtAPI)" - # ) - - # files_out = result.splitlines() - # if not files_out: # pragma: no cover - # self.log_warning("No files listed") - # return files_out - list = [] - mechdbPath = self.run_python_script("""ExtAPI.DataModel.Project.FilePath""") - print("mechdb path if any", mechdbPath) - if mechdbPath != "": - list.append(mechdbPath) - rootDir = self.run_python_script("""ExtAPI.DataModel.Project.ProjectDirectory""") - if not os.path.exists(rootDir): - print(f"Error: rootDir {rootDir} does not exist") - print("-" * 10, "rootDir -- ", rootDir) - print("repeating project dir again") - rootDir = self.run_python_script("""ExtAPI.DataModel.Project.ProjectDirectory""") - if not os.path.exists(rootDir): - print(f"Error: rootDir {rootDir} does not exist") - print("-" * 10, "rootDir -- ", rootDir) - print("Directory listing of tmp:") - print(os.listdir(rootDir)) - for dirPath, dirNames, fileNames in os.walk(rootDir): - for fileName in fileNames: - list.append(os.path.join(dirPath, fileName)) - print("-" * 10, "list", list) + list = self.run_python_script( + """import os +mechdbPath = ExtAPI.DataModel.Project.FilePath +list = [] +if mechdbPath != '': + list.append(mechdbPath) +rootDir = ExtAPI.DataModel.Project.ProjectDirectory +for dirPath, dirNames, fileNames in os.walk(rootDir): + for fileName in fileNames: + list.append(os.path.join(dirPath, fileName)) +list +""" + ) + print(list) files_out = "\n".join(list).splitlines() - print("-" * 10, "list split", files_out) if not files_out: # pragma: no cover self.log_warning("No files listed") return files_out From 8476b4cd0b5ddac0a73380e2a79dcc698a388f10 Mon Sep 17 00:00:00 2001 From: Dipin Nair Date: Wed, 5 Feb 2025 13:57:23 -0500 Subject: [PATCH 10/10] modify func and add prints --- src/ansys/mechanical/core/mechanical.py | 39 ++++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/ansys/mechanical/core/mechanical.py b/src/ansys/mechanical/core/mechanical.py index 3c29772f9..f123fb81d 100644 --- a/src/ansys/mechanical/core/mechanical.py +++ b/src/ansys/mechanical/core/mechanical.py @@ -1264,24 +1264,29 @@ def list_files(self): >>> files = mechanical.list_files() >>> for file in files: print(file) """ - list = self.run_python_script( - """import os -mechdbPath = ExtAPI.DataModel.Project.FilePath -list = [] -if mechdbPath != '': - list.append(mechdbPath) -rootDir = ExtAPI.DataModel.Project.ProjectDirectory -for dirPath, dirNames, fileNames in os.walk(rootDir): - for fileName in fileNames: - list.append(os.path.join(dirPath, fileName)) -list -""" - ) - print(list) - files_out = "\n".join(list).splitlines() - if not files_out: # pragma: no cover + # _list = self.run_python_script( + # """import os + # mechdbPath = ExtAPI.DataModel.Project.FilePath + # file_list = [] + # if mechdbPath != '': + # file_list.append(mechdbPath) + # rootDir = ExtAPI.DataModel.Project.ProjectDirectory + # """ + # ) + print("func list_files started") + file_list = [] + mechdbPath = self.run_python_script("""ExtAPI.DataModel.Project.FilePath""") + if mechdbPath != "": + file_list.append(mechdbPath) + rootDir = self.project_directory + for dirPath, dirNames, fileNames in os.walk(rootDir): + for fileName in fileNames: + file_list.append(os.path.join(dirPath, fileName)) + print(file_list) + print(type(file_list)) + if not file_list: # pragma: no cover self.log_warning("No files listed") - return files_out + return list(file_list) def _get_files(self, files, recursive=False): self_files = self.list_files() # to avoid calling it too much