Corrected Python env location in Linux

Author: Chris Maunder

.vscode/settings.json

@@ -26,12 +26,14 @@
         "colour",
         "colourised",
         "colours",
+        "computecap",
         "Consolas",
         "consoleloggerparameters",
         "CPAI",
         "createallsubdirs",
         "Crockford",
         "Cuda",
+        "cuDNN",
         "CUDNN",
         "Darkmode",
         "Denoising",
@@ -61,6 +63,9 @@
         "fouo",
         "generalise",
         "getframe",
+        "giga",
+        "gigaunit",
+        "gpuname",
         "HKCU",
         "HKLM",
         "hostbuilder",
@@ -82,18 +87,28 @@
         "Jetson",
         "keypair",
         "keypoints",
+        "kilounit",
         "labelledby",
         "Lanczos",
         "licence",
         "LOCALAPPDATA",
         "logicaldisk",
         "logvals",
+        "lproj",
         "maxs",
+        "megas",
+        "megaunit",
         "membuffer",
+        "memfree",
+        "memsize",
+        "memtotal",
         "memused",
         "millidegree",
+        "moduleid",
         "modulesettings",
         "nbsp",
+        "NETBIOS",
+        "noheader",
         "norestart",
         "normalises",
         "noscroll",
@@ -109,8 +124,10 @@
         "paddleocr",
         "parsejson",
         "peasy",
+        "physmem",
         "platenumber",
         "pluralise",
+        "PMIC",
         "popd",
         "postinst",
         "postprocess",
@@ -139,6 +156,7 @@
         "reqtype",
         "reso",
         "RKNN",
+        "Rockchip",
         "rocm",
         "rocminfo",
         "runhidden",
@@ -160,6 +178,9 @@
         "Tegra",
         "tegrastats",
         "tempstore",
+        "tera",
+        "teras",
+        "teraunit",
         "textreader",
         "tflite",
         "topbanner",
@@ -172,7 +193,10 @@
         "upsampling",
         "usebackq",
         "userid",
+        "usermem",
+        "utilisation",
         "utilise",
+        "vcgencmd",
         "venv",
         "vggish",
         "waitretry",

src/SDK/NET/Utils/SystemInfo.cs

@@ -251,6 +251,8 @@ public class SystemInfo
         private static string?       _dockerContainerId;
         private static string?       _osVersion;
         private static string?       _osName;
+        private static string?       _osFlavour;
+        private static string?       _osCodeName;
         private static bool          _isSSH;
         private static Runtimes      _runtimes = new Runtimes();
 
@@ -616,7 +618,32 @@ public static string HardwareVendor
         }
 
         /// <summary>
-        /// Gets the current Operating System name.
+        /// Gets a value indicating whether the current OS is Windows
+        /// </summary>
+        public static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+
+        /// <summary>
+        /// Gets a value indicating whether the current OS is Linux
+        /// </summary>
+        public static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+
+        /// <summary>
+        /// Gets a value indicating whether the current OS is macOS
+        /// </summary>
+        public static bool IsMacOS => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+
+        /// <summary>
+        /// Gets a value indicating whether the current OS is FreeBSD
+        /// </summary>
+        public static bool IsFreeBSD => RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD);
+
+        /// <summary>
+        /// Gets a value indicating whether we are currently running in Docker
+        /// </summary>
+        public static bool IsDocker => ExecutionEnvironment == ExecutionEnvironment.Docker;
+
+        /// <summary>
+        /// Gets the Operating System type. Specifically: Windows, Linux, macOS or FreeBSD.
         /// </summary>
         public static string OperatingSystem
         {
@@ -641,29 +668,20 @@ public static string OperatingSystem
         }
 
         /// <summary>
-        /// Gets a value indicating whether the current OS is Windows
-        /// </summary>
-        public static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-
-        /// <summary>
-        /// Gets a value indicating whether the current OS is Linux
-        /// </summary>
-        public static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
-
-        /// <summary>
-        /// Gets a value indicating whether the current OS is macOS
-        /// </summary>
-        public static bool IsMacOS => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
-
-        /// <summary>
-        /// Gets a value indicating whether the current OS is FreeBSD
+        /// Gets the actual name of the current Operating System name. eg Windows, Ubuntu, Debian.
         /// </summary>
-        public static bool IsFreeBSD => RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD);
+        public static string OperatingSystemName
+        {
+            get { return _osFlavour ?? string.Empty; }
+        }
 
         /// <summary>
-        /// Gets a value indicating whether we are currently running in Docker
+        /// Gets the current Operating System code name. eg Redstone, Jammy, Big Sur
         /// </summary>
-        public static bool IsDocker => ExecutionEnvironment == ExecutionEnvironment.Docker;
+        public static string OperatingSystemCodeName
+        {
+            get { return _osCodeName ?? string.Empty; }
+        }
 
         /// <summary>
         /// Returns the Operating System description, with corrections for Windows 11
@@ -672,26 +690,18 @@ public static string OperatingSystemDescription
         {
             get
             {
-                // WSL is Linux, so this isn't needed since the line below will handle it and do the
-                // same thing. However, it's here because we may want to report this differently.
-                if (IsWSL)
-                    return $"{_osName} {_osVersion}";
-
-                if (IsLinux)
-                    return $"{_osName} {_osVersion}";
+                string description;
+                if (OperatingSystemName.StartsWith(OperatingSystem))
+                    description = $"{OperatingSystem} ({OperatingSystem} {OperatingSystemVersion}";
+                else
+                    description = $"{OperatingSystem} ({OperatingSystemName} {OperatingSystemVersion}";
 
-                if (IsMacOS)
-                    return $"{_osName} {_osVersion}";
+                if (!OperatingSystemCodeName.StartsWith(OperatingSystem))
+                    description += $" \"{OperatingSystemCodeName}\"";
 
-                // See https://github.com/getsentry/sentry-dotnet/issues/1484. 
-                // C'mon guys: technically the version may be 10.x, but stick to the branding that
-                // the rest of the world understands.
-                if (IsWindows &&
-                    Environment.OSVersion.Version.Major >= 10 &&
-                    Environment.OSVersion.Version.Build >= 22000)
-                    return RuntimeInformation.OSDescription.Replace("Windows 10.", "Windows 11 version 10.");
+                description += ")";
 
-                return RuntimeInformation.OSDescription;
+                return description;
             }
         }
 
@@ -736,7 +746,7 @@ public static async Task InitializeAsync()
 
             await CheckForWslAsync().ConfigureAwait(false);
             await GetDockerContainerIdAsync().ConfigureAwait(false);
-            await CheckOSVersionNameAsync().ConfigureAwait(false);
+            await GetOsDetailsAsync().ConfigureAwait(false);
             await CheckForSshAsync().ConfigureAwait(false);
             await GetcuDNNVersionAsync().ConfigureAwait(false);
 
@@ -765,34 +775,34 @@ public static string GetSystemInfo()
             else
                 info.AppendLine($"System:           {SystemName}");
 
-            info.AppendLine($"Operating System: {OperatingSystem} ({OperatingSystemDescription})");
+            info.AppendLine($"Operating System: {OperatingSystemDescription}");
 
             if (CPU is not null)
             {
-                var cpus = new StringBuilder();
+                var cpuList = new StringBuilder();
                 if (!string.IsNullOrEmpty(CPU[0].Name))
                 {
-                    cpus.Append(CPU[0].Name);
+                    cpuList.Append(CPU[0].Name);
                     if (!string.IsNullOrWhiteSpace(CPU[0].HardwareVendor))
-                        cpus.Append($" ({CPU[0].HardwareVendor})");
-                    cpus.Append("\n                  ");
+                        cpuList.Append($" ({CPU[0].HardwareVendor})");
+                    cpuList.Append("\n                  ");
                 }
 
-                cpus.Append(CPU.Count + " CPU");
+                cpuList.Append(CPU.Count + " CPU");
                 if (CPU.Count != 1)
-                    cpus.Append("s");
+                    cpuList.Append("s");
 
                 if (CPU[0].NumberOfCores > 0)
                 {
-                    cpus.Append($" x {CPU[0].NumberOfCores} core");
+                    cpuList.Append($" x {CPU[0].NumberOfCores} core");
                     if (CPU[0].NumberOfCores != 1)
-                        cpus.Append("s");
+                        cpuList.Append("s");
                 }
-                cpus.Append(".");
+                cpuList.Append(".");
                 if (CPU[0].LogicalProcessors > 0)
-                    cpus.Append($" {CPU[0].LogicalProcessors} logical processors");
+                    cpuList.Append($" {CPU[0].LogicalProcessors} logical processors");
 
-                info.AppendLine($"CPUs:             {cpus} ({Architecture})");
+                info.AppendLine($"CPUs:             {cpuList} ({Architecture})");
             }
 
             if (!string.IsNullOrWhiteSpace(gpuDesc))
@@ -1602,7 +1612,7 @@ private static async Task GetMemoryInfoAsync()
 
         private static CpuCollection GetCpuInfo() 
         {
-            var cpus = new CpuCollection();
+            var cpuList = new CpuCollection();
             if (_hardwareInfo != null)
             {
                 foreach (var cpu in _hardwareInfo.CpuList)
@@ -1632,15 +1642,15 @@ private static CpuCollection GetCpuInfo()
                     else if (EdgeDevice == "Radxa ROCK")
                         cpuInfo.HardwareVendor = "Rockchip";
 
-                    cpus.Add(cpuInfo);
+                    cpuList.Add(cpuInfo);
                 }
             }
 
             // There's obviously at least 1.
-            if (cpus.Count == 0)
-                cpus.Add(new CpuInfo() { NumberOfCores = 1, LogicalProcessors = 1 });
+            if (cpuList.Count == 0)
+                cpuList.Add(new CpuInfo() { NumberOfCores = 1, LogicalProcessors = 1 });
 
-            return cpus;
+            return cpuList;
         }
 
         private async static Task CheckForWslAsync() 
@@ -1688,18 +1698,19 @@ private async static Task GetDockerContainerIdAsync()
             }
         }
 
-        private async static Task CheckOSVersionNameAsync()
+        private async static Task GetOsDetailsAsync()
         {
             // Default fallback
             _osName    = OperatingSystem;
+            _osFlavour = OperatingSystem;
             _osVersion = Environment.OSVersion.Version.Major.ToString();
 
             if (IsLinux)
             {
                 var results = await GetProcessInfoAsync("/bin/bash", "-c \". /etc/os-release;echo $NAME\"", null)
                                                                              .ConfigureAwait(false);
                 if (results is not null)
-                    _osName = results["output"]?.Trim(); // eg "ubuntu", "debian"
+                    _osFlavour = results["output"]?.Trim(); // eg "ubuntu", "debian"
 
                 // VERSION_ID is in form "24.10"
                 results = await GetProcessInfoAsync("/bin/bash", "-c \". /etc/os-release;echo $VERSION_ID\"", null)
@@ -1716,22 +1727,36 @@ private async static Task CheckOSVersionNameAsync()
                 {
                     string? name = results["name"]?.Trim();       // eg. "Oracular Oriole" for Ubuntu 24.10
                     if (!string.IsNullOrWhiteSpace(name))
-                        _osName += " (" + name + ")";
+                        _osCodeName = name;
                 }
-
             }
             else if (IsWindows)
             {
-                if (Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000)
-                    _osVersion = "11";
+                _osCodeName = "Windows " + Environment.OSVersion.Version.Major;
+
+                if (Environment.OSVersion.Version.Major >= 10)
+                {
+                    // See https://github.com/getsentry/sentry-dotnet/issues/1484. 
+                    // C'mon guys: technically the version may be 10.x, but stick to the branding
+                    // that the rest of the world understands.
+                    if (Environment.OSVersion.Version.Build >= 22000)
+                    {
+                        _osVersion  = "11";
+                        _osCodeName = "Sun Valley";
+                    }
+                    else
+                    {
+                        _osCodeName = "Redstone";
+                    }
+                }
             }
             else if (IsMacOS)
             {
                 string command = "awk '/SOFTWARE LICENSE AGREEMENT FOR macOS/' '/System/Library/CoreServices/Setup Assistant.app/Contents/Resources/en.lproj/OSXSoftwareLicense.rtf' | awk -F 'macOS ' '{print $NF}' | awk '{print substr($0, 0, length($0)-1)}'";
                 var results = await GetProcessInfoAsync("/bin/bash", $"-c \"{command}\"", null)
                                                                                 .ConfigureAwait(false);
                 if (results is not null)
-                    _osName = results["output"]?.Trim();  // eg. "Big Sur"
+                    _osCodeName = results["output"]?.Trim();  // eg. "Big Sur"
 
                 results = await GetProcessInfoAsync("/bin/bash", "-c \"sw_vers -productVersion\"", null)
                                                                                 .ConfigureAwait(false);

src/server/Modules/ModuleSettings.cs

@@ -25,6 +25,7 @@ public class ModuleSettings
         const string CurrentModuleDirPathMarker       = "%CURRENT_MODULE_PATH%";
         const string PlatformMarker                   = "%PLATFORM%";
         const string OSMarker                         = "%OS%";  
+        const string OSNameMarker                     = "%OS_NAME%";
         const string DataDirMarker                    = "%DATA_DIR%";
         const string PythonPathMarker                 = "%PYTHON_PATH%";
         const string PythonNameMarker                 = "%PYTHON_NAME%";
@@ -340,6 +341,7 @@ private void ExpandMacros()
                 value = value.Replace(ExternalModulesDirPath,   _moduleOptions.ExternalModulesDirPath);
             value = value.Replace(PlatformMarker,           SystemInfo.Platform.ToLower());
             value = value.Replace(OSMarker,                 SystemInfo.OperatingSystem.ToLower());
+            value = value.Replace(OSNameMarker,             SystemInfo.OperatingSystemName.ToLower());
             value = value.Replace(PythonPathMarker,         _moduleOptions.PythonRelativeInterpreterPath);
             value = value.Replace(DataDirMarker,            _appDataDirectory);
             // Do this last in case other markers contains this marker

src/server/appsettings.json

@@ -138,7 +138,7 @@
     // TODO: Have 'runtime' plugins register runtimes and their launcher's paths to remove the need
     //       for this hardcoding.
 
-    "PythonRelativeInterpreterPath": "/bin/%OS%/%PYTHON_NAME%/venv/Scripts/python", // ** %PYTHON_PATH% will expand to this value
+    "PythonRelativeInterpreterPath": "/bin/%OS_NAME%/%PYTHON_NAME%/venv/Scripts/python", // ** %PYTHON_PATH% will expand to this value
 
     // Whether or not to install the initial set of modules concurrently or one by one.
     "ConcurrentInitialInstalls": false,

src/server/appsettings.linux.arm64.json

@@ -1,7 +1,7 @@
 {
   "ModuleOptions": {
 
-    "PythonRelativeInterpreterPath": "/bin/%OS%/%PYTHON_NAME%/venv/bin/python3", // ** %PYTHON_PATH% will expand to this value
+    "PythonRelativeInterpreterPath": "/bin/%OS_NAME%/%PYTHON_NAME%/venv/bin/python3", // ** %PYTHON_PATH% will expand to this value
 
     // The list of Modules to install on Initial run. The format for the list of initial modules is
     // "moduleid:version; moduleid:version, ...", with the version being optional. If the version is