Move include munging into compile_stan_file, post-validation

Author: WardBrian

cmdstanpy/compilation.py

@@ -352,6 +352,18 @@ def compile_stan_file(
     )
     compiler_options.validate()
 
+    # if program has include directives, record path
+    if '#include' in src.read_text():
+        path = os.fspath(src.parent.resolve())
+        if 'include-paths' not in compiler_options.stanc_options:
+            compiler_options.stanc_options['include-paths'] = [path]
+        else:
+            paths: list[str] = compiler_options.stanc_options[
+                'include-paths'
+            ]  # type: ignore
+            if path not in paths:
+                paths.append(path)
+
     exe_target = src.with_suffix(EXTENSION)
     if exe_target.exists():
         exe_time = os.path.getmtime(exe_target)

cmdstanpy/model.py

@@ -168,18 +168,6 @@ def __init__(
                         ' found: {}.'.format(self._name, filename)
                     )
 
-            # if program has include directives, record path
-            with open(self._stan_file, 'r') as fd:
-                program = fd.read()
-            if '#include' in program:
-                path, _ = os.path.split(
-                    os.path.abspath(os.path.expanduser(self._stan_file))
-                )
-                if 'include-paths' not in self._stanc_options:
-                    self._stanc_options['include-paths'] = [path]
-                elif path not in self._stanc_options['include-paths']:
-                    self._stanc_options['include-paths'].append(path)
-
             self._exe_file = compilation.compile_stan_file(
                 str(self.stan_file),
                 force=force_compile,