From f940276e07ff05e0b626288ffd6abb46457f0715 Mon Sep 17 00:00:00 2001 From: Tadeas Hejnic Date: Mon, 13 Apr 2026 15:29:35 +0200 Subject: [PATCH 1/6] v1.0.1 -> v1.1.0 --- server/settings/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/settings/main.py b/server/settings/main.py index d5f2e08..db2745d 100644 --- a/server/settings/main.py +++ b/server/settings/main.py @@ -113,7 +113,7 @@ class BinaryDistributionSettings(BaseSettingsModel): "value to use the USD builds we provide.", ) server_repo: str = SettingsField( - "lakefs://ayon-usd/v1.0.1/", + "lakefs://ayon-usd/v1.1.0/", title="Repository URI", description="The repository tag or branch URI within the LakeFs server.", ) From 5944720b1c9075f6ace1d109074c7fbffa3f5435 Mon Sep 17 00:00:00 2001 From: Tadeas Hejnic Date: Mon, 20 Apr 2026 10:34:58 +0200 Subject: [PATCH 2/6] remove global usd downloadduring start --- client/ayon_usd/addon.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/ayon_usd/addon.py b/client/ayon_usd/addon.py index 685503f..4002914 100644 --- a/client/ayon_usd/addon.py +++ b/client/ayon_usd/addon.py @@ -45,7 +45,8 @@ def tray_start(self): Download USD if needed. """ - self._download_global_lakefs_binaries() + # self._download_global_lakefs_binaries() + pass def tray_exit(self): """Exit tray module.""" From e1cb1225f286f4f3ed7c1eb42ac352dd88cac387 Mon Sep 17 00:00:00 2001 From: Tadeas Hejnic Date: Mon, 20 Apr 2026 11:40:28 +0200 Subject: [PATCH 3/6] get back to previous --- client/ayon_usd/addon.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/ayon_usd/addon.py b/client/ayon_usd/addon.py index 4002914..685503f 100644 --- a/client/ayon_usd/addon.py +++ b/client/ayon_usd/addon.py @@ -45,8 +45,7 @@ def tray_start(self): Download USD if needed. """ - # self._download_global_lakefs_binaries() - pass + self._download_global_lakefs_binaries() def tray_exit(self): """Exit tray module.""" From 0985bac11c6b89fd05affea5bd9e70c5de11eb6f Mon Sep 17 00:00:00 2001 From: Tadeas Hejnic Date: Mon, 20 Apr 2026 12:18:44 +0200 Subject: [PATCH 4/6] fix error during tray init --- client/ayon_usd/addon.py | 2 +- client/ayon_usd/config.py | 33 ++++++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/client/ayon_usd/addon.py b/client/ayon_usd/addon.py index 685503f..5f03a96 100644 --- a/client/ayon_usd/addon.py +++ b/client/ayon_usd/addon.py @@ -146,4 +146,4 @@ def _download_global_lakefs_binaries(self): ) download_ui.setStyleSheet(style.load_stylesheet()) download_ui.start() - self._download_window = download_ui \ No newline at end of file + self._download_window = download_ui diff --git a/client/ayon_usd/config.py b/client/ayon_usd/config.py index 3f9b261..7abcc38 100644 --- a/client/ayon_usd/config.py +++ b/client/ayon_usd/config.py @@ -29,24 +29,43 @@ def get_global_lake_instance(settings=None): if not settings: settings = get_studio_settings() distribution = settings["usd"]["distribution"] - return wrapper.LakeCtl( + + _LocalCache.lake_instance = wrapper.LakeCtl( server_url=distribution["server_uri"], access_key_id=distribution["access_key_id"], secret_access_key=distribution["secret_access_key"], ) + return _LocalCache.lake_instance + + +def _normalize_lakefs_repo_root(lake_fs_repo: str) -> str: + """Return a repo URI normalized for repo-root operations.""" + lake_fs_repo = lake_fs_repo.strip() + if not lake_fs_repo.endswith("/"): + lake_fs_repo = f"{lake_fs_repo}/" + return lake_fs_repo + +def _normalize_lakefs_repo_base(lake_fs_repo: str) -> str: + """Return a repo URI normalized for object-path construction.""" + return lake_fs_repo.strip().rstrip("/") -def _get_lakefs_repo_items(lake_fs_repo: str) -> list: + +def _get_lakefs_repo_items(lake_fs_repo: str, settings=None) -> list: """Return all repo object names in the LakeFS repository""" if not lake_fs_repo: return [] - return get_global_lake_instance().list_repo_objects(lake_fs_repo) + + lake_fs_repo = _normalize_lakefs_repo_root(lake_fs_repo) + + return get_global_lake_instance(settings).list_repo_objects(lake_fs_repo) -def get_lakefs_usdlib_name(lake_fs_repo: str) -> str: +def get_lakefs_usdlib_name(lake_fs_repo: str, settings=None) -> str: """Return AyonUsdBin/usd LakeFS repo object name for current platform.""" platform_name = platform.system().lower() - lake_fs_repo_items = _get_lakefs_repo_items(lake_fs_repo) + lake_fs_repo = _normalize_lakefs_repo_base(lake_fs_repo) + lake_fs_repo_items = _get_lakefs_repo_items(lake_fs_repo, settings) for item in lake_fs_repo_items: if "AyonUsdBin/usd" in item and platform_name in item: return item @@ -60,6 +79,6 @@ def get_lakefs_usdlib_name(lake_fs_repo: str) -> str: def get_lakefs_usdlib_path(settings: dict) -> str: """Return AyonUsdBin/usd LakeFS full url for current platform. """ lake_fs_repo = settings["usd"]["distribution"]["server_repo"] - lake_fs_repo = lake_fs_repo.strip().rstrip("/") - usd_lib_conf = get_lakefs_usdlib_name(lake_fs_repo) + lake_fs_repo = _normalize_lakefs_repo_base(lake_fs_repo) + usd_lib_conf = get_lakefs_usdlib_name(lake_fs_repo, settings=settings) return f"{lake_fs_repo}/{usd_lib_conf}" From 0ea06ab15afd58cd73068265fad9db98356848b5 Mon Sep 17 00:00:00 2001 From: Tadeas Hejnic Date: Mon, 25 May 2026 14:46:01 +0200 Subject: [PATCH 5/6] use the latest release --- server/settings/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/settings/main.py b/server/settings/main.py index db2745d..23b7780 100644 --- a/server/settings/main.py +++ b/server/settings/main.py @@ -113,7 +113,7 @@ class BinaryDistributionSettings(BaseSettingsModel): "value to use the USD builds we provide.", ) server_repo: str = SettingsField( - "lakefs://ayon-usd/v1.1.0/", + "lakefs://ayon-usd/v1.1.2/", title="Repository URI", description="The repository tag or branch URI within the LakeFs server.", ) From 44adf5746cf22cd364ed3dea378e5a39ae28a020 Mon Sep 17 00:00:00 2001 From: Tadeas Hejnic Date: Mon, 25 May 2026 15:24:41 +0200 Subject: [PATCH 6/6] disable auto download of usd libs --- client/ayon_usd/addon.py | 3 ++- client/ayon_usd/utils.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/ayon_usd/addon.py b/client/ayon_usd/addon.py index 5f03a96..f27d78a 100644 --- a/client/ayon_usd/addon.py +++ b/client/ayon_usd/addon.py @@ -81,7 +81,8 @@ def _download_global_lakefs_binaries(self): json.dump(init_data, json_file) if not utils.is_usd_lib_download_needed(settings): - self.log.info("USD Libs already available. Skipping download.") + # self.log.info("USD Libs already available. Skipping download.") + self.log.info("USD Libs are not needed or are already available. Skipping download.") return lake_fs_usd_lib_path = config.get_lakefs_usdlib_path(settings) diff --git a/client/ayon_usd/utils.py b/client/ayon_usd/utils.py index c629a8e..dc1b6a9 100644 --- a/client/ayon_usd/utils.py +++ b/client/ayon_usd/utils.py @@ -51,6 +51,9 @@ def is_usd_lib_download_needed(settings: dict) -> bool: bool: When true, a new download is required. """ + # currently there is no need to download usd libs + return False + lake_fs_repo = settings["usd"]["distribution"]["server_repo"] usd_lib_dir = os.path.abspath(get_downloaded_usd_root(lake_fs_repo)) if not os.path.exists(usd_lib_dir):