🌐 AI搜索 & 代理 主页
Skip to content

Use uv and derive as much as possible from the environment, if available #2652

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
filmor merged 3 commits into from
Oct 25, 2025
Merged

Use uv and derive as much as possible from the environment, if available #2652

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d8bf26
Use uv
filmor Nov 25, 2024
9e6ffba
Derive program name from venv if possible
filmor Oct 25, 2025
3a3abb9
Implement venv derivation
filmor Oct 25, 2025
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
Prev Previous commit
Next Next commit
Derive program name from venv if possible
  • Loading branch information
@filmor
filmor committed Oct 25, 2025
commit 9e6ffba2de96c4ee5e53afcacd6d97bc35f8bf02
42 changes: 41 additions & 1 deletion src/runtime/Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Text;
using System.Threading;
using System.Collections.Generic;
using System.IO;
using Python.Runtime.Native;
using System.Linq;
using static System.FormattableString;
Expand Down Expand Up @@ -33,7 +34,8 @@ public static string? PythonDLL
private static string? GetDefaultDllName()
{
string dll = Environment.GetEnvironmentVariable("PYTHONNET_PYDLL");
if (dll is not null) return dll;
if (!string.IsNullOrEmpty(dll))
return dll;

string verString = Environment.GetEnvironmentVariable("PYTHONNET_PYVER");
if (!Version.TryParse(verString, out var version)) return null;
Expand Down Expand Up @@ -96,6 +98,42 @@ internal static int GetRun()
return runNumber;
}

static void EnsureProgramName()
{
if (!string.IsNullOrEmpty(PythonEngine.ProgramName))
return;

string fromEnv = Environment.GetEnvironmentVariable("PYTHONNET_PYEXE");
if (!string.IsNullOrEmpty(fromEnv))
{
PythonEngine.ProgramName = fromEnv;
return;
}

string venv = Environment.GetEnvironmentVariable("VIRTUAL_ENV");
if (!string.IsNullOrEmpty(venv))
{
if (IsWindows)
{
var path = Path.Combine(venv, "Scripts", "python.exe");
if (System.IO.File.Exists(path))
{
PythonEngine.ProgramName = path;
return;
}
}
else
{
var path = Path.Combine(venv, "bin", "python");
if (System.IO.File.Exists(path))
{
PythonEngine.ProgramName = path;
return;
}
}
}
}

internal static bool HostedInPython;
internal static bool ProcessIsTerminating;

Expand All @@ -117,6 +155,8 @@ internal static void Initialize(bool initSigs = false)
);
if (!interpreterAlreadyInitialized)
{
EnsureProgramName();

Py_InitializeEx(initSigs ? 1 : 0);

NewRun();
Expand Down
Loading