From 43c552dbbfd74712eeebb57e22bc1ef4b807b92e Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 9 Dec 2021 12:13:36 +0100
Subject: [PATCH] added option to pass global settings to
 'get_expected_studio_version_str'

---
 igniter/bootstrap_repos.py | 7 +++++--
 igniter/tools.py           | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/igniter/bootstrap_repos.py b/igniter/bootstrap_repos.py
index 77fcd15f1e..70e6a75b9d 100644
--- a/igniter/bootstrap_repos.py
+++ b/igniter/bootstrap_repos.py
@@ -591,19 +591,22 @@ class OpenPypeVersion(semver.VersionInfo):
         return all_versions[-1]
 
     @classmethod
-    def get_expected_studio_version(cls, staging=False):
+    def get_expected_studio_version(cls, staging=False, global_settings=None):
         """Expected OpenPype version that should be used at the moment.
 
         If version is not defined in settings the latest found version is
         used.
 
+        Using precached global settings is needed for usage inside OpenPype.
+
         Args:
             staging (bool): Staging version or production version.
+            global_settings (dict): Optional precached global settings.
 
         Returns:
             OpenPypeVersion: Version that should be used.
         """
-        result = get_expected_studio_version_str(staging)
+        result = get_expected_studio_version_str(staging, global_settings)
         if not result:
             return None
         return OpenPypeVersion(version=result)
diff --git a/igniter/tools.py b/igniter/tools.py
index 2595140582..735402e9a2 100644
--- a/igniter/tools.py
+++ b/igniter/tools.py
@@ -187,17 +187,21 @@ def get_openpype_path_from_db(url: str) -> Union[str, None]:
     return None
 
 
-def get_expected_studio_version_str(staging=False) -> str:
+def get_expected_studio_version_str(
+    staging=False, global_settings=None
+) -> str:
     """Version that should be currently used in studio.
 
     Args:
         staging (bool): Get current version for staging.
+        global_settings (dict): Optional precached global settings.
 
     Returns:
         str: OpenPype version which should be used. Empty string means latest.
     """
     mongo_url = os.environ.get("OPENPYPE_MONGO")
-    global_settings = get_openpype_global_settings(mongo_url)
+    if global_settings is None:
+        global_settings = get_openpype_global_settings(mongo_url)
     if staging:
         key = "staging_version"
     else: