Skip to content

Allow RuntimeManager to load scripts stored as assembly resource files #6

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

Merged
glopesdev merged 2 commits into from
Feb 16, 2024
Merged

Allow RuntimeManager to load scripts stored as assembly resource files #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
254e8f5
Updated to load assembly locations
ncguilbeault Jan 22, 2024
c774db3
Apply suggestions from code review
ncguilbeault Feb 16, 2024
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
39 changes: 38 additions & 1 deletion src/Bonsai.Scripting.Python/RuntimeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System;
using System.IO;
using System.Reflection;
using System.Reactive.Concurrency;
using System.Reactive.Linq;
using Python.Runtime;
using SystemPath = System.IO.Path;

namespace Bonsai.Scripting.Python
{
Expand All @@ -13,6 +15,7 @@ namespace Bonsai.Scripting.Python
/// </summary>
public class RuntimeManager : IDisposable
{
const char AssemblySeparator = ':';
readonly EventLoopScheduler runtimeScheduler;
readonly IObserver<RuntimeManager> runtimeObserver;
IntPtr threadState;
Expand Down Expand Up @@ -40,6 +43,40 @@ internal RuntimeManager(string pythonHome, string scriptPath, IObserver<RuntimeM
disposable => disposable.Subject)
.Take(1);

static bool IsEmbeddedResourcePath(string path)
{
var separatorIndex = path.IndexOf(AssemblySeparator);
return separatorIndex >= 0 && !SystemPath.IsPathRooted(path);
}

static string ReadAllText(string path)
{
if (IsEmbeddedResourcePath(path))
{
var nameElements = path.Split(new[] { AssemblySeparator }, 2);
if (string.IsNullOrEmpty(nameElements[0]))
{
throw new InvalidOperationException(
"The embedded resource path \"" + path +
"\" must be qualified with a valid assembly name.");
}

var assembly = Assembly.Load(nameElements[0]);
var resourceName = string.Join(ExpressionHelper.MemberSeparator, nameElements);
using var resourceStream = assembly.GetManifestResourceStream(resourceName);
if (resourceStream == null)
{
throw new InvalidOperationException(
"The specified embedded resource \"" + nameElements[1] +
"\" was not found in assembly \"" + nameElements[0] + "\"");
}

using var reader = new StreamReader(resourceStream);
return reader.ReadToEnd();
}
else return File.ReadAllText(path);
}

internal static DynamicModule CreateModule(string name = "", string scriptPath = "")
{
using (Py.GIL())
Expand All @@ -49,7 +86,7 @@ internal static DynamicModule CreateModule(string name = "", string scriptPath =
{
try
{
var code = File.ReadAllText(scriptPath);
var code = ReadAllText(scriptPath);
module.Exec(code);
}
catch (Exception)
Expand Down