Allows custom file model to accept pathlib.Path objects

RascalSoftware · Jun 20, 2024 · 082e3f1 · 082e3f1
1 parent c62bdc1
commit 082e3f1
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/RAT/examples/absorption/absorption.py b/RAT/examples/absorption/absorption.py
@@ -80,7 +80,7 @@
 
 # Add the custom file
 problem.custom_files.append(name="DPPC absorption", filename="volume_thiol_bilayer.py", language="python",
-                            path=str(pathlib.Path(__file__).parent.resolve()))
+                            path=pathlib.Path(__file__).parent.resolve())
 
 # Finally add the contrasts
 problem.contrasts.append(name="D2O Down", data="D2O_dn", background="Background 1", bulk_in="Silicon",

diff --git a/RAT/examples/domains/domains_XY.py → RAT/examples/domains/domains_custom_XY.py b/RAT/examples/domains/domains_XY.py → RAT/examples/domains/domains_custom_XY.py
@@ -21,7 +21,7 @@
 
 # Add the custom file
 problem.custom_files.append(name="Domain Layer", filename="domains_XY_model.py", language="python",
-                            path=str(pathlib.Path(__file__).parent.resolve()))
+                            path=pathlib.Path(__file__).parent.resolve())
 
 # Make contrasts
 problem.contrasts.append(name="D2O", background="Background 1", resolution="Resolution 1", scalefactor="Scalefactor 1",

diff --git a/RAT/examples/domains/domains_custom_layers.py b/RAT/examples/domains/domains_custom_layers.py
@@ -21,7 +21,7 @@
 
 # Add the custom file
 problem.custom_files.append(name="Alloy domains", filename="alloy_domains.py", language="python",
-                            path=str(pathlib.Path(__file__).parent.resolve()))
+                            path=pathlib.Path(__file__).parent.resolve())
 
 # Make a contrast
 problem.contrasts.append(name="D2O Contrast", data="Simulation", background="Background 1", bulk_in="Silicon",

diff --git a/RAT/examples/domains/standard_layers.py → ...amples/domains/domains_standard_layers.py b/RAT/examples/domains/standard_layers.py → ...amples/domains/domains_standard_layers.py
diff --git a/RAT/examples/languages/run_custom_file_languages.py b/RAT/examples/languages/run_custom_file_languages.py
@@ -5,6 +5,8 @@
 import setup_problem
 import time
 
+path = pathlib.Path(__file__).parent.resolve()
+
 project = setup_problem.make_example_problem()
 controls = RAT.set_controls()
 
@@ -17,8 +19,7 @@
 RAT.utils.plotting.plot_ref_sld(project, results)
 
 # Matlab
-project.custom_files.set_fields(0, filename='custom_bilayer.m', language='matlab',
-                                path=str(pathlib.Path(__file__).parent.resolve()))
+project.custom_files.set_fields(0, filename='custom_bilayer.m', language='matlab', path=path)
 
 start = time.time()
 project, results = RAT.run(project, controls)
@@ -28,8 +29,7 @@
 RAT.utils.plotting.plot_ref_sld(project, results)
 
 # C++
-project.custom_files.set_fields(0, filename='custom_bilayer.dll', language='cpp',
-                                path=str(pathlib.Path(__file__).parent.resolve()))
+project.custom_files.set_fields(0, filename='custom_bilayer.dll', language='cpp', path=path)
 
 start = time.time()
 project, results = RAT.run(project, controls)

diff --git a/RAT/examples/languages/setup_problem.py b/RAT/examples/languages/setup_problem.py
@@ -51,7 +51,7 @@ def make_example_problem():
 
     # Add the custom file to the project
     problem.custom_files.append(name="DSPC Model", filename="custom_bilayer.py", language="python",
-                                path=str(pathlib.Path(__file__).parent.resolve()))
+                                path=pathlib.Path(__file__).parent.resolve())
 
     # Also, add the relevant background parameters - one each for each contrast:
     problem.background_parameters.set_fields(0, name="Background parameter D2O", fit=True, min=1.0e-10, max=1.0e-5,

diff --git a/RAT/examples/non_polarised/DSPC_custom_XY.py b/RAT/examples/non_polarised/DSPC_custom_XY.py
@@ -69,7 +69,7 @@
 
 # Add the custom file to the project
 problem.custom_files.append(name="DSPC Model", filename="custom_XY_DSPC.py", language="python",
-                            path=str(pathlib.Path(__file__).parent.resolve()))
+                            path=pathlib.Path(__file__).parent.resolve())
 
 # Also, add the relevant background parameters - one each for each contrast:
 problem.background_parameters.set_fields(0, name="Background parameter D2O", fit=True, min=1.0e-10, max=1.0e-5,

diff --git a/RAT/examples/non_polarised/DSPC_custom_layers.py b/RAT/examples/non_polarised/DSPC_custom_layers.py
@@ -49,7 +49,7 @@
 
 # Add the custom file to the project
 problem.custom_files.append(name="DSPC Model", filename="custom_bilayer_DSPC.py", language="python",
-                            path=str(pathlib.Path(__file__).parent.resolve()))
+                            path=pathlib.Path(__file__).parent.resolve())
 
 # Also, add the relevant background parameters - one each for each contrast:
 problem.background_parameters.set_fields(0, name="Background parameter D2O", fit=True, min=1.0e-10, max=1.0e-5, value=1.0e-07)

diff --git a/RAT/models.py b/RAT/models.py
@@ -3,7 +3,7 @@
 import numpy as np
 from pydantic import BaseModel, Field, ValidationInfo, field_validator, model_validator
 import pathlib
-from typing import Any
+from typing import Any, Union
 
 from RAT.utils.enums import BackgroundActions, Hydration, Languages, Priors, TypeOptions
 
@@ -90,7 +90,7 @@ class CustomFile(RATModel):
     filename: str = ''
     function_name: str = ''
     language: Languages = Languages.Python
-    path: str = ''
+    path: Union[str, pathlib.Path] = ''
 
     def model_post_init(self, __context: Any) -> None:
         """If a "filename" is supplied but the "function_name" field is not set, the "function_name" should be set to