Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix kit problems with search path logic and module reload #402

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Fix kit problems with search path logic and module reload #402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/ansys/pyensight/core/exts/ansys.geometry.service/ansys/geometry/service/extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,30 @@
At this point, the name should be: {something}\ansys\pyensight\core\exts
Check for the fragments in the right order.
"""
offsets = []
for name in ["ansys", "pyensight", "core", "exts"]:
offsets.append(kit_dir.find(name))
# if the order of the names in correct and there is no -1 in the offsets, we found it
if (sorted(offsets) == offsets) and (sorted(offsets)[0] != -1):
tmp_kit_dir = kit_dir
valid_dir = True
for name in ["exts", "core", "pyensight", "ansys"]:
if not tmp_kit_dir.endswith(name):
valid_dir = False
tmp_kit_dir = os.path.dirname(tmp_kit_dir)
if valid_dir:
# name of 'ansys/pyensight/core' directory. We need three levels above.
name = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(kit_dir))))
sys.path.insert(0, name)
logging.info(f"Using ansys.pyensight.core from: {name}")
logging.warning(f"Using ansys.pyensight.core from: {name}")

# at this point, we may need to repeat the imports that make have failed earlier
import ansys.pyensight.core # noqa: F811, E402
import ansys.pyensight.core.utils.dsg_server as dsg_server # noqa: E402
import ansys.pyensight.core.utils.omniverse_dsg_server as ov_dsg_server # noqa: E402

# force a reload if we changed the path or had a partial failure that lead
# to a pipapi install.
_ = reload(ansys.pyensight.core)
_ = reload(ansys.pyensight.core.utils)
import ansys.pyensight.core.utils.dsg_server as dsg_server # noqa: E402

_ = reload(ansys.pyensight.core.utils.dsg_server)
import ansys.pyensight.core.utils.omniverse_dsg_server as ov_dsg_server # noqa: E402

_ = reload(ansys.pyensight.core.utils.omniverse_dsg_server)

logging.warning(f"Using ansys.pyensight.core from: {ansys.pyensight.core.__file__}")
Expand Down
Loading