From 4c8eb9639f2395d8e422a2b70f8cdee59d7cbc2b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 8 Mar 2024 18:04:35 -0800
Subject: [PATCH] server: use separate python version for pip checks

---
 server/package-lock.json                   | 4 ++--
 server/python/plugin_remote.py             | 4 ++--
 server/src/plugin/runtime/python-worker.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 6cd0f7046..b24b966c9 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/server",
-  "version": "0.94.14",
+  "version": "0.94.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/server",
-      "version": "0.94.14",
+      "version": "0.94.15",
       "license": "ISC",
       "dependencies": {
         "@bjia56/portable-python-3.9": "^0.1.10",
diff --git a/server/python/plugin_remote.py b/server/python/plugin_remote.py
index addc5dea3..6967cb821 100644
--- a/server/python/plugin_remote.py
+++ b/server/python/plugin_remote.py
@@ -547,8 +547,8 @@ class PluginRemote:
 
             python_versioned_directory = '%s-%s-%s' % (
                 python_version, platform.system(), platform.machine())
-            SCRYPTED_BASE_VERSION = os.environ.get('SCRYPTED_BASE_VERSION')
-            python_versioned_directory += '-' + SCRYPTED_BASE_VERSION
+            SCRYPTED_PYTHON_VERSION = os.environ.get('SCRYPTED_PYTHON_VERSION')
+            python_versioned_directory += '-' + SCRYPTED_PYTHON_VERSION
 
             pip_target = os.path.join(
                 plugin_volume, python_versioned_directory)
diff --git a/server/src/plugin/runtime/python-worker.ts b/server/src/plugin/runtime/python-worker.ts
index e37c3ad99..c0b600804 100644
--- a/server/src/plugin/runtime/python-worker.ts
+++ b/server/src/plugin/runtime/python-worker.ts
@@ -87,7 +87,7 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
             stdio: ['pipe', 'pipe', 'pipe', 'pipe', 'pipe'],
             env: Object.assign({
                 // rev this if the base python version or server characterstics change.
-                SCRYPTED_BASE_VERSION: '20240308',
+                SCRYPTED_PYTHON_VERSION: '20240308',
                 PYTHONUNBUFFERED: '1',
                 PYTHONPATH,
             }, gstEnv, process.env, env),