Changeset a22d104 in sasmodels for sasmodels/generate.py

Timestamp:

Mar 2, 2018 5:18:44 PM (6 years ago)

Author:

krzywon

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2f733b1

Parents:

fc3ae1b

Message:

If cannot find built-in model, try plugin path.

File:

• sasmodels/generate.py (modified) (2 diffs)

sasmodels/generate.py

@@ -169 +169 @@
 
 import sys
-from os.path import abspath, dirname, join as joinpath, exists, getmtime
+from os import environ
+from os.path import abspath, dirname, join as joinpath, exists, getmtime, sep
 import re
 import string
@@ -897 +898 @@
     load it from :mod:`sasmodels.models`.
     """
+    # TODO: Keep current scheme (.py looks in custom folders)
+    plugin_path = environ.get('PLUGIN_MODEL_DIR', None)
     if model_name.endswith('.py'):
         kernel_module = load_custom_kernel_module(model_name)
     else:
-        from sasmodels import models
-        __import__('sasmodels.models.'+model_name)
-        kernel_module = getattr(models, model_name, None)
+        try:
+            from sasmodels import models
+            __import__('sasmodels.models.'+model_name)
+            kernel_module = getattr(models, model_name, None)
+        except Exception:
+            if plugin_path is not None:
+                file_name = model_name.split(sep)[-1]
+                model_name = plugin_path + sep + file_name + ".py"
+            kernel_module = load_custom_kernel_module(model_name)
     return kernel_module